CWS gnumake3: clean up mingw stuff after adding STDLIBS

10 files changed, 4 insertions, 124 deletions

diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 0b44b82632d1..7e71e3068e70 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -97,19 +97,5 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
 endif
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fwe,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index fc60fdf15564..046c7230e35f 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -78,23 +78,9 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\
 ))
 
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_linked_libs,fwi,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
     advapi32 \
-    kernel32 \
-    msvcrt \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,fwi,\
-    advapi32 \
-))
-endif
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 27e3d924774c..a34a1bc59720 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -185,19 +185,4 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/xml/acceleratorconfigurationwriter \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fwk,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index cbf4a7b9a901..928c723d3f80 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -84,18 +84,4 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\
     framework/source/uielement/toolbarsmenucontroller \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fwl,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-endif
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index c242ecc8e12f..dbd486c40de1 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -65,19 +65,4 @@ $(eval $(call gb_Library_add_exception_objects,fwm,\
     framework/source/tabwin/tabwinfactory \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fwm,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 4cfd5da93bb6..4bb343e316d6 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -267,7 +267,9 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     Cocoa \
 ))
 endif
+
 ifeq ($(OS),WNT)
+
 # workaround: disable PCH for these objects to avoid redeclaration
 # errors - needs to be fixed in module tools
 $(eval $(call gb_Library_add_cxxobjects,sfx,\
@@ -277,24 +279,6 @@ $(eval $(call gb_Library_add_cxxobjects,sfx,\
     , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) -nologo -UPRECOMPILED_HEADERS \
 ))
 
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,sfx,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    advapi32 \
-    gdi32 \
-    kernel32 \
-    msvcrt \
-    ole32 \
-    shell32 \
-    user32 \
-    uuid \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,sfx,\
     gdi32 \
     advapi32 \
@@ -303,8 +287,9 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     user32 \
     uuid \
 ))
-endif
+
 else
+
 $(eval $(call gb_Library_add_cxxobjects,sfx,\
     sfx2/source/appl/shutdowniconw32 \
     sfx2/source/doc/sfxacldetect \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index b549adeb9030..4ce5250f77a5 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -222,7 +222,6 @@ else
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,svx,\
     advapi32 \
-    oldnames \
 ))
 $(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 5b7546d2d1c7..f3941defc8db 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -430,10 +430,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/xoutdev/xtablend \
 ))
 
-#.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P") 
-#NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
-#.ENDIF
-
 # the following source file can't be compiled with optimization by some compilers (crash or endless loop):
 # Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
 # the latter is currently not supported by gbuild and needs a fix here later
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 71afa085d2cd..8efabefa47b1 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -379,18 +379,4 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
     xmloff/source/xforms/xformsimport \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,xo,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-endif
-endif
 # vim: set noet ts=4 sw=4:
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index dca8b3901874..455daadaf6e3 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -90,18 +90,4 @@ $(eval $(call gb_Library_add_exception_objects,xof,\
     xmloff/source/transform/XMLFilterRegistration \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,xof,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-endif
-endif
 # vim: set noet ts=4 sw=4: