diff options
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/ExternalPackage_libwpd.mk (renamed from libwpd/Package_libwpd.mk) | 8 | ||||
| -rw-r--r-- | libwpd/Module_libwpd.mk | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libwpd/Package_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk index 331a7d1490a3..72eb4c5e30a6 100644 --- a/libwpd/Package_libwpd.mk +++ b/libwpd/ExternalPackage_libwpd.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libwpd_inc,$(call gb_UnpackedTarball_get_dir,wpd/src/lib))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd_inc,wpd)) -$(eval $(call gb_Package_use_unpacked,libwpd_inc,wpd)) - -$(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd,\ libwpd.h \ WPDocument.h \ WPXBinaryData.h \ @@ -22,7 +20,7 @@ $(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd,\ WPXPropertyListVector.h \ )) -$(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd-stream,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd-stream,\ libwpd-stream.h \ WPXStream.h \ WPXStreamImplementation.h \ diff --git a/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk index fd0d0bb0685a..74ff85e19a38 100644 --- a/libwpd/Module_libwpd.mk +++ b/libwpd/Module_libwpd.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libwpd)) ifeq ($(SYSTEM_LIBWPD),NO) $(eval $(call gb_Module_add_targets,libwpd,\ - Package_libwpd \ + ExternalPackage_libwpd \ StaticLibrary_wpd \ UnpackedTarball_wpd \ )) |