gbuild: split uwinapi out of gb_STDLIBS

Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7

Library_merged.mk

@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
 	tl \
 	ucbhelper \
 	xmlreader \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

UnoControls/Library_ctl.mk

@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,ctl,\
     cppuhelper \
     sal \
     tl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

accessibility/Library_acc.mk

@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,acc,\
     tl \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

accessibility/Library_java_uno_accessbridge.mk

@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\
     salhelper \
     tl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

animations/Library_animcore.mk

@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,animcore,\
     cppu \
 	cppuhelper \
     sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

avmedia/Library_avmedia.mk

@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
 	tl \
 	utl \
 	vcl \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

avmedia/Library_avmediaQuickTime.mk

@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
 	sal \
 	tl \
 	vcl \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

avmedia/Library_avmediagst.mk

@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\
 	sal \
 	tl \
 	vcl \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

avmedia/Library_avmediagst_0_10.mk

@@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\
 	sal \
 	tl \
 	vcl \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

avmedia/Library_avmediawin.mk

@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\
 	tl \
 	utl \
 	vcl \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

basctl/Library_basctl.mk

@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,basctl,\
 	ucbhelper \
 	vcl \
 	xmlscript \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

basebmp/CppunitTest_basebmp.mk

@@ -27,6 +27,7 @@ endif
 $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
     basegfx \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

basebmp/Library_basebmp.mk

@@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_external,basebmp,vigra_headers))
 $(eval $(call gb_Library_use_libraries,basebmp,\
     basegfx \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

basebmp/StaticLibrary_basebmp.mk

@@ -18,6 +18,7 @@ $(eval $(call gb_StaticLibrary_use_external,basebmp,vigra_headers))
 $(eval $(call gb_StaticLibrary_use_libraries,basebmp,\
     basegfx \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

basegfx/CppunitTest_basegfx.mk

@@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx_cpputest,\
     cppu \
     cppuhelper \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

basegfx/Library_basegfx.mk

@@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_libraries,basegfx,\
     cppu \
     cppuhelper \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

basic/CppunitTest_basic_enable.mk

@@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
     vcl \
     xmlscript \
     test \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

basic/CppunitTest_basic_nested_struct.mk

@@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
     vcl \
     xmlscript \
     test \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

basic/CppunitTest_basic_scanner.mk

@@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
     utl \
     vcl \
     xmlscript \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

basic/Library_sb.mk

@@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,sb,\
 	utl \
 	vcl \
 	xmlscript \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

bean/Library_officebean.mk

@@ -48,6 +48,7 @@ ifeq ($(GUI),WNT)
 
 $(eval $(call gb_Library_use_libraries,officebean,\
     jawt \
+	$(gb_UWINAPI) \
 ))
 
 else

binaryurp/CppunitTest_binaryurp_test-cache.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache))
 
 $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
 	sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

binaryurp/CppunitTest_binaryurp_test-unmarshal.mk

@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
 	cppuhelper \
 	sal \
 	salhelper \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

binaryurp/Library_binaryurp.mk

@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\
 	cppuhelper \
 	sal \
 	salhelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

bridges/Library_java_uno.mk

@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,java_uno,\
 	jvmaccess \
 	sal \
 	salhelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

canvas/Library_cairocanvas.mk

@@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\
 	tl \
 	i18nisolang1 \
 	canvastools \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

canvas/Library_canvasfactory.mk

@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

canvas/Library_canvastools.mk

@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,canvastools,\
 	tk \
 	tl \
 	vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

canvas/Library_directx9canvas.mk

@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\
 	tl \
 	utl \
 	i18nisolang1 \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

canvas/Library_gdipluscanvas.mk

@@ -61,6 +61,7 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\
 	tl \
 	utl \
 	i18nisolang1 \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

canvas/Library_nullcanvas.mk

@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,nullcanvas,\
 	cppuhelper \
 	sal \
 	vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

canvas/Library_simplecanvas.mk

@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

canvas/Library_vclcanvas.mk

@@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\
 	tk \
 	tl \
 	vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

chart2/Library_chartcontroller.mk

@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

chart2/Library_chartcore.mk

@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

cli_ure/Executable_climaker.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_Executable_use_libraries,climaker,\
 		,msvcmrt \
 	) \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

comphelper/CppunitTest_comphelper_test.mk

@@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \
     cppuhelper \
     cppu \
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

comphelper/Library_comphelper.mk

@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,comphelper,\
     sal \
     salhelper \
     ucbhelper \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

configmgr/Library_configmgr.mk

@@ -72,6 +72,7 @@ $(eval $(call gb_Library_use_libraries,configmgr, \
     sal \
     salhelper \
     xmlreader \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

connectivity/Library_ado.mk

@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,ado,\
 	uuid \
 	dbtools \
 	comphelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_calc.mk

@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,calc,\
 	dbtools \
 	file \
 	comphelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_dbase.mk

@@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,dbase,\
 	file \
 	utl \
 	comphelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_dbpool2.mk

@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\
 	dbtools \
 	sal \
 	salhelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_dbtools.mk

@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
 	tl \
 	comphelper \
 	i18nisolang1 \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_evoab.mk

@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,evoab,\
 	salhelper \
 	dbtools \
 	file \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_file.mk

@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,file,\
 	dbtools \
 	utl \
 	comphelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_flat.mk

@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,flat,\
 	dbtools \
 	file \
 	comphelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_hsqldb.mk

@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\
 	sal \
 	tl \
 	utl \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_jdbc.mk

@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,jdbc,\
 	utl \
 	jvmfwk \
 	comphelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_mork.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_libraries,mork, \
     dbtools \
     sal \
     salhelper \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

connectivity/Library_mozab.mk

@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,mozab2,\
 	cppuhelper \
 	dbtools \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_mozabdrv.mk

@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\
 	dbtools \
 	sal \
 	salhelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_mozbootstrap.mk

@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_mysql.mk

@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mysql,\
 	sal \
 	dbtools \
 	comphelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_odbc.mk

@@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,odbc,\
 	cppuhelper \
 	sal \
 	salhelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_odbcbase.mk

@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\
 	salhelper \
 	dbtools \
 	comphelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_postgresql-sdbc-impl.mk

@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 	cppuhelper \
 	sal \
 	salhelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_postgresql-sdbc.mk

@@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

connectivity/Library_sdbc2.mk

@@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\
 	dbtools \
 	utl \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppcanvas/Library_cppcanvas.mk

@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,cppcanvas,\
 	svt \
 	tl \
 	vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

cppcanvas/Library_mtfrenderer.mk

@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\
 	comphelper \
 	cppcanvas \
 	basegfx \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

cppu/CppunitTest_cppu_checkapi.mk

@@ -49,6 +49,7 @@ $(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \
 
 $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\
     cppu \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

cppu/CppunitTest_cppu_qa_any.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_any, \
 $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \
 	cppu \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppu/CppunitTest_cppu_qa_recursion.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_recursion, \
 $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \
 	cppu \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppu/CppunitTest_cppu_qa_reference.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_reference, \
 $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
 	cppu \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppu/CppunitTest_cppu_qa_unotype.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_unotype, \
 $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \
 	cppu \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppu/CppunitTest_cppu_test_cppumaker.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_test_cppumaker, \
 $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \
 	cppu \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppu/Library_affine_uno.mk

@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,affine_uno))
 $(eval $(call gb_Library_use_libraries,affine_uno,\
 	purpenvhelper \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppu/Library_cppu.mk

@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_defs,cppu,\
 $(eval $(call gb_Library_use_libraries,cppu,\
 	sal \
 	salhelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppu/Library_log_uno.mk

@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,log_uno,\
 	cppu \
 	purpenvhelper \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppu/Library_purpenvhelper.mk

@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_sdk_api,purpenvhelper))
 $(eval $(call gb_Library_use_libraries,purpenvhelper,\
 	cppu \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppu/Library_unsafe_uno.mk

@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,unsafe_uno))
 $(eval $(call gb_Library_use_libraries,unsafe_uno,\
 	purpenvhelper \
 	sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cppuhelper/CppunitTest_cppuhelper_checkapi.mk

@@ -49,6 +49,7 @@ $(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) :| \
 
 $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\
     cppuhelper \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk

@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\
 	cppu \
     cppuhelper \
 	sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk

@@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\
 	cppu \
     cppuhelper \
 	sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

cppuhelper/CppunitTest_cppuhelper_qa_weak.mk

@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\
 	cppu \
     cppuhelper \
 	sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

cppuhelper/Library_cppuhelper.mk

@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\
 	sal \
 	salhelper \
 	xmlreader \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cpputools/Executable_regcomp.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\
     cppu \
     cppuhelper \
     sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cpputools/Executable_regsingleton.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\
     cppu \
     cppuhelper \
     sal \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cpputools/Executable_uno.mk

@@ -35,6 +35,7 @@ $(eval $(call gb_Executable_use_libraries,uno,\
     cppuhelper \
     sal \
     salhelper \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

cui/Library_cui.mk

@@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_libraries,cui,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

dbaccess/CppunitTest_dbaccess_macros_test.mk

@@ -68,6 +68,7 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
     vbahelper \
     vcl \
     xo \
+	$(gb_UWINAPI) \
 	$(gb_STDLIBS) \
 ))
 

dbaccess/Executable_odbcconfig.mk

@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\
 $(eval $(call gb_Library_use_sdk_api,odbcconfig))
 
 $(eval $(call gb_Executable_use_libraries,odbcconfig,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

dbaccess/Library_dba.mk

@@ -63,6 +63,7 @@ $(eval $(call gb_Library_use_libraries,dba,\
     utl \
     vcl \
     xo \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

dbaccess/Library_dbaxml.mk

@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\
     utl \
     vcl \
     xo \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

dbaccess/Library_dbmm.mk

@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,dbmm,\
     utl \
     vcl \
     xmlscript \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

dbaccess/Library_dbu.mk

@@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\
     ucbhelper \
     utl \
     vcl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

dbaccess/Library_sdbt.mk

@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,sdbt,\
     sal \
     tl \
     utl \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_crashrep.com.mk

@@ -38,6 +38,7 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,crashrep_com,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_officeloader.mk

@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\
 
 $(eval $(call gb_Executable_use_libraries,officeloader,\
     sal \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_quickstart.mk

@@ -39,6 +39,7 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\
     ole32 \
     oleaut32 \
     shell32 \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_sbase.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sbase,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,sbase,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_scalc.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,scalc,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,scalc,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_sdraw.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sdraw,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,sdraw,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_simpress.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,simpress,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,simpress,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_smath.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,smath,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,smath,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_soffice.bin.mk

@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice.bin,\
 $(eval $(call gb_Executable_use_libraries,soffice.bin,\
     sal \
     sofficeapp \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_soffice.mk

@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_use_libraries,soffice,\
     advapi32 \
     shell32 \
     shlwapi \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_soffice_bin.mk

@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice_bin,\
 $(eval $(call gb_Executable_use_libraries,soffice_bin,\
     sal \
     sofficeapp \
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))
 

desktop/Executable_sweb.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sweb,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,sweb,\
+	$(gb_UWINAPI) \
     $(gb_STDLIBS) \
 ))