summaryrefslogtreecommitdiff
path: root/liborcus
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-05-06 23:35:13 +0200
committerMichael Stahl <mstahl@redhat.com>2013-05-07 01:41:26 +0200
commit10fc13c94890837ca6a8c1a47efe3b2dcba85471 (patch)
tree2b597737c4647a21c0d0b59b0a125410034d5eb8 /liborcus
parent276021c76102e685c7dbe3776d5f79f71a59ac82 (diff)
lib*: consistently name all UnpackedTarball and ExternalProject
Change-Id: I4d11dc634c4f93ffcdc7e1f359e5d6a0d001aaae
Diffstat (limited to 'liborcus')
-rw-r--r--liborcus/ExternalPackage_liborcus.mk2
-rw-r--r--liborcus/ExternalProject_liborcus.mk2
-rw-r--r--liborcus/Module_liborcus.mk2
-rw-r--r--liborcus/UnpackedTarball_liborcus.mk (renamed from liborcus/UnpackedTarball_orcus.mk)18
4 files changed, 12 insertions, 12 deletions
diff --git a/liborcus/ExternalPackage_liborcus.mk b/liborcus/ExternalPackage_liborcus.mk
index 8ed7a6773e3a..8381e76fcd9c 100644
--- a/liborcus/ExternalPackage_liborcus.mk
+++ b/liborcus/ExternalPackage_liborcus.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,orcus))
+$(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 80eb92620dbf..df8b49447e9e 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,liborcus,orcus))
+$(eval $(call gb_ExternalProject_ExternalProject,liborcus,liborcus))
$(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
diff --git a/liborcus/Module_liborcus.mk b/liborcus/Module_liborcus.mk
index af18ad3b37c0..78e90d98ca07 100644
--- a/liborcus/Module_liborcus.mk
+++ b/liborcus/Module_liborcus.mk
@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_LIBORCUS),NO)
$(eval $(call gb_Module_add_targets,liborcus,\
ExternalProject_liborcus \
ExternalPackage_liborcus \
- UnpackedTarball_orcus \
+ UnpackedTarball_liborcus \
))
endif
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_liborcus.mk
index 6370b2f8a4b1..e43144db031b 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_liborcus.mk
@@ -7,31 +7,31 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,orcus))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,liborcus))
-$(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,liborcus,$(ORCUS_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,0))
-orcus_patches :=
+liborcus_patches :=
# make config.sub recognize arm-linux-androideabi
-orcus_patches += liborcus_0.1.0-configure.patch
+liborcus_patches += liborcus_0.1.0-configure.patch
# don't use dllimport
-orcus_patches += liborcus_0.1.0-dllimport.patch
+liborcus_patches += liborcus_0.1.0-dllimport.patch
ifeq ($(OS),MACOSX)
# no "tac" command on OS X, but "tail -r"
-orcus_patches += liborcus_0.1.0-tac.patch
+liborcus_patches += liborcus_0.1.0-tac.patch
endif
# <https://gitorious.org/orcus/orcus/merge_requests/2#
# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
-$(eval $(call gb_UnpackedTarball_add_patches,orcus,\
- $(foreach patch,$(orcus_patches),liborcus/$(patch)) \
+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
+ $(foreach patch,$(liborcus_patches),liborcus/$(patch)) \
))
# vim: set noet sw=4 ts=4: