Kaydet (Commit) 653e358a authored tarafından Michael Stahl's avatar Michael Stahl

consistent naming of externals: exttextcat -> libexttextcat

Change-Id: Ia70782713fee251deeea5580961219938cfe8b89
Reviewed-on: https://gerrit.libreoffice.org/42293Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 38abb6aa
...@@ -783,19 +783,19 @@ else # !SYSTEM_LIBEXTTEXTCAT ...@@ -783,19 +783,19 @@ else # !SYSTEM_LIBEXTTEXTCAT
define gb_LinkTarget__use_libexttextcat define gb_LinkTarget__use_libexttextcat
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,exttextcat/src) \ -I$(call gb_UnpackedTarball_get_dir,libexttextcat/src) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
$(call gb_LinkTarget_use_static_libraries,$(1),\ $(call gb_LinkTarget_use_static_libraries,$(1),\
exttextcat \ libexttextcat \
) )
else else
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,exttextcat)/src/.libs/libexttextcat-2.0.a\ $(call gb_UnpackedTarball_get_dir,libexttextcat)/src/.libs/libexttextcat-2.0.a\
) )
$(call gb_LinkTarget_use_external_project,$(1),exttextcat) $(call gb_LinkTarget_use_external_project,$(1),libexttextcat)
endif endif
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# 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_fingerprint,exttextcat)) $(eval $(call gb_ExternalPackage_ExternalPackage,libexttextcat_fingerprint,libexttextcat))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(LIBO_SHARE_FOLDER)/fingerprint,\ $(eval $(call gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(LIBO_SHARE_FOLDER)/fingerprint,\
langclass/fpdb.conf \ langclass/fpdb.conf \
......
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
# 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,exttextcat)) $(eval $(call gb_ExternalProject_ExternalProject,libexttextcat))
$(eval $(call gb_ExternalProject_register_targets,exttextcat,\ $(eval $(call gb_ExternalProject_register_targets,libexttextcat,\
build \ build \
)) ))
$(call gb_ExternalProject_get_state_target,exttextcat,build): $(call gb_ExternalProject_get_state_target,libexttextcat,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
./configure --disable-shared --with-pic \ ./configure --disable-shared --with-pic \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
......
...@@ -11,15 +11,15 @@ $(eval $(call gb_Module_Module,libexttextcat)) ...@@ -11,15 +11,15 @@ $(eval $(call gb_Module_Module,libexttextcat))
$(eval $(call gb_Module_add_targets,libexttextcat,\ $(eval $(call gb_Module_add_targets,libexttextcat,\
ExternalPackage_fingerprint \ ExternalPackage_fingerprint \
UnpackedTarball_exttextcat \ UnpackedTarball_libexttextcat \
)) ))
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
$(eval $(call gb_Module_add_targets,libexttextcat,\ $(eval $(call gb_Module_add_targets,libexttextcat,\
StaticLibrary_exttextcat \ StaticLibrary_libexttextcat \
)) ))
else else
$(eval $(call gb_Module_add_targets,libexttextcat,\ $(eval $(call gb_Module_add_targets,libexttextcat,\
ExternalProject_exttextcat \ ExternalProject_libexttextcat \
)) ))
endif endif
......
...@@ -7,18 +7,18 @@ ...@@ -7,18 +7,18 @@
# 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_StaticLibrary_StaticLibrary,exttextcat)) $(eval $(call gb_StaticLibrary_StaticLibrary,libexttextcat))
$(eval $(call gb_StaticLibrary_use_unpacked,exttextcat,exttextcat)) $(eval $(call gb_StaticLibrary_use_unpacked,libexttextcat,libexttextcat))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,exttextcat)) $(eval $(call gb_StaticLibrary_set_warnings_not_errors,libexttextcat))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,exttextcat,\ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libexttextcat,\
UnpackedTarball/exttextcat/src/common \ UnpackedTarball/libexttextcat/src/common \
UnpackedTarball/exttextcat/src/fingerprint \ UnpackedTarball/libexttextcat/src/fingerprint \
UnpackedTarball/exttextcat/src/textcat \ UnpackedTarball/libexttextcat/src/textcat \
UnpackedTarball/exttextcat/src/wg_mempool \ UnpackedTarball/libexttextcat/src/wg_mempool \
UnpackedTarball/exttextcat/src/utf8misc \ UnpackedTarball/libexttextcat/src/utf8misc \
)) ))
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
# 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,exttextcat)) $(eval $(call gb_UnpackedTarball_UnpackedTarball,libexttextcat))
$(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\ $(eval $(call gb_UnpackedTarball_add_patches,libexttextcat,\
external/libexttextcat/exttextcat-iOS.patch.1 \ external/libexttextcat/exttextcat-iOS.patch.1 \
)) ))
$(eval $(call gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL))) $(eval $(call gb_UnpackedTarball_set_tarball,libexttextcat,$(LIBEXTTEXTCAT_TARBALL)))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment