summaryrefslogtreecommitdiff
path: root/libwps
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-09-21 16:53:52 +0200
committerDavid Tardon <dtardon@redhat.com>2012-09-22 14:57:30 +0200
commitf8afd6e28232a02eace0fda3a34b4edc8dc667fe (patch)
treeb4f9e72939dbf99514f9a9e084cee515e35f64d5 /libwps
parent98a852fe6af082fc9c9679841dc390b4635888d4 (diff)
update ext. projects to use ExternalPackage
Change-Id: Ia66854f21446fff9a04b1708964286c566333ab0
Diffstat (limited to 'libwps')
-rw-r--r--libwps/ExternalPackage_libwps.mk (renamed from libwps/Package_libwps.mk)6
-rw-r--r--libwps/Module_libwps.mk2
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 \
))