diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-05-06 23:35:13 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-05-07 01:41:26 +0200 |
commit | 10fc13c94890837ca6a8c1a47efe3b2dcba85471 (patch) | |
tree | 2b597737c4647a21c0d0b59b0a125410034d5eb8 /libwpg | |
parent | 276021c76102e685c7dbe3776d5f79f71a59ac82 (diff) |
lib*: consistently name all UnpackedTarball and ExternalProject
Change-Id: I4d11dc634c4f93ffcdc7e1f359e5d6a0d001aaae
Diffstat (limited to 'libwpg')
-rw-r--r-- | libwpg/ExternalPackage_libwpg.mk | 2 | ||||
-rw-r--r-- | libwpg/ExternalProject_libwpg.mk | 2 | ||||
-rw-r--r-- | libwpg/Module_libwpg.mk | 2 | ||||
-rw-r--r-- | libwpg/UnpackedTarball_libwpg.mk (renamed from libwpg/UnpackedTarball_wpg.mk) | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libwpg/ExternalPackage_libwpg.mk b/libwpg/ExternalPackage_libwpg.mk index 916aae1e1316..927f2dae9b1f 100644 --- a/libwpg/ExternalPackage_libwpg.mk +++ b/libwpg/ExternalPackage_libwpg.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg,wpg)) +$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg,libwpg)) $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpg,inc/external/libwpg,\ src/lib/libwpg.h \ diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk index 3f6522c6cd1f..0a0b6bcb05de 100644 --- a/libwpg/ExternalProject_libwpg.mk +++ b/libwpg/ExternalProject_libwpg.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libwpg,wpg)) +$(eval $(call gb_ExternalProject_ExternalProject,libwpg,libwpg)) $(eval $(call gb_ExternalProject_use_autoconf,libwpg,build)) diff --git a/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk index d15e01d84242..17abb6853460 100644 --- a/libwpg/Module_libwpg.mk +++ b/libwpg/Module_libwpg.mk @@ -14,7 +14,7 @@ ifeq ($(SYSTEM_WPG),NO) $(eval $(call gb_Module_add_targets,libwpg,\ ExternalProject_libwpg \ ExternalPackage_libwpg \ - UnpackedTarball_wpg \ + UnpackedTarball_libwpg \ )) endif diff --git a/libwpg/UnpackedTarball_wpg.mk b/libwpg/UnpackedTarball_libwpg.mk index 00c127c77449..03be2064afba 100644 --- a/libwpg/UnpackedTarball_wpg.mk +++ b/libwpg/UnpackedTarball_libwpg.mk @@ -7,8 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UnpackedTarball_UnpackedTarball,wpg)) +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpg)) -$(eval $(call gb_UnpackedTarball_set_tarball,wpg,$(WPG_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,libwpg,$(WPG_TARBALL))) # vim: set noet sw=4 ts=4: |