CWS gnumake3: use standard linked libs on Windows

5 files changed, 6 insertions, 28 deletions

diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 5f9753a2a88f..b904dbf16433 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
     stl \
     tl \
     vos3 \
+    $(gb_StdLibs) \
 ))
 
 # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
@@ -73,11 +74,7 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
 ))
 else
 $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
-    kernel32 \
-    msvcrt \
     oldnames \
-    user32 \
-    uwinapi \
 ))
 endif
 endif
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 85551407d335..e0fd67efb03b 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
     stl \
     tl \
     vos3 \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,rscdep,\
@@ -77,13 +78,7 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
 else
 $(eval $(call gb_Executable_add_linked_libs,rscdep,\
     gnu_getopt \
-))
-$(eval $(call gb_Executable_add_linked_libs,rscdep,\
-    kernel32 \
-    msvcrt \
     oldnames \
-    user32 \
-    uwinapi \
 ))
 endif
 endif
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 1c0faf30b015..952bb338aabc 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Executable_set_cxxflags,so_checksum,\
 $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
     sal \
     tl \
+    $(gb_StdLibs) \
 ))
 # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial
 
@@ -64,14 +65,6 @@ $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
     msvcrt \
     user32 \
 ))
-else
-$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
-    kernel32 \
-    msvcrt \
-    oldnames \
-    user32 \
-    uwinapi \
-))
 endif
 endif
 
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index 637acf2afd0e..64b7d6ef0cd4 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
     stl \
     tl \
     vos3 \
+    $(gb_StdLibs) \
 ))
 # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
 
@@ -71,11 +72,7 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
 ))
 else
 $(eval $(call gb_Executable_add_linked_libs,sspretty,\
-    kernel32 \
-    msvcrt \
     oldnames \
-    user32 \
-    uwinapi \
 ))
 endif
 endif
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index a4f57ed2d239..0cb59eaeac94 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
     cppu \
     sal \
     vos3 \
+    $(gb_StdLibs) \
 ))
 
 
@@ -159,14 +160,13 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
 
 ifneq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_linked_libs,tl,\
+    uwinapi \
     mingwthrd \
     $(gb_MINGW_LIBSTDCPP) \
     mingw32 \
     $(gb_MINGW_LIBGCC) \
-    uwinapi \
     moldname \
     mingwex \
-    advapi32 \
     kernel32 \
     mpr \
     msvcrt \
@@ -177,16 +177,12 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
 ))
 else
 $(eval $(call gb_Library_add_linked_libs,tl,\
-    advapi32 \
-    kernel32 \
     mpr \
-    msvcrt \
     oldnames \
     ole32 \
     shell32 \
     user32 \
     uuid \
-    uwinapi \
 ))
 endif
 endif