gbuild: split uwinapi out of gb_STDLIBS

Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7

23 files changed, 23 insertions, 0 deletions

diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 96ed6f76cc60..d75f80614d29 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,crashrep_com,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index e3a766f2dd27..08c413a53387 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\
 
 $(eval $(call gb_Executable_use_libraries,officeloader,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index b3fbde1eaaf1..8500b1decd4a 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\
     ole32 \
     oleaut32 \
     shell32 \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 375cba33385f..7a517aa8f06e 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sbase,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,sbase,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index ce90099a532b..7ba226e06146 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,scalc,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,scalc,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 4642445173b4..558b8d340a8b 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sdraw,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,sdraw,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index c3026435e3f4..66002ce86f4f 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,simpress,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,simpress,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index 4c7c4afb8232..3315f718b1e5 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,smath,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,smath,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index d1c6aec55939..126f728cea36 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice.bin,\
 $(eval $(call gb_Executable_use_libraries,soffice.bin,\
     sal \
     sofficeapp \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 18efbbdf8770..17ac2d07cd8d 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_use_libraries,soffice,\
     advapi32 \
     shell32 \
     shlwapi \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk
index e87b8a041d2b..efddda2f1fc0 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice_bin,\
 $(eval $(call gb_Executable_use_libraries,soffice_bin,\
     sal \
     sofficeapp \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 870cf7d6c86a..1a62d5db772e 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sweb,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,sweb,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index acd299b641ca..68047ecdac1d 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,swriter,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,swriter,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index 9303eefeefb1..ab71f1d1a56d 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\
     sal \
     tl \
     unopkgapp \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 3910fb910757..f5fb20e062f0 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\
     ucbhelper \
     utl \
     xmlscript \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index f5f48e47d118..865add0e01a3 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index 72ac02bd7c2a..93f66de60f26 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\
     ucbhelper \
     utl \
     xmlscript \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 838b475da267..3187188728af 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\
     sal \
     tl \
     utl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index d39497e32ea3..fd7201f4321c 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\
     sal \
     tl \
     utl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index f75728dab7bc..18653a3fca65 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,offacc,\
     cppu \
     cppuhelper \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 9e4fa379374b..ea039d4a8f8a 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index 0d45c5991078..a950d31438c1 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,spl,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 081fee923a33..0d6222ab0e3d 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))