RepositoryExternal.mk: clean up awful icudata/icui18n duplication

Change-Id: Ic4794d9a908b60220a4a849ff263eaa08776550c

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)

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) \

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))
 

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 \
 ))
 

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 \

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 \

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 \

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 \
 ))
 

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:

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:

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:

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:

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:

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:

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 \
 ))
 

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:

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:

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:

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:

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))