summaryrefslogtreecommitdiff
path: root/libpng
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 /libpng
parent98a852fe6af082fc9c9679841dc390b4635888d4 (diff)
update ext. projects to use ExternalPackage
Change-Id: Ia66854f21446fff9a04b1708964286c566333ab0
Diffstat (limited to 'libpng')
-rw-r--r--libpng/ExternalPackage_libpng.mk (renamed from libpng/Package_libpng.mk)6
-rw-r--r--libpng/Module_libpng.mk2
2 files changed, 3 insertions, 5 deletions
diff --git a/libpng/Package_libpng.mk b/libpng/ExternalPackage_libpng.mk
index 0bda07dcf6bd..6fb731da2b4c 100644
--- a/libpng/Package_libpng.mk
+++ b/libpng/ExternalPackage_libpng.mk
@@ -7,11 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,libpng_inc,$(call gb_UnpackedTarball_get_dir,png)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libpng_inc,png))
-$(eval $(call gb_Package_use_unpacked,libpng_inc,png))
-
-$(eval $(call gb_Package_add_files,libpng_inc,inc/external/libpng,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libpng_inc,inc/external/libpng,\
png.h \
pngconf.h \
pnglibconf.h \
diff --git a/libpng/Module_libpng.mk b/libpng/Module_libpng.mk
index a3ecb7baef64..6ee8e4cf4d58 100644
--- a/libpng/Module_libpng.mk
+++ b/libpng/Module_libpng.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libpng))
ifeq ($(SYSTEM_LIBPNG),NO)
$(eval $(call gb_Module_add_targets,libpng,\
- Package_libpng \
+ ExternalPackage_libpng \
StaticLibrary_png \
UnpackedTarball_png \
))