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 /libcdr | |
| parent | 276021c76102e685c7dbe3776d5f79f71a59ac82 (diff) | |
lib*: consistently name all UnpackedTarball and ExternalProject
Change-Id: I4d11dc634c4f93ffcdc7e1f359e5d6a0d001aaae
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/ExternalPackage_libcdr.mk | 2 | ||||
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 2 | ||||
| -rw-r--r-- | libcdr/Module_libcdr.mk | 2 | ||||
| -rw-r--r-- | libcdr/UnpackedTarball_libcdr.mk (renamed from libcdr/UnpackedTarball_cdr.mk) | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index 4f08279c754b..9fd6d9ad713a 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,cdr)) +$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,libcdr)) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\ src/lib/libcdr.h \ diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 1a89d5846d28..f71408e4b48c 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libcdr,cdr)) +$(eval $(call gb_ExternalProject_ExternalProject,libcdr,libcdr)) $(eval $(call gb_ExternalProject_use_autoconf,libcdr,build)) diff --git a/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk index e92d5ad8e1ca..9074a9e9aae3 100644 --- a/libcdr/Module_libcdr.mk +++ b/libcdr/Module_libcdr.mk @@ -14,7 +14,7 @@ ifeq ($(SYSTEM_CDR),NO) $(eval $(call gb_Module_add_targets,libcdr,\ ExternalPackage_libcdr \ ExternalProject_libcdr \ - UnpackedTarball_cdr \ + UnpackedTarball_libcdr \ )) endif diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_libcdr.mk index a4a427d4ca21..e5cd13595292 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_libcdr.mk @@ -7,13 +7,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr)) +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr)) -$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1)) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,1)) -$(eval $(call gb_UnpackedTarball_add_patches,cdr,\ +$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\ libcdr/libcdr-0.0.13.patch \ )) |