gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT:

add a new gb_LinkTarget_use_system_win32_libs to abstract different
linker options on MSVC and GCC.

Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d

Library_merged.mk

@@ -107,14 +107,14 @@ $(eval $(call gb_Library_add_libs,merged,\
 endif
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,merged,\
+$(eval $(call gb_Library_use_system_win32_libs,merged,\
 	advapi32 \
 	gdi32 \
 	gdiplus \
 	imm32 \
 	mpr \
 	msimg32 \
-	$(gb_Library_win32_OLDNAMES) \
+	oldnames \
 	ole32 \
 	oleaut32 \
 	shell32 \

RepositoryExternal.mk

@@ -1468,7 +1468,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 	-lobjc \
 )
 else ifeq ($(OS),WNT)
-$(call gb_LinkTarget_use_libraries,$(1),\
+$(call gb_LinkTarget_use_system_win32_libs,$(1),\
 	advapi32 \
 	gdi32 \
 )
@@ -1614,7 +1614,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 ifeq ($(GUI)$(COM),WNTMSC)
 $(call gb_LinkTarget_use_external,$(1),openssl)
 
-$(call gb_LinkTarget_use_libraries,$(1),\
+$(call gb_LinkTarget_use_system_win32_libs,$(1),\
 	secur32 \
 	ws2_32 \
 )

RepositoryFixes.mk

@@ -132,21 +132,17 @@ gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
 
 
 # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
-gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
-gb_Library_NOILIBFILENAMES += \
+gb_Library_NOILIBFILENAMES := \
     glib-2.0 \
     gmodule-2.0 \
     graphite2_off \
     icudt icuin icule icuuc \
     langtag \
     lcms2 \
-    msvcprt \
     nspr4 \
     nss3 \
-    shlwapi \
     smime3 \
     uwinapi \
-    version \
 
 gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))

avmedia/Library_avmediawin.mk

@@ -41,9 +41,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\
 	comphelper \
 	cppu \
 	cppuhelper \
-	gdi32 \
-	ole32 \
-	oleaut32 \
 	sal \
 	tl \
 	utl \
@@ -53,8 +50,11 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\
 
 $(eval $(call gb_Library_add_standard_system_libs,avmediawin))
 
-$(eval $(call gb_Library_add_libs,avmediawin,\
-	strmiids.lib \
+$(eval $(call gb_Library_use_system_win32_libs,avmediawin,\
+	gdi32 \
+	ole32 \
+	oleaut32 \
+	strmiids \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,avmediawin,\

basctl/Library_basctl.mk

@@ -124,7 +124,7 @@ $(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,basctl,\
+$(eval $(call gb_Library_use_system_win32_libs,basctl,\
 	advapi32 \
 	gdi32 \
 	shell32 \

basic/CppunitTest_basic_enable.mk

@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
 $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
+$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \
 	oleaut32 \
 ))
 endif

basic/CppunitTest_basic_nested_struct.mk

@@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
 $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
+$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_nested_struct, \
 	oleaut32 \
 ))
 endif

basic/CppunitTest_basic_scanner.mk

@@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
 $(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
+$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \
 	oleaut32 \
 ))
 endif

bean/Library_officebean.mk

@@ -47,10 +47,13 @@ endif
 ifeq ($(GUI),WNT)
 
 $(eval $(call gb_Library_use_libraries,officebean,\
-    jawt \
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Library_use_system_win32_libs,officebean,\
+    jawt \
+))
+
 else
 
 $(eval $(call gb_Library_add_libs,officebean,\

canvas/Library_canvastools.mk

@@ -87,7 +87,7 @@ endif
 endif
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,canvastools,\
+$(eval $(call gb_Library_use_system_win32_libs,canvastools,\
 	winmm \
 ))
 endif

canvas/Library_directx9canvas.mk

@@ -60,7 +60,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\
 
 $(eval $(call gb_Library_add_standard_system_libs,directx9canvas))
 
-$(eval $(call gb_Library_use_libraries,directx9canvas,\
+$(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\
 	d3d9 \
 	gdi32 \
 	gdiplus \

canvas/Library_gdipluscanvas.mk

@@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\
 
 $(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas))
 
-$(eval $(call gb_Library_use_libraries,gdipluscanvas,\
+$(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\
 	gdi32 \
 	gdiplus \
 ))

cli_ure/Executable_climaker.mk

@@ -24,13 +24,16 @@ $(eval $(call gb_Executable_use_internal_bootstrap_api,climaker,\
 $(eval $(call gb_Executable_use_libraries,climaker,\
 	cppu \
 	cppuhelper \
+	sal \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Executable_use_system_win32_libs,climaker,\
 	mscoree \
 	$(if $(USE_DEBUG_RUNTIME) \
 		,msvcmrtd \
 		,msvcmrt \
 	) \
-	sal \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Executable_add_standard_system_libs,climaker))

cli_ure/Library_cli_cppuhelper_native.mk

@@ -33,16 +33,19 @@ $(eval $(call gb_Library_use_packages,cli_cppuhelper_native,\
 ))
 
 $(eval $(call gb_Library_use_libraries,cli_cppuhelper_native,\
-	advapi32 \
 	cppu \
 	cppuhelper \
+	sal \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,cli_cppuhelper_native,\
+	advapi32 \
 	delayimp \
 	mscoree \
 	$(if $(USE_DEBUG_RUNTIME)\
 		,msvcmrtd \
 		,msvcmrt \
 	) \
-	sal \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,cli_cppuhelper_native,\

cli_ure/Library_cli_uno.mk

@@ -19,12 +19,15 @@ $(eval $(call gb_Library_use_udk_api,cli_uno))
 
 $(eval $(call gb_Library_use_libraries,cli_uno,\
 	cppu \
+	sal \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,cli_uno,\
 	mscoree \
 	$(if $(USE_DEBUG_RUNTIME)\
 		,msvcmrtd \
 		,msvcmrt \
 	) \
-	sal \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,cli_uno,\

connectivity/Library_ado.mk

@@ -42,14 +42,17 @@ $(eval $(call gb_Library_add_cxxflags,ado,\
 ))
 endif
 
+$(eval $(call gb_Library_use_system_win32_libs,ado,\
+	ole32 \
+	oleaut32 \
+	uuid \
+))
+
 $(eval $(call gb_Library_use_libraries,ado,\
 	cppu \
 	cppuhelper \
 	sal \
 	salhelper \
-	ole32 \
-	oleaut32 \
-	uuid \
 	dbtools \
 	comphelper \
 	$(gb_UWINAPI) \

connectivity/Library_postgresql-sdbc-impl.mk

@@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 $(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
+$(eval $(call gb_Library_use_system_win32_libs,postgresql-sdbc-impl,\
 	shell32 \
 	wldap32 \
 ))

cui/Library_cui.mk

@@ -78,7 +78,7 @@ $(eval $(call gb_Library_use_externals,cui,\
 ))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_use_libraries,cui,\
+$(eval $(call gb_Library_use_system_win32_libs,cui,\
     advapi32 \
     shlwapi \
 ))

dbaccess/Library_dbu.mk

@@ -76,7 +76,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\
 $(eval $(call gb_Library_add_standard_system_libs,dbu))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_use_libraries,dbu,\
+$(eval $(call gb_Library_use_system_win32_libs,dbu,\
     ole32 \
     oleaut32 \
     uuid \

desktop/Executable_quickstart.mk

@@ -33,12 +33,15 @@ $(eval $(call gb_Executable_set_include,quickstart,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_use_libraries,quickstart,\
+$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\
     comdlg32 \
     gdi32 \
     ole32 \
     oleaut32 \
     shell32 \
+))
+
+$(eval $(call gb_Executable_use_libraries,quickstart,\
 	$(gb_UWINAPI) \
 ))
 
@@ -46,14 +49,14 @@ $(eval $(call gb_Executable_add_standard_system_libs,quickstart))
 
 ifeq ($(COM),GCC)
 
-$(eval $(call gb_Executable_use_libraries,quickstart,\
+$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\
     uuid \
 ))
 
 else
 
-$(eval $(call gb_Executable_add_libs,quickstart,\
-    comsupp.lib \
+$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\
+    comsupp \
 ))
 
 endif

desktop/Executable_soffice.mk

@@ -30,10 +30,13 @@ $(eval $(call gb_Executable_Executable,soffice))
 $(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
 
 $(eval $(call gb_Executable_use_libraries,soffice,\
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Executable_use_system_win32_libs,soffice,\
     advapi32 \
     shell32 \
     shlwapi \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Executable_add_standard_system_libs,soffice))

desktop/Library_deploymentgui.mk

@@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_standard_system_libs,deploymentgui))
 
 ifeq ($(OS),WNT)
 
-$(eval $(call gb_Library_use_libraries,deploymentgui,\
+$(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\
     ole32 \
 ))
 

dtrans/Library_dnd.mk

@@ -37,17 +37,19 @@ $(eval $(call gb_Library_set_include,dnd,\
 $(eval $(call gb_Library_use_sdk_api,dnd))
 
 $(eval $(call gb_Library_use_libraries,dnd,\
-	advapi32 \
 	cppu \
 	cppuhelper \
+	sal \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,dnd,\
+	advapi32 \
 	gdi32 \
 	ole32 \
 	oleaut32 \
-	sal \
 	shell32 \
 	uuid \
-	uwinapi \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,dnd))

dtrans/Library_ftransl.mk

@@ -37,16 +37,18 @@ $(eval $(call gb_Library_set_include,ftransl,\
 $(eval $(call gb_Library_use_sdk_api,ftransl))
 
 $(eval $(call gb_Library_use_libraries,ftransl,\
-	advapi32 \
 	cppu \
 	cppuhelper \
-	gdi32 \
-	ole32 \
 	sal \
-	uwinapi \
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Library_use_system_win32_libs,ftransl,\
+	advapi32 \
+	gdi32 \
+	ole32 \
+))
+
 $(eval $(call gb_Library_add_standard_system_libs,ftransl))
 
 $(eval $(call gb_Library_use_static_libraries,ftransl,\

dtrans/Library_sysdtrans.mk

@@ -42,17 +42,19 @@ $(eval $(call gb_Library_add_defs,sysdtrans,\
 ))
 
 $(eval $(call gb_Library_use_libraries,sysdtrans,\
-	advapi32 \
 	cppu \
 	cppuhelper \
+	sal \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,sysdtrans,\
+	advapi32 \
 	gdi32 \
 	ole32 \
 	oleaut32 \
-	sal \
 	shell32 \
 	uuid \
-	uwinapi \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,sysdtrans))

embeddedobj/Library_emboleobj.mk

@@ -63,6 +63,9 @@ ifeq ($(OS),WNT)
 
 $(eval $(call gb_Library_use_libraries,emboleobj,\
 	embobj \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,emboleobj,\
 	gdi32 \
 	ole32 \
 	oleaut32 \

embedserv/Library_emser.mk

@@ -45,12 +45,15 @@ $(eval $(call gb_Library_use_libraries,emser,\
 	comphelper \
 	cppu \
 	cppuhelper \
+	sal \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,emser,\
 	gdi32 \
 	ole32 \
 	oleaut32 \
-	sal \
 	uuid \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,emser))

embedserv/Library_inprocserv.mk

@@ -32,10 +32,13 @@ $(eval $(call gb_Library_set_include,inprocserv,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_libraries,inprocserv,\
+$(eval $(call gb_Library_use_system_win32_libs,inprocserv,\
 	gdi32 \
 	ole32 \
 	uuid \
+))
+
+$(eval $(call gb_Library_use_libraries,inprocserv,\
 	$(gb_UWINAPI) \
 ))
 

extensions/CppunitTest_extensions_test_update.mk

@@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \
 $(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\
+$(eval $(call gb_CppunitTest_use_system_win32_libs,extensions_test_update,\
 	shell32 \
 	ole32 \
 ))

extensions/Executable_nsplugin.mk

@@ -67,18 +67,18 @@ $(eval $(call gb_Executable_use_static_libraries,nsplugin,\
 	ooopathutils \
 ))
 
-$(eval $(call gb_Executable_use_libraries,nsplugin,\
-	ws2_32 \
-	shell32 \
-	ole32 \
-	kernel32 \
-	user32 \
-	gdi32 \
-	winspool \
-	comdlg32 \
+$(eval $(call gb_Executable_use_system_win32_libs,nsplugin,\
 	advapi32 \
+	comdlg32 \
+	gdi32 \
+	kernel32 \
+	ole32 \
 	oleaut32 \
+	shell32 \
+	user32 \
 	uuid \
+	winspool \
+	ws2_32 \
 ))
 endif # WNT
 

extensions/Library_ldapbe2.mk

@@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,ldapbe2,\
+$(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\
 	wldap32 \
 ))
 else # 0S!=WNT

extensions/Library_npsoplugin.mk

@@ -69,18 +69,18 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
 	ooopathutils \
 ))
 
-$(eval $(call gb_Library_use_libraries,npsoplugin,\
-	ws2_32 \
-	shell32 \
-	ole32 \
-	kernel32 \
-	user32 \
-	gdi32 \
-	winspool \
-	comdlg32 \
+$(eval $(call gb_Library_use_system_win32_libs,npsoplugin,\
 	advapi32 \
+	comdlg32 \
+	gdi32 \
+	kernel32 \
+	ole32 \
 	oleaut32 \
+	shell32 \
+	user32 \
 	uuid \
+	winspool \
+	ws2_32 \
 ))
 
 $(eval $(call gb_Library_add_defs,npsoplugin,\

extensions/Library_oleautobridge.mk

@@ -43,6 +43,9 @@ $(eval $(call gb_Library_use_libraries,oleautobridge,\
 	cppuhelper \
 	cppu \
 	sal \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\
 	advapi32 \
 	ole32 \
 	oleaut32 \

extensions/Library_oleautobridge2.mk

@@ -47,6 +47,9 @@ $(eval $(call gb_Library_use_libraries,oleautobridge2,\
 	cppuhelper \
 	cppu \
 	sal \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,oleautobridge2,\
 	advapi32 \
 	ole32 \
 	oleaut32 \

extensions/Library_pl.mk

@@ -63,10 +63,10 @@ $(eval $(call gb_Library_add_libs,pl,\
 endif # OS=SOLARIS
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_use_libraries,pl,\
-	version \
-	ole32 \
+$(eval $(call gb_Library_use_system_win32_libs,pl,\
 	advapi32 \
+	ole32 \
+	version \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,pl,\

extensions/Library_so_activex.mk

@@ -54,14 +54,14 @@ $(eval $(call gb_Library_add_ldflags,so_activex,\
 	/DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \
 ))
 
-$(eval $(call gb_Library_use_libraries,so_activex,\
-	uuid \
+$(eval $(call gb_Library_use_system_win32_libs,so_activex,\
 	advapi32 \
+	gdi32 \
 	ole32 \
 	oleaut32 \
-	gdi32 \
-	urlmon \
 	shlwapi \
+	urlmon \
+	uuid \
 ))
 
 ifneq ($(USE_DEBUG_RUNTIME),)

extensions/Library_so_activex_x64.mk

@@ -57,14 +57,14 @@ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\
 	/DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \
 ))
 
-$(eval $(call gb_Library_use_libraries,so_activex_x64,\
-	uuid \
+$(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\
 	advapi32 \
+	gdi32 \
 	ole32 \
 	oleaut32 \
-	gdi32 \
-	urlmon \
 	shlwapi \
+	urlmon \
+	uuid \
 ))
 
 ifneq ($(USE_DEBUG_RUNTIME),)

extensions/Library_updchk.mk

@@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_libraries,updchk,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,updchk,\
+$(eval $(call gb_Library_use_system_win32_libs,updchk,\
 	ole32 \
 	shell32 \
 	wininet \

fpicker/Library_fps.mk

@@ -52,6 +52,10 @@ $(eval $(call gb_Library_use_libraries,fps,\
 	tl \
 	utl \
 	vcl \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Library_use_system_win32_libs,fps,\
 	advapi32 \
 	comdlg32 \
 	gdi32 \
@@ -60,7 +64,6 @@ $(eval $(call gb_Library_use_libraries,fps,\
 	oleaut32 \
 	shell32 \
 	uuid \
-	$(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,fps))

framework/Library_fwi.mk

@@ -76,7 +76,7 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,fwi,\
+$(eval $(call gb_Library_use_system_win32_libs,fwi,\
     advapi32 \
 ))
 endif

hwpfilter/Library_hwp.mk

@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_external,hwp,zlib))
 
 ifeq ($(OS),WNT)
 
-$(eval $(call gb_Library_use_libraries,hwp,\
+$(eval $(call gb_Library_use_system_win32_libs,hwp,\
     ole32 \
     uuid \
 ))

jvmfwk/Library_jvmfwk.mk

@@ -50,8 +50,8 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\
 $(eval $(call gb_Library_add_standard_system_libs,jvmfwk))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,jvmfwk,\
-    advapi32 \
+$(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\
+	advapi32 \
 ))
 endif
 

jvmfwk/Library_sunjavaplugin.mk

@@ -62,9 +62,8 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\
 endif
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_use_libraries,sunjavaplugin,\
-    advapi32 \
-    uwinapi \
+$(eval $(call gb_Library_use_system_win32_libs,sunjavaplugin,\
+	advapi32 \
 ))
 endif
 

neon/Library_neon.mk

@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,neon,\
+$(eval $(call gb_Library_use_system_win32_libs,neon,\
 	ws2_32 \
 ))
 

sal/Library_sal.mk

@@ -57,21 +57,22 @@ $(eval $(call gb_Library_add_defs,sal,\
 ))
 
 $(eval $(call gb_Library_use_libraries,sal,\
-	$(if $(filter $(OS),WNT), \
-		advapi32 \
-		comdlg32 \
-		mpr \
-		ole32 \
-		shell32 \
-		user32 \
-		ws2_32 \
-	) \
 	$(if $(filter $(OS),ANDROID), \
 		lo-bootstrap \
 	) \
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Library_use_system_win32_libs,sal,\
+	advapi32 \
+	comdlg32 \
+	mpr \
+	ole32 \
+	shell32 \
+	user32 \
+	ws2_32 \
+))
+
 $(eval $(call gb_Library_add_libs,sal,\
 	$(if $(filter $(GUI),UNX), \
 		$(if $(filter $(OS),ANDROID),, \

sal/Library_uwinapi.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,uwinapi))
 
-$(eval $(call gb_Library_use_libraries,uwinapi,\
+$(eval $(call gb_Library_use_system_win32_libs,uwinapi,\
 	$(if $(filter $(COM),MSC), \
 		kernel32 \
 		msvcrt \

sc/Library_scui.mk

@@ -121,10 +121,10 @@ $(eval $(call gb_Library_add_exception_objects,scui,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,scui,\
+$(eval $(call gb_Library_use_system_win32_libs,scui,\
 	advapi32 \
-	$(gb_Library_win32_OLDNAMES) \
-	uwinapi \
+	oldnames \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:

sc/Library_vbaobj.mk

@@ -143,10 +143,10 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
 endif
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,vbaobj,\
+$(eval $(call gb_Library_use_system_win32_libs,vbaobj,\
 	advapi32 \
-	$(gb_Library_win32_OLDNAMES) \
-	uwinapi \
+	oldnames \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:

sd/CppunitTest_sd_uimpress.mk

@@ -77,7 +77,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
 $(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
+$(eval $(call gb_CppunitTest_use_system_win32_libs,sd_uimpress,\
 	ws2_32 \
 ))
 endif

sd/Library_sd.mk

@@ -114,7 +114,7 @@ $(eval $(call gb_Library_use_externals,sd,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,sd,\
+$(eval $(call gb_Library_use_system_win32_libs,sd,\
 	ws2_32 \
 ))
 endif

sfx2/Library_sfx.mk

@@ -295,12 +295,12 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/doc/syspathw32 \
 ))
 
-$(eval $(call gb_Library_use_libraries,sfx,\
-    gdi32 \
-    advapi32 \
-    ole32 \
-    shell32 \
-    uuid \
+$(eval $(call gb_Library_use_system_win32_libs,sfx,\
+	advapi32 \
+	gdi32 \
+	ole32 \
+	shell32 \
+	uuid \
 ))
 
 endif

shell/Executable_senddoc.mk

@@ -27,8 +27,11 @@
 
 $(eval $(call gb_Executable_Executable,senddoc))
 
-$(eval $(call gb_Executable_use_libraries,senddoc,\
+$(eval $(call gb_Executable_use_system_win32_libs,senddoc,\
 	kernel32 \
+))
+
+$(eval $(call gb_Executable_use_libraries,senddoc,\
 	sal \
 ))
 

shell/Library_ooofilt.mk

@@ -53,19 +53,19 @@ $(eval $(call gb_Library_use_externals,ooofilt,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,ooofilt,\
+$(eval $(call gb_Library_use_system_win32_libs,ooofilt,\
 	advapi32 \
 	comctl32 \
 	kernel32 \
 	msvcprt \
+	oldnames \
 	ole32 \
 	shell32 \
 	uuid \
-	$(gb_Library_win32_OLDNAMES) \
 ))
 
 ifneq ($(PRODUCT),full)
-$(eval $(call gb_Library_use_libraries,ooofilt,\
+$(eval $(call gb_Library_use_system_win32_libs,ooofilt,\
 	msvcrt \
 ))
 endif

shell/Library_ooofilt_x64.mk

@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,ooofilt_x64,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,ooofilt_x64,\
+$(eval $(call gb_Library_use_system_win32_libs,ooofilt_x64,\
 	advapi32 \
 	comctl32 \
 	gdi32 \
@@ -67,13 +67,13 @@ $(eval $(call gb_Library_use_libraries,ooofilt_x64,\
 	kernel32 \
 	msvcprt \
 	msvcrt \
+	oldnames \
 	ole32 \
 	oleaut32 \
 	propsys \
 	shell32 \
 	user32 \
 	uuid \
-	$(gb_Library_win32_OLDNAMES) \
 ))
 
 $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\

shell/Library_propertyhdl.mk

@@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_externals,propertyhdl,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,propertyhdl,\
+$(eval $(call gb_Library_use_system_win32_libs,propertyhdl,\
 	advapi32 \
 	comctl32 \
 	gdi32 \

shell/Library_propertyhdl_x64.mk

@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,propertyhdl_x64,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,propertyhdl_x64,\
+$(eval $(call gb_Library_use_system_win32_libs,propertyhdl_x64,\
 	advapi32 \
 	comctl32 \
 	gdi32 \
@@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,propertyhdl_x64,\
 	kernel32 \
 	msvcprt \
 	msvcrt \
+	oldnames \
 	ole32 \
 	oleaut32 \
 	propsys \
@@ -74,7 +75,6 @@ $(eval $(call gb_Library_use_libraries,propertyhdl_x64,\
 	shlwapi \
 	user32 \
 	uuid \
-	$(gb_Library_win32_OLDNAMES) \
 ))
 
 $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\

shell/Library_shlxthdl.mk

@@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_externals,shlxthdl,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,shlxthdl,\
+$(eval $(call gb_Library_use_system_win32_libs,shlxthdl,\
 	advapi32 \
 	comctl32 \
 	gdi32 \

shell/Library_shlxthdl_x64.mk

@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,shlxthdl_x64,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_use_libraries,shlxthdl_x64,\
+$(eval $(call gb_Library_use_system_win32_libs,shlxthdl_x64,\
 	advapi32 \
 	comctl32 \
 	gdi32 \
@@ -67,13 +67,13 @@ $(eval $(call gb_Library_use_libraries,shlxthdl_x64,\
 	kernel32 \
 	msvcprt \
 	msvcrt \
+	oldnames \
 	ole32 \
 	oleaut32 \
 	shell32 \
 	shlwapi \
 	user32 \
 	uuid \
-	$(gb_Library_win32_OLDNAMES) \
 ))
 
 $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\

shell/Library_smplmail.mk

@@ -29,8 +29,11 @@ $(eval $(call gb_Library_Library,smplmail))
 
 $(eval $(call gb_Library_use_sdk_api,smplmail))
 
-$(eval $(call gb_Library_use_libraries,smplmail,\
+$(eval $(call gb_Library_use_system_win32_libs,smplmail,\
 	advapi32 \
+))
+
+$(eval $(call gb_Library_use_libraries,smplmail,\
 	cppu \
 	cppuhelper \
 	sal \

shell/Library_syssh_win.mk

@@ -32,12 +32,15 @@ $(eval $(call gb_Library_use_sdk_api,syssh))
 $(eval $(call gb_Library_use_libraries,syssh,\
 	cppu \
 	cppuhelper \
-	ole32 \
 	sal \
-	shell32 \
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Library_use_system_win32_libs,syssh,\
+	ole32 \
+	shell32 \
+))
+
 $(eval $(call gb_Library_add_standard_system_libs,syssh))
 
 $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh))

slideshow/Library_OGLTrans.mk

@@ -81,7 +81,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\
 ))
 
 else ifeq ($(strip $(OS)),WNT)
-$(eval $(call gb_Library_use_libraries,OGLTrans,\
+$(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\
     gdi32 \
     glu32 \
     opengl32 \

solenv/gbuild/CppunitTest.mk

@@ -343,6 +343,7 @@ $(eval $(foreach method,\
 	add_libs \
 	add_standard_system_libs \
 	use_system_darwin_frameworks \
+	use_system_win32_libs \
 	use_sdk_api \
 	use_udk_api \
 	use_internal_api \

solenv/gbuild/Executable.mk

@@ -107,6 +107,7 @@ $(eval $(foreach method,\
 	add_libs \
 	add_standard_system_libs \
 	use_system_darwin_frameworks \
+	use_system_win32_libs \
 	set_library_path_flags \
 	add_api \
 	use_api \

solenv/gbuild/Library.mk

@@ -187,6 +187,7 @@ $(eval $(foreach method,\
 	add_libs \
 	add_standard_system_libs \
 	use_system_darwin_frameworks \
+	use_system_win32_libs \
 	set_library_path_flags \
 	add_api \
 	use_api \

solenv/gbuild/platform/WNT_INTEL_GCC.mk

@@ -186,6 +186,10 @@ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_d
 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1)))
 endef
 
+define gb_LinkTarget_use_system_win32_libs
+$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),-l$(patsubst oldnames,moldname,$(lib))))
+endef
+
 
 # Library class
 
@@ -213,46 +217,6 @@ gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT)
 gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT)
 gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT)
 
-gb_Library_win32_OLDNAMES := moldname
-
-gb_Library_PLAINLIBS_NONE += \
-	mingwthrd \
-	mingw32 \
-	mingwex \
-	advapi32 \
-	comctl32 \
-	comdlg32 \
-	crypt32 \
-	d3d9 \
-	d3dx \
-	ddraw \
-	gdi32 \
-	gdiplus \
-	imm32 \
-	kernel32 \
-	jawt \
-	msi \
-	msimg32 \
-	msvcrt \
-	msvcprt \
-	mpr \
-	$(gb_Library_win32_OLDNAMES) \
-	ole32 \
-	oleaut32 \
-	propsys \
-	shell32 \
-	shlwapi \
-	urlmon \
-	user32 \
-	usp10 \
-	uuid \
-	winmm \
-	version \
-	wininet \
-	winspool \
-	wldap32 \
-	ws2_32 \
-
 gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \

solenv/gbuild/platform/WNT_INTEL_MSC.mk

@@ -374,6 +374,9 @@ $(call gb_Helper_abbreviate_dirs,\
 	; exit $$RC)
 endef
 
+define gb_LinkTarget_use_system_win32_libs
+$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),$(lib).lib))
+endef
 
 # Flags common for PE executables (EXEs and DLLs) 
 gb_Windows_PE_TARGETTYPEFLAGS := \
@@ -401,50 +404,6 @@ gb_Library_get_rpath :=
 gb_Library_SYSPRE := i
 gb_Library_PLAINEXT := .lib
 
-gb_Library_win32_OLDNAMES := oldnames
-
-gb_Library_PLAINLIBS_NONE += \
-	advapi32 \
-	comctl32 \
-	comdlg32 \
-	crypt32 \
-	d3d9 \
-	d3dx \
-	ddraw \
-	delayimp \
-	gdi32 \
-	gdiplus \
-	imm32\
-	kernel32 \
-	jawt \
-	libcmt \
-	libcmtd \
-	mpr \
-	mscoree \
-	msi \
-	msimg32 \
-	msvcmrt \
-	msvcmrtd \
-	msvcrt \
-	msvcprt \
-	$(gb_Library_win32_OLDNAMES) \
-	ole32 \
-	oleaut32 \
-	propsys \
-	secur32 \
-	shell32 \
-	shlwapi \
-	urlmon \
-	user32 \
-	usp10 \
-	uuid \
-	version \
-	wininet \
-	winmm \
-	winspool \
-	wldap32 \
-	ws2_32 \
-
 gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \

svl/CppunitTest_svl_lngmisc.mk

@@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \
 $(eval $(call gb_CppunitTest_add_standard_system_libs,svl_lngmisc))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \
+$(eval $(call gb_CppunitTest_use_system_win32_libs,svl_lngmisc, \
 	oleaut32 \
 ))
 endif

svtools/Library_svt.mk

@@ -271,7 +271,7 @@ $(eval $(call gb_Library_add_cobjects,svt,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,svt,\
+$(eval $(call gb_Library_use_system_win32_libs,svt,\
     advapi32 \
     gdi32 \
     ole32 \

svx/Executable_gengal.bin.mk

@@ -71,12 +71,11 @@ $(eval $(call gb_Executable_use_static_libraries,$(svx_GENGALBIN),\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
-    kernel32 \
-    msvcrt \
-    $(gb_Library_win32_OLDNAMES) \
-    user32 \
-    uwinapi \
+$(eval $(call gb_Executable_use_system_win32_libs,$(svx_GENGALBIN),\
+	kernel32 \
+	msvcrt \
+	oldnames \
+	user32 \
 ))
 endif
 

tools/Library_tl.mk

@@ -117,11 +117,11 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/win/source/dll/toolsdll \
 ))
 
-$(eval $(call gb_Library_use_libraries,tl,\
-    mpr \
-    ole32 \
-    shell32 \
-    uuid \
+$(eval $(call gb_Library_use_system_win32_libs,tl,\
+	mpr \
+	ole32 \
+	shell32 \
+	uuid \
 ))
 
 endif

ucb/Library_ucpdav1.mk

@@ -74,7 +74,7 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,ucpdav1,\
+$(eval $(call gb_Library_use_system_win32_libs,ucpdav1,\
 	ws2_32 \
 ))
 endif

vcl/Library_vcl.mk

@@ -314,11 +314,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/generic/glyphs/graphite_serverfont \
 ))
 endif
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_libraries,vcl,\
-    version \
-))
-endif
 
 $(eval $(call gb_Library_use_external,vcl,graphite))
 
@@ -640,21 +635,20 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/win/source/window/salobj \
 ))
 
-$(eval $(call gb_Library_use_libraries,vcl,\
-    advapi32 \
-    gdi32 \
-    gdiplus \
-    imm32 \
-    mpr \
-    msimg32 \
-    $(gb_Library_win32_OLDNAMES) \
-    ole32 \
-    shell32 \
-    uuid \
+$(eval $(call gb_Library_use_system_win32_libs,vcl,\
+	advapi32 \
+	gdi32 \
+	gdiplus \
+	imm32 \
+	mpr \
+	msimg32 \
+	oldnames \
+	ole32 \
+	shell32 \
 	usp10 \
-    uwinapi \
-    winspool \
-    version \
+	uuid \
+	version \
+	winspool \
 ))
 
 $(eval $(call gb_Library_add_nativeres,vcl,vcl/src))

xmlsecurity/Library_xsec_xmlsec.mk

@@ -101,7 +101,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
 	xmlsec1-mscrypto \
 ))
 
-$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
+$(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\
 	crypt32 \
 	advapi32 \
 ))