gbuild: split uwinapi out of gb_STDLIBS

Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7

32 files changed, 32 insertions, 0 deletions

diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk
index f74e84753a89..d2f5079723e3 100644
--- a/sal/CppunitTest_Module_DLL.mk
+++ b/sal/CppunitTest_Module_DLL.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\
 
 $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk
index 6ceb12af917c..cdb62c7e4334 100644
--- a/sal/CppunitTest_sal_bytesequence.mk
+++ b/sal/CppunitTest_sal_bytesequence.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk
index 280fd7306acb..8b7ca18c9339 100644
--- a/sal/CppunitTest_sal_checkapi.mk
+++ b/sal/CppunitTest_sal_checkapi.mk
@@ -44,6 +44,7 @@ $(call gb_CxxObject_get_target,sal/qa/checkapi/strings) :| \
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk
index 9ea1a2a7c2e7..4c90de256844 100644
--- a/sal/CppunitTest_sal_osl_condition.mk
+++ b/sal/CppunitTest_sal_osl_condition.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk
index ff46564c855e..dfd5d592f999 100644
--- a/sal/CppunitTest_sal_osl_file.mk
+++ b/sal/CppunitTest_sal_osl_file.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
index cfbb95d89e25..199f94cc3fc1 100644
--- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
+++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_getsystempathfromfile
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk
index d64498a561cc..7b75f8a3e0fc 100644
--- a/sal/CppunitTest_sal_osl_module.mk
+++ b/sal/CppunitTest_sal_osl_module.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk
index cfc92f5e3253..131761d1d078 100644
--- a/sal/CppunitTest_sal_osl_mutex.mk
+++ b/sal/CppunitTest_sal_osl_mutex.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk
index 0e92b707b972..3828b7784b9a 100644
--- a/sal/CppunitTest_sal_osl_old_test_file.mk
+++ b/sal/CppunitTest_sal_osl_old_test_file.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk
index 8e6b5bfe796e..4aa70952531b 100644
--- a/sal/CppunitTest_sal_osl_pipe.mk
+++ b/sal/CppunitTest_sal_osl_pipe.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_pipe, \
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \
     sal \
     unotest \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk
index 60c728ab40ff..6a53add92dae 100644
--- a/sal/CppunitTest_sal_osl_process.mk
+++ b/sal/CppunitTest_sal_osl_process.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_process,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk
index 7eb2b9dc087a..1195b7d55eb1 100644
--- a/sal/CppunitTest_sal_osl_profile.mk
+++ b/sal/CppunitTest_sal_osl_profile.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk
index 1e2aac169e06..a583b7c423dc 100644
--- a/sal/CppunitTest_sal_osl_security.mk
+++ b/sal/CppunitTest_sal_osl_security.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_security,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk
index 69a350254365..6d6f8df52238 100644
--- a/sal/CppunitTest_sal_osl_setthreadname.mk
+++ b/sal/CppunitTest_sal_osl_setthreadname.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk
index 22fdb6831355..b014c83e46ba 100644
--- a/sal/CppunitTest_sal_osl_thread.mk
+++ b/sal/CppunitTest_sal_osl_thread.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_thread,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk
index 5ed812526d60..e6a52823b2a9 100644
--- a/sal/CppunitTest_sal_rtl_alloc.mk
+++ b/sal/CppunitTest_sal_rtl_alloc.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_alloc,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk
index aee5f0fe1cb7..78cca6b7b39a 100644
--- a/sal/CppunitTest_sal_rtl_cipher.mk
+++ b/sal/CppunitTest_sal_rtl_cipher.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_cipher,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk
index 32da6ec443c6..1c5b6d19c71d 100644
--- a/sal/CppunitTest_sal_rtl_crc32.mk
+++ b/sal/CppunitTest_sal_rtl_crc32.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_crc32,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk
index aeaa91b4f588..9c11d796de49 100644
--- a/sal/CppunitTest_sal_rtl_doublelock.mk
+++ b/sal/CppunitTest_sal_rtl_doublelock.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_doublelock,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk
index 96d11fe389e3..613251ef6c13 100644
--- a/sal/CppunitTest_sal_rtl_locale.mk
+++ b/sal/CppunitTest_sal_rtl_locale.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_locale,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk
index 09856b7d686a..df570a552b0d 100644
--- a/sal/CppunitTest_sal_rtl_math.mk
+++ b/sal/CppunitTest_sal_rtl_math.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk
index 721996298bb3..f0ea74c7ca97 100644
--- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk
+++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ostringbuffer,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk
index 570717eb559b..f2384f709cdc 100644
--- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk
+++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustringbuffer,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk
index 2762133e24f3..bdab2fb48987 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_strings,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk
index 1da1b1b55bb6..69e701b794ab 100644
--- a/sal/CppunitTest_sal_rtl_uri.mk
+++ b/sal/CppunitTest_sal_rtl_uri.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uri,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk
index 9a92af246696..8be994595e1f 100644
--- a/sal/CppunitTest_sal_rtl_uuid.mk
+++ b/sal/CppunitTest_sal_rtl_uuid.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uuid,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk
index d96f57c688f3..7efbad135f36 100644
--- a/sal/CppunitTest_sal_tcwf.mk
+++ b/sal/CppunitTest_sal_tcwf.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk
index bc904e23c23e..720f5ee3cf0b 100644
--- a/sal/CppunitTest_sal_types.mk
+++ b/sal/CppunitTest_sal_types.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_types,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_types,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk
index e9d4170b58fe..c8d8f4756222 100644
--- a/sal/Executable_cppunittester.mk
+++ b/sal/Executable_cppunittester.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_set_include,cppunit/cppunittester,\
 
 $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk
index 90548762fb52..d43400d6d86f 100644
--- a/sal/Executable_osl_process_child.mk
+++ b/sal/Executable_osl_process_child.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Executable_Executable,osl_process_child))
 
 $(eval $(call gb_Executable_use_libraries,osl_process_child,\
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 4da0e3b6653c..653aa0bdafad 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_Library_use_libraries,sal,\
 	$(if $(filter $(OS),ANDROID), \
 		lo-bootstrap \
 	) \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk
index 3ad5dbfb8832..94f69911cebc 100644
--- a/sal/Library_sal_textenc.mk
+++ b/sal/Library_sal_textenc.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,sal_textenc))
 
 $(eval $(call gb_Library_use_libraries,sal_textenc,\
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))