gbuild: invert handling of standard system libraries:

Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
2012-09-28 16:29:24 +02:00
parent 7312f5ceac
commit 5032dc0fc3
480 changed files with 13 additions and 958 deletions
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,merged))
-
 $(eval $(call gb_Library_use_externals,merged,\
 	cups \
 	icui18n \
--- a/UnoControls/Library_ctl.mk
+++ b/UnoControls/Library_ctl.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,ctl,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,ctl))
-
 $(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl))

 $(eval $(call gb_Library_add_exception_objects,ctl,\
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,acc,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,acc))
-
 $(eval $(call gb_Library_add_exception_objects,acc,\
    accessibility/source/extended/AccessibleBrowseBox \
    accessibility/source/extended/AccessibleBrowseBoxBase \
--- a/accessibility/Library_java_uno_accessbridge.mk
+++ b/accessibility/Library_java_uno_accessbridge.mk
@@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,java_uno_accessbridge))
-
 $(eval $(call gb_Library_add_exception_objects,java_uno_accessbridge,\
    accessibility/bridge/source/java/WindowsAccessBridgeAdapter \
 ))
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,animcore,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,animcore))
-
 $(eval $(call gb_Library_add_exception_objects,animcore,\
    animations/source/animcore/animcore \
 	animations/source/animcore/factreg \
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -59,8 +59,6 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,avmedia))
-
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
 	avmedia/source/framework/mediacontrol \
 	avmedia/source/framework/mediaitem \
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,avmediaQuickTime))
-
 $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\
 	Cocoa \
 	QTKit \
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,avmediagst))
-
 $(eval $(call gb_Library_add_exception_objects,avmediagst,\
 	avmedia/source/gstreamer/gstmanager \
 	avmedia/source/gstreamer/gstplayer \
--- a/avmedia/Library_avmediagst_0_10.mk
+++ b/avmedia/Library_avmediagst_0_10.mk
@@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,avmediagst_0_10))
-
 $(eval $(call gb_Library_add_libs,avmediagst_0_10,\
 	$(GSTREAMER_0_10_LIBS) \
 	-lgstinterfaces-0.10 \
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,avmediawin))
-
 $(eval $(call gb_Library_use_system_win32_libs,avmediawin,\
 	gdi32 \
 	ole32 \
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,basctl,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,basctl))
-
 $(eval $(call gb_Library_add_exception_objects,basctl,\
 	basctl/source/accessibility/accessibledialogcontrolshape \
 	basctl/source/accessibility/accessibledialogwindow \
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -30,8 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,basebmp_cpputest))
-
 $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_cpputest,\
    basebmp/test/basictest \
    basebmp/test/bmpmasktest \
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_Library_use_libraries,basebmp,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,basebmp))
-
 $(eval $(call gb_Library_set_include,basebmp,\
    -I$(SRCDIR)/basebmp/inc/ \
    $$(INCLUDE) \
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -22,8 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,basegfx_cpputest))
-
 $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_cpputest,\
    basegfx/test/basegfx1d \
    basegfx/test/basegfx2d \
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -24,8 +24,6 @@ $(eval $(call gb_Library_use_libraries,basegfx,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,basegfx))
-
 $(eval $(call gb_Library_set_include,basegfx,\
    -I$(SRCDIR)/basegfx/inc \
    -I$(SRCDIR)/basegfx/source/inc \
--- a/basic/CppunitTest_basic_enable.mk
+++ b/basic/CppunitTest_basic_enable.mk
@@ -31,8 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable))
-
 ifeq ($(GUI),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \
 	oleaut32 \
--- a/basic/CppunitTest_basic_nested_struct.mk
+++ b/basic/CppunitTest_basic_nested_struct.mk
@@ -32,8 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct))
-
 ifeq ($(GUI),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_nested_struct, \
 	oleaut32 \
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -32,8 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner))
-
 ifeq ($(GUI),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \
 	oleaut32 \
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,sb,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,sb))
-
 ifneq ($(DISABLE_SCRIPTING),TRUE)

 $(eval $(call gb_Library_add_exception_objects,sb,\
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -53,6 +53,4 @@ $(eval $(call gb_Library_add_libs,officebean,\
 	$(AWTLIB) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,officebean))
-
 # vim: set noet sw=4 ts=4:
--- a/binaryurp/CppunitTest_binaryurp_test-cache.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk
@@ -33,8 +33,6 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-cache))
-
 $(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\
 	binaryurp/qa/test-cache \
 ))
--- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
@@ -36,8 +36,6 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-unmarshal))
-
 $(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\
 	binaryurp \
 ))
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,binaryurp))
-
 $(eval $(call gb_Library_add_exception_objects,binaryurp,\
 	binaryurp/source/binaryany \
 	binaryurp/source/bridge \
--- a/bridges/Library_gcc3_linux_arm.mk
+++ b/bridges/Library_gcc3_linux_arm.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	sal \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno))
-
 $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\
 	bridges/source/cpp_uno/shared/bridge \
 	bridges/source/cpp_uno/shared/component \
--- a/bridges/Library_gcc3_linux_intel.mk
+++ b/bridges/Library_gcc3_linux_intel.mk
@@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	sal \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno))
-
 $(eval $(call gb_Library_add_asmobjects,gcc3_uno,\
 	bridges/source/cpp_uno/gcc3_linux_intel/call \
 ))
--- a/bridges/Library_gcc3_linux_mips.mk
+++ b/bridges/Library_gcc3_linux_mips.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	sal \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,gcc3_uno))
-
 $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\
 	bridges/source/cpp_uno/gcc3_linux_mips/except \
 	bridges/source/cpp_uno/shared/bridge \
--- a/bridges/Library_java_uno.mk
+++ b/bridges/Library_java_uno.mk
@@ -34,8 +34,6 @@ $(eval $(call gb_Library_use_libraries,java_uno,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,java_uno))
-
 $(eval $(call gb_Library_add_exception_objects,java_uno,\
 	bridges/source/jni_uno/jni_bridge \
 	bridges/source/jni_uno/jni_data \
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -71,8 +71,6 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,cairocanvas))
-
 $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 	canvas/source/cairo/cairo_cachedbitmap \
 	canvas/source/cairo/cairo_cairo \
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,canvasfactory))
-
 $(eval $(call gb_Library_add_exception_objects,canvasfactory,\
 	canvas/source/factory/cf_service \
 ))
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,canvastools,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,canvastools))
-
 $(eval $(call gb_Library_add_exception_objects,canvastools,\
 	canvas/source/tools/cachedprimitivebase \
 	canvas/source/tools/canvascustomspritehelper \
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,directx9canvas))
-
 $(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\
 	d3d9 \
 	gdi32 \
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -64,8 +64,6 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas))
-
 $(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\
 	gdi32 \
 	gdiplus \
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,nullcanvas))
-
 $(eval $(call gb_Library_add_exception_objects,nullcanvas,\
 	canvas/source/null/null_canvasbitmap \
 	canvas/source/null/null_canvascustomsprite \
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,simplecanvas))
-
 $(eval $(call gb_Library_add_exception_objects,simplecanvas,\
 	canvas/source/simplecanvas/simplecanvasimpl \
 ))
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,vclcanvas))
-
 $(eval $(call gb_Library_add_exception_objects,vclcanvas,\
 	canvas/source/vcl/backbuffer \
 	canvas/source/vcl/bitmapbackbuffer \
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,chartcontroller))
-
 $(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller))

 $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,chartcore))
-
 $(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore))

 # view pieces ...
--- a/cli_ure/Executable_climaker.mk
+++ b/cli_ure/Executable_climaker.mk
@@ -36,8 +36,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,climaker,\
 	) \
 ))

-$(eval $(call gb_Executable_add_standard_system_libs,climaker))
-
 $(eval $(call gb_Executable_add_exception_objects,climaker,\
 	cli_ure/source/climaker/climaker_app \
 	cli_ure/source/climaker/climaker_emit \
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -50,8 +50,6 @@ $(eval $(call gb_Library_add_defs,clucene,\
    $(LFS_CFLAGS) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,clucene))
-
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,clucene,\
 	-lm \
--- a/comphelper/CppunitTest_comphelper_test.mk
+++ b/comphelper/CppunitTest_comphelper_test.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,comphelper_test))
-
 $(eval $(call gb_CppunitTest_set_include,comphelper_test,\
    -I$(SRCDIR)/comphelper/inc \
    $$(INCLUDE) \
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,comphelper,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,comphelper))
-
 $(eval $(call gb_Library_use_sdk_api,comphelper))

 $(eval $(call gb_Library_add_exception_objects,comphelper,\
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -75,6 +75,4 @@ $(eval $(call gb_Library_use_libraries,configmgr, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,configmgr))
-
 $(eval $(call gb_Library_set_componentfile,configmgr,configmgr/source/configmgr))
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,ado,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,ado))
-
 $(eval $(call gb_Library_add_exception_objects,ado,\
 	connectivity/source/drivers/ado/ADatabaseMetaDataImpl \
 	connectivity/source/drivers/ado/Aolevariant \
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,calc,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,calc))
-
 $(eval $(call gb_Library_add_exception_objects,calc,\
 	connectivity/source/drivers/calc/CResultSet \
 	connectivity/source/drivers/calc/CStatement \
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,dbase,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,dbase))
-
 $(eval $(call gb_Library_add_exception_objects,dbase,\
 	connectivity/source/drivers/dbase/DCode \
 	connectivity/source/drivers/dbase/DResultSet \
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,dbpool2))
-
 $(eval $(call gb_Library_add_exception_objects,dbpool2,\
 	connectivity/source/cpool/ZConnectionWrapper \
 	connectivity/source/cpool/ZDriverWrapper \
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,dbtools))
-
 ifeq ($(filter-out NETBSD MACOSX,$(OS)),)
 $(eval $(call gb_Library_use_libraries,dbtools,\
 	ucbhelper \
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,evoab,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,evoab))
-
 $(eval $(call gb_Library_add_exception_objects,evoab,\
 	connectivity/source/drivers/evoab2/NDriver \
 	connectivity/source/drivers/evoab2/NTable \
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,file,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,file))
-
 $(eval $(call gb_Library_add_exception_objects,file,\
 	connectivity/source/drivers/file/FCatalog \
 	connectivity/source/drivers/file/FColumns \
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,flat,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,flat))
-
 $(eval $(call gb_Library_add_exception_objects,flat,\
 	connectivity/source/drivers/flat/EResultSet \
 	connectivity/source/drivers/flat/EStatement \
--- a/connectivity/Library_hsqldb.mk
+++ b/connectivity/Library_hsqldb.mk
@@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,hsqldb))
-
 $(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb))

 $(eval $(call gb_Library_add_exception_objects,hsqldb,\
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,jdbc,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,jdbc))
-
 $(eval $(call gb_Library_add_exception_objects,jdbc,\
 	connectivity/source/drivers/jdbc/Array \
 	connectivity/source/drivers/jdbc/Blob \
--- a/connectivity/Library_kab1.mk
+++ b/connectivity/Library_kab1.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,kab1,\
 	salhelper \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,kab1))
-
 $(eval $(call gb_Library_add_exception_objects,kab1,\
 	connectivity/source/drivers/kab/KDriver \
 	connectivity/source/drivers/kab/KServices \
--- a/connectivity/Library_kabdrv1.mk
+++ b/connectivity/Library_kabdrv1.mk
@@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,kabdrv1,\
 	comphelper \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,kabdrv1))
-
 $(eval $(call gb_Library_add_exception_objects,kabdrv1,\
 	connectivity/source/drivers/kab/KColumns \
 	connectivity/source/drivers/kab/KTable \
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,macab1,\
 	salhelper \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,macab1))
-
 $(eval $(call gb_Library_set_include,macab1,\
        $$(INCLUDE) \
        -I$(SRCDIR)/connectivity/inc \
--- a/connectivity/Library_macabdrv1.mk
+++ b/connectivity/Library_macabdrv1.mk
@@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,macabdrv1,\
 	salhelper \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,macabdrv1))
-
 $(eval $(call gb_Library_set_include,macabdrv1,\
        $$(INCLUDE) \
        -I$(SRCDIR)/connectivity/inc \
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -30,8 +30,6 @@ $(eval $(call gb_Library_use_libraries,mork, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,mork))
-
 $(eval $(call gb_Library_use_sdk_api,mork))

 $(eval $(call gb_Library_add_exception_objects,mork, \
--- a/connectivity/Library_mozab.mk
+++ b/connectivity/Library_mozab.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,mozab2,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,mozab2))
-
 $(eval $(call gb_Library_add_exception_objects,mozab2,\
 	connectivity/source/drivers/mozab/MDriver \
 	connectivity/source/drivers/mozab/MServices \
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,mozabdrv))
-
 $(eval $(call gb_Library_use_externals,mozabdrv,\
 	mozilla \
 ))
--- a/connectivity/Library_mozbootstrap.mk
+++ b/connectivity/Library_mozbootstrap.mk
@@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,mozbootstrap))
-
 $(eval $(call gb_Library_add_exception_objects,mozbootstrap,\
 	connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap \
 	connectivity/source/drivers/mozab/bootstrap/MNSFolders \
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,mysql,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,mysql))
-
 $(eval $(call gb_Library_add_exception_objects,mysql,\
 	connectivity/source/drivers/mysql/YDriver \
 	connectivity/source/drivers/mysql/YTables \
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,odbc,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,odbc))
-
 $(eval $(call gb_Library_add_exception_objects,odbc,\
 	connectivity/source/drivers/odbc/oservices \
 	connectivity/source/drivers/odbc/ORealDriver \
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,odbcbase))
-
 $(eval $(call gb_Library_add_exception_objects,odbcbase,\
 	connectivity/source/drivers/odbcbase/OPreparedStatement \
 	connectivity/source/drivers/odbcbase/OStatement \
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl))
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,postgresql-sdbc-impl,\
 	shell32 \
--- a/connectivity/Library_postgresql-sdbc.mk
+++ b/connectivity/Library_postgresql-sdbc.mk
@@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc))
-
 $(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc))

 $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc,\
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,sdbc2))
-
 $(eval $(call gb_Library_add_exception_objects,sdbc2,\
 	connectivity/source/manager/mdrivermanager \
 	connectivity/source/manager/mregistration \
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,tdeab1,\
 	salhelper \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,tdeab1))
-
 $(eval $(call gb_Library_add_exception_objects,tdeab1,\
 	connectivity/source/drivers/kab/KDriver \
 	connectivity/source/drivers/kab/KServices \
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,tdeabdrv1,\
 	comphelper \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,tdeabdrv1))
-
 $(eval $(call gb_Library_add_exception_objects,tdeabdrv1,\
 	connectivity/source/drivers/kab/KColumns \
 	connectivity/source/drivers/kab/KTable \
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,cppcanvas))
-
 $(eval $(call gb_Library_add_exception_objects,cppcanvas,\
 	cppcanvas/source/mtfrenderer/bitmapaction \
 	cppcanvas/source/mtfrenderer/cachedprimitivebase \
--- a/cppcanvas/Library_mtfrenderer.mk
+++ b/cppcanvas/Library_mtfrenderer.mk
@@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,mtfrenderer))
-
 $(eval $(call gb_Library_use_sdk_api,mtfrenderer))

 $(eval $(call gb_Library_add_exception_objects,mtfrenderer,\
--- a/cppu/CppunitTest_cppu_checkapi.mk
+++ b/cppu/CppunitTest_cppu_checkapi.mk
@@ -52,6 +52,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_checkapi))
-
 # vim: set noet sw=4 ts=4:
--- a/cppu/CppunitTest_cppu_qa_any.mk
+++ b/cppu/CppunitTest_cppu_qa_any.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_any))
-
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \
 	cppu \
 	udkapi \
--- a/cppu/CppunitTest_cppu_qa_recursion.mk
+++ b/cppu/CppunitTest_cppu_qa_recursion.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_recursion))
-
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \
 	cppu \
 	udkapi \
--- a/cppu/CppunitTest_cppu_qa_reference.mk
+++ b/cppu/CppunitTest_cppu_qa_reference.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_reference))
-
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \
 	cppu \
 	udkapi \
--- a/cppu/CppunitTest_cppu_qa_unotype.mk
+++ b/cppu/CppunitTest_cppu_qa_unotype.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_unotype))
-
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \
 	cppu \
 	udkapi \
--- a/cppu/CppunitTest_cppu_test_cppumaker.mk
+++ b/cppu/CppunitTest_cppu_test_cppumaker.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_test_cppumaker))
-
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \
 	cppu \
 	udkapi \
--- a/cppu/Library_affine_uno.mk
+++ b/cppu/Library_affine_uno.mk
@@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,affine_uno,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,affine_uno))
-
 $(eval $(call gb_Library_add_exception_objects,affine_uno,\
 	cppu/source/AffineBridge/AffineBridge \
 ))
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,cppu,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,cppu))
-
 $(eval $(call gb_Library_add_cobjects,cppu,\
 	cppu/source/uno/EnvDcp \
 ))
--- a/cppu/Library_log_uno.mk
+++ b/cppu/Library_log_uno.mk
@@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,log_uno,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,log_uno))
-
 $(eval $(call gb_Library_add_exception_objects,log_uno,\
 	cppu/source/LogBridge/LogBridge \
 ))
--- a/cppu/Library_purpenvhelper.mk
+++ b/cppu/Library_purpenvhelper.mk
@@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,purpenvhelper,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,purpenvhelper))
-
 $(eval $(call gb_Library_add_exception_objects,purpenvhelper,\
 	cppu/source/helper/purpenv/helper_purpenv_Environment \
 	cppu/source/helper/purpenv/helper_purpenv_Mapping \
--- a/cppu/Library_unsafe_uno.mk
+++ b/cppu/Library_unsafe_uno.mk
@@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,unsafe_uno,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,unsafe_uno))
-
 $(eval $(call gb_Library_add_exception_objects,unsafe_uno,\
 	cppu/source/UnsafeBridge/UnsafeBridge \
 ))
--- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
@@ -52,6 +52,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_checkapi))
-
 # vim: set noet sw=4 ts=4:
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
@@ -42,6 +42,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_ifcontainer))
-
 # vim: set noet sw=4 ts=4:
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
@@ -38,6 +38,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_unourl))
-
 # vim: set noet sw=4 ts=4:
--- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
@@ -42,6 +42,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_qa_weak))
-
 # vim: set noet sw=4 ts=4:
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,cppuhelper))
-
 $(eval $(call gb_Library_add_cobjects,cppuhelper,\
 	cppuhelper/source/findsofficepath \
 ))
--- a/cpputools/Executable_regcomp.mk
+++ b/cpputools/Executable_regcomp.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Executable_add_standard_system_libs,regcomp))
-
 $(eval $(call gb_Executable_add_exception_objects,regcomp,\
    cpputools/source/registercomponent/registercomponent \
 ))
--- a/cpputools/Executable_regsingleton.mk
+++ b/cpputools/Executable_regsingleton.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Executable_add_standard_system_libs,regsingleton))
-
 $(eval $(call gb_Executable_add_exception_objects,regsingleton,\
    cpputools/source/regsingleton/regsingleton \
 ))
--- a/cpputools/Executable_uno.mk
+++ b/cpputools/Executable_uno.mk
@@ -38,8 +38,6 @@ $(eval $(call gb_Executable_use_libraries,uno,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Executable_add_standard_system_libs,uno))
-
 $(eval $(call gb_Executable_use_externals,uno,\
    libxml2 \
 ))
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -71,8 +71,6 @@ $(eval $(call gb_Library_use_libraries,cui,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,cui))
-
 $(eval $(call gb_Library_use_externals,cui,\
    icuuc \
 ))
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -71,8 +71,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_CppunitTest_add_standard_system_libs,dbaccess_macros_test))
-
 $(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\
    -I$(SRCDIR)/sc/source/ui/inc \
    -I$(SRCDIR)/sc/inc \
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -40,8 +40,6 @@ $(eval $(call gb_Executable_use_libraries,odbcconfig,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Executable_add_standard_system_libs,odbcconfig))
-
 $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\
    dbaccess/win32/source/odbcconfig/odbcconfig \
 ))
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_libraries,dba,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,dba))
-
 $(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba))

 $(eval $(call gb_Library_add_exception_objects,dba,\
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,dbaxml))
-
 $(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml))

 $(eval $(call gb_Library_add_exception_objects,dbaxml,\
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,dbmm,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,dbmm))
-
 $(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm))

 $(eval $(call gb_Library_add_exception_objects,dbmm,\
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -73,8 +73,6 @@ $(eval $(call gb_Library_use_libraries,dbu,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,dbu))
-
 ifeq ($(GUI),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,dbu,\
    ole32 \
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,sdbt,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Library_add_standard_system_libs,sdbt))
-
 $(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt))

 $(eval $(call gb_Library_add_exception_objects,sdbt,\
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,crashrep_com,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Executable_add_standard_system_libs,crashrep_com))
-
 $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\
    desktop/win32/source/guistdio/guistdio \
 ))
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -36,8 +36,6 @@ $(eval $(call gb_Executable_use_libraries,officeloader,\
 	$(gb_UWINAPI) \
 ))

-$(eval $(call gb_Executable_add_standard_system_libs,officeloader))
-
 # I'm not suer wht was the intent, but that break the link
 #$(eval $(call gb_Executable_set_ldflags,officeloader,\
 #    $(filter -bind_at_load,$$(LDFLAGS)) \
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,oosplash,\
    sal \
 ))

-$(eval $(call gb_Executable_add_standard_system_libs,oosplash))
-
 $(eval $(call gb_Executable_add_cobjects,oosplash,\
    desktop/unx/source/args \
    desktop/unx/source/file_image_unx \
--- a/Show More
+++ b/Show More