summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Library_merged.mk8
-rw-r--r--RepositoryExternal.mk16
-rw-r--r--forms/Library_frm.mk8
-rw-r--r--i18npool/CppunitTest_i18npool_test_textsearch.mk2
-rw-r--r--i18npool/Executable_gencoll_rule.mk8
-rw-r--r--i18npool/Executable_genindex_data.mk8
-rw-r--r--i18npool/Library_i18npool.mk7
-rw-r--r--i18npool/Library_i18nsearch.mk2
-rw-r--r--l10ntools/Executable_cfgex.mk2
-rw-r--r--l10ntools/Executable_helpex.mk2
-rw-r--r--l10ntools/Executable_localize.mk2
-rw-r--r--l10ntools/Executable_propex.mk2
-rw-r--r--l10ntools/Executable_renewpo.mk2
-rw-r--r--l10ntools/Executable_stringex.mk2
-rw-r--r--l10ntools/Executable_transex3.mk2
-rw-r--r--l10ntools/Executable_treex.mk2
-rw-r--r--l10ntools/Executable_uiex.mk2
-rw-r--r--l10ntools/Executable_ulfex.mk2
-rw-r--r--l10ntools/Executable_xrmex.mk2
-rw-r--r--lotuswordpro/Library_lwpft.mk7
20 files changed, 22 insertions, 66 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 61de3a2e2f12..58e219cbf92f 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(eval $(call gb_Library_use_externals,merged,\
cups \
+ icui18n \
icule \
icuuc \
jpeg \
@@ -121,13 +122,6 @@ $(eval $(call gb_Library_add_ldflags,merged,\
/ignore:4049 \
/ignore:4217 \
))
-$(eval $(call gb_Library_use_externals,merged,\
- icuin \
-))
-else
-$(eval $(call gb_Library_use_externals,merged,\
- icui18n \
-))
endif
ifeq ($(OS),MACOSX)
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5ead1031b997..2159be13197d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -871,18 +871,15 @@ ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
icudt \
icuin \
- icule \
- icutu \
- icuuc \
))
-define gb_LinkTarget__use_icudt
+define gb_LinkTarget__use_icudata
$(call gb_LinkTarget_use_libraries,$(1),\
icudt \
)
endef
-define gb_LinkTarget__use_icuin
+define gb_LinkTarget__use_icui18n
$(call gb_LinkTarget_use_libraries,$(1),\
icuin \
)
@@ -892,9 +889,6 @@ else
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
icudata$(gb_ICU_suffix) \
icui18n$(gb_ICU_suffix) \
- icule$(gb_ICU_suffix) \
- icutu$(gb_ICU_suffix) \
- icuuc$(gb_ICU_suffix) \
))
define gb_LinkTarget__use_icudata
@@ -911,6 +905,12 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef
endif
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ icule$(gb_ICU_suffix) \
+ icutu$(gb_ICU_suffix) \
+ icuuc$(gb_ICU_suffix) \
+))
+
define gb_LinkTarget__use_icule
$(call gb_LinkTarget_use_libraries,$(1),\
icule$(gb_ICU_suffix) \
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index e86803163839..4f60e8f3e11a 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -60,19 +60,11 @@ $(eval $(call gb_Library_use_libraries,frm,\
$(gb_UWINAPI) \
))
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_Library_use_externals,frm,\
- icuin \
- icuuc \
- libxml2 \
-))
-else
$(eval $(call gb_Library_use_externals,frm,\
icui18n \
icuuc \
libxml2 \
))
-endif
$(eval $(call gb_Library_set_componentfile,frm,forms/util/frm))
diff --git a/i18npool/CppunitTest_i18npool_test_textsearch.mk b/i18npool/CppunitTest_i18npool_test_textsearch.mk
index b563ac1f8dbb..2f6998f94be8 100644
--- a/i18npool/CppunitTest_i18npool_test_textsearch.mk
+++ b/i18npool/CppunitTest_i18npool_test_textsearch.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_textsearch,\
))
$(eval $(call gb_CppunitTest_use_externals,i18npool_test_textsearch,\
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
icuuc \
))
diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk
index d0ef67acc5a9..4974c6335ee4 100644
--- a/i18npool/Executable_gencoll_rule.mk
+++ b/i18npool/Executable_gencoll_rule.mk
@@ -38,19 +38,11 @@ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\
$(gb_UWINAPI) \
))
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_Executable_use_externals,gencoll_rule,\
- icudt \
- icuin \
- icuuc \
-))
-else
$(eval $(call gb_Executable_use_externals,gencoll_rule,\
icudata \
icui18n \
icuuc \
))
-endif
$(eval $(call gb_Executable_add_exception_objects,gencoll_rule,\
i18npool/source/collator/gencoll_rule \
diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk
index 2c36e3e3123a..0795b7bb2c51 100644
--- a/i18npool/Executable_genindex_data.mk
+++ b/i18npool/Executable_genindex_data.mk
@@ -37,19 +37,11 @@ $(eval $(call gb_Executable_use_libraries,genindex_data,\
$(gb_UWINAPI) \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_use_externals,gencoll_rule,\
- icudt \
- icuin \
- icuuc \
-))
-else
$(eval $(call gb_Executable_use_externals,genindex_data,\
icudata \
icui18n \
icuuc \
))
-endif
$(eval $(call gb_Executable_add_exception_objects,genindex_data,\
i18npool/source/indexentry/genindex_data \
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 1e26716a3d5b..183ea54ecabd 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -47,17 +47,10 @@ $(eval $(call gb_Library_use_libraries,i18npool,\
$(gb_UWINAPI) \
))
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_Library_use_externals,i18npool,\
- icuin \
- icuuc \
-))
-else
$(eval $(call gb_Library_use_externals,i18npool,\
icui18n \
icuuc \
))
-endif
$(eval $(call gb_Library_add_exception_objects,i18npool,\
i18npool/source/breakiterator/breakiterator_cjk \
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index d59345e91574..77780775ca56 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_set_include,i18nsearch,\
$(eval $(call gb_Library_use_sdk_api,i18nsearch))
$(eval $(call gb_Library_use_externals,i18nsearch,\
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
icuuc \
))
diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk
index e8e16829536c..74ed3f81753c 100644
--- a/l10ntools/Executable_cfgex.mk
+++ b/l10ntools/Executable_cfgex.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Executable_add_exception_objects,cfgex,\
$(eval $(call gb_Executable_use_externals,cfgex,\
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk
index 66d870768bc2..48261762135d 100644
--- a/l10ntools/Executable_helpex.mk
+++ b/l10ntools/Executable_helpex.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Executable_add_exception_objects,helpex,\
$(eval $(call gb_Executable_use_externals,helpex,\
libxml2 \
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk
index a810b6cd8e22..5e55eee665e7 100644
--- a/l10ntools/Executable_localize.mk
+++ b/l10ntools/Executable_localize.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Executable_add_exception_objects,localize,\
$(eval $(call gb_Executable_use_externals,localize,\
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_propex.mk b/l10ntools/Executable_propex.mk
index 06080c682840..f97f7a14d0be 100644
--- a/l10ntools/Executable_propex.mk
+++ b/l10ntools/Executable_propex.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Executable_add_exception_objects,propex,\
$(eval $(call gb_Executable_use_externals,propex,\
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
))
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk
index db84a41ae5d7..cfdb923dd057 100644
--- a/l10ntools/Executable_renewpo.mk
+++ b/l10ntools/Executable_renewpo.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Executable_add_exception_objects,renewpo,\
$(eval $(call gb_Executable_use_externals,renewpo,\
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
))
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_stringex.mk b/l10ntools/Executable_stringex.mk
index f42b36c79acf..b05341290995 100644
--- a/l10ntools/Executable_stringex.mk
+++ b/l10ntools/Executable_stringex.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Executable_add_exception_objects,stringex,\
$(eval $(call gb_Executable_use_externals,stringex,\
libxml2 \
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
))
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk
index 5568f93ef475..baba40e777a3 100644
--- a/l10ntools/Executable_transex3.mk
+++ b/l10ntools/Executable_transex3.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Executable_add_exception_objects,transex3,\
$(eval $(call gb_Executable_use_externals,transex3,\
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
libxml2 \
))
diff --git a/l10ntools/Executable_treex.mk b/l10ntools/Executable_treex.mk
index af77c71a1546..2cdb1b2de4a2 100644
--- a/l10ntools/Executable_treex.mk
+++ b/l10ntools/Executable_treex.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Executable_add_exception_objects,treex,\
$(eval $(call gb_Executable_use_externals,treex,\
libxml2 \
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
))
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk
index 8a20512b3412..5a8f23c7a433 100644
--- a/l10ntools/Executable_uiex.mk
+++ b/l10ntools/Executable_uiex.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Executable_use_externals,uiex,\
libxslt \
boost_headers \
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
))
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk
index 5f4a492fdac8..0ee4d44cb4c1 100644
--- a/l10ntools/Executable_ulfex.mk
+++ b/l10ntools/Executable_ulfex.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Executable_add_exception_objects,ulfex,\
$(eval $(call gb_Executable_use_externals,ulfex,\
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk
index 3dab334c7032..bcad1b9d3993 100644
--- a/l10ntools/Executable_xrmex.mk
+++ b/l10ntools/Executable_xrmex.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Executable_add_exception_objects,xrmex,\
$(eval $(call gb_Executable_use_externals,xrmex,\
libxml2 \
icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
+ icui18n \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index a521edca33fc..d528c63806f8 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -50,17 +50,10 @@ $(eval $(call gb_Library_use_libraries,lwpft,\
$(gb_UWINAPI) \
))
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_Library_use_externals,lwpft,\
- icuin \
- icuuc \
-))
-else
$(eval $(call gb_Library_use_externals,lwpft,\
icui18n \
icuuc \
))
-endif
$(eval $(call gb_Library_set_componentfile,lwpft,lotuswordpro/util/lwpfilter))
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 20:39:38 +0000