Repository.mk | 1 -
i18npool/Library_collator_data.mk | 23 -----------------------
i18npool/Library_i18npool.mk | 10 ++++++++++
i18npool/Module_i18npool.mk | 1 -
4 files changed, 10 insertions(+), 25 deletions(-)
New commits:
commit 70cc059b7b9fbb38cbbdd04832dd6c87553c8672
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Feb 9 13:58:52 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Feb 12 09:55:40 2024 +0100
merge collator_data library into i18npool
they are both small libraries and this is one less library to
dynamically link in at startup time
Change-Id: I1b36ba1b11b9d69deea3fe0d91b512328d0a42a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163165
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/Repository.mk b/Repository.mk
index f39f9dc656df..8c9923bcc6c2 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -699,7 +699,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
))
$(eval $(call gb_Helper_register_plugins_for_install,PLAINLIBS_OOO,ooo, \
- collator_data \
dict_ja \
dict_zh \
index_data \
diff --git a/i18npool/Library_collator_data.mk
b/i18npool/Library_collator_data.mk
deleted file mode 100644
index 5aaadcb1d20b..000000000000
--- a/i18npool/Library_collator_data.mk
+++ /dev/null
@@ -1,23 +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/.
-#
-
-i18npool_ICULT53 := $(filter 1, $(shell expr $(ICU_MAJOR) \< 53))
-i18npool_LCDALL := $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt)
-i18npool_LCDTXTS := $(if $(i18npool_ICULT53), $(i18npool_LCDALL), $(filter-out
%/ko_charset.txt, $(i18npool_LCDALL)))
-
-$(eval $(call gb_Library_Library,collator_data))
-
-$(eval $(call gb_Library_set_plugin_for_nodep,collator_data,i18npool))
-
-$(eval $(call gb_Library_add_generated_exception_objects,collator_data,\
- $(foreach txt,$(i18npool_LCDTXTS),\
- CustomTarget/i18npool/collator/collator_$(notdir $(basename
$(txt)))) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 97a79be3910b..b7f28f67d8f4 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -7,6 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+i18npool_ICULT53 := $(filter 1, $(shell expr $(ICU_MAJOR) \< 53))
+i18npool_LCDALL := $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt)
+i18npool_LCDTXTS := $(if $(i18npool_ICULT53), $(i18npool_LCDALL), $(filter-out
%/ko_charset.txt, $(i18npool_LCDALL)))
+
$(eval $(call gb_Library_Library,i18npool))
ifeq ($(WITH_LOCALES),en)
@@ -119,6 +123,12 @@ $(eval $(call gb_Library_add_exception_objects,i18npool,\
i18npool/source/transliteration/transliteration_OneToOne \
))
+# collator data
+$(eval $(call gb_Library_add_generated_exception_objects,i18npool,\
+ $(foreach txt,$(i18npool_LCDTXTS),\
+ CustomTarget/i18npool/collator/collator_$(notdir $(basename
$(txt)))) \
+))
+
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(call gb_CxxObject_get_target,i18npool/source/localedata/localedata): $(call
gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_static.hxx
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 3de7643264cc..97c77a014389 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Module_add_targets,i18npool,\
CustomTarget_indexentry \
CustomTarget_localedata \
CustomTarget_textconversion \
- Library_collator_data \
$(if $(filter-out iOS ANDROID,$(OS)), \
Library_dict_ja \
Library_dict_zh) \
