diff options
| -rw-r--r-- | RepositoryExternal.mk | 8 | ||||
| -rw-r--r-- | external/libexttextcat/ExternalPackage_fingerprint.mk | 2 | ||||
| -rw-r--r-- | external/libexttextcat/ExternalProject_libexttextcat.mk (renamed from external/libexttextcat/ExternalProject_exttextcat.mk) | 6 | ||||
| -rw-r--r-- | external/libexttextcat/Module_libexttextcat.mk | 6 | ||||
| -rw-r--r-- | external/libexttextcat/StaticLibrary_exttextcat.mk | 25 | ||||
| -rw-r--r-- | external/libexttextcat/StaticLibrary_libexttextcat.mk | 25 | ||||
| -rw-r--r-- | external/libexttextcat/UnpackedTarball_libexttextcat.mk (renamed from external/libexttextcat/UnpackedTarball_exttextcat.mk) | 6 |
7 files changed, 39 insertions, 39 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 469ff43944e8..7505c709c51b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -783,19 +783,19 @@ else # !SYSTEM_LIBEXTTEXTCAT define gb_LinkTarget__use_libexttextcat $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,exttextcat/src) \ + -I$(call gb_UnpackedTarball_get_dir,libexttextcat/src) \ $$(INCLUDE) \ ) ifeq ($(COM),MSC) $(call gb_LinkTarget_use_static_libraries,$(1),\ - exttextcat \ + libexttextcat \ ) else $(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 diff --git a/external/libexttextcat/ExternalPackage_fingerprint.mk b/external/libexttextcat/ExternalPackage_fingerprint.mk index 68d4d2461ba2..016446a2afa8 100644 --- a/external/libexttextcat/ExternalPackage_fingerprint.mk +++ b/external/libexttextcat/ExternalPackage_fingerprint.mk @@ -7,7 +7,7 @@ # 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,\ langclass/fpdb.conf \ diff --git a/external/libexttextcat/ExternalProject_exttextcat.mk b/external/libexttextcat/ExternalProject_libexttextcat.mk index f217e84dd12f..34fbc8405cc5 100644 --- a/external/libexttextcat/ExternalProject_exttextcat.mk +++ b/external/libexttextcat/ExternalProject_libexttextcat.mk @@ -7,13 +7,13 @@ # 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 \ )) -$(call gb_ExternalProject_get_state_target,exttextcat,build): +$(call gb_ExternalProject_get_state_target,libexttextcat,build): $(call gb_ExternalProject_run,build,\ ./configure --disable-shared --with-pic \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ diff --git a/external/libexttextcat/Module_libexttextcat.mk b/external/libexttextcat/Module_libexttextcat.mk index 1e74a88f3878..00f73f6196b2 100644 --- a/external/libexttextcat/Module_libexttextcat.mk +++ b/external/libexttextcat/Module_libexttextcat.mk @@ -11,15 +11,15 @@ $(eval $(call gb_Module_Module,libexttextcat)) $(eval $(call gb_Module_add_targets,libexttextcat,\ ExternalPackage_fingerprint \ - UnpackedTarball_exttextcat \ + UnpackedTarball_libexttextcat \ )) ifeq ($(COM),MSC) $(eval $(call gb_Module_add_targets,libexttextcat,\ - StaticLibrary_exttextcat \ + StaticLibrary_libexttextcat \ )) else $(eval $(call gb_Module_add_targets,libexttextcat,\ - ExternalProject_exttextcat \ + ExternalProject_libexttextcat \ )) endif diff --git a/external/libexttextcat/StaticLibrary_exttextcat.mk b/external/libexttextcat/StaticLibrary_exttextcat.mk deleted file mode 100644 index a2c99411eaf1..000000000000 --- a/external/libexttextcat/StaticLibrary_exttextcat.mk +++ /dev/null @@ -1,25 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,exttextcat)) - -$(eval $(call gb_StaticLibrary_use_unpacked,exttextcat,exttextcat)) - -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,exttextcat)) - -$(eval $(call gb_StaticLibrary_add_generated_cobjects,exttextcat,\ - UnpackedTarball/exttextcat/src/common \ - UnpackedTarball/exttextcat/src/fingerprint \ - UnpackedTarball/exttextcat/src/textcat \ - UnpackedTarball/exttextcat/src/wg_mempool \ - UnpackedTarball/exttextcat/src/utf8misc \ -)) - - -# vim: set noet sw=4 ts=4: diff --git a/external/libexttextcat/StaticLibrary_libexttextcat.mk b/external/libexttextcat/StaticLibrary_libexttextcat.mk new file mode 100644 index 000000000000..b3301fa73665 --- /dev/null +++ b/external/libexttextcat/StaticLibrary_libexttextcat.mk @@ -0,0 +1,25 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_StaticLibrary_StaticLibrary,libexttextcat)) + +$(eval $(call gb_StaticLibrary_use_unpacked,libexttextcat,libexttextcat)) + +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libexttextcat)) + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,libexttextcat,\ + UnpackedTarball/libexttextcat/src/common \ + UnpackedTarball/libexttextcat/src/fingerprint \ + UnpackedTarball/libexttextcat/src/textcat \ + UnpackedTarball/libexttextcat/src/wg_mempool \ + UnpackedTarball/libexttextcat/src/utf8misc \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/external/libexttextcat/UnpackedTarball_exttextcat.mk b/external/libexttextcat/UnpackedTarball_libexttextcat.mk index cdd2d5e32374..6b590f2fdf21 100644 --- a/external/libexttextcat/UnpackedTarball_exttextcat.mk +++ b/external/libexttextcat/UnpackedTarball_libexttextcat.mk @@ -7,12 +7,12 @@ # 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 \ )) -$(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: |