gbuild: split uwinapi out of gb_STDLIBS

Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7

24 files changed, 24 insertions, 0 deletions

diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index d707bc8f33c9..a33164371afe 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index b6b71a0b4514..c91923061d58 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 7d67779ee0b4..c7fbb6731750 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index 6c3f4a0c013c..b7d1fb6be404 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 6a4b89ba6897..f0788fb0fd6b 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 40e3f83df1eb..1636112f43b0 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index 7b3e45b2696b..6e5fa7076955 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index 56378223778c..7b47240e0138 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index ef47365af404..c61b4a2fbbf6 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -77,6 +77,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
 	$(if $(filter $(OS),ANDROID), \
 		lo-bootstrap \
 	) \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 839c9e39c38b..a24f391b9c09 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 44ac9f51af3c..42a48f870730 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 666181118538..ff9ad582d92e 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 99a215dbebff..192bbbd70c08 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index 67762d9e0c80..6933c2583da0 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index ecb4bf74bdca..982ec6e4b35a 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
 	$(if $(filter $(OS),ANDROID), \
 		lo-bootstrap \
 	) \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index ece36aae60c3..b72bb005305f 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index d904e745a830..2bacb8f2725c 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 1e097a02434f..c7b7fcd827cf 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 6710f8a523f7..3948bcfb04ec 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index bbbab8f84bb0..96cb69132a70 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Library_use_libraries,sc,\
 	vbahelper \
 	vcl \
 	xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 6b74917f62f6..4c39cf1f40d3 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,scd,\
 	tl \
 	ucbhelper \
 	vcl \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 8816bc3db13a..d38d40b97027 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\
 	tl \
 	utl \
 	vcl \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 6d67de093be3..7f94c6193f5e 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,scui,\
 	tl \
 	utl \
 	vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 37dfd24178ca..30eb16d059ff 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\
 	utl \
 	vbahelper \
 	vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))