CWS gnumake3: clean up mingw stuff after adding STDLIBS

6 files changed, 1 insertions, 104 deletions

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: