diff options
Diffstat (limited to 'libmspub')
-rw-r--r-- | libmspub/ExternalPackage_libmspub.mk (renamed from libmspub/Package_libmspub.mk) | 6 | ||||
-rw-r--r-- | libmspub/Module_libmspub.mk | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libmspub/Package_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk index af25dc129c74..2b834cf3a062 100644 --- a/libmspub/Package_libmspub.mk +++ b/libmspub/ExternalPackage_libmspub.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libmspub_inc,$(call gb_UnpackedTarball_get_dir,mspub/src/lib))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub_inc,mspub)) -$(eval $(call gb_Package_use_unpacked,libmspub_inc,mspub)) - -$(eval $(call gb_Package_add_files,libmspub_inc,inc/external/libmspub,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub_inc,inc/external/libmspub,\ libmspub.h \ MSPUBDocument.h \ MSPUBStringVector.h \ diff --git a/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk index d81abdd60f29..0106a9f27f71 100644 --- a/libmspub/Module_libmspub.mk +++ b/libmspub/Module_libmspub.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libmspub)) ifeq ($(SYSTEM_LIBMSPUB),NO) $(eval $(call gb_Module_add_targets,libmspub,\ - Package_libmspub \ + ExternalPackage_libmspub \ StaticLibrary_mspub \ UnpackedTarball_mspub \ )) |