gbuild: replace direct gb_STDLIBS use with ...

... new gb_LinkTarget_add_standard_system_libs

Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69

21 files changed, 42 insertions, 21 deletions

diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 0fe4577ecff0..c51f0a1630ce 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\
 	sal \
 	unotest \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_breakiterator))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\
     i18npool/qa/cppunit/test_breakiterator \
 ))
diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
index 9c6b549da697..086dec586d1f 100644
--- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk
+++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
@@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification
 	sal \
 	unotest \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_characterclassification))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\
     i18npool/qa/cppunit/test_characterclassification \
 ))
diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk
index cdb846894122..7043f320c028 100644
--- a/i18npool/CppunitTest_i18npool_test_languagetag.mk
+++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk
@@ -21,9 +21,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\
 	cppuhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_languagetag))
+
 ifeq ($(ENABLE_LIBLANGTAG),YES)
 $(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\
 	liblangtag \
diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
index a2ea6f51430e..ed943389e970 100644
--- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
+++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
@@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\
 	sal \
 	unotest \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_ordinalsuffix))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_ordinalsuffix,\
     i18npool/qa/cppunit/test_ordinalsuffix \
 ))
diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk
index 5999b06466b8..82aafdb4cea0 100644
--- a/i18npool/Executable_gencoll_rule.mk
+++ b/i18npool/Executable_gencoll_rule.mk
@@ -36,9 +36,10 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\
 $(eval $(call gb_Executable_use_libraries,gencoll_rule,\
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,gencoll_rule))
+
 ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_Executable_use_externals,gencoll_rule,\
 	icudt \
diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk
index 58a3011afb16..22ea9c5d54d1 100644
--- a/i18npool/Executable_genconv_dict.mk
+++ b/i18npool/Executable_genconv_dict.mk
@@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,genconv_dict,\
 $(eval $(call gb_Executable_use_libraries,genconv_dict,\
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,genconv_dict))
+
 $(eval $(call gb_Executable_add_exception_objects,genconv_dict,\
 	i18npool/source/textconversion/genconv_dict \
 ))
diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk
index a49f2eb4c726..38aae75eb138 100644
--- a/i18npool/Executable_gendict.mk
+++ b/i18npool/Executable_gendict.mk
@@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,gendict,\
 $(eval $(call gb_Executable_use_libraries,gendict,\
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,gendict))
+
 $(eval $(call gb_Executable_add_exception_objects,gendict,\
 	i18npool/source/breakiterator/gendict \
 ))
diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk
index c1279d00964b..c6b532192466 100644
--- a/i18npool/Executable_genindex_data.mk
+++ b/i18npool/Executable_genindex_data.mk
@@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,genindex_data,\
 $(eval $(call gb_Executable_use_libraries,genindex_data,\
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,genindex_data))
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_use_externals,gencoll_rule,\
 	icudt \
diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk
index eb4efdf838a7..b61799d690d1 100644
--- a/i18npool/Executable_saxparser.mk
+++ b/i18npool/Executable_saxparser.mk
@@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\
 	cppuhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,saxparser))
+
 $(eval $(call gb_Executable_add_exception_objects,saxparser,\
 	i18npool/source/localedata/LocaleNode \
 	i18npool/source/localedata/filewriter \
diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk
index 507a3455c9b6..a136cef873e0 100644
--- a/i18npool/Library_collator_data.mk
+++ b/i18npool/Library_collator_data.mk
@@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,collator_data))
 
 $(eval $(call gb_Library_use_libraries,collator_data,\
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,collator_data))
+
 $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\
 	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\
 		CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \
diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk
index 658d8334cf6c..a22555b231f5 100644
--- a/i18npool/Library_dict_ja.mk
+++ b/i18npool/Library_dict_ja.mk
@@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,dict_ja))
 
 $(eval $(call gb_Library_use_libraries,dict_ja,\
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,dict_ja))
+
 $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\
 	CustomTarget/i18npool/breakiterator/dict_ja \
 ))
diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk
index c21addb7f2cb..8b80f193de23 100644
--- a/i18npool/Library_dict_zh.mk
+++ b/i18npool/Library_dict_zh.mk
@@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,dict_zh))
 
 $(eval $(call gb_Library_use_libraries,dict_zh,\
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,dict_zh))
+
 $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\
 	CustomTarget/i18npool/breakiterator/dict_zh \
 ))
diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk
index 4ff6fff4331a..422d9cde94f6 100644
--- a/i18npool/Library_i18nisolang1.mk
+++ b/i18npool/Library_i18nisolang1.mk
@@ -44,9 +44,10 @@ $(eval $(call gb_Library_add_defs,i18nisolang1,\
 $(eval $(call gb_Library_use_libraries,i18nisolang1,\
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,i18nisolang1))
+
 $(eval $(call gb_Library_add_exception_objects,i18nisolang1,\
 	i18npool/source/isolang/insys \
 	i18npool/source/isolang/isolang \
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 73d38e954cb3..81486613da42 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,i18npool,\
 	i18nutil \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,i18npool))
+
 ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_Library_use_externals,i18npool,\
 	icuin \
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index b55f8cdfe731..828ec2ba37ca 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\
 	i18nregexp \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,i18nsearch))
+
 $(eval $(call gb_Library_add_exception_objects,i18nsearch,\
 	i18npool/source/search/levdis \
 	i18npool/source/search/textsearch \
diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk
index c5bf1f4004ac..79f1cd93a64b 100644
--- a/i18npool/Library_index_data.mk
+++ b/i18npool/Library_index_data.mk
@@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,index_data))
 
 $(eval $(call gb_Library_use_libraries,index_data,\
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,index_data))
+
 $(eval $(call gb_Library_add_generated_exception_objects,index_data,\
 	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),\
 		CustomTarget/i18npool/indexentry/$(notdir $(basename $(txt)))) \
diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk
index 4cd77fc77448..a5cf7a780676 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,localedata_en))
 
 $(eval $(call gb_Library_use_libraries,localedata_en,\
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,localedata_en))
+
 $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\
 	CustomTarget/i18npool/localedata/localedata_en_AU \
 	CustomTarget/i18npool/localedata/localedata_en_BZ \
diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk
index 145123225e2c..75ba17341a33 100644
--- a/i18npool/Library_localedata_es.mk
+++ b/i18npool/Library_localedata_es.mk
@@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_es))
 $(eval $(call gb_Library_use_libraries,localedata_es,\
 	localedata_en \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,localedata_es))
+
 $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\
 	CustomTarget/i18npool/localedata/localedata_es_AR \
 	CustomTarget/i18npool/localedata/localedata_es_BO \
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index c1b4569d01d9..ad3ebc679071 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_euro))
 $(eval $(call gb_Library_use_libraries,localedata_euro,\
 	localedata_en \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,localedata_euro))
+
 $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
 	CustomTarget/i18npool/localedata/localedata_an_ES \
 	CustomTarget/i18npool/localedata/localedata_ast_ES \
diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk
index d331b8906506..b18593db55bf 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_others))
 $(eval $(call gb_Library_use_libraries,localedata_others,\
 	localedata_en \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,localedata_others))
+
 $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\
 	CustomTarget/i18npool/localedata/localedata_af_NA \
 	CustomTarget/i18npool/localedata/localedata_af_ZA \
diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk
index e274c549e850..a568534c0a97 100644
--- a/i18npool/Library_textconv_dict.mk
+++ b/i18npool/Library_textconv_dict.mk
@@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_sdk_api,textconv_dict))
 
 $(eval $(call gb_Library_use_libraries,textconv_dict,\
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,textconv_dict))
+
 $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\
 	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic),\
 		CustomTarget/i18npool/textconversion/$(notdir $(basename $(txt)))) \