summaryrefslogtreecommitdiff
path: root/libexttextcat
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2012-11-10 11:47:50 -0500
committerPeter Foley <pefoley2@verizon.net>2012-11-10 11:47:50 -0500
commit093acfe13c8f63807c0d004b78844c6f39d1160c (patch)
treedcaa4322d87652ace8ae9ca85cf2e4f2e64fa023 /libexttextcat
parentbd5ce1784c0f139e287f3d0f7ab50b030453e6b8 (diff)
cleanup libexttextcat naming
Change-Id: I8aee95e0f93deaaf08046f544713af010a7f1e44
Diffstat (limited to 'libexttextcat')
-rw-r--r--libexttextcat/ExternalPackage_exttextcat.mk (renamed from libexttextcat/ExternalPackage_libexttextcat.mk)8
-rw-r--r--libexttextcat/ExternalProject_exttextcat.mk (renamed from libexttextcat/ExternalProject_libexttextcat.mk)8
-rw-r--r--libexttextcat/Module_libexttextcat.mk6
-rw-r--r--libexttextcat/StaticLibrary_exttextcat.mk10
-rw-r--r--libexttextcat/UnpackedTarball_exttextcat.mk (renamed from libexttextcat/UnpackedTarball_libexttextcat.mk)6
5 files changed, 19 insertions, 19 deletions
diff --git a/libexttextcat/ExternalPackage_libexttextcat.mk b/libexttextcat/ExternalPackage_exttextcat.mk
index 21a1a90bcc82..cf79b283cc80 100644
--- a/libexttextcat/ExternalPackage_libexttextcat.mk
+++ b/libexttextcat/ExternalPackage_exttextcat.mk
@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,libexttextcat,libexttextcat))
+$(eval $(call gb_ExternalPackage_ExternalPackage,exttextcat,exttextcat))
ifneq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_use_external_project,libexttextcat,libexttextcat))
+$(eval $(call gb_ExternalPackage_use_external_project,exttextcat,exttextcat))
-$(eval $(call gb_ExternalPackage_add_file,libexttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-1.0.a))
+$(eval $(call gb_ExternalPackage_add_file,exttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-1.0.a))
ifeq ($(OS),WNT)
-$(eval $(call gb_ExternalPackage_add_file,libexttextcat,bin/libexttextcat.dll,src/.libs/libexttextcat.dll))
+$(eval $(call gb_ExternalPackage_add_file,exttextcat,bin/libexttextcat.dll,src/.libs/libexttextcat.dll))
endif
endif
diff --git a/libexttextcat/ExternalProject_libexttextcat.mk b/libexttextcat/ExternalProject_exttextcat.mk
index e792b3f975df..f439d08ac51f 100644
--- a/libexttextcat/ExternalProject_libexttextcat.mk
+++ b/libexttextcat/ExternalProject_exttextcat.mk
@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libexttextcat))
+$(eval $(call gb_ExternalProject_ExternalProject,exttextcat))
-$(eval $(call gb_ExternalProject_use_unpacked,libexttextcat,libexttextcat))
+$(eval $(call gb_ExternalProject_use_unpacked,exttextcat,exttextcat))
-$(eval $(call gb_ExternalProject_register_targets,libexttextcat,\
+$(eval $(call gb_ExternalProject_register_targets,exttextcat,\
build \
))
-$(call gb_ExternalProject_get_state_target,libexttextcat,build):
+$(call gb_ExternalProject_get_state_target,exttextcat,build):
cd $(EXTERNAL_WORKDIR) \
&& ./configure --disable-shared --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/libexttextcat/Module_libexttextcat.mk b/libexttextcat/Module_libexttextcat.mk
index 7aa1e10a5ad9..bf65b04e1342 100644
--- a/libexttextcat/Module_libexttextcat.mk
+++ b/libexttextcat/Module_libexttextcat.mk
@@ -11,8 +11,8 @@ $(eval $(call gb_Module_Module,libexttextcat))
ifeq ($(SYSTEM_LIBEXTTEXTCAT),NO)
$(eval $(call gb_Module_add_targets,libexttextcat,\
- UnpackedTarball_libexttextcat \
- ExternalPackage_libexttextcat \
+ UnpackedTarball_exttextcat \
+ ExternalPackage_exttextcat \
Zip_fingerprint \
))
ifeq ($(COM),MSC)
@@ -21,7 +21,7 @@ $(eval $(call gb_Module_add_targets,libexttextcat,\
))
else
$(eval $(call gb_Module_add_targets,libexttextcat,\
- ExternalProject_libexttextcat \
+ ExternalProject_exttextcat \
))
endif
endif
diff --git a/libexttextcat/StaticLibrary_exttextcat.mk b/libexttextcat/StaticLibrary_exttextcat.mk
index 194aa6b3b195..ec2d896b251d 100644
--- a/libexttextcat/StaticLibrary_exttextcat.mk
+++ b/libexttextcat/StaticLibrary_exttextcat.mk
@@ -14,11 +14,11 @@ $(eval $(call gb_StaticLibrary_use_unpacked,exttextcat,libexttextcat))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,exttextcat))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,exttextcat,\
- UnpackedTarball/libexttextcat/src/common \
- UnpackedTarball/libexttextcat/src/fingerprint \
- UnpackedTarball/libexttextcat/src/textcat \
- UnpackedTarball/libexttextcat/src/wg_mempool \
- UnpackedTarball/libexttextcat/src/utf8misc \
+ UnpackedTarball/exttextcat/src/common \
+ UnpackedTarball/exttextcat/src/fingerprint \
+ UnpackedTarball/exttextcat/src/textcat \
+ UnpackedTarball/exttextcat/src/wg_mempool \
+ UnpackedTarball/exttextcat/src/utf8misc \
))
diff --git a/libexttextcat/UnpackedTarball_libexttextcat.mk b/libexttextcat/UnpackedTarball_exttextcat.mk
index bd8fae6a642f..ef90108f2913 100644
--- a/libexttextcat/UnpackedTarball_libexttextcat.mk
+++ b/libexttextcat/UnpackedTarball_exttextcat.mk
@@ -7,11 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,libexttextcat))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,exttextcat))
-$(eval $(call gb_UnpackedTarball_set_tarball,libexttextcat,$(LIBEXTTEXTCAT_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL)))
-$(eval $(call gb_UnpackedTarball_add_patches,libexttextcat,\
+$(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\
libexttextcat/android.patch \
))