From 25e10370feb4d62b953c317169516737fe982a34 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Mon, 19 Dec 2011 19:30:31 +0200
Subject: Link most libs and executables with gb_STDLIBS as presumably is
 intended

---
 desktop/Executable_crashrep.com.mk | 4 ++++
 desktop/Executable_officeloader.mk | 1 +
 desktop/Executable_oosplash.mk     | 1 +
 desktop/Executable_quickstart.mk   | 1 +
 desktop/Executable_sbase.mk        | 4 ++++
 desktop/Executable_scalc.mk        | 4 ++++
 desktop/Executable_sdraw.mk        | 4 ++++
 desktop/Executable_simpress.mk     | 4 ++++
 desktop/Executable_smath.mk        | 4 ++++
 desktop/Executable_soffice.bin.mk  | 1 +
 desktop/Executable_soffice.mk      | 1 +
 desktop/Executable_sweb.mk         | 4 ++++
 desktop/Executable_swriter.mk      | 4 ++++
 desktop/Executable_unopkg.bin.mk   | 1 +
 desktop/Library_deploymentgui.mk   | 1 +
 desktop/Library_deploymentmisc.mk  | 1 +
 desktop/Library_migrationoo2.mk    | 1 +
 desktop/Library_migrationoo3.mk    | 1 +
 desktop/Library_offacc.mk          | 1 +
 desktop/Library_sofficeapp.mk      | 1 +
 desktop/Library_spl.mk             | 1 +
 desktop/Library_spl_unx.mk         | 1 +
 desktop/Library_unopkgapp.mk       | 1 +
 23 files changed, 47 insertions(+)

(limited to 'desktop')

diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 1db348367ef7..d7f4d73f8926 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\
     $(LFS_CFLAGS) \
 ))
 
+$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\
     desktop/win32/source/guistdio/guistdio \
 ))
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index c05d4a45f7a6..f1801e6af4b3 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_add_linked_libs,officeloader,\
     sal \
+    $(gb_STDLIBS) \
 ))
 
 # I'm not suer wht was the intent, but that break the link
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index d18cfcc94a61..698b58a2da30 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Executable_set_include,oosplash,\
 
 $(eval $(call gb_Executable_add_linked_libs,oosplash,\
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_cobjects,oosplash,\
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index 470497d07e39..7da506601cd9 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Executable_add_linked_libs,quickstart,\
     ole32 \
     oleaut32 \
     shell32 \
+    $(gb_STDLIBS) \
 ))
 
 ifeq ($(COM),GCC)
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 1d6ff3839d39..37738a067e2c 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,sbase,\
     -DUNICODE \
 ))
 
+$(eval $(call gb_Executable_add_linked_libs,sbase,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Executable_add_noexception_objects,sbase,\
     desktop/win32/source/applauncher/launcher \
     desktop/win32/source/applauncher/sbase \
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 47dc397885d7..ec7274238806 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,scalc,\
     -DUNICODE \
 ))
 
+$(eval $(call gb_Executable_add_linked_libs,scalc,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Executable_add_noexception_objects,scalc,\
     desktop/win32/source/applauncher/launcher \
     desktop/win32/source/applauncher/scalc \
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 87de0eb93f1d..24fec0e9c83d 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,sdraw,\
     -DUNICODE \
 ))
 
+$(eval $(call gb_Executable_add_linked_libs,sdraw,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Executable_add_noexception_objects,sdraw,\
     desktop/win32/source/applauncher/launcher \
     desktop/win32/source/applauncher/sdraw \
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index d698df259c30..f0b72411d521 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,simpress,\
     -DUNICODE \
 ))
 
+$(eval $(call gb_Executable_add_linked_libs,simpress,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Executable_add_noexception_objects,simpress,\
     desktop/win32/source/applauncher/launcher \
     desktop/win32/source/applauncher/simpress \
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index a7b69e570a2a..ff73c2a2ca05 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,smath,\
     -DUNICODE \
 ))
 
+$(eval $(call gb_Executable_add_linked_libs,smath,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Executable_add_noexception_objects,smath,\
     desktop/win32/source/applauncher/launcher \
     desktop/win32/source/applauncher/smath \
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index a4aa5738e308..456171d774b6 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Executable_set_include,$(sofficebin),\
 $(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\
     sal \
     sofficeapp \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_cobjects,$(sofficebin),\
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 115ecb777a93..f768d99041d1 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Executable_add_linked_libs,soffice,\
     advapi32 \
     shell32 \
     shlwapi \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_linked_static_libs,soffice,\
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 3a87a313c4c7..00d085204720 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,sweb,\
     -DUNICODE \
 ))
 
+$(eval $(call gb_Executable_add_linked_libs,sweb,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Executable_add_noexception_objects,sweb,\
     desktop/win32/source/applauncher/launcher \
     desktop/win32/source/applauncher/sweb \
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index 04624d652bfc..7f5e8d9bdb1f 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,swriter,\
     -DUNICODE \
 ))
 
+$(eval $(call gb_Executable_add_linked_libs,swriter,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Executable_add_noexception_objects,swriter,\
     desktop/win32/source/applauncher/launcher \
     desktop/win32/source/applauncher/swriter \
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index 759a4e90147b..464824fa2f75 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Executable_add_linked_libs,$(unopkgbin),\
     sal \
     tl \
     unopkgapp \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_cobjects,$(unopkgbin),\
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 28b9b4a63593..2ce86226d8f3 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,deploymentgui,\
     ucbhelper \
     utl \
     vcl \
+    $(gb_STDLIBS) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index fc1a175d5e55..d4bf21128a27 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,deploymentmisc,\
     ucbhelper \
     utl \
     xcr \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,deploymentmisc,\
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 6bdf9268d213..43a860bc12c5 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_linked_libs,migrationoo2,\
     sal \
     tl \
     utl \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,migrationoo2,\
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index a50067726dd6..e315a8470dd4 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_linked_libs,migrationoo3,\
     sal \
     tl \
     utl \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,migrationoo3,\
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index c60db2574c77..e556cb724d44 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_linked_libs,offacc,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc))
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index a0f65b420336..cd57646baede 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_add_linked_libs,sofficeapp,\
     ucbhelper \
     utl \
     vcl \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index da9dc4853666..be7de6deef47 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,spl,\
     ucbhelper \
     utl \
     vcl \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl))
diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk
index e549a3eb67fe..82b1ecc03ae7 100644
--- a/desktop/Library_spl_unx.mk
+++ b/desktop/Library_spl_unx.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_add_linked_libs,spl_unx,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,spl_unx,desktop/unx/splash/splash))
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index f2233ec8726f..d2f9abbb4491 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,unopkgapp,\
     ucbhelper \
     utl \
     vcl \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,unopkgapp,\
-- 
cgit