mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup libexttextcat naming

Browse Source 
Change-Id: I8aee95e0f93deaaf08046f544713af010a7f1e44
This commit is contained in:
Peter Foley
2012-11-10 11:47:50 -05:00
parent bd5ce1784c
commit 093acfe13c
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RepositoryExternal.mk
View File

@@ -512,7 +512,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
) )
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,libexttextcat/src) \ -I$(call gb_UnpackedTarball_get_dir,exttextcat/src) \
$$(INCLUDE) \ $$(INCLUDE) \
) )

8
libexttextcat/ExternalPackage_libexttextcat.mk → libexttextcat/ExternalPackage_exttextcat.mk
View File

@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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) 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) 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
endif endif

8
libexttextcat/ExternalProject_libexttextcat.mk → libexttextcat/ExternalProject_exttextcat.mk
View File

@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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 \ build \
)) ))
$(call gb_ExternalProject_get_state_target,libexttextcat,build): $(call gb_ExternalProject_get_state_target,exttextcat,build):
cd $(EXTERNAL_WORKDIR) \ cd $(EXTERNAL_WORKDIR) \
&& ./configure --disable-shared --with-pic \ && ./configure --disable-shared --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \

6
libexttextcat/Module_libexttextcat.mk
View File

@@ -11,8 +11,8 @@ $(eval $(call gb_Module_Module,libexttextcat))
ifeq ($(SYSTEM_LIBEXTTEXTCAT),NO) ifeq ($(SYSTEM_LIBEXTTEXTCAT),NO)
$(eval $(call gb_Module_add_targets,libexttextcat,\ $(eval $(call gb_Module_add_targets,libexttextcat,\
UnpackedTarball_libexttextcat \ UnpackedTarball_exttextcat \
ExternalPackage_libexttextcat \ ExternalPackage_exttextcat \
Zip_fingerprint \ Zip_fingerprint \
)) ))
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
@@ -21,7 +21,7 @@ $(eval $(call gb_Module_add_targets,libexttextcat,\
)) ))
else else
$(eval $(call gb_Module_add_targets,libexttextcat,\ $(eval $(call gb_Module_add_targets,libexttextcat,\
ExternalProject_libexttextcat \ ExternalProject_exttextcat \
)) ))
endif endif
endif endif

10
libexttextcat/StaticLibrary_exttextcat.mk
View File

@@ -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_set_warnings_not_errors,exttextcat))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,exttextcat,\ $(eval $(call gb_StaticLibrary_add_generated_cobjects,exttextcat,\
UnpackedTarball/libexttextcat/src/common \ UnpackedTarball/exttextcat/src/common \
UnpackedTarball/libexttextcat/src/fingerprint \ UnpackedTarball/exttextcat/src/fingerprint \
UnpackedTarball/libexttextcat/src/textcat \ UnpackedTarball/exttextcat/src/textcat \
UnpackedTarball/libexttextcat/src/wg_mempool \ UnpackedTarball/exttextcat/src/wg_mempool \
UnpackedTarball/libexttextcat/src/utf8misc \ UnpackedTarball/exttextcat/src/utf8misc \
)) ))

6
libexttextcat/UnpackedTarball_libexttextcat.mk → libexttextcat/UnpackedTarball_exttextcat.mk
View File

@@ -7,11 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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 \ libexttextcat/android.patch \
)) ))