CWS gnumake3: use standard linked libs on Windows

13 files changed, 14 insertions, 101 deletions

diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 6c621d3e6721..293270b9a47c 100755
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -164,6 +164,7 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\
     icuuc \
     i18nisolang1 \
     i18npaper \
+    $(gb_StdLibs) \
 ))
 
 ifeq ($(OS),LINUX)
@@ -174,14 +175,5 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\
 ))
 endif
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,editeng,\
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
 
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 4197128abf6e..63ff8cbb9897 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\
     utl \
     vcl \
     vos3 \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,fwe,\
@@ -116,12 +117,6 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\
     kernel32 \
     msvcrt \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,fwe,\
-    kernel32 \
-    msvcrt \
-    uwinapi \
-))
 endif
 endif
 # TODO: visibility
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 1ba9d9fda79a..e510768700be 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
     utl \
     vcl \
     vos3 \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,fwi,\
@@ -91,21 +92,14 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
     mingw32 \
     $(gb_MINGW_LIBGCC) \
     uwinapi \
-    moldname \
     mingwex \
     advapi32 \
     kernel32 \
     msvcrt \
-    unicows \
 ))
 else
 $(eval $(call gb_Library_add_linked_libs,fwi,\
     advapi32 \
-    kernel32 \
-    msvcrt \
-    stl \
-    unicows \
-    uwinapi \
 ))
 endif
 endif
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 0bafaa85c23e..80a0ea120d1f 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
     ucbhelper \
     utl \
     vcl \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,fwk,\
@@ -201,12 +202,6 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
     kernel32 \
     msvcrt \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,fwk,\
-    kernel32 \
-    msvcrt \
-    uwinapi \
-))
 endif
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 4fb96617cad3..86325804e513 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\
     tl \
     utl \
     vcl \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,fwl,\
@@ -101,12 +102,6 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\
     kernel32 \
     msvcrt \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,fwl,\
-    kernel32 \
-    msvcrt \
-    uwinapi \
-))
 endif
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index 7e75f3f8906f..f441f4d78d56 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\
     utl \
     vcl \
     vos3 \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,fwm,\
@@ -83,12 +84,6 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\
     kernel32 \
     msvcrt \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,fwm,\
-    kernel32 \
-    msvcrt \
-    uwinapi \
-))
 endif
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk
index b914422813ee..d2a31b624d0d 100755
--- a/sfx2/CppunitTest_sfx2_metadatable.mk
+++ b/sfx2/CppunitTest_sfx2_metadatable.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
     sal \
     sfx \
     stl \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
@@ -43,13 +44,4 @@ $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
     -I$(OUTDIR)/inc \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
-    kernel32 \
-    user32 \
-    oldnames \
-    msvcrt \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 6ead09f6eb48..9ce73f2369ef 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     vcl \
     vos3 \
     xml2 \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_linked_system_libs,sfx,\
@@ -290,7 +291,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     mingw32 \
     $(gb_MINGW_LIBGCC) \
     uwinapi \
-    moldname \
     mingwex \
     advapi32 \
     gdi32 \
@@ -303,16 +303,12 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
 ))
 else
 $(eval $(call gb_Library_add_linked_libs,sfx,\
-    advapi32 \
     gdi32 \
-    kernel32 \
-    msvcrt \
-    oldnames \
+    advapi32 \
     ole32 \
     shell32 \
     user32 \
     uuid \
-    uwinapi \
 ))
 endif
 else
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 944f5126a59f..97cde827eb56 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     vos3 \
     xo \
     xcr \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,svx,\
@@ -226,11 +227,7 @@ else
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,svx,\
     advapi32 \
-    kernel32 \
-    msvcrt \
     oldnames \
-    user32 \
-    uwinapi \
 ))
 $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/dialog/sendreportw32 \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 33f6ac03af5a..6e811cead2a9 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
     vcl \
     vos3 \
     xo \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,svxcore,\
@@ -455,17 +456,6 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
 ))
 endif
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,svxcore,\
-    advapi32 \
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
-))
-endif
-
 $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
 
 $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index 9df518190077..2e0880aced18 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
     tl \
     utl \
     vcl \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\
@@ -71,15 +72,4 @@ $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
 ))
 endif
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
-    advapi32 \
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 566154a3c480..1aa8b6407eae 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,xo,\
     tl \
     utl \
     vos3 \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,xo,\
@@ -395,19 +396,9 @@ $(eval $(call gb_Library_add_linked_libs,xo,\
     mingw32 \
     $(gb_MINGW_LIBGCC) \
     uwinapi \
-    moldname \
     mingwex \
     kernel32 \
     msvcrt \
-    user32 \
-))
-else
-$(eval $(call gb_Library_add_linked_libs,xo,\
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
 ))
 endif
 endif
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index be5c7144aa6e..55e3fbdd66ee 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\
     salhelper \
     stl \
     xo \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,xof,\
@@ -106,19 +107,9 @@ $(eval $(call gb_Library_add_linked_libs,xof,\
     mingw32 \
     $(gb_MINGW_LIBGCC) \
     uwinapi \
-    moldname \
     mingwex \
     kernel32 \
     msvcrt \
-    user32 \
-))
-else
-$(eval $(call gb_Library_add_linked_libs,xof,\
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
 ))
 endif
 endif