gbuild: replace direct gb_STDLIBS use with ...

... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
darshan-yadav · Sep 28, 2012 · b85c349 · b85c349
1 parent 2e677c3
commit b85c349
Show file tree

Hide file tree

Showing 486 changed files with 972 additions and 496 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \