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 /libwps | |
parent | 276021c76102e685c7dbe3776d5f79f71a59ac82 (diff) |
lib*: consistently name all UnpackedTarball and ExternalProject
Change-Id: I4d11dc634c4f93ffcdc7e1f359e5d6a0d001aaae
Diffstat (limited to 'libwps')
-rw-r--r-- | libwps/ExternalPackage_libwps.mk | 2 | ||||
-rw-r--r-- | libwps/ExternalProject_libwps.mk | 2 | ||||
-rw-r--r-- | libwps/Module_libwps.mk | 2 | ||||
-rw-r--r-- | libwps/UnpackedTarball_libwps.mk (renamed from libwps/UnpackedTarball_wps.mk) | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libwps/ExternalPackage_libwps.mk b/libwps/ExternalPackage_libwps.mk index 2390a8fae881..995ec7c8a856 100644 --- a/libwps/ExternalPackage_libwps.mk +++ b/libwps/ExternalPackage_libwps.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,libwps,wps)) +$(eval $(call gb_ExternalPackage_ExternalPackage,libwps,libwps)) $(eval $(call gb_ExternalPackage_add_unpacked_files,libwps,inc/external/libwps,\ src/lib/libwps.h \ diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk index 322d50a7b71c..0cccf2cc536b 100644 --- a/libwps/ExternalProject_libwps.mk +++ b/libwps/ExternalProject_libwps.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libwps,wps)) +$(eval $(call gb_ExternalProject_ExternalProject,libwps,libwps)) $(eval $(call gb_ExternalProject_use_autoconf,libwps,build)) diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk index 36ab218835e7..c5fd1660bdac 100644 --- a/libwps/Module_libwps.mk +++ b/libwps/Module_libwps.mk @@ -14,7 +14,7 @@ ifeq ($(SYSTEM_WPS),NO) $(eval $(call gb_Module_add_targets,libwps,\ ExternalProject_libwps \ ExternalPackage_libwps \ - UnpackedTarball_wps \ + UnpackedTarball_libwps \ )) endif diff --git a/libwps/UnpackedTarball_wps.mk b/libwps/UnpackedTarball_libwps.mk index c5698f7fc94a..1fd633acbe90 100644 --- a/libwps/UnpackedTarball_wps.mk +++ b/libwps/UnpackedTarball_libwps.mk @@ -7,8 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UnpackedTarball_UnpackedTarball,wps)) +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libwps)) -$(eval $(call gb_UnpackedTarball_set_tarball,wps,$(WPS_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL))) # vim: set noet sw=4 ts=4: |