summaryrefslogtreecommitdiff
path: root/libcdr
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 /libcdr
parent98a852fe6af082fc9c9679841dc390b4635888d4 (diff)
update ext. projects to use ExternalPackage
Change-Id: Ia66854f21446fff9a04b1708964286c566333ab0
Diffstat (limited to 'libcdr')
-rw-r--r--libcdr/ExternalPackage_libcdr.mk (renamed from libcdr/Package_libcdr.mk)6
-rw-r--r--libcdr/Module_libcdr.mk2
2 files changed, 3 insertions, 5 deletions
diff --git a/libcdr/Package_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk
index e7d21bcba5b6..c2c12dcf615d 100644
--- a/libcdr/Package_libcdr.mk
+++ b/libcdr/ExternalPackage_libcdr.mk
@@ -7,11 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,libcdr_inc,$(call gb_UnpackedTarball_get_dir,cdr/src/lib)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr_inc,cdr))
-$(eval $(call gb_Package_use_unpacked,libcdr_inc,cdr))
-
-$(eval $(call gb_Package_add_files,libcdr_inc,inc/external/libcdr,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr_inc,inc/external/libcdr,\
libcdr.h \
CDRDocument.h \
CDRStringVector.h \
diff --git a/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk
index 6fb369ab0eca..b02dc270cca5 100644
--- a/libcdr/Module_libcdr.mk
+++ b/libcdr/Module_libcdr.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libcdr))
ifeq ($(SYSTEM_LIBCDR),NO)
$(eval $(call gb_Module_add_targets,libcdr,\
- Package_libcdr \
+ ExternalPackage_libcdr \
StaticLibrary_cdr \
UnpackedTarball_cdr \
))