gbuild: split uwinapi out of gb_STDLIBS

Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7

18 files changed, 18 insertions, 0 deletions

diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 5a02e31872f9..47d7a35e3075 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \
     cppu \
     cppuhelper \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index 6d0b024ef5c5..080bd6aeb1d7 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index c8d94e795018..e42eb0c9276b 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index d4e28d66bc71..538542b37ef7 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk
index a59be4022800..10e7ab20769f 100644
--- a/sw/CppunitTest_sw_subsequent_odfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfexport.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \
     unotest \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk
index cba3ebd24779..aceaa697b7e6 100644
--- a/sw/CppunitTest_sw_subsequent_odfimport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfimport.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \
     unotest \
     vcl \
     tl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
index eafc644b6a5f..5a9587948a21 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \
     unotest \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
index c06de2a849da..8fc2dfedecaa 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \
     unotest \
     sw \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk
index fb787a3c4cea..1609b6f41ffc 100644
--- a/sw/CppunitTest_sw_subsequent_rtfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \
     unotest \
 	utl \
 	tl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk
index 3f4747c7cd7d..7ce087e36e40 100644
--- a/sw/CppunitTest_sw_subsequent_rtfimport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \
     unotest \
     vcl \
     tl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk
index 4595de555c2b..9f4677b5b29e 100644
--- a/sw/CppunitTest_sw_subsequent_ww8export.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8export.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \
     utl \
     sw \
     tl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk
index 6e70c9ddad60..16c36843407a 100644
--- a/sw/CppunitTest_sw_subsequent_ww8import.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8import.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \
     test \
     unotest \
     sw \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 74bb52a7f834..8b53bdf32009 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 54bb731aee69..365c69096b96 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,msword,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 1d1801345a5e..b58f71a72b3e 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_Library_use_libraries,sw,\
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index a96018ee57b8..73f5fb857781 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,swd,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 86c7372b2eee..4de06513c59a 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,swui,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index e77dc7823d43..310a90f4dbff 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\
     utl \
     vbahelper \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))