diff options
Diffstat (limited to 'libwps')
-rw-r--r-- | libwps/ExternalPackage_libwps.mk (renamed from libwps/Package_libwps.mk) | 6 | ||||
-rw-r--r-- | libwps/Module_libwps.mk | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libwps/Package_libwps.mk b/libwps/ExternalPackage_libwps.mk index 6ebee913b92d..102453780f89 100644 --- a/libwps/Package_libwps.mk +++ b/libwps/ExternalPackage_libwps.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libwps_inc,$(call gb_UnpackedTarball_get_dir,wps/src/lib))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libwps_inc,wps)) -$(eval $(call gb_Package_use_unpacked,libwps_inc,wps)) - -$(eval $(call gb_Package_add_files,libwps_inc,inc/external/libwps,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libwps_inc,inc/external/libwps,\ libwps.h \ WPSDocument.h \ )) diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk index aacdb0e274b5..a903fa955389 100644 --- a/libwps/Module_libwps.mk +++ b/libwps/Module_libwps.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libwps)) ifeq ($(SYSTEM_LIBWPS),NO) $(eval $(call gb_Module_add_targets,libwps,\ - Package_libwps \ + ExternalPackage_libwps \ StaticLibrary_wps \ UnpackedTarball_wps \ )) |