Skip to content

C
core
Kaydet (Commit) 4b43f23b authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

libwpd: invalid to have both ExternalPackage and Package in one makefile 

Change-Id: Ia695c0a1fff265360bee57f9b6063178856b7f82
üst 4901a282
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
libwpd/ExternalPackage_libwpd.mk
Dosyayı görüntüle @ 4b43f23b
......@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd_inc,wpd))
$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,wpd))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd,\
$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd,\
src/lib/libwpd.h \
src/lib/WPDocument.h \
src/lib/WPXBinaryData.h \
......@@ -20,15 +20,13 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libw
src/lib/WPXPropertyListVector.h \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd-stream,\
$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd-stream,\
src/lib/libwpd-stream.h \
src/lib/WPXStream.h \
src/lib/WPXStreamImplementation.h \
))
$(eval $(call gb_Package_Package,libwpd,$(call gb_UnpackedTarball_get_dir,wpd)))
$(eval $(call gb_Package_use_external_project,libwpd,libwpd))
$(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd))
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment