diff options
486 files changed, 972 insertions, 496 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 0c6cb408fd46..8914e598e5fc 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,merged,\ ucbhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,merged)) + $(eval $(call gb_Library_use_externals,merged,\ cups \ icui18n \ diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk index e5ac6d72ce4e..fd7e1736962a 100644 --- a/UnoControls/Library_ctl.mk +++ b/UnoControls/Library_ctl.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,ctl,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 7da687e3695c..667dcc30e09e 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,acc,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk index 5e0b98fad2ee..1579f8a35e3a 100644 --- a/accessibility/Library_java_uno_accessbridge.mk +++ b/accessibility/Library_java_uno_accessbridge.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ )) diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index 370e1855a9ba..f4ada9c4f3af 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,animcore,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 2eed8e188686..f597bb35647d 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -57,9 +57,10 @@ $(eval $(call gb_Library_use_libraries,avmedia,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 4f367776207d..1daa4aafbe10 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmediaQuickTime)) + $(eval $(call gb_Library_use_externals,avmediaQuickTime,\ cocoa \ qtkit \ diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 20261158c4b1..394873f04a16 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index dace38183760..3369dbf57833 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 3eb9fe2e4962..64750496d43c 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,avmediawin)) + $(eval $(call gb_Library_add_libs,avmediawin,\ strmiids.lib \ )) diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index f83840635926..6cd860ee73f9 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,basctl,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index fc7275a64801..5747cb6b59c8 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -28,9 +28,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 661f5aa2bd22..fd385a8b1eb5 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -19,9 +19,10 @@ $(eval $(call gb_Library_use_libraries,basebmp,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,basebmp)) + $(eval $(call gb_Library_set_include,basebmp,\ -I$(SRCDIR)/basebmp/inc/ \ $$(INCLUDE) \ diff --git a/basebmp/StaticLibrary_basebmp.mk b/basebmp/StaticLibrary_basebmp.mk index 25b923df532b..200f46e96f58 100644 --- a/basebmp/StaticLibrary_basebmp.mk +++ b/basebmp/StaticLibrary_basebmp.mk @@ -19,7 +19,6 @@ $(eval $(call gb_StaticLibrary_use_libraries,basebmp,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) $(eval $(call gb_StaticLibrary_set_include,basebmp,\ diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index 121faf6af57c..a531848951b8 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index e3b11aecfd97..6d974ec6395a 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -22,9 +22,10 @@ $(eval $(call gb_Library_use_libraries,basegfx,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index 3bd2bc87337a..c09080ce2276 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -29,9 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ xmlscript \ test \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \ oleaut32 \ diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index fcadba3b0c84..e43404a27094 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -30,9 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ xmlscript \ test \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \ oleaut32 \ diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index af058148e32f..36806d0e276d 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -30,9 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ oleaut32 \ diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index de50d0c70f9f..c29a58c4b366 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,sb,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sb)) + ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Library_add_exception_objects,sb,\ diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 78cc7dba7297..2b8e2164f045 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -64,8 +64,6 @@ $(eval $(call gb_Library_add_ldflags,officebean,\ endif -$(eval $(call gb_Library_use_libraries,officebean,\ - $(gb_STDLIBS) \ -)) +$(eval $(call gb_Library_add_standard_system_libs,officebean)) # vim: set noet sw=4 ts=4: diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index 7818b21b9163..ecde720b9f58 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -31,9 +31,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache)) $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ )) diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index 2c8c907fa7e1..aed5a30d78a3 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -34,9 +34,10 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,binaryurp_test-unmarshal)) + $(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\ binaryurp \ )) diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index 879025b84606..99e223a68d22 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,binaryurp)) + $(eval $(call gb_Library_add_exception_objects,binaryurp,\ binaryurp/source/binaryany \ binaryurp/source/bridge \ diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index c37275a02dba..ae0df1bad934 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ dl \ ) \ sal \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk index 503eb462b3df..526a1c95b322 100644 --- a/bridges/Library_gcc3_linux_intel.mk +++ b/bridges/Library_gcc3_linux_intel.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ dl \ ) \ sal \ - $(gb_STDLIBS) \ )) +$(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 \ )) diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk index f03752ac74c5..4cd01957c3dd 100644 --- a/bridges/Library_gcc3_linux_mips.mk +++ b/bridges/Library_gcc3_linux_mips.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ dl \ ) \ sal \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk index 3bee8a12e679..df834277c41d 100644 --- a/bridges/Library_java_uno.mk +++ b/bridges/Library_java_uno.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,java_uno,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 74ded07486cf..85ea94cda4ed 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -69,9 +69,10 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\ i18nisolang1 \ canvastools \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 974231a039a1..1b66f16a6b57 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,canvasfactory)) + $(eval $(call gb_Library_add_exception_objects,canvasfactory,\ canvas/source/factory/cf_service \ )) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 4e70f654c6ad..d08d76934fac 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,canvastools,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 08ffdf4017fe..fb2a28b6a928 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\ utl \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,directx9canvas)) + $(eval $(call gb_Library_use_libraries,directx9canvas,\ d3d9 \ gdi32 \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 6ae93a809466..cfe70a926995 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -62,9 +62,10 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ utl \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gdipluscanvas)) + $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ gdi32 \ gdiplus \ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index a130dfb39fbe..ea7376e41bf5 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\ sal \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index d5edd33bbfbe..1fa62e75d91c 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,simplecanvas)) + $(eval $(call gb_Library_add_exception_objects,simplecanvas,\ canvas/source/simplecanvas/simplecanvasimpl \ )) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 922e5ca45dfc..53599b5555bf 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 3baaee9b5713..d5d4ec39e4f1 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 6ca04479fad0..429416d6a955 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,chartcore,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,chartcore)) + $(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore)) # view pieces ... diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index bdea302bb619..e6abcf5f55bf 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Executable_use_libraries,climaker,\ ) \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index 39ef5ca79b34..d80af92de302 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -50,10 +50,7 @@ $(eval $(call gb_Library_add_defs,clucene,\ $(LFS_CFLAGS) \ )) -# clucene does not depend on sal nor needs uwinapi here -$(eval $(call gb_Library_use_libraries,clucene,\ - $(filter-out uwinapi,$(gb_STDLIBS)) \ -)) +$(eval $(call gb_Library_add_standard_system_libs,clucene)) ifeq ($(OS),LINUX) $(eval $(call gb_Library_use_libraries,clucene,\ diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index f77cf84ee57c..11592b7cc976 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,comphelper_test)) + $(eval $(call gb_CppunitTest_set_include,comphelper_test,\ -I$(SRCDIR)/comphelper/inc \ $$(INCLUDE) \ diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 71d03cc9894c..c54d59d85339 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,comphelper,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 588ddd819c86..7dd348d45562 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -73,7 +73,8 @@ $(eval $(call gb_Library_use_libraries,configmgr, \ salhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,configmgr)) + $(eval $(call gb_Library_set_componentfile,configmgr,configmgr/source/configmgr)) diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 4bd5d78cc247..bd24464a5331 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,ado,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index ffd3f71640fe..489542bbe743 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,calc,\ file \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 68f4ea449d80..14c61ec5fcd8 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,dbase,\ utl \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index e128c937ee41..ac008feb4bac 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 1cce1c6e246f..74d8fea6058e 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ comphelper \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbtools)) + ifeq ($(filter-out NETBSD MACOSX,$(OS)),) $(eval $(call gb_Library_use_libraries,dbtools,\ ucbhelper \ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 78cf2d73957e..4606b8865e1d 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,evoab,\ dbtools \ file \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 8c21f99fed5e..c3326b4af484 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,file,\ utl \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 601f96f06b4f..84345d803895 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,flat,\ file \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index 1ffd932298dd..b8b0e0f4372d 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 704f050b6755..71edd85d90d5 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ jvmfwk \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk index 86f713d15ef9..8f2c04ee1263 100644 --- a/connectivity/Library_kab1.mk +++ b/connectivity/Library_kab1.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,kab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index 6a0f16c427f0..097848e6e567 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,kabdrv1,\ salhelper \ dbtools \ comphelper \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk index 842394c40bfa..7058eb553ae6 100644 --- a/connectivity/Library_macab1.mk +++ b/connectivity/Library_macab1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,macab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macab1)) + $(eval $(call gb_Library_set_include,macab1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index 471c6c777ff3..bfb78473a161 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,macabdrv1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macabdrv1)) + $(eval $(call gb_Library_set_include,macabdrv1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index c2b95a0416db..009a3c79b01f 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -28,9 +28,10 @@ $(eval $(call gb_Library_use_libraries,mork, \ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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, \ diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index 7872b26932db..394d227ea51f 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,mozab2,\ dbtools \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index 0e4c541ea6c4..b7f95a811fa0 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mozabdrv)) + $(eval $(call gb_Library_use_externals,mozabdrv,\ mozilla \ )) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index 649f9907c06a..edfb4986d943 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 388af52f2263..71bdd14bec67 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,mysql,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 4b0e61baa48b..32961f472a61 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,odbc,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 9655773afa00..f2b2d41d5b12 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 439524882f8d..50900b1b7f66 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ shell32 \ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 7646af16ef12..60fbfc97f9f7 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 032937a81e6e..60db324099f8 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ utl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 9cc62e2433f1..8c402457d7fc 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,tdeab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index b2ceb087b798..40601d7cf416 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,tdeabdrv1,\ salhelper \ dbtools \ comphelper \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 283ad64dda71..a37d36e0ab70 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index e86b99303fd4..eb7dbc43f161 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\ cppcanvas \ basegfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk index e68cc5cd5241..af9e7ea16b48 100644 --- a/cppu/CppunitTest_cppu_checkapi.mk +++ b/cppu/CppunitTest_cppu_checkapi.mk @@ -50,7 +50,8 @@ $(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\ cppu \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 04f33de964ba..2b5f4653ee32 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_any)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk index 671bd7f4eccf..dffd187d01a1 100644 --- a/cppu/CppunitTest_cppu_qa_recursion.mk +++ b/cppu/CppunitTest_cppu_qa_recursion.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_recursion)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index 4eef2ae78385..d2b59a27d5f9 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_reference)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk index 963ace47a15b..ddc84583ff05 100644 --- a/cppu/CppunitTest_cppu_qa_unotype.mk +++ b/cppu/CppunitTest_cppu_qa_unotype.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_unotype)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index 41da8e269314..7472a3619da2 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_test_cppumaker)) + $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \ cppu \ udkapi \ diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk index 2103eb49b77b..644c82054e85 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,affine_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,affine_uno)) + $(eval $(call gb_Library_add_exception_objects,affine_uno,\ cppu/source/AffineBridge/AffineBridge \ )) diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index de47490923b5..4bdbb01d2565 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,cppu,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cppu)) + $(eval $(call gb_Library_add_cobjects,cppu,\ cppu/source/uno/EnvDcp \ )) diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index 04d9b7d8d588..aacb8ed73495 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,log_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,log_uno)) + $(eval $(call gb_Library_add_exception_objects,log_uno,\ cppu/source/LogBridge/LogBridge \ )) diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index 05606523a758..de60f76c5ce0 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,purpenvhelper,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk index afeb4cc6af22..9b3eb68418f4 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,unsafe_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unsafe_uno)) + $(eval $(call gb_Library_add_exception_objects,unsafe_uno,\ cppu/source/UnsafeBridge/UnsafeBridge \ )) diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk index 4369cfc2ea33..e5ef4b2b895c 100644 --- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk +++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk @@ -50,7 +50,8 @@ $(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\ cppuhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index 726c220ff4ea..7b50f334646d 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -40,7 +40,8 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_ifcontainer)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index 2d6c943ecc30..ee832217dd03 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -36,7 +36,8 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_unourl)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index 391c13e4ac74..6dd88b393cb1 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -40,7 +40,8 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_qa_weak)) + # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 705bd7cdc921..fcb37211671f 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\ salhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cppuhelper)) + $(eval $(call gb_Library_add_cobjects,cppuhelper,\ cppuhelper/source/findsofficepath \ )) diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk index 4743fdef91ae..017a8d6332c7 100644 --- a/cpputools/Executable_regcomp.mk +++ b/cpputools/Executable_regcomp.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,regcomp)) + $(eval $(call gb_Executable_add_exception_objects,regcomp,\ cpputools/source/registercomponent/registercomponent \ )) diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk index 64892fd28696..19d507fe6a81 100644 --- a/cpputools/Executable_regsingleton.mk +++ b/cpputools/Executable_regsingleton.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,regsingleton)) + $(eval $(call gb_Executable_add_exception_objects,regsingleton,\ cpputools/source/regsingleton/regsingleton \ )) diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk index 1b2a878951be..65280c0b2269 100644 --- a/cpputools/Executable_uno.mk +++ b/cpputools/Executable_uno.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Executable_use_libraries,uno,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,uno)) + $(eval $(call gb_Executable_use_externals,uno,\ libxml2 \ )) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 3ed7c2508731..059044fcafc4 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -69,9 +69,10 @@ $(eval $(call gb_Library_use_libraries,cui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cui)) + $(eval $(call gb_Library_use_externals,cui,\ icuuc \ )) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 6a28adaf748f..06ac3147070c 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -69,9 +69,10 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index fb4a0d87211a..809832fad7a3 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_sdk_api,odbcconfig)) $(eval $(call gb_Executable_use_libraries,odbcconfig,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,odbcconfig)) + $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\ dbaccess/win32/source/odbcconfig/odbcconfig \ )) diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 863bcbbaba5e..8ec7dcd47e35 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -64,9 +64,10 @@ $(eval $(call gb_Library_use_libraries,dba,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index 0d38f503aa85..e9db12444e8d 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 89d9c0e83920..3da15cfea101 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 7e0fe1cfaa15..579deb6618ba 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -71,9 +71,10 @@ $(eval $(call gb_Library_use_libraries,dbu,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbu)) + ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_libraries,dbu,\ ole32 \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index ee61c037f875..306b9ec99075 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,sdbt,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index d75f80614d29..1c712acd537b 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\ $(eval $(call gb_Executable_use_libraries,crashrep_com,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,crashrep_com)) + $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\ desktop/win32/source/guistdio/guistdio \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index 08c413a53387..d881087c969c 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Executable_set_include,officeloader,\ $(eval $(call gb_Executable_use_libraries,officeloader,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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)) \ diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index a4451f3d4325..0cded218f54f 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,oosplash,\ $(eval $(call gb_Executable_use_libraries,oosplash,\ sal \ - $(gb_STDLIBS) \ )) +$(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 \ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 8500b1decd4a..8e2bc84ad6ef 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\ oleaut32 \ shell32 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,quickstart)) + ifeq ($(COM),GCC) $(eval $(call gb_Executable_use_libraries,quickstart,\ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 7a517aa8f06e..2da4803c9f31 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sbase,\ $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sbase)) + $(eval $(call gb_Executable_add_libs,sbase,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 7ba226e06146..9d8c906240f7 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,scalc,\ $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,scalc)) + $(eval $(call gb_Executable_add_libs,scalc,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 558b8d340a8b..37605330bfb8 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sdraw)) + $(eval $(call gb_Executable_add_libs,sdraw,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 66002ce86f4f..da674755db7e 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,simpress,\ $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,simpress)) + $(eval $(call gb_Executable_add_libs,simpress,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 3315f718b1e5..261fada2d03c 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,smath,\ $(eval $(call gb_Executable_use_libraries,smath,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,smath)) + $(eval $(call gb_Executable_add_libs,smath,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 126f728cea36..98271c98d55b 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Executable_use_libraries,soffice.bin,\ sal \ sofficeapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice.bin)) + $(eval $(call gb_Executable_add_cobjects,soffice.bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 17ac2d07cd8d..afe746dc01d9 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Executable_use_libraries,soffice,\ shell32 \ shlwapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice)) + $(eval $(call gb_Executable_use_static_libraries,soffice,\ ooopathutils \ winextendloaderenv \ diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index efddda2f1fc0..83c725701c27 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice_bin)) + $(eval $(call gb_Executable_add_cobjects,soffice_bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 1a62d5db772e..2bade4a68e1e 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sweb,\ $(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sweb)) + $(eval $(call gb_Executable_add_libs,sweb,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 68047ecdac1d..2e9d22fb1e9d 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,swriter,\ $(eval $(call gb_Executable_use_libraries,swriter,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,swriter)) + $(eval $(call gb_Executable_add_libs,swriter,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index ab71f1d1a56d..d2ff1a3db48b 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ tl \ unopkgapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,$(desktop_UNOPKGBIN))) + $(eval $(call gb_Executable_add_cobjects,$(desktop_UNOPKGBIN),\ desktop/source/pkgchk/unopkg/unopkg_main \ )) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index f5fb20e062f0..9937fdf0abe5 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,deployment,\ utl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deployment)) + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deployment,\ berkeleydb \ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 865add0e01a3..f81be8c52f41 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,deploymentgui,\ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 93f66de60f26..e5b179abc38d 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ utl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deploymentmisc)) + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deploymentmisc,\ berkeleydb \ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 3187188728af..8c803522193b 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,migrationoo2)) + $(eval $(call gb_Library_use_externals,migrationoo2,\ berkeleydb \ )) diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index fd7201f4321c..41bc2c1b4a07 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,migrationoo3)) + $(eval $(call gb_Library_use_externals,migrationoo3,\ berkeleydb \ )) diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 18653a3fca65..769cf5a56945 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,offacc,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,offacc)) + $(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc)) $(eval $(call gb_Library_add_exception_objects,offacc,\ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index ea039d4a8f8a..af9f39f7d72c 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sofficeapp)) + ifeq ($(GUIBASE),cocoatouch) $(eval $(call gb_Library_add_cflags,sofficeapp,\ $(gb_OBJCFLAGS) \ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index a950d31438c1..97c0cbf67dac 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,spl,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spl)) + $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl)) $(eval $(call gb_Library_add_exception_objects,spl,\ diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk index 08412d5ac192..92059c690010 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,spl_unx,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spl_unx)) + $(eval $(call gb_Library_set_componentfile,spl_unx,desktop/unx/splash/splash)) $(eval $(call gb_Library_add_exception_objects,spl_unx,\ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 0d6222ab0e3d..4958c6fa47ca 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unopkgapp)) + $(eval $(call gb_Library_add_exception_objects,unopkgapp,\ desktop/source/pkgchk/unopkg/unopkg_app \ desktop/source/pkgchk/unopkg/unopkg_cmdenv \ diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 518fe885b45c..0b0a62cab133 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,drawinglayer,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,drawinglayer)) + $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/animation/animationtiming \ drawinglayer/source/attribute/fillbitmapattribute \ diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index dd15f23d33c0..7b6f08621c23 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,dnd,\ uuid \ uwinapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dnd)) + $(eval $(call gb_Library_use_static_libraries,dnd,\ dtobj \ )) diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk index 307bf030d865..e6e48bebd32b 100644 --- a/dtrans/Library_dtrans.mk +++ b/dtrans/Library_dtrans.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,dtrans,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dtrans)) + $(eval $(call gb_Library_add_exception_objects,dtrans,\ dtrans/source/generic/clipboardmanager \ dtrans/source/generic/dtrans \ diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index 83d91bb76066..ae12a2bee575 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,ftransl,\ sal \ uwinapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ftransl)) + $(eval $(call gb_Library_use_static_libraries,ftransl,\ dtobj \ )) diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index 80ad2bd23525..aa112dc51705 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,mcnttype,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mcnttype)) + $(eval $(call gb_Library_add_exception_objects,mcnttype,\ dtrans/source/cnttype/mcnttfactory \ dtrans/source/cnttype/mcnttype \ diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index ef358cf7c40f..698b9d605936 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,sysdtrans,\ uuid \ uwinapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sysdtrans)) + $(eval $(call gb_Library_use_static_libraries,sysdtrans,\ dtobj \ )) diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index 32eea423ea6c..6b513bba5388 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -53,9 +53,10 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \ i18nisolang1 \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_borderline)) + $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index cc12b6df0e4a..561effdb67da 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -58,9 +58,10 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_core)) + $(eval $(call gb_CppunitTest_use_externals,editeng_core,\ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk index 8911f87d8cec..a61c85495baa 100644 --- a/editeng/CppunitTest_editeng_lookuptree.mk +++ b/editeng/CppunitTest_editeng_lookuptree.mk @@ -53,9 +53,10 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_lookuptree, \ i18nisolang1 \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,editeng_lookuptree)) + $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\ icuuc \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index f65f2eb1d35b..308e7595de12 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -152,9 +152,10 @@ $(eval $(call gb_Library_use_libraries,editeng,\ i18nisolang1 \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,editeng)) + $(eval $(call gb_Library_use_external,editeng,icuuc)) # Runtime dependency for unit-tests diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index d4e57c034fa0..083166c77c1c 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,embobj,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,embobj)) + $(eval $(call gb_Library_add_exception_objects,embobj,\ embeddedobj/source/commonembedding/embedobj \ embeddedobj/source/commonembedding/inplaceobj \ diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 3b280bc8e33a..d3ca7501e8cd 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,emboleobj,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,emboleobj)) + $(eval $(call gb_Library_add_exception_objects,emboleobj,\ embeddedobj/source/msole/closepreventer \ embeddedobj/source/msole/oleembed \ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 50a80d613b45..617458b94b1e 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,emser,\ sal \ uuid \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,emser)) + ifeq ($(USE_DEBUG_RUNTIME),) $(eval $(call gb_Library_add_libs,emser,\ $(ATL_LIB)/atls.lib \ diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 256871f62686..122858ed9413 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\ ole32 \ uuid \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,inprocserv)) + ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,inprocserv,\ /EXPORT:DllCanUnloadNow \ diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk index 06eb7948e832..3ea419418096 100644 --- a/eventattacher/Library_evtatt.mk +++ b/eventattacher/Library_evtatt.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,evtatt,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,evtatt)) + $(eval $(call gb_Library_add_exception_objects,evtatt,\ eventattacher/source/eventattacher \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index ad617f690582..766552e29396 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -40,9 +40,10 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ test \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update)) + ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\ shell32 \ diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index 708d89f5a7b6..82ac86bef87d 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -84,7 +84,8 @@ $(eval $(call gb_Library_use_libraries,abp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,abp)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index aa4e368942a4..6ba529538ad3 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -68,7 +68,8 @@ $(eval $(call gb_Library_use_libraries,bib,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,bib)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index 1f9c76917c72..caf72dc5114a 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -70,7 +70,8 @@ $(eval $(call gb_Library_use_libraries,dbp,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbp)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index 9fd561c884db..a366362cfea3 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -53,7 +53,8 @@ $(eval $(call gb_Library_use_libraries,log,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,log)) + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 847ba21c5604..974701566838 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,pcr,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,pcr)) + $(eval $(call gb_Library_add_exception_objects,pcr,\ extensions/source/propctrlr/MasterDetailLinkDialog \ extensions/source/propctrlr/browserline \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index e6c5f0d7e1cf..45b1b75d58b7 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -131,9 +131,10 @@ $(eval $(call gb_Library_use_libraries,pl,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,pl)) + $(eval $(call gb_Library_add_exception_objects,pl,\ extensions/source/plugin/base/context \ extensions/source/plugin/base/evtlstnr \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index cd7bc522b424..22587cc65e9c 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,res,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,res)) + $(eval $(call gb_Library_add_exception_objects,res,\ extensions/source/resource/ResourceIndexAccess \ extensions/source/resource/oooresourceloader \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 7cca92e09eed..75872b73465f 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,scn,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scn)) + $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scnserv \ extensions/source/scanner/scanner \ diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk index ea8336544d78..01a54320119a 100644 --- a/fileaccess/Library_fileacc.mk +++ b/fileaccess/Library_fileacc.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,fileacc,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fileacc)) + $(eval $(call gb_Library_set_componentfile,fileacc,fileaccess/source/fileacc)) $(eval $(call gb_Library_add_exception_objects,fileacc,fileaccess/source/FileAccess)) diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index 20cbe8613239..a84cffa41506 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_pict_test)) + $(eval $(call gb_CppunitTest_use_api,filter_pict_test,\ udkapi \ offapi \ diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index fc05c5b68ac8..597cd2cbfa55 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_tga_test)) + $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\ udkapi \ offapi \ diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index 4da2def1178f..ce29bb29c6f8 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,filter_tiff_test)) + $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\ udkapi \ offapi \ diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index bc22022a7d9a..ad38d5eba6fd 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,svg2odf)) + $(eval $(call gb_Executable_add_exception_objects,svg2odf,\ filter/source/svg/test/svg2odf \ filter/source/svg/test/odfserializer \ diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index dc676fc1eb04..22e613952383 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,PptImporter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,PptImporter)) + $(eval $(call gb_Library_add_exception_objects,PptImporter,\ filter/source/msfilter/powerpoint/pptimporter \ filter/source/msfilter/powerpoint/pptimporteruno \ diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index 76f996ec5a5b..68c45f9f1adb 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,egi,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,egi)) + $(eval $(call gb_Library_add_exception_objects,egi,\ filter/source/graphicfilter/egif/egif \ filter/source/graphicfilter/egif/giflzwc \ diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index fc67818d2918..aed74813581c 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,eme,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,eme)) + $(eval $(call gb_Library_add_exception_objects,eme,\ filter/source/graphicfilter/eos2met/eos2met \ )) diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index d9ab41e401d0..dabe92c4d75c 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,epb,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,epb)) + $(eval $(call gb_Library_add_exception_objects,epb,\ filter/source/graphicfilter/epbm/epbm \ )) diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index dd5aba2718e6..cf1ab1f69b65 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,epg,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,epg)) + $(eval $(call gb_Library_add_exception_objects,epg,\ filter/source/graphicfilter/epgm/epgm \ )) diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 545522dae843..9ca7ff0d0c4d 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,epp,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,epp)) + $(eval $(call gb_Library_add_exception_objects,epp,\ filter/source/graphicfilter/eppm/eppm \ )) diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index a1d80c7c8605..7ce9d29b04a4 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,eps,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,eps)) + $(eval $(call gb_Library_add_exception_objects,eps,\ filter/source/graphicfilter/eps/eps \ )) diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index 2c8f8a406742..5281662571a4 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,ept,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ept)) + $(eval $(call gb_Library_add_exception_objects,ept,\ filter/source/graphicfilter/epict/epict \ )) diff --git a/filter/Library_era.mk b/filter/Library_era.mk index 9c37c67e6b6b..b558d014c8dd 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,era,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,era)) + $(eval $(call gb_Library_add_exception_objects,era,\ filter/source/graphicfilter/eras/eras \ )) diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index e1f3eefe6b40..45c1aa1a9fd8 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,eti,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,eti)) + $(eval $(call gb_Library_add_exception_objects,eti,\ filter/source/graphicfilter/etiff/etiff \ )) diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index 8c2c06a8d136..de4e0873178c 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,exp,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,exp)) + $(eval $(call gb_Library_add_exception_objects,exp,\ filter/source/graphicfilter/expm/expm \ )) diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index b6404a177ba9..accb75de4a39 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,filterconfig,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,filterconfig)) + $(eval $(call gb_Library_add_exception_objects,filterconfig,\ filter/source/config/cache/basecontainer \ diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index 808f7a57172f..13843bd93578 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,flash,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,flash)) + $(eval $(call gb_Library_use_externals,flash,zlib)) $(eval $(call gb_Library_add_exception_objects,flash,\ diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index bee43bbe7ceb..ca60b884d51b 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_use_libraries,icd,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,icd)) + $(eval $(call gb_Library_add_exception_objects,icd,\ filter/source/graphicfilter/ipcd/ipcd \ )) diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index 7d9241fe9e2e..614107ef2be3 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,icg,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,icg)) + $(eval $(call gb_Library_add_exception_objects,icg,\ filter/source/graphicfilter/icgm/actimpr \ filter/source/graphicfilter/icgm/bitmap \ diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index 6040d65538d2..6cd2083284b9 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,idx,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,idx)) + $(eval $(call gb_Library_add_exception_objects,idx,\ filter/source/graphicfilter/idxf/dxf2mtf \ filter/source/graphicfilter/idxf/dxfblkrd \ diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index d93303030f58..8aa08162ddb6 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ime,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ime)) + $(eval $(call gb_Library_add_exception_objects,ime,\ filter/source/graphicfilter/ios2met/ios2met \ )) diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index 813954141b66..34db6b034768 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ipb,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipb)) + $(eval $(call gb_Library_add_exception_objects,ipb,\ filter/source/graphicfilter/ipbm/ipbm \ )) diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index 6f87872d92eb..d84768c10561 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ipd,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipd)) + $(eval $(call gb_Library_add_exception_objects,ipd,\ filter/source/graphicfilter/ipsd/ipsd \ )) diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index face1d7f1fb3..01226fc530db 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ips,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ips)) + $(eval $(call gb_Library_add_exception_objects,ips,\ filter/source/graphicfilter/ieps/ieps \ )) diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index 768af3940040..f6047a0c2460 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_use_libraries,ipt,\ basegfx \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipt)) + $(eval $(call gb_Library_add_exception_objects,ipt,\ filter/source/graphicfilter/ipict/ipict \ filter/source/graphicfilter/ipict/shape \ diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index 5cea98191964..b266f3b39879 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ipx,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ipx)) + $(eval $(call gb_Library_add_exception_objects,ipx,\ filter/source/graphicfilter/ipcx/ipcx \ )) diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index 914c53e19cfd..d1f2b8a14cc1 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,ira,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ira)) + $(eval $(call gb_Library_add_exception_objects,ira,\ filter/source/graphicfilter/iras/iras \ )) diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index 2a9a03e15f1f..fb7ae312fc3f 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,itg,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,itg)) + $(eval $(call gb_Library_add_exception_objects,itg,\ filter/source/graphicfilter/itga/itga \ )) diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index e736ffafe2e0..895b2cd172e7 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,iti,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,iti)) + $(eval $(call gb_Library_add_exception_objects,iti,\ filter/source/graphicfilter/itiff/ccidecom \ filter/source/graphicfilter/itiff/itiff \ diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 0de501dfeb09..2061f571015e 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,msfilter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,msfilter)) + $(eval $(call gb_Library_add_exception_objects,msfilter,\ filter/source/msfilter/countryid \ filter/source/msfilter/escherex \ diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index 3df371a63c8c..b7a99a4568e8 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,odfflatxml,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,odfflatxml)) + $(eval $(call gb_Library_add_exception_objects,odfflatxml,\ filter/source/odfflatxml/OdfFlatXml \ )) diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index 77be3737a741..1801ccf6086f 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,pdffilter)) + $(eval $(call gb_Library_add_exception_objects,pdffilter,\ filter/source/pdf/impdialog \ filter/source/pdf/pdfdialog \ diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index e4d6684a26c1..eee399f1b859 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,placeware,\ sal \ sax \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,placeware)) + $(eval $(call gb_Library_add_exception_objects,placeware,\ filter/source/placeware/exporter \ filter/source/placeware/filter \ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index 886882cf18fe..c3b752e4d0f2 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svgfilter)) + $(eval $(call gb_Library_use_externals,svgfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,svgfilter,\ diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index 082601caf7e0..b3d649db3ad2 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,t602filter,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,t602filter)) + $(eval $(call gb_Library_add_exception_objects,t602filter,\ filter/source/t602/filterenv \ filter/source/t602/t602filter \ diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk index 594ce61f7456..3acc160d3954 100644 --- a/filter/Library_textfd.mk +++ b/filter/Library_textfd.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,textfd,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textfd)) + $(eval $(call gb_Library_add_exception_objects,textfd,\ filter/source/textfilterdetect/fdcomp \ filter/source/textfilterdetect/filterdetect \ diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index acb109aee92e..5cd70bb6ab76 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlfa)) + $(eval $(call gb_Library_add_exception_objects,xmlfa,\ filter/source/xmlfilteradaptor/XmlFilterAdaptor \ filter/source/xmlfilteradaptor/genericfilter \ diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index b42e79ee2c70..99c6a8e91a62 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Library_use_libraries,xmlfd,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlfd)) + $(eval $(call gb_Library_add_exception_objects,xmlfd,\ filter/source/xmlfilterdetect/fdcomp \ filter/source/xmlfilterdetect/filterdetect \ diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 805e0e71f3cb..2f87b27acfa7 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsltdlg)) + $(eval $(call gb_Library_add_exception_objects,xsltdlg,\ filter/source/xsltdialog/typedetectionexport \ filter/source/xsltdialog/typedetectionimport \ diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index 293c28b0af20..3dec5645a86f 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,xsltfilter,\ salhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsltfilter)) + $(eval $(call gb_Library_use_externals,xsltfilter,\ libxml2 \ libxslt \ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 2b4361fde1ca..809bef707b6e 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,frm,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,frm)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,frm,\ icuin \ diff --git a/formula/Library_for.mk b/formula/Library_for.mk index 4678e9f4aeda..4e392b7fa15c 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,for,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,for)) + $(eval $(call gb_Library_set_componentfile,for,formula/util/for)) $(eval $(call gb_Library_add_exception_objects,for,\ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 3090ed411160..b92cf91da298 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,forui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,forui)) + $(eval $(call gb_Library_add_exception_objects,forui,\ formula/source/ui/dlg/formula \ formula/source/ui/dlg/FormulaHelper \ diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index fdba80e5e721..c18687564d4d 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,fpicker,\ svt \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fpicker)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fpicker,\ odma_lib \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 95e315743eca..05f84ea2b1ba 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,fps,\ shell32 \ uuid \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps)) + ifeq ($(COM),MSC) $(eval $(call gb_Library_add_libs,fps,\ Delayimp.lib /DELAYLOAD:shell32.dll \ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index cb7e1a9e7c77..2c7665855779 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,fps_aqua,\ sal \ tl \ vcl \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_aqua)) + $(eval $(call gb_Library_add_objcxxobjects,fps_aqua,\ fpicker/source/aqua/AquaFilePickerDelegate \ fpicker/source/aqua/CFStringUtilities \ diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index 08eff663bfac..dbb1fe382339 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,fps_odma,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_odma)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,fps_odma,\ odma_lib \ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 2db54954bdeb..5582ffb076e2 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fps_office)) + $(eval $(call gb_Library_add_exception_objects,fps_office,\ fpicker/source/office/asyncfilepicker \ fpicker/source/office/commonpicker \ diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 3d3598c6d1c2..fcc35cc1fecc 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,fwe,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwe)) + $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/classes/actiontriggercontainer \ framework/source/fwe/classes/actiontriggerpropertyset \ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index b33194267453..ac51b15602a6 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -55,9 +55,10 @@ $(eval $(call gb_Library_use_libraries,fwi,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwi)) + $(eval $(call gb_Library_add_exception_objects,fwi,\ framework/source/fwi/classes/converter \ framework/source/fwi/classes/propertysethelper \ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 348812634bbf..3a4ed045cae0 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -55,9 +55,10 @@ $(eval $(call gb_Library_use_libraries,fwk,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwk)) + $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/accelerators/acceleratorcache \ framework/source/accelerators/acceleratorconfiguration \ diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index f02de16d2026..45c605663651 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,fwl,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwl)) + $(eval $(call gb_Library_add_exception_objects,fwl,\ framework/source/classes/fwlresid \ framework/source/dispatch/mailtodispatcher \ diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index bd656521ea40..bc0daca7caff 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,fwm,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fwm)) + $(eval $(call gb_Library_add_exception_objects,fwm,\ framework/source/dispatch/systemexec \ framework/source/jobs/helponstartup \ diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk index 3536625dbac0..b9f8c5fef6fa 100644 --- a/framework/Library_lomenubar.mk +++ b/framework/Library_lomenubar.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,lomenubar,\ cppuhelper \ comphelper \ X11 \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lomenubar)) + $(eval $(call gb_Library_add_exception_objects,lomenubar,\ framework/source/lomenubar/MenuItemInfo \ framework/source/lomenubar/AwtKeyToDbusmenuString \ diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index 834c9ae1212a..f4a269873d5e 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \ test \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,hwpfilter_test_hwpfilter)) + $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\ offapi \ udkapi \ diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 612a124e7ccd..5ca70188fcf3 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,hwp,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hwp)) + $(eval $(call gb_Library_use_external,hwp,zlib)) ifeq ($(OS),WNT) diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 0fe4577ecff0..c51f0a1630ce 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_breakiterator)) + $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ i18npool/qa/cppunit/test_breakiterator \ )) diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk index 9c6b549da697..086dec586d1f 100644 --- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk +++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk @@ -39,9 +39,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_characterclassification)) + $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\ i18npool/qa/cppunit/test_characterclassification \ )) diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk index cdb846894122..7043f320c028 100644 --- a/i18npool/CppunitTest_i18npool_test_languagetag.mk +++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk @@ -21,9 +21,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_languagetag)) + ifeq ($(ENABLE_LIBLANGTAG),YES) $(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\ liblangtag \ diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk index a2ea6f51430e..ed943389e970 100644 --- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\ sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_ordinalsuffix)) + $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_ordinalsuffix,\ i18npool/qa/cppunit/test_ordinalsuffix \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 5999b06466b8..82aafdb4cea0 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,gencoll_rule)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index 58a3011afb16..22ea9c5d54d1 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,genconv_dict,\ $(eval $(call gb_Executable_use_libraries,genconv_dict,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,genconv_dict)) + $(eval $(call gb_Executable_add_exception_objects,genconv_dict,\ i18npool/source/textconversion/genconv_dict \ )) diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index a49f2eb4c726..38aae75eb138 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,gendict,\ $(eval $(call gb_Executable_use_libraries,gendict,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,gendict)) + $(eval $(call gb_Executable_add_exception_objects,gendict,\ i18npool/source/breakiterator/gendict \ )) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index c1279d00964b..c6b532192466 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,genindex_data,\ $(eval $(call gb_Executable_use_libraries,genindex_data,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,genindex_data)) + ifeq ($(OS),WNT) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index eb4efdf838a7..b61799d690d1 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,saxparser)) + $(eval $(call gb_Executable_add_exception_objects,saxparser,\ i18npool/source/localedata/LocaleNode \ i18npool/source/localedata/filewriter \ diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index 507a3455c9b6..a136cef873e0 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,collator_data)) $(eval $(call gb_Library_use_libraries,collator_data,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,collator_data)) + $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\ CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index 658d8334cf6c..a22555b231f5 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,dict_ja)) $(eval $(call gb_Library_use_libraries,dict_ja,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dict_ja)) + $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\ CustomTarget/i18npool/breakiterator/dict_ja \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index c21addb7f2cb..8b80f193de23 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,dict_zh)) $(eval $(call gb_Library_use_libraries,dict_zh,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dict_zh)) + $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\ CustomTarget/i18npool/breakiterator/dict_zh \ )) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 4ff6fff4331a..422d9cde94f6 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_add_defs,i18nisolang1,\ $(eval $(call gb_Library_use_libraries,i18nisolang1,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nisolang1)) + $(eval $(call gb_Library_add_exception_objects,i18nisolang1,\ i18npool/source/isolang/insys \ i18npool/source/isolang/isolang \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 73d38e954cb3..81486613da42 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ i18nutil \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18npool)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,i18npool,\ icuin \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index b55f8cdfe731..828ec2ba37ca 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\ i18nregexp \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nsearch)) + $(eval $(call gb_Library_add_exception_objects,i18nsearch,\ i18npool/source/search/levdis \ i18npool/source/search/textsearch \ diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index c5bf1f4004ac..79f1cd93a64b 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,index_data)) $(eval $(call gb_Library_use_libraries,index_data,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,index_data)) + $(eval $(call gb_Library_add_generated_exception_objects,index_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),\ CustomTarget/i18npool/indexentry/$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index 4cd77fc77448..a5cf7a780676 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,localedata_en)) $(eval $(call gb_Library_use_libraries,localedata_en,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_en)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\ CustomTarget/i18npool/localedata/localedata_en_AU \ CustomTarget/i18npool/localedata/localedata_en_BZ \ diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index 145123225e2c..75ba17341a33 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_es)) $(eval $(call gb_Library_use_libraries,localedata_es,\ localedata_en \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_es)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\ CustomTarget/i18npool/localedata/localedata_es_AR \ CustomTarget/i18npool/localedata/localedata_es_BO \ diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index c1b4569d01d9..ad3ebc679071 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_euro)) $(eval $(call gb_Library_use_libraries,localedata_euro,\ localedata_en \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_euro)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ CustomTarget/i18npool/localedata/localedata_an_ES \ CustomTarget/i18npool/localedata/localedata_ast_ES \ diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index d331b8906506..b18593db55bf 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_Library,localedata_others)) $(eval $(call gb_Library_use_libraries,localedata_others,\ localedata_en \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localedata_others)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ CustomTarget/i18npool/localedata/localedata_af_NA \ CustomTarget/i18npool/localedata/localedata_af_ZA \ diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index e274c549e850..a568534c0a97 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_sdk_api,textconv_dict)) $(eval $(call gb_Library_use_libraries,textconv_dict,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textconv_dict)) + $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic),\ CustomTarget/i18npool/textconversion/$(notdir $(basename $(txt)))) \ diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index b9cbbdcc151e..fab587956517 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Library_use_libraries,i18nutil,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nutil)) + $(eval $(call gb_Library_add_exception_objects,i18nutil,\ i18nutil/source/utility/casefolding \ i18nutil/source/utility/oneToOneMapping \ diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index bdf0aa40e124..fdde856cd925 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,svidl,\ tl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,svidl)) + $(eval $(call gb_Executable_add_exception_objects,svidl,\ idl/source/cmptools/hash \ idl/source/cmptools/lex \ diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index a07da5d58765..f00e15bed383 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,acceptor,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,acceptor)) + $(eval $(call gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor)) $(eval $(call gb_Library_add_exception_objects,acceptor,\ diff --git a/io/Library_connector.mk b/io/Library_connector.mk index 2bbe7257e922..826b074507c3 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,connector,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,connector)) + $(eval $(call gb_Library_set_componentfile,connector,io/source/connector/connector)) $(eval $(call gb_Library_add_exception_objects,connector,\ diff --git a/io/Library_streams.mk b/io/Library_streams.mk index bb79154ff61a..8bf18f4db6d2 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,streams,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,streams)) + $(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams)) $(eval $(call gb_Library_add_exception_objects,streams,\ diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk index b921a206792d..80ada3ef8d17 100644 --- a/io/Library_textinstream.mk +++ b/io/Library_textinstream.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,textinstream,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textinstream)) + $(eval $(call gb_Library_set_componentfile,textinstream,io/source/TextInputStream/textinstream)) $(eval $(call gb_Library_add_exception_objects,textinstream,\ diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk index 17fe1ec591a3..b6b0ff2bf899 100644 --- a/io/Library_textoutstream.mk +++ b/io/Library_textoutstream.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,textoutstream,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textoutstream)) + $(eval $(call gb_Library_set_componentfile,textoutstream,io/source/TextOutputStream/textoutstream)) $(eval $(call gb_Library_add_exception_objects,textoutstream,\ diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index ecacfd9978d0..dd1644f4005a 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,juh,\ $(eval $(call gb_Library_use_libraries,juh,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,juh)) + ifneq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Library_add_exception_objects,juh,\ javaunohelper/source/preload \ diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index ce8ac747934e..eeef545357b7 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,juhx,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,juhx)) + $(eval $(call gb_Library_add_exception_objects,juhx,\ javaunohelper/source/bootstrap \ javaunohelper/source/javaunohelper \ diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index eb9656737b3a..3f50e7a34a8e 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_Library,jpipe)) $(eval $(call gb_Library_use_libraries,jpipe,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jpipe)) + ifeq ($(OS),WNT) # The real library is called jpipx on Windows. We build only a wrapper diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk index c36dce20b949..14d91cb9b839 100644 --- a/jurt/Library_jpipx.mk +++ b/jurt/Library_jpipx.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,jpipx)) $(eval $(call gb_Library_use_libraries,jpipx,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jpipx)) + $(eval $(call gb_Library_add_cobjects,jpipx,\ jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \ )) diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index 2a957ee006ce..6e8578dd0147 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,jvmaccess,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jvmaccess)) + $(eval $(call gb_Library_add_exception_objects,jvmaccess,\ jvmaccess/source/classpath \ jvmaccess/source/unovirtualmachine \ diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index 177947cd0b15..aedb7dbc0b3a 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Executable_use_libraries,javaldx,\ jvmfwk \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,javaldx)) + $(eval $(call gb_Executable_add_exception_objects,javaldx,\ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index c4a459728324..73a2e6bd5e5c 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,jvmfwk,\ advapi32 \ diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 517892fa8e8e..e25d993fac2d 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sunjavaplugin)) + ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ lo-bootstrap \ diff --git a/l10ntools/Executable_ulfconv.mk b/l10ntools/Executable_ulfconv.mk index 7a92c2edd596..b981e56e2e59 100644 --- a/l10ntools/Executable_ulfconv.mk +++ b/l10ntools/Executable_ulfconv.mk @@ -12,9 +12,10 @@ $(eval $(call gb_Executable_Executable,ulfconv)) $(eval $(call gb_Executable_use_libraries,ulfconv,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,ulfconv)) + $(eval $(call gb_Executable_add_exception_objects,ulfconv,\ l10ntools/source/ulfconv/ulfconv \ )) diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk index f3f37e2f7b69..57d5a65568d1 100644 --- a/lingucomponent/Library_MacOSXSpell.mk +++ b/lingucomponent/Library_MacOSXSpell.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,MacOSXSpell,\ $(eval $(call gb_Library_use_sdk_api,MacOSXSpell)) $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ - $(gb_STDLIBS) \ cppu \ cppuhelper \ lng \ @@ -48,6 +47,8 @@ $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ utl \ )) +$(eval $(call gb_Library_add_standard_system_libs,MacOSXSpell)) + $(eval $(call gb_Library_use_externals,MacOSXSpell,\ cocoa \ hunspell \ diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk index bfd8ffa7a805..73bfcb648061 100644 --- a/lingucomponent/Library_guesslang.mk +++ b/lingucomponent/Library_guesslang.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,guesslang,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,guesslang)) + $(eval $(call gb_Library_use_externals,guesslang,\ libexttextcat \ )) diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index ce28dd9e9b67..ed316051e1ed 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,hyphen,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hyphen)) + $(eval $(call gb_Library_use_static_libraries,hyphen,\ ulingu \ )) diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index 96a57d04e246..98e2eeeed8db 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,lnth,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lnth)) + $(eval $(call gb_Library_use_static_libraries,lnth,\ ulingu \ )) diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index 2868b3e0d8ce..5b8d7b142d0b 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,spell,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spell)) + $(eval $(call gb_Library_use_static_libraries,spell,\ ulingu \ )) diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index 3e9900ba0f21..bf26844f67dc 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,lng,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lng)) + $(eval $(call gb_Library_use_external,lng,icuuc)) $(eval $(call gb_Library_add_exception_objects,lng,\ diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index c96fbbcf148c..6f4b3b62ff73 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,lotuswordpro_test_lotuswordpro)) + $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\ offapi \ udkapi \ diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 676446b8fe42..4620f6c819c2 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,lwpft)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,lwpft,\ icuin \ diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 30de08e70d06..eed591bfdc81 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -33,9 +33,10 @@ $(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc)) $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,o3tl_tests)) + $(eval $(call gb_CppunitTest_add_exception_objects,o3tl_tests,\ o3tl/qa/cow_wrapper_clients \ o3tl/qa/test-cow_wrapper \ diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index af41d6fdceb1..47c14a001172 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -31,9 +31,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,officecfg_cppheader_test)) $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,officecfg_cppheader_test)) + $(eval $(call gb_CppunitTest_add_exception_objects,officecfg_cppheader_test, \ officecfg/qa/cppheader \ )) diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 56443e46671a..d97fa4aac2ac 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -76,9 +76,10 @@ $(eval $(call gb_Library_use_libraries,oox,\ xo \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,oox)) + $(eval $(call gb_Library_use_external,oox,openssl)) $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) diff --git a/package/Library_package2.mk b/package/Library_package2.mk index a453af4a9a5b..c56a1863fa6c 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,package2,\ sax \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,package2)) + $(eval $(call gb_Library_use_externals,package2,\ zlib \ )) diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 15c2cb47dd98..498f35d0fe8b 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,xstor,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xstor)) + $(eval $(call gb_Library_add_exception_objects,xstor,\ package/source/xstor/disposelistener \ package/source/xstor/ocompinstream \ diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 3bcf1989c3bc..d699894b33fd 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Executable_use_libraries,spadmin.bin,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,spadmin.bin)) + $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ padmin/source/desktopcontext \ padmin/source/pamain \ diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 6ee2ef230ae6..1db89d5f6ce8 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,spa,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spa)) + $(eval $(call gb_Library_add_exception_objects,spa,\ padmin/source/adddlg \ diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index 1b3b73197f8f..0b3e6021d138 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,i18nregexp,\ sal \ i18nutil \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,i18nregexp)) + $(eval $(call gb_Library_add_exception_objects,i18nregexp,\ regexp/source/reclass \ )) diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index 2701c472dfd2..c6b1cd96fae1 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,reg,\ sal \ store \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,reg)) + $(eval $(call gb_Library_add_exception_objects,reg,\ registry/source/keyimpl \ registry/source/reflread \ diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk index d8079bac6860..cf8c0083d5c5 100644 --- a/remotebridges/Library_uuresolver.mk +++ b/remotebridges/Library_uuresolver.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,uuresolver,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,uuresolver)) + $(eval $(call gb_Library_add_exception_objects,uuresolver,\ remotebridges/source/unourl_resolver/unourl_resolver \ )) diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 300874c586d0..deb1b13bf9b6 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,rpt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,rpt)) + $(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt)) $(eval $(call gb_Library_add_exception_objects,rpt,\ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 4949dea74ea2..7e5d9f197fdf 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,rptui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,rptui)) + $(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui)) $(eval $(call gb_Library_add_exception_objects,rptui,\ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index c1ee286f9d65..b0fc1bacc198 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,rptxml,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,rptxml)) + $(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml)) $(eval $(call gb_Library_add_exception_objects,rptxml,\ diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index 25af0b595ea1..3dd0feca4add 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Executable_use_libraries,rsc,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,rsc)) + $(eval $(call gb_Executable_add_grammars,rsc,\ rsc/source/parser/rscyacc \ )) diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk index d2f5079723e3..fe58e255a2df 100644 --- a/sal/CppunitTest_Module_DLL.mk +++ b/sal/CppunitTest_Module_DLL.mk @@ -37,7 +37,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\ $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,Module_DLL)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk index cdb62c7e4334..222f77a7b53c 100644 --- a/sal/CppunitTest_sal_bytesequence.mk +++ b/sal/CppunitTest_sal_bytesequence.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\ $(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_bytesequence)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk index 8b7ca18c9339..b61a739dbe2c 100644 --- a/sal/CppunitTest_sal_checkapi.mk +++ b/sal/CppunitTest_sal_checkapi.mk @@ -45,7 +45,8 @@ $(call gb_CxxObject_get_target,sal/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk index 4c90de256844..0dad649efa4c 100644 --- a/sal/CppunitTest_sal_osl_condition.mk +++ b/sal/CppunitTest_sal_osl_condition.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_condition)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index dfd5d592f999..ea64e55daca7 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_file)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk index 199f94cc3fc1..af121a42f62e 100644 --- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk +++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_getsystempathfromfile $(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_getsystempathfromfileurl)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk index 7b75f8a3e0fc..93a24b4fdd8d 100644 --- a/sal/CppunitTest_sal_osl_module.mk +++ b/sal/CppunitTest_sal_osl_module.mk @@ -38,7 +38,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_module)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk index 131761d1d078..7768b1e5ce99 100644 --- a/sal/CppunitTest_sal_osl_mutex.mk +++ b/sal/CppunitTest_sal_osl_mutex.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_mutex)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk index 3828b7784b9a..3b9040c2f519 100644 --- a/sal/CppunitTest_sal_osl_old_test_file.mk +++ b/sal/CppunitTest_sal_osl_old_test_file.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_old_test_file)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk index 4aa70952531b..a71937b15342 100644 --- a/sal/CppunitTest_sal_osl_pipe.mk +++ b/sal/CppunitTest_sal_osl_pipe.mk @@ -36,7 +36,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \ sal \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_pipe)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk index 6a53add92dae..4ee7e3f6eba6 100644 --- a/sal/CppunitTest_sal_osl_process.mk +++ b/sal/CppunitTest_sal_osl_process.mk @@ -20,7 +20,9 @@ # For minor contributions see the git repository. # # Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +#se_libraries,sal_osl_process,\ + sal \ + $(g either the GNU General Public License Version 3 or later (the "GPLv3+"), or # the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. @@ -34,9 +36,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_process,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_process)) + # Depend on to be tested executable $(call gb_CppunitTest_get_target,sal_osl_process) : \ $(call gb_Executable_get_target,osl_process_child) diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk index 1195b7d55eb1..87d587f6632f 100644 --- a/sal/CppunitTest_sal_osl_profile.mk +++ b/sal/CppunitTest_sal_osl_profile.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_profile)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk index a583b7c423dc..edb6a96ed88c 100644 --- a/sal/CppunitTest_sal_osl_security.mk +++ b/sal/CppunitTest_sal_osl_security.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_security,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_security)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index 6d6f8df52238..f7024cae6f07 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_setthreadname)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk index b014c83e46ba..6feb7d59b584 100644 --- a/sal/CppunitTest_sal_osl_thread.mk +++ b/sal/CppunitTest_sal_osl_thread.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_thread,\ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_thread)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk index e6a52823b2a9..83405ab0a8b6 100644 --- a/sal/CppunitTest_sal_rtl_alloc.mk +++ b/sal/CppunitTest_sal_rtl_alloc.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_alloc,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_alloc)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk index 78cca6b7b39a..ce2cc1da5a19 100644 --- a/sal/CppunitTest_sal_rtl_cipher.mk +++ b/sal/CppunitTest_sal_rtl_cipher.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_cipher,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_cipher)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk index 1c5b6d19c71d..1a2390f5fd2e 100644 --- a/sal/CppunitTest_sal_rtl_crc32.mk +++ b/sal/CppunitTest_sal_rtl_crc32.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_crc32,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_crc32)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk index 9c11d796de49..e4fd8f2bf4b4 100644 --- a/sal/CppunitTest_sal_rtl_doublelock.mk +++ b/sal/CppunitTest_sal_rtl_doublelock.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_doublelock,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_doublelock)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk index 613251ef6c13..ce1f0ab9ce1c 100644 --- a/sal/CppunitTest_sal_rtl_locale.mk +++ b/sal/CppunitTest_sal_rtl_locale.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_locale,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_locale)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk index df570a552b0d..c502ab226659 100644 --- a/sal/CppunitTest_sal_rtl_math.mk +++ b/sal/CppunitTest_sal_rtl_math.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_math)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk index f0ea74c7ca97..8c38783b7a93 100644 --- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ostringbuffer,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_ostringbuffer)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk index f2384f709cdc..bb316eeda619 100644 --- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk @@ -38,7 +38,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustringbuffer,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_oustringbuffer)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index bdab2fb48987..67299a3ab9d2 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -41,9 +41,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_strings,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_strings)) + # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk index 69e701b794ab..67ce1eab2732 100644 --- a/sal/CppunitTest_sal_rtl_uri.mk +++ b/sal/CppunitTest_sal_rtl_uri.mk @@ -23,9 +23,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uri,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uri)) + # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk index 8be994595e1f..74ea9e057f6c 100644 --- a/sal/CppunitTest_sal_rtl_uuid.mk +++ b/sal/CppunitTest_sal_rtl_uuid.mk @@ -22,7 +22,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uuid,\ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uuid)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk index 7efbad135f36..fd202e2adec8 100644 --- a/sal/CppunitTest_sal_tcwf.mk +++ b/sal/CppunitTest_sal_tcwf.mk @@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\ $(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_tcwf)) + # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk index 720f5ee3cf0b..942e8f318c35 100644 --- a/sal/CppunitTest_sal_types.mk +++ b/sal/CppunitTest_sal_types.mk @@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_types,\ $(eval $(call gb_CppunitTest_use_libraries,sal_types,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_types)) + # vim: set noet sw=4 ts=4: diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index c8d8f4756222..9cf275e91476 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,cppunit/cppunittester,\ $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,cppunit/cppunittester)) + $(eval $(call gb_Executable_use_external,cppunit/cppunittester,cppunit)) $(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\ diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index d43400d6d86f..3f3cce24c160 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -32,9 +32,10 @@ $(eval $(call gb_Executable_Executable,osl_process_child)) $(eval $(call gb_Executable_use_libraries,osl_process_child,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,osl_process_child)) + $(eval $(call gb_Executable_add_exception_objects,osl_process_child,\ sal/qa/osl/process/osl_process_child \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 653aa0bdafad..f5b3b3d4e689 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -82,9 +82,10 @@ $(eval $(call gb_Library_use_libraries,sal,\ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sal)) + ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_externals,sal,\ carbon \ diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index 94f69911cebc..c50fa94ce6e4 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,sal_textenc)) $(eval $(call gb_Library_use_libraries,sal_textenc,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sal_textenc)) + $(eval $(call gb_Library_add_defs,sal_textenc,\ $(LFS_CFLAGS) \ )) diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index aa06e116f93a..c5356c9f00d0 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,uwinapi,\ user32 \ version \ ) \ - $(filter-out uwinapi,$(gb_STDLIBS)) \ )) +$(eval $(call gb_Library_add_standard_system_libs,uwinapi)) + $(eval $(call gb_Library_add_defs,uwinapi,\ $(if $(filter $(COM),GCC), \ -Wno-unused-parameter -Wno-return-type) \ diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk index 6ebc52ef5b19..fb2361db4fa4 100644 --- a/salhelper/CppunitTest_salhelper_checkapi.mk +++ b/salhelper/CppunitTest_salhelper_checkapi.mk @@ -45,7 +45,8 @@ $(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) :| \ $(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,salhelper_checkapi)) + # vim: set noet sw=4 ts=4: diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index 2787529cf2ae..b416cc82c589 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_add_defs,salhelper,\ $(eval $(call gb_Library_use_libraries,salhelper,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,salhelper)) + $(eval $(call gb_Library_add_exception_objects,salhelper,\ salhelper/source/condition \ salhelper/source/dynload \ diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index 0e889e2418b1..3cfa8cacfdd5 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -20,9 +20,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \ comphelper \ cppu \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sax_cpputest)) + $(eval $(call gb_CppunitTest_add_exception_objects,sax_cpputest, \ sax/qa/cppunit/test_converter \ )) diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index 6007467b11cc..e7028b450435 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -27,9 +27,10 @@ $(eval $(call gb_Library_use_libraries,expwrap,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,expwrap)) + $(eval $(call gb_Library_use_static_libraries,expwrap,\ sax_shared \ )) diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index b28b653e4bfd..d7465316c1c3 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Library_use_libraries,fastsax,\ sal \ sax \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fastsax)) + $(eval $(call gb_Library_use_static_libraries,fastsax,\ sax_shared \ )) diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 4c72db00051b..93cd25c66e62 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -26,9 +26,10 @@ $(eval $(call gb_Library_use_libraries,sax,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sax)) + $(eval $(call gb_Library_add_defs,sax,\ -DSAX_DLLIMPLEMENTATION \ )) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index a33164371afe..b6bdef73cddb 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_annonationshapeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_annonationshapeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index c91923061d58..195dea16e5d0 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_cellrangesbase)) + $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index c7fbb6731750..4eeb3645c745 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_chart_regression_test)) + $(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index b7d1fb6be404..b09b0318b1da 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_databaserangeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index f0788fb0fd6b..f8988749dbb0 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilotfieldobj)) + $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 1636112f43b0..31832f2364ab 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_datapilottableobj)) + $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 6e5fa7076955..1826fb887bd5 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_cell)) + $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 7b47240e0138..009aa66f1fb8 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_editfieldobj_header)) + $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index c61b4a2fbbf6..09df0f2a96b5 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -78,9 +78,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index a24f391b9c09..3fc1b7c77df6 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_macros_test)) + $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 42a48f870730..cb8f0a53cf9d 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_modelobj)) + $(eval $(call gb_CppunitTest_set_include,sc_modelobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index ff9ad582d92e..9d30c411f359 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangeobj)) + $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 192bbbd70c08..893abdf5ea9a 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_namedrangesobj)) + $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 6933c2583da0..9bd621db1f74 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_rangelst_test)) + $(eval $(call gb_CppunitTest_set_include,sc_rangelst_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 982ec6e4b35a..2f5dd35a7ae1 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -72,9 +72,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ lo-bootstrap \ ) \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_subsequent_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index b72bb005305f..e526b1750618 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_tableautoformatfield)) + $(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 2bacb8f2725c..0c9220419fd0 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetobj)) + $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index c7b7fcd827cf..2f9cb97fd71d 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -70,9 +70,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_spreadsheetsobj)) + $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsobj,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/inc \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 3948bcfb04ec..24cc9b7e50c7 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -77,9 +77,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sc_ucalc)) + $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ -I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/source/core/inc \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 96cb69132a70..ed74a69202b6 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -84,9 +84,10 @@ $(eval $(call gb_Library_use_libraries,sc,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sc)) + $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/attarray \ sc/source/core/data/attrib \ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index 4c39cf1f40d3..b22f0c0eaca1 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,scd,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scd)) + $(eval $(call gb_Library_add_exception_objects,scd,\ sc/source/ui/unoobj/detreg \ sc/source/ui/unoobj/scdetect \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index d38d40b97027..8a8e6fe0d183 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scfilt)) + $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ )) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 7f94c6193f5e..86f7f8c4d0f8 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,scui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scui)) + $(eval $(call gb_Library_add_exception_objects,scui,\ sc/source/ui/attrdlg/attrdlg \ sc/source/ui/attrdlg/scdlgfact \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 30eb16d059ff..e0e71a0da812 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -59,9 +59,10 @@ $(eval $(call gb_Library_use_libraries,vbaobj,\ vbahelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbaobj)) + $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/excelvbahelper \ sc/source/ui/vba/service \ diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index e1fe08c217b5..78b7bea0676c 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,analysis,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,analysis)) + $(eval $(call gb_Library_add_exception_objects,analysis,\ scaddins/source/analysis/analysis \ scaddins/source/analysis/analysishelper \ diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index f224c80f7a8a..d5db83125da3 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,date,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,date)) + $(eval $(call gb_Library_add_exception_objects,date,\ scaddins/source/datefunc/datefunc \ )) diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 42a4fa3d72e8..013855cbd344 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,solver,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,solver)) + $(eval $(call gb_Library_use_external,solver,lpsolve55)) $(eval $(call gb_Library_add_exception_objects,solver,\ diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index 5debc0acd8e5..8941931b7ee4 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,basprov,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,basprov)) + $(eval $(call gb_Library_add_exception_objects,basprov,\ scripting/source/basprov/baslibnode \ scripting/source/basprov/basmethnode \ diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index c9e3b2140e94..6ffb4fe0d029 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dlgprov)) + $(eval $(call gb_Library_add_exception_objects,dlgprov,\ scripting/source/dlgprov/DialogModelProvider \ scripting/source/dlgprov/dlgevtatt \ diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index d99f60fd4fe1..a9ca47acfd26 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\ sfx \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,protocolhandler)) + $(eval $(call gb_Library_add_exception_objects,protocolhandler,\ scripting/source/protocolhandler/scripthandler \ )) diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index 86d6a05bc894..025c5952cd8d 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\ tl \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,scriptframe)) + $(eval $(call gb_Library_add_exception_objects,scriptframe,\ scripting/source/provider/ActiveMSPList \ scripting/source/provider/BrowseNodeFactoryImpl \ diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index eeb11a1c8668..3ec938c4cb52 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,stringresource,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,stringresource)) + $(eval $(call gb_Library_add_exception_objects,stringresource,\ scripting/source/stringresource/stringresource \ )) diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index 45c35ff163ac..e469d786e4e0 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,vbaevents,\ sb \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbaevents)) + $(eval $(call gb_Library_add_exception_objects,vbaevents,\ scripting/source/vbaevents/eventhelper \ scripting/source/vbaevents/service \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 99a19042cb21..1d9f6fb297ce 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -71,9 +71,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index e0a5000359de..85ea7eb91f1b 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_regression_test)) + $(eval $(call gb_CppunitTest_set_include,sd_regression_test,\ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/inc \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 5209b6445001..70f742949bc4 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -72,9 +72,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress)) + ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ ws2_32 \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index b0535d506bbd..3ac73b8f0857 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -104,9 +104,10 @@ $(eval $(call gb_Library_use_libraries,sd,\ vcl \ xmlsecurity \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sd)) + $(eval $(call gb_Library_use_externals,sd,\ libxml2 \ dbus \ diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index 404ea819e63a..c668637a588c 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,sdd,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdd)) + $(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd)) $(eval $(call gb_Library_add_exception_objects,sdd,\ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 2402116a33e2..b0b0d967731e 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdfilt)) + $(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt)) $(eval $(call gb_Library_add_exception_objects,sdfilt,\ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 7fcf0b01bae2..7949f732e34e 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -65,9 +65,10 @@ $(eval $(call gb_Library_use_libraries,sdui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdui)) + $(eval $(call gb_Library_add_exception_objects,sdui,\ sd/source/filter/html/htmlattr \ sd/source/filter/html/pubdlg \ diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index 1ea6bc6c22f1..8d40f2431493 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -54,9 +54,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\ test \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sdext_pdfimport)) + $(eval $(call gb_CppunitTest_use_static_libraries,sdext_pdfimport,\ pdfimport_s \ )) diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 6c1d68d8c189..81706c523065 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -29,9 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ sal \ sfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sfx2_metadatable)) + $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ $$(INCLUDE) \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 12c1812a96b4..22925b03f315 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ vcl \ sfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,qstart_gtk)) + $(eval $(call gb_Library_use_externals,qstart_gtk,\ gio \ gtk \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 5e01c7d01f70..23badc19286e 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,sfx,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sfx)) + $(eval $(call gb_Library_use_external,sfx,libxml2)) $(eval $(call gb_Library_add_exception_objects,sfx,\ diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index 9ed4dd0f01e8..b32ba7e89b97 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,lngconvex)) + $(eval $(call gb_Executable_add_exception_objects,lngconvex,\ shell/source/tools/lngconvex/cmdline \ shell/source/tools/lngconvex/lngconvex \ diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 0ae262bee72c..58c13032f883 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cmdmail)) + $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail)) $(eval $(call gb_Library_add_exception_objects,cmdmail,\ diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index fbc05a0e318c..28a0e8760ab0 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,desktopbe1)) + $(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1)) $(eval $(call gb_Library_add_exception_objects,desktopbe1,\ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index 5e513237caba..d2deb022d20d 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,gconfbe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,gconfbe1)) + $(eval $(call gb_Library_set_componentfile,gconfbe1,shell/source/backends/gconfbe/gconfbe1)) $(eval $(call gb_Library_add_exception_objects,gconfbe1,\ diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk index c31fb68afea8..c20863655d9f 100644 --- a/shell/Library_kde4be.mk +++ b/shell/Library_kde4be.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,kde4be1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kde4be1)) + $(eval $(call gb_Library_set_componentfile,kde4be1,shell/source/backends/kde4be/kde4be1)) $(eval $(call gb_Library_add_exception_objects,kde4be1,\ diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index a367c8d62bf8..8637341d6ff0 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,kdebe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kdebe1)) + $(eval $(call gb_Library_set_componentfile,kdebe1,shell/source/backends/kdebe/kdebe1)) $(eval $(call gb_Library_add_exception_objects,kdebe1,\ diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 008a00481008..96022b731a24 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,localebe1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,localebe1)) + $(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1)) $(eval $(call gb_Library_add_exception_objects,localebe1,\ diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 9057373a51a4..236cc6ce6e0a 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,macbe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macbe1)) + $(eval $(call gb_Library_set_componentfile,macbe1,shell/source/backends/macbe/macbe1)) $(eval $(call gb_Library_add_objcxxobjects,macbe1,\ diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk index c6c25e89a5b2..c95b2d1ee343 100644 --- a/shell/Library_recentfile.mk +++ b/shell/Library_recentfile.mk @@ -47,9 +47,10 @@ endif $(eval $(call gb_Library_use_libraries,recentfile,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,recentfile)) + $(eval $(call gb_Library_use_static_libraries,recentfile,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index 252aa827d7c4..e16e957b7986 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,syssh,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,syssh)) + $(eval $(call gb_Library_use_static_libraries,syssh,\ shell_xmlparser \ )) diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk index 481728a3c4a8..b6ba2b4333fa 100644 --- a/shell/Library_syssh_win.mk +++ b/shell/Library_syssh_win.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,syssh,\ sal \ shell32 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,syssh)) + $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh)) $(eval $(call gb_Library_add_exception_objects,syssh,\ diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index a6ca92b2e391..a9472456af73 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,tdebe1,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tdebe1)) + $(eval $(call gb_Library_set_componentfile,tdebe1,shell/source/backends/kdebe/tdebe1)) $(eval $(call gb_Library_add_exception_objects,tdebe1,\ diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk index d02c6cc5027b..c2dbd1341e30 100644 --- a/shell/Library_wininetbe.mk +++ b/shell/Library_wininetbe.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,wininetbe1)) + $(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1)) $(eval $(call gb_Library_add_exception_objects,wininetbe1,\ diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 42be84b0d0f6..133ae060e6fa 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -67,9 +67,10 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,slideshow)) + $(eval $(call gb_CppunitTest_add_exception_objects,slideshow,\ slideshow/test/slidetest \ slideshow/test/testshape \ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 86d14c4b3106..3ed481ed774f 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,demoshow)) + $(eval $(call gb_Executable_add_exception_objects,demoshow,\ slideshow/test/demoshow \ )) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 199699fd24cd..380f935d9e0e 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ sal \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,OGLTrans)) + $(eval $(call gb_Library_use_external,OGLTrans,mesa_headers)) $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans)) diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 22b6f5d6bfd6..d065532a696c 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,slideshow)) + $(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow)) $(eval $(call gb_Library_add_exception_objects,slideshow,\ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 5de9b9320c25..ee844de24330 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -341,6 +341,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ + add_standard_system_libs \ use_sdk_api \ use_udk_api \ use_internal_api \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index db901f079512..1ddedfdad41b 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -105,6 +105,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ + add_standard_system_libs \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 01ee922935ae..10ca542b58c5 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -185,6 +185,7 @@ $(eval $(foreach method,\ set_ldflags \ set_x64 \ add_libs \ + add_standard_system_libs \ set_library_path_flags \ add_api \ use_api \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 8dddeb390402..5b953005ef24 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -648,6 +648,13 @@ define gb_LinkTarget_add_libs $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2) endef +# add platform specific standard libraries to linker command for linktarget $(1) +# there are currently 94 Libraries/Executables/CppunitTests not using +# gb_STDLIBS... probably this should need to be added explicitly +define gb_LinkTarget_add_standard_system_libs +$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(gb_STDLIBS) +endef + define gb_LinkTarget_add_api $$(call gb_Output_error,\ gb_LinkTarget_add_api: use gb_LinkTarget_use_api instead.) diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk index acebb04da5e6..50267d307251 100644 --- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk @@ -29,7 +29,7 @@ gb_CPUDEFS := -DX86 gb_COMPILERDEFAULTOPTFLAGS := -O2 -gb_STDLIBS := pthread +gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk index 5eaa617bd6b3..34f35a36f7fd 100644 --- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk @@ -28,7 +28,7 @@ #please make generic modifications to unxgcc.mk gb_COMPILERDEFAULTOPTFLAGS := -O2 -gb_STDLIBS := pthread +gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index a59782c6dd75..d2e53537d2e9 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -107,9 +107,9 @@ gb_LinkTarget_LDFLAGS += -shared-libgcc endif gb_STDLIBS := \ - mingwthrd \ - mingw32 \ - mingwex \ + -lmingwthrd \ + -lmingw32 \ + -lmingwex \ # LinkTarget class diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 9deca874330a..739427e65659 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -188,7 +188,7 @@ gb_CXXFLAGS := \ -Zm500 \ gb_STDLIBS := \ - advapi32 \ + advapi32.lib \ ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) gb_CFLAGS_WERROR := -WX -DLIBO_WERROR diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index cb071aee1865..f32fcc5bcb3e 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -9,7 +9,7 @@ # Link almost everything with -lgnustl_shared gb_STDLIBS := \ - gnustl_shared + -lgnustl_shared \ gb_Library_PLAINLIBS_NONE := \ android \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 6c77d71247f0..be54115de350 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -237,9 +237,9 @@ gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) gb_STDLIBS := \ - m \ - nsl \ - socket \ + -lm \ + -lnsl \ + -lsocket \ gb_Library_PLAINLIBS_NONE += \ dl \ diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index da79a6556c8b..0941434cf7f0 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ tl \ unotest \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sot_test_sot)) + $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\ offapi \ udkapi \ diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index 50a80db23884..c11af837e39f 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,sot,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sot)) + $(eval $(call gb_Library_add_exception_objects,sot,\ sot/source/unoolestorage/xolesimplestorage \ sot/source/unoolestorage/register \ diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 892af74daa71..df89cdb9dd9d 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -61,9 +61,10 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,starmath_qa_cppunit)) + $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ starmath/qa/cppunit/test_nodetotextvisitors \ starmath/qa/cppunit/test_starmath \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 2ecb8d8e7ed3..554b49ce16e0 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,sm,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sm)) + $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/accessibility \ starmath/source/action \ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 3ab12ab75593..0837c2db16f3 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,smd,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,smd)) + $(eval $(call gb_Library_add_exception_objects,smd,\ starmath/source/detreg \ starmath/source/smdetect \ diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index e1ef1806ae64..46d72b7633d9 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\ salhelper \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,bootstrap)) + $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap)) $(eval $(call gb_Library_add_exception_objects,bootstrap,\ diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index 2f2f07d4c926..a1e058c86304 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,introspection,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,introspection)) + $(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection)) $(eval $(call gb_Library_add_exception_objects,introspection,\ diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 38dd68b657f0..7fe31573d480 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,invocadapt)) + $(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt)) $(eval $(call gb_Library_add_exception_objects,invocadapt,\ diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index df8d3c78d468..b2544c77372b 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,invocation,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,invocation)) + $(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation)) $(eval $(call gb_Library_add_exception_objects,invocation,\ diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index e0ff05a968df..2303d92c0195 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,javaloader,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,javaloader)) + $(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader)) $(eval $(call gb_Library_add_exception_objects,javaloader,\ diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index d8b5b464f44e..a0fc87853263 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,javavm,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,javavm)) + $(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm)) $(eval $(call gb_Library_add_exception_objects,javavm,\ diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index 124bfaa3055c..ed115ed30c42 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,namingservice,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,namingservice)) + $(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice)) $(eval $(call gb_Library_add_exception_objects,namingservice,\ diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index cf87b477597d..8eb08e55265d 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,proxyfac)) + $(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac)) $(eval $(call gb_Library_add_exception_objects,proxyfac,\ diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index 644f9f28f1b3..aa5198a84bdd 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,reflection,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,reflection)) + $(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection)) $(eval $(call gb_Library_add_exception_objects,reflection,\ diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 8f4ec53dd618..2a8b7b8f31e5 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,stocservices)) + $(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices)) $(eval $(call gb_Library_add_exception_objects,stocservices,\ diff --git a/store/Library_store.mk b/store/Library_store.mk index 39029be71fe5..43d81da71f0a 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_add_defs,store,\ $(eval $(call gb_Library_use_libraries,store,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,store)) + $(eval $(call gb_Library_add_exception_objects,store,\ store/source/object \ store/source/lockbyte \ diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index c356f403a56b..791f2716e659 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -40,9 +40,10 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ salhelper \ svl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,svl_lngmisc)) + ifeq ($(GUI),WNT) $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ oleaut32 \ diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index b0cbcd0e6a35..ef2f3f040ce5 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -49,7 +49,8 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,svl_urihelper)) + $(eval $(call gb_CppunitTest_use_ure,svl_urihelper)) diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 86c00f45418f..558dc60d7eac 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,fsstorage,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,fsstorage)) + $(eval $(call gb_Library_add_exception_objects,fsstorage,\ svl/source/fsstor/fsfactory \ svl/source/fsstor/fsstorage \ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 1b89ea3ed3da..a7c9886d925e 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,passwordcontainer,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,passwordcontainer)) + $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ svl/source/passwordcontainer/passwordcontainer \ svl/source/passwordcontainer/syscreds \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 8f7940d2b76b..46af0f9970ca 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,svl,\ ucbhelper \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svl)) + $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/config/asiancfg \ svl/source/config/cjkoptions \ diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk index 65b4e1bea3ab..aff901c79df6 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,svtools_filters_test)) + $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\ udkapi \ offapi \ diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index f8fee180d891..e837abd32d58 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Executable_use_libraries,bmp,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,bmp)) + $(eval $(call gb_Executable_add_exception_objects,bmp,\ svtools/bmpmaker/bmp \ svtools/bmpmaker/bmpcore \ diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk index a00b928bd39a..7ae8dbf46dd3 100644 --- a/svtools/Executable_bmpsum.mk +++ b/svtools/Executable_bmpsum.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Executable_use_libraries,bmpsum,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,bmpsum)) + $(eval $(call gb_Executable_add_exception_objects,bmpsum,\ svtools/bmpmaker/bmpsum \ )) diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index 0936abd454cf..3dace37d6c7f 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Executable_use_libraries,g2g,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,g2g)) + $(eval $(call gb_Executable_add_exception_objects,g2g,\ svtools/bmpmaker/g2g \ )) diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk index 532b78bbecb6..704e51b636ee 100644 --- a/svtools/Executable_langsupport.mk +++ b/svtools/Executable_langsupport.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,langsupport)) + $(eval $(call gb_Executable_add_exception_objects,langsupport,\ svtools/langsupport/langsupport \ )) diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index 1c7cb22309d7..1827cb1ae389 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ tl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hatchwindowfactory)) + $(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ svtools/source/hatchwindow/documentcloser \ svtools/source/hatchwindow/hatchwindow \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 7a2379b8c2cd..1f40a65b5001 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,svt,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svt)) + $(eval $(call gb_Library_use_externals,svt,\ icuuc \ jpeg \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 11aad40f4d46..696212b9d6c7 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ vcl \ svxcore \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,$(svx_GENGALBIN))) + $(eval $(call gb_Executable_add_exception_objects,$(svx_GENGALBIN),\ svx/source/gengal/gengal \ )) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index a939a086a82a..796aa222aac1 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,svx,\ xo \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svx)) + $(eval $(call gb_Library_use_external,svx,icuuc)) $(eval $(call gb_Library_add_exception_objects,svx,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index f94e359aa6a6..929c8cf49ae6 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -83,9 +83,10 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,svxcore)) + $(eval $(call gb_Library_use_external,svxcore,icuuc)) $(eval $(call gb_Library_add_exception_objects,svxcore,\ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 9b2fdff4b386..13a11c1c1937 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,textconversiondlgs)) + $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ svx/source/unodialogs/textconversiondlgs/services \ svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 47d7a35e3075..53d990751bb5 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -56,9 +56,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_filters_test)) + $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index 080bd6aeb1d7..ccbe8cd678ce 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -67,9 +67,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_layout_test)) + $(eval $(call gb_CppunitTest_set_include,sw_layout_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index e42eb0c9276b..30915f2ae77f 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_macros_test)) + $(eval $(call gb_CppunitTest_set_include,sw_macros_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index 538542b37ef7..69c10d366a67 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_regression_test)) + $(eval $(call gb_CppunitTest_set_include,sw_regression_test,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc \ diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 10e7ab20769f..03af297f98d9 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfexport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index aceaa697b7e6..7d52f510aed5 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \ vcl \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfimport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index 5a9587948a21..1523e5ca4f52 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlexport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index 8fc2dfedecaa..30d793c32c76 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \ sw \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlimport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index 1609b6f41ffc..e9c721ec5611 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \ utl \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfexport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 7ce087e36e40..6e9339e37a18 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \ vcl \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfimport)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index 9f4677b5b29e..35a6af3814ce 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \ sw \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8export)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index 16c36843407a..f4bf71c30725 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \ unotest \ sw \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8import)) + $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\ libxml2 \ )) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 8b53bdf32009..268a620e9161 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_swdoc_test)) + $(eval $(call gb_CppunitTest_use_externals,sw_swdoc_test,\ icuuc \ libxml2 \ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 365c69096b96..f1f3a8c7a9b6 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,msword,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,msword)) + $(eval $(call gb_Library_use_externals,msword,\ icuuc \ libxml2 \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index b58f71a72b3e..5dd22de249c2 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -77,9 +77,10 @@ $(eval $(call gb_Library_use_libraries,sw,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sw)) + $(eval $(call gb_Library_use_externals,sw,\ icuuc \ libxml2 \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 73f5fb857781..780b069f4bfd 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,swd,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,swd)) + $(eval $(call gb_Library_add_exception_objects,swd,\ sw/source/filter/basflt/iodetect \ sw/source/ui/uno/detreg \ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 4de06513c59a..040717b7900a 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,swui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,swui)) + $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/chrdlg/break \ sw/source/ui/chrdlg/chardlg \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index 310a90f4dbff..aeed2a85a0ff 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -64,9 +64,10 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ vbahelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbaswobj)) + $(eval $(call gb_Library_use_externals,vbaswobj,\ libxml2 \ )) diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 1eca2f36e502..886702d022d7 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,subsequenttest)) + ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,subsequenttest) : \ $(call gb_Library_get_target,desktop_detector) \ diff --git a/test/Library_test.mk b/test/Library_test.mk index e730c8b944fa..61579bf8d0a3 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,test,\ unotest \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,test)) + ifeq ($(GUIBASE),unx) $(call gb_Library_get_target,test) : \ $(call gb_Library_get_target,desktop_detector) \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 0388f3cb62bd..20f97124e355 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,tk,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tk)) + $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/asynccallback \ toolkit/source/awt/stylesettings \ diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index ba876eab4a8c..6fce0cdcbf4a 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -47,9 +47,10 @@ $(eval $(call gb_CppunitTest_use_libraries,tools_test, \ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,tools_test)) + $(eval $(call gb_CppunitTest_use_static_libraries,tools_test, \ ooopathutils \ )) diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk index a30b5e5e0fe2..5fae14f4f6e4 100644 --- a/tools/Executable_bestreversemap.mk +++ b/tools/Executable_bestreversemap.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Executable_set_include,bestreversemap,\ $(eval $(call gb_Executable_use_libraries,bestreversemap,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,bestreversemap)) + $(eval $(call gb_Executable_add_exception_objects,bestreversemap,\ tools/source/reversemap/bestreversemap \ )) diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index e97405bec6dc..c92e01296759 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Executable_use_libraries,mkunroll,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,mkunroll)) + $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ tools/bootstrp/mkunroll/mkunroll \ )) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 12635cd3a7b5..b408da57beb4 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Executable_use_libraries,rscdep,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,rscdep)) + $(eval $(call gb_Executable_use_sdk_api,rscdep)) $(eval $(call gb_Executable_add_exception_objects,rscdep,\ diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index 260607035582..c7cfd90e695a 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -29,10 +29,11 @@ $(eval $(call gb_Executable_use_libraries,so_checksum,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial +$(eval $(call gb_Executable_add_standard_system_libs,so_checksum)) + $(eval $(call gb_Executable_add_exception_objects,so_checksum,\ tools/bootstrp/md5 \ tools/bootstrp/so_checksum \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index b588874d04ca..3981bac35735 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,tl,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tl)) + $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/datetime/datetime \ diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk index fda47419328f..261d305f3ffe 100644 --- a/touch/Library_libotouch.mk +++ b/touch/Library_libotouch.mk @@ -20,9 +20,10 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,libotouch,\ )) $(eval $(call gb_Library_use_libraries,libotouch,\ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,libotouch)) + $(eval $(call gb_Library_add_exception_objects,libotouch,\ touch/source/uno/Document \ touch/source/generic/libotouch \ diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk index 1a54526c9872..728067ddb4c3 100644 --- a/tubes/CppunitTest_tubes_test.mk +++ b/tubes/CppunitTest_tubes_test.mk @@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,tubes_test, \ tubes \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,tubes_test)) + $(eval $(call gb_CppunitTest_use_externals,tubes_test,\ telepathy \ )) diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index b077841a25d6..fd1d2a1685a7 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,tubes,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tubes)) + $(eval $(call gb_Library_use_externals,tubes,\ gtk \ telepathy \ diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index 93ac31c15548..e5f4b858179e 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,cached1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,cached1)) + $(eval $(call gb_Library_add_exception_objects,cached1,\ ucb/source/cacher/cachedcontentresultset \ ucb/source/cacher/cachedcontentresultsetstub \ diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index c349e1cec703..38a48be65839 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,srtrs1,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,srtrs1)) + $(eval $(call gb_Library_add_exception_objects,srtrs1,\ ucb/source/sorter/sortdynres \ ucb/source/sorter/sortmain \ diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 109cf2a55be6..5b04efbc31b7 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,ucb1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucb1)) + $(eval $(call gb_Library_add_exception_objects,ucb1,\ ucb/source/core/cmdenv \ ucb/source/core/identify \ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index d7fac5b45f89..6d3a61a37174 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ ucbhelper \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpcmis1)) + $(eval $(call gb_Library_use_externals,ucpcmis1,\ cmis \ curl \ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 3f8e2f42cb0e..e0b9801e2672 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpdav1)) + $(eval $(call gb_Library_use_externals,ucpdav1,\ libxml2 \ neon \ diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index dda77b3e430a..ade70cf4b568 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,ucpexpand1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpexpand1)) + $(eval $(call gb_Library_add_exception_objects,ucpexpand1,\ ucb/source/ucp/expand/ucpexpand \ )) diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index eb436aee0a6c..4a1de1b2460f 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpext,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpext)) + $(eval $(call gb_Library_add_exception_objects,ucpext,\ ucb/source/ucp/ext/ucpext_content \ ucb/source/ucp/ext/ucpext_datasupplier \ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index 4f729b1dec08..532e5802de59 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucpfile1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpfile1)) + $(eval $(call gb_Library_add_exception_objects,ucpfile1,\ ucb/source/ucp/file/bc \ ucb/source/ucp/file/filcmd \ diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index 8b197d56b72c..aa37b20a71af 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ sal \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpftp1)) + $(eval $(call gb_Library_use_externals,ucpftp1,\ curl \ zlib \ diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk index d986f2c3737c..e863fc7602fe 100644 --- a/ucb/Library_ucpgio1.mk +++ b/ucb/Library_ucpgio1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,ucpgio1,\ sal \ salhelper \ ucbhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpgio1)) + $(eval $(call gb_Library_use_externals,ucpgio1,\ gio \ )) diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk index 577b65d6eec1..42f0dc663741 100644 --- a/ucb/Library_ucpgvfs1.mk +++ b/ucb/Library_ucpgvfs1.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,ucpgvfs1,\ sal \ salhelper \ ucbhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpgvfs1)) + $(eval $(call gb_Library_add_exception_objects,ucpgvfs1,\ ucb/source/ucp/gvfs/gvfs_content \ ucb/source/ucp/gvfs/gvfs_directory \ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 9d33231e23fa..4f4325bc5b20 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,ucphier1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucphier1)) + $(eval $(call gb_Library_add_exception_objects,ucphier1,\ ucb/source/ucp/hierarchy/dynamicresultset \ ucb/source/ucp/hierarchy/hierarchycontentcaps \ diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk index e67f9aa84660..d11376325a3a 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucpodma1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucpodma1)) + $(eval $(call gb_Library_use_static_libraries,ucpodma1,\ odma_lib \ )) diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index f1212d0f629a..40983cf0b43b 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucppkg1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucppkg1)) + $(eval $(call gb_Library_add_exception_objects,ucppkg1,\ ucb/source/ucp/package/pkgcontentcaps \ ucb/source/ucp/package/pkgcontent \ diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index 97c18b33505b..9138ca2af3eb 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,ucptdoc1,\ salhelper \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucptdoc1)) + $(eval $(call gb_Library_add_exception_objects,ucptdoc1,\ ucb/source/ucp/tdoc/tdoc_contentcaps \ ucb/source/ucp/tdoc/tdoc_content \ diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index f394025ac0f8..d6e32e8effbd 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -19,9 +19,10 @@ $(eval $(call gb_Library_use_libraries,ucbhelper,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ucbhelper)) + $(eval $(call gb_Library_add_defs,ucbhelper,\ -DUCBHELPER_DLLIMPLEMENTATION \ )) diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index 4fba9a027607..1da0fd52ccb1 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unobootstrapprotector)) + $(eval $(call gb_Library_use_externals,unobootstrapprotector,\ cppunit \ )) diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index f7d50c76a9b7..ca5f9c064242 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unoexceptionprotector)) + $(eval $(call gb_Library_use_externals,unoexceptionprotector,\ cppunit \ )) diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index 809968835707..3c851a3cee54 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,unotest,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unotest)) + $(eval $(call gb_Library_use_externals,unotest,\ cppunit \ )) diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 0b7eef7b73fb..ef33f7f5c48f 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,utl,\ tl \ ucbhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,utl)) + # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,utl,\ diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index f9395a83d160..bc8aef2e2f3f 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,unordf,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unordf)) + $(eval $(call gb_Library_use_externals,unordf,librdf)) $(eval $(call gb_Library_use_externals,unordf,libxslt)) $(eval $(call gb_Library_use_externals,unordf,libxml2)) diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 3dccdccaec18..8d47855670e7 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,unoxml,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unoxml)) + $(eval $(call gb_Library_use_external,unoxml,libxml2)) $(eval $(call gb_Library_add_exception_objects,unoxml,\ diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index e9030b96fe6e..797f8eaf0512 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,uui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,uui)) + $(eval $(call gb_Library_add_exception_objects,uui,\ uui/source/alreadyopen \ uui/source/filechanged \ diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 9a5493c12cb8..e8c009b3e59f 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,msforms,\ vbahelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,msforms)) + # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,msforms,\ diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 8bbe47457870..06a146904a5c 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,vbahelper,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vbahelper)) + # add all source files that shall be compiled with exceptions enabled # the name is relative to $(SRCROOT) and must not contain an extension $(eval $(call gb_Library_add_exception_objects,vbahelper,\ diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk index 9e185e155544..c0adf2735b6f 100644 --- a/vcl/Executable_kdefilepicker.mk +++ b/vcl/Executable_kdefilepicker.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Executable_add_defs,kdefilepicker,\ $(eval $(call gb_Executable_use_libraries,kdefilepicker,\ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,kdefilepicker)) + $(eval $(call gb_Executable_add_libs,kdefilepicker,\ $(KDE_LIBS) \ -lkio -lX11 \ diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk index a92bb5ede1cb..7458f4197b2c 100644 --- a/vcl/Executable_tdefilepicker.mk +++ b/vcl/Executable_tdefilepicker.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Executable_set_include,tdefilepicker,\ $(eval $(call gb_Executable_use_libraries,tdefilepicker,\ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,tdefilepicker)) + $(eval $(call gb_Executable_add_libs,tdefilepicker,\ $(TDE_LIBS) \ -lkio -lX11 \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 91438e9c2d54..af8578988c34 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -59,9 +59,10 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,desktop_detector)) + $(eval $(call gb_Library_use_externals,desktop_detector,\ icule \ icuuc \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index df68439c72c1..a7ee6ca8e3d9 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -85,9 +85,10 @@ $(eval $(call gb_Library_use_libraries,vcl,\ sal \ xmlreader \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vcl)) + ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_libraries,vcl,\ objc \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 88e997b0c7a8..0261c036465b 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_gen)) + $(eval $(call gb_Library_use_externals,vclplug_gen,\ cairo \ icule \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 4684aa18f474..2d3b46eaa686 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk)) + $(eval $(call gb_Library_use_externals,vclplug_gtk,\ dbus \ gtk \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 187773c6b719..138904a0a004 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -73,9 +73,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk3)) + $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ dbus \ )) diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 5f405cc6f47a..7aa5ee5e230b 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -62,9 +62,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde)) + $(eval $(call gb_Library_use_externals,vclplug_kde,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 057ea274354a..3fbb80319a80 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -60,9 +60,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_kde4)) + $(eval $(call gb_Library_use_externals,vclplug_kde4,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index f859b1ef4104..63c9d725af73 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ jvmaccess \ cppu \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_svp)) + $(eval $(call gb_Library_use_externals,vclplug_svp,\ icule \ icuuc \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index b698cb45552f..5e61c6315d7a 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -67,9 +67,10 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ Xext \ SM \ ICE \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,vclplug_tde)) + $(eval $(call gb_Library_use_externals,vclplug_tde,\ icule \ icuuc \ diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index cf48c49851cf..b5b8e7e928b8 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -38,9 +38,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ sal \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_doctok)) + $(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\ $$(INCLUDE) \ -I$(SRCDIR)/writerfilter/inc \ diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 78f2a008abc6..a50d72151a30 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ vcl \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_rtftok)) + $(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\ offapi \ udkapi \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 83006badc658..5429ea7af4c6 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -81,9 +81,10 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,writerfilter)) + $(eval $(call gb_Library_use_external,writerfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter,\ diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index d7a72fc4c0c8..bc0bd83c9205 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\ sal \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,writerfilter_uno)) + $(eval $(call gb_Library_use_external,writerfilter_uno,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter_uno,\ diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 412b0c982430..38e961df7ebf 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\ utl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,wpftdraw)) + $(eval $(call gb_Library_use_static_libraries,wpftdraw,\ writerperfect \ )) diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index a4295a5019b6..3752308b6fa3 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ utl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,wpftwriter)) + $(eval $(call gb_Library_use_static_libraries,wpftwriter,\ writerperfect \ )) diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk index 878e9e20fe53..9704b7642b3e 100644 --- a/xml2cmp/Executable_xml2cmp.mk +++ b/xml2cmp/Executable_xml2cmp.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Executable_add_exception_objects,xml2cmp,\ xml2cmp/source/xcd/dependy \ )) -#uwinapi is part of STDLIBS on windows, but it is created in sal, which -#depends on this module. -$(eval $(call gb_Executable_use_libraries,xml2cmp,\ - $(filter-out uwinapi,$(gb_STDLIBS)) \ -)) +$(eval $(call gb_Executable_add_standard_system_libs,xml2cmp)) + +# vim: set noet sw=4 ts=4: diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 73be015cb824..d51a29352829 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,xo,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xo)) + $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/chart/ColorPropertySet \ xmloff/source/chart/PropertyMaps \ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 15e65da4c325..e1870a4d6029 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,xof,\ sax \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xof)) + $(eval $(call gb_Library_add_exception_objects,xof,\ xmloff/source/transform/ChartOASISTContext \ xmloff/source/transform/ChartOOoTContext \ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index 7035278e9c44..b3cd8f704aff 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -38,10 +38,11 @@ $(eval $(call gb_Library_use_libraries,xmlreader,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) # cppu is only needed due to the cppumaker -C hack +$(eval $(call gb_Library_add_standard_system_libs,xmlreader)) + $(eval $(call gb_Library_add_exception_objects,xmlreader,\ xmlreader/source/pad \ xmlreader/source/span \ diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index 3f83379ba8b3..00353edc75e2 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -24,9 +24,10 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlscript)) + $(eval $(call gb_Library_set_include,xmlscript,\ -I$(SRCDIR)/xmlscript/source/inc \ $$(INCLUDE) \ diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 7501f23cc110..201b8bf540cb 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ test \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,xmlsecurity_qa_certext)) + $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_qa_certext,\ xmlsecurity/qa/certext/SanCertExt \ )) diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index 09766bc188f4..3333e21f5fce 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlsecurity)) + $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\ xmlsecurity/source/component/certificatecontainer \ xmlsecurity/source/component/documentdigitalsignatures \ diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 99b393f532de..1aea707bcb5e 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsec_fw)) + $(eval $(call gb_Library_add_exception_objects,xsec_fw,\ xmlsecurity/source/framework/buffernode \ xmlsecurity/source/framework/decryptorimpl \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 5195db72d41a..41cbfafcaad1 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ tl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsec_xmlsec)) + $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ )) |