gbuild: split uwinapi out of gb_STDLIBS

Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7

21 files changed, 21 insertions, 0 deletions

diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 3a7855d8e3f4..0fe4577ecff0 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\
 	cppuhelper \
 	sal \
 	unotest \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
index b4e0a81cd826..9c6b549da697 100644
--- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk
+++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification
 	cppuhelper \
 	sal \
 	unotest \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk
index fd7c6047644d..cdb846894122 100644
--- a/i18npool/CppunitTest_i18npool_test_languagetag.mk
+++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
index 68e5076099c6..a2ea6f51430e 100644
--- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
+++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\
 	cppuhelper \
 	sal \
 	unotest \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk
index b1d0bd46b1a4..5999b06466b8 100644
--- a/i18npool/Executable_gencoll_rule.mk
+++ b/i18npool/Executable_gencoll_rule.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\
 
 $(eval $(call gb_Executable_use_libraries,gencoll_rule,\
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk
index 85a49b15e655..58a3011afb16 100644
--- a/i18npool/Executable_genconv_dict.mk
+++ b/i18npool/Executable_genconv_dict.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,genconv_dict,\
 
 $(eval $(call gb_Executable_use_libraries,genconv_dict,\
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk
index 3941b10a09f0..a49f2eb4c726 100644
--- a/i18npool/Executable_gendict.mk
+++ b/i18npool/Executable_gendict.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,gendict,\
 
 $(eval $(call gb_Executable_use_libraries,gendict,\
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk
index 3665f44e9aec..c1279d00964b 100644
--- a/i18npool/Executable_genindex_data.mk
+++ b/i18npool/Executable_genindex_data.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,genindex_data,\
 
 $(eval $(call gb_Executable_use_libraries,genindex_data,\
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk
index 5e61b3280270..eb4efdf838a7 100644
--- a/i18npool/Executable_saxparser.mk
+++ b/i18npool/Executable_saxparser.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk
index bd6ee6048f1c..507a3455c9b6 100644
--- a/i18npool/Library_collator_data.mk
+++ b/i18npool/Library_collator_data.mk
@@ -29,6 +29,7 @@
 $(eval $(call gb_Library_Library,collator_data))
 
 $(eval $(call gb_Library_use_libraries,collator_data,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk
index 89784694b4f7..658d8334cf6c 100644
--- a/i18npool/Library_dict_ja.mk
+++ b/i18npool/Library_dict_ja.mk
@@ -29,6 +29,7 @@
 $(eval $(call gb_Library_Library,dict_ja))
 
 $(eval $(call gb_Library_use_libraries,dict_ja,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk
index 2a910e502136..c21addb7f2cb 100644
--- a/i18npool/Library_dict_zh.mk
+++ b/i18npool/Library_dict_zh.mk
@@ -29,6 +29,7 @@
 $(eval $(call gb_Library_Library,dict_zh))
 
 $(eval $(call gb_Library_use_libraries,dict_zh,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk
index 72134c2d87b5..4ff6fff4331a 100644
--- a/i18npool/Library_i18nisolang1.mk
+++ b/i18npool/Library_i18nisolang1.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_defs,i18nisolang1,\
 
 $(eval $(call gb_Library_use_libraries,i18nisolang1,\
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index bdd0fd66087a..73d38e954cb3 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,i18npool,\
 	i18nisolang1 \
 	i18nutil \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index bfe6450c5899..b55f8cdfe731 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\
 	cppuhelper \
 	i18nregexp \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk
index 9a7270c82c1f..c5bf1f4004ac 100644
--- a/i18npool/Library_index_data.mk
+++ b/i18npool/Library_index_data.mk
@@ -29,6 +29,7 @@
 $(eval $(call gb_Library_Library,index_data))
 
 $(eval $(call gb_Library_use_libraries,index_data,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk
index fe944a792350..4cd77fc77448 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -29,6 +29,7 @@
 $(eval $(call gb_Library_Library,localedata_en))
 
 $(eval $(call gb_Library_use_libraries,localedata_en,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk
index 0d8f1ea77283..145123225e2c 100644
--- a/i18npool/Library_localedata_es.mk
+++ b/i18npool/Library_localedata_es.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_es))
 
 $(eval $(call gb_Library_use_libraries,localedata_es,\
 	localedata_en \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index 96a823e3efd0..c1b4569d01d9 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_euro))
 
 $(eval $(call gb_Library_use_libraries,localedata_euro,\
 	localedata_en \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk
index 08f38bf1c775..d331b8906506 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_others))
 
 $(eval $(call gb_Library_use_libraries,localedata_others,\
 	localedata_en \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk
index e98a4525bf6f..e274c549e850 100644
--- a/i18npool/Library_textconv_dict.mk
+++ b/i18npool/Library_textconv_dict.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_set_include,textconv_dict,\
 $(eval $(call gb_Library_use_sdk_api,textconv_dict))
 
 $(eval $(call gb_Library_use_libraries,textconv_dict,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))