CWS gnumake3: clean up mingw stuff after adding STDLIBS

15 files changed, 6 insertions, 259 deletions

diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 2950b3aa7dd3..f3b8f41e3c69 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -60,20 +60,4 @@ $(eval $(call gb_Library_add_exception_objects,fsstorage,\
     svl/source/fsstor/ostreamcontainer \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fsstorage,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-endif
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index e17004cff265..08acae0930ec 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -56,19 +56,4 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\
     svl/source/passwordcontainer/syscreds \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index c406fc42b0cf..0ad3ecc4aa87 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -158,26 +158,10 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/source/svdde/ddewrap \
 ))
 
-ifneq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_linked_libs,svl,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    advapi32 \
-    kernel32 \
-    gdi32 \
-    msvcrt \
-    shell32 \
     user32 \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,svl,\
-    user32 \
-))
-endif
+
 else
 $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/unx/source/svdde/ddedummy \
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index ed63b5a66ad3..115665ed0d18 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -53,21 +53,4 @@ $(eval $(call gb_Executable_add_exception_objects,bmp,\
     svtools/bmpmaker/bmpcore \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,bmp,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index c89a8f1a0af3..37fa508bdda2 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -49,21 +49,4 @@ $(eval $(call gb_Executable_add_exception_objects,bmpsum,\
     svtools/bmpmaker/bmpsum \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 12cd79353f1c..d55b37abd565 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -50,20 +50,5 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\
 $(eval $(call gb_Executable_add_exception_objects,g2g,\
     svtools/bmpmaker/g2g \
 ))
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,g2g,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-endif
-endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index d8d3163dd2af..b92313e446d7 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -57,21 +57,4 @@ $(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\
     svtools/source/hatchwindow/ipwin \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
-endif
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk
index 09a9ed4e6990..6e76b1d6c9db 100644
--- a/svtools/Library_productregistration.mk
+++ b/svtools/Library_productregistration.mk
@@ -58,20 +58,4 @@ $(eval $(call gb_Library_add_exception_objects,productregistration,\
     svtools/source/productregistration/registrationdlg \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,productregistration,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-endif
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 02774c3482d0..8828a91c6b14 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -292,34 +292,13 @@ $(eval $(call gb_Library_add_cobjects,svt,\
 ))
 
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_linked_libs,svt,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
     advapi32 \
     gdi32 \
-    kernel32 \
-    msvcrt \
     ole32 \
     oleaut32 \
     user32 \
     uuid \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,svt,\
-    advapi32 \
-    gdi32 \
-    oldnames \
-    ole32 \
-    oleaut32 \
-    user32 \
-    uuid \
-))
-endif
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index d2a988928efb..453a0aa473f8 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -161,18 +161,5 @@ $(eval $(call gb_Library_add_linked_libs,tk,\
     X11 \
 ))
 endif
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,tk,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-endif
-endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 18a23bb9bcf5..60c6e676057e 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -58,25 +58,4 @@ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\
     tools/bootstrp/prj \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
-$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
-    oldnames \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 31a823a2a207..abde9af09dfa 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -64,21 +64,7 @@ $(eval $(call gb_Executable_set_cxxflags,rscdep,\
 ))
 endif
 $(eval $(call gb_Executable_add_linked_libs,rscdep,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
-$(eval $(call gb_Executable_add_linked_libs,rscdep,\
     gnu_getopt \
-    oldnames \
 ))
 endif
 endif
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 491a2a958514..32b95bedd6da 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -51,21 +51,4 @@ $(eval $(call gb_Executable_add_exception_objects,so_checksum,\
     tools/bootstrp/so_checksum \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index c086cc5160a1..ab8379bae5bd 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -56,25 +56,4 @@ $(eval $(call gb_Executable_add_exception_objects,sspretty,\
     tools/bootstrp/sspretty \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,sspretty,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
-$(eval $(call gb_Executable_add_linked_libs,sspretty,\
-    oldnames \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 8489f21d7d47..4e676f2c3436 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -141,6 +141,7 @@ $(eval $(call gb_Library_add_linked_static_libs,tl,\
 endif
 
 ifeq ($(OS),WNT)
+
 $(eval $(call gb_Library_set_include,tl,\
     $$(INCLUDE) \
     -I$(SRCDIR)/tools/win/inc \
@@ -150,34 +151,16 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/win/source/dll/toolsdll \
 ))
 
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,tl,\
-    uwinapi \
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    moldname \
-    mingwex \
-    kernel32 \
-    mpr \
-    msvcrt \
-    ole32 \
-    shell32 \
-    user32 \
-    uuid \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,tl,\
     mpr \
-    oldnames \
     ole32 \
     shell32 \
     user32 \
     uuid \
 ))
+
 endif
-endif
+
 # tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g
 # -DOPTIMIZE
 # no -DTOOLS_DLLIMPLEMENTATION on toolsdll