Kaydet (Commit) fdda178d authored tarafından Michael Meeks's avatar Michael Meeks

targetted improvement of UNO API includes / usage

üst 6baa0319
......@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,ctl,\
-I$(SRCDIR)/UnoControls/source/inc \
))
$(eval $(call gb_Library_use_api,ctl,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,ctl))
$(eval $(call gb_Library_use_libraries,ctl,\
comphelper \
......
......@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,acc,\
-I$(SRCDIR)/accessibility/source/inc \
))
$(eval $(call gb_Library_use_api,acc,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,acc))
$(eval $(call gb_Library_use_libraries,acc,\
comphelper \
......
......@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,java_uno_accessbridge))
$(eval $(call gb_Library_use_custom_headers,java_uno_accessbridge,accessibility/bridge/inc))
$(eval $(call gb_Library_use_api,java_uno_accessbridge,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,java_uno_accessbridge,))
$(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\
cppu \
......
......@@ -32,10 +32,7 @@ $(eval $(call gb_Library_use_package,animcore,animations_inc))
$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
$(eval $(call gb_Library_use_api,animcore,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,animcore))
$(eval $(call gb_Library_use_libraries,animcore,\
cppu \
......
......@@ -38,10 +38,7 @@ $(eval $(call gb_Library_set_include,avmedia,\
-I$(SRCDIR)/avmedia/source/inc \
))
$(eval $(call gb_Library_use_api,avmedia,\
udkapi \
offapi \
))
$(eval $(call gb_Library_use_sdk_api,avmedia,))
$(eval $(call gb_Library_add_defs,avmedia,\
-DAVMEDIA_DLLIMPLEMENTATION \
......
......@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,avmediaQuickTime,\
-I$(SRCDIR)/avmedia/source/inc \
))
$(eval $(call gb_Library_use_api,avmediaQuickTime,\
udkapi \
offapi \
))
$(eval $(call gb_Library_use_sdk_api,avmediaQuickTime));
$(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
comphelper \
......
......@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,avmediagst,\
$(shell pkg-config --cflags gstreamer-0.10, gstreamer-plugins-base-0.10) \
))
$(eval $(call gb_Library_use_api,avmediagst,\
udkapi \
offapi \
))
$(eval $(call gb_Library_use_sdk_api,avmediagst))
ifeq ($(GUI),WNT)
$(eval $(call gb_Library_add_defs,avmediagst,\
......
......@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,avmediawin,\
-I$(SRCDIR)/avmedia/source/inc \
))
$(eval $(call gb_Library_use_api,avmediawin,\
udkapi \
offapi \
))
$(eval $(call gb_Library_use_sdk_api,avmediawin))
$(eval $(call gb_Library_use_libraries,avmediawin,\
comphelper \
......
......@@ -38,10 +38,7 @@ $(eval $(call gb_Library_set_include,basctl,\
-I$(WORKDIR)/SdiTarget/basctl/sdi \
))
$(eval $(call gb_Library_use_api,basctl,\
udkapi \
offapi \
))
$(eval $(call gb_Library_use_sdk_api,basctl))
$(eval $(call gb_Library_use_libraries,basctl,\
comphelper \
......
......@@ -11,10 +11,7 @@ $(eval $(call gb_Library_Library,basebmp))
$(eval $(call gb_Library_use_package,basebmp,basebmp_inc))
$(eval $(call gb_Library_use_api,basebmp,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,basebmp))
$(eval $(call gb_Library_use_libraries,basebmp,\
basegfx \
......
......@@ -14,10 +14,7 @@ $(eval $(call gb_Library_use_packages,basegfx,\
o3tl_inc \
))
$(eval $(call gb_Library_use_api,basegfx,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,basegfx))
$(eval $(call gb_Library_use_libraries,basegfx,\
cppu \
......
......@@ -38,11 +38,8 @@ $(eval $(call gb_Library_set_include,sb,\
-I$(SRCDIR)/basic/source/inc \
))
$(eval $(call gb_Library_use_api,sb,\
udkapi \
offapi \
oovbaapi \
))
$(eval $(call gb_Library_use_sdk_api,sb))
$(eval $(call gb_Library_use_api,sb,oovbaapi))
$(eval $(call gb_Library_add_defs,sb,\
-DBASIC_DLLIMPLEMENTATION \
......
......@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,binaryurp))
$(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp))
$(eval $(call gb_Library_use_api,binaryurp,\
udkapi \
offapi \
))
$(eval $(call gb_Library_use_sdk_api,binaryurp))
$(eval $(call gb_Library_use_libraries,binaryurp,\
cppu \
......
......@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_api,cairocanvas,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,cairocanvas))
ifeq ($(OS),MACOSX)
......
......@@ -35,10 +35,8 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_api,canvasfactory,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,canvasfactory))
$(eval $(call gb_Library_use_libraries,canvasfactory,\
cppu \
cppuhelper \
......
......@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,canvastools,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_api,canvastools,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,canvastools))
$(eval $(call gb_Library_add_defs,canvastools,\
-DCANVASTOOLS_DLLIMPLEMENTATION \
......
......@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,directx9canvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_api,directx9canvas,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,directx9canvas))
# clear NOMINMAX because GdiplusTypes.h uses those macros :(
$(eval $(call gb_Library_add_defs,directx9canvas,\
......
......@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_api,gdipluscanvas,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,gdipluscanvas))
# clear NOMINMAX because GdiplusTypes.h uses those macros :(
$(eval $(call gb_Library_add_defs,gdipluscanvas,\
......
......@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_api,nullcanvas,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,nullcanvas))
$(eval $(call gb_Library_use_libraries,nullcanvas,\
basegfx \
......
......@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_api,simplecanvas,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,simplecanvas))
$(eval $(call gb_Library_use_libraries,simplecanvas,\
basegfx \
......
......@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_Library_use_api,vclcanvas,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,vclcanvas))
$(eval $(call gb_Library_use_libraries,vclcanvas,\
basegfx \
......
......@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,chartcontroller,\
-I$(SRCDIR)/chart2/source/inc \
))
$(eval $(call gb_Library_use_api,chartcontroller,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,chartcontroller))
# TODO: is this still necessary?
# (from chart2/source/controller/dialogs/makefile.mk)
......
......@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,chartmodel,\
-I$(SRCDIR)/chart2/source/inc \
))
$(eval $(call gb_Library_use_api,chartmodel,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,chartmodel))
# TODO: is this still necessary?
# (from chart2/source/model/template/makefile.mk)
......
......@@ -36,10 +36,7 @@ $(eval $(call gb_Library_add_defs,charttools,\
-DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
))
$(eval $(call gb_Library_use_api,charttools,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,charttools))
$(eval $(call gb_Library_use_libraries,charttools,\
basegfx \
......
......@@ -37,10 +37,7 @@ $(eval $(call gb_Library_add_defs,chartview,\
-DOOO_DLLIMPLEMENTATION_CHARTVIEW \
))
$(eval $(call gb_Library_use_api,chartview,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,chartview))
$(eval $(call gb_Library_use_libraries,chartview,\
basegfx \
......
......@@ -41,10 +41,7 @@ $(eval $(call gb_Library_use_libraries,comphelper,\
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_api,comphelper,\
udkapi \
offapi \
))
$(eval $(call gb_Library_use_sdk_api,comphelper))
$(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/compare/AnyCompareFactory \
......
......@@ -63,10 +63,7 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
configmgr/source/xmldata \
))
$(eval $(call gb_Library_use_api,configmgr, \
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,configmgr))
$(eval $(call gb_Library_use_libraries,configmgr, \
comphelper \
......
......@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,ado,\
$$(INCLUDE) \
))
$(eval $(call gb_Library_use_api,ado,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,ado))
ifeq ($(COM),GCC)
$(eval $(call gb_Library_add_cxxflags,ado,\
......
......@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,calc))
$(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
$(eval $(call gb_Library_use_api,calc,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,calc))
$(eval $(call gb_Library_set_include,calc,\
$$(INCLUDE) \
......
......@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,dbase))
$(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
$(eval $(call gb_Library_use_api,dbase,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,dbase))
$(eval $(call gb_Library_set_include,dbase,\
$$(INCLUDE) \
......
......@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,dbpool2,\
-I$(SRCDIR)/connectivity/source/inc \
))
$(eval $(call gb_Library_use_api,dbpool2,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,dbpool2))
$(eval $(call gb_Library_use_libraries,dbpool2,\
comphelper \
......
......@@ -47,10 +47,7 @@ $(eval $(call gb_Library_set_include,dbtools,\
-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
))
$(eval $(call gb_Library_use_api,dbtools,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,dbtools))
$(eval $(call gb_Library_use_libraries,dbtools,\
cppu \
......
......@@ -39,10 +39,7 @@ $(eval $(call gb_Library_use_externals,evoab,\
$(eval $(call gb_Library_set_componentfile,evoab,connectivity/source/drivers/evoab2/evoab))
$(eval $(call gb_Library_use_api,evoab,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,evoab))
$(eval $(call gb_Library_use_libraries,evoab,\
comphelper \
......
......@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,file,\
-I$(SRCDIR)/connectivity/source/inc \
))
$(eval $(call gb_Library_use_api,file,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,file))
$(eval $(call gb_Library_use_libraries,file,\
cppu \
......
......@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,flat))
$(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
$(eval $(call gb_Library_use_api,flat,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,flat))
$(eval $(call gb_Library_set_include,flat,\
$$(INCLUDE) \
......
......@@ -36,10 +36,7 @@ $(eval $(call gb_Library_use_externals,hsqldb,\
hsqldb \
))
$(eval $(call gb_Library_use_api,hsqldb,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,hsqldb))
$(eval $(call gb_Library_use_libraries,hsqldb,\
comphelper \
......
......@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,jdbc))
$(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
$(eval $(call gb_Library_use_api,jdbc,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,jdbc))
$(eval $(call gb_Library_set_include,jdbc,\
$$(INCLUDE) \
......
......@@ -31,10 +31,7 @@ $(eval $(call gb_Library_use_externals,kab1,kde))
$(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1))
$(eval $(call gb_Library_use_api,kab1,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,kab1))
$(eval $(call gb_Library_set_include,kab1,\
-I$(SRCDIR)/connectivity/source/inc \
......
......@@ -31,10 +31,7 @@ $(eval $(call gb_Library_use_packages,kabdrv1,\
shell_inc \
))
$(eval $(call gb_Library_use_api,kabdrv1,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,kabdrv1))
$(eval $(call gb_Library_use_externals,kabdrv1,\
kde \
......
......@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,macab1))
$(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1))
$(eval $(call gb_Library_use_api,macab1,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,macab1))
$(eval $(call gb_Library_use_libraries,macab1,\
cppu \
......
......@@ -27,10 +27,7 @@
$(eval $(call gb_Library_Library,macabdrv1))
$(eval $(call gb_Library_use_api,macabdrv1,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,macabdrv1))
$(eval $(call gb_Library_add_libs,macabdrv1,\
-framework Carbon \
......
......@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,mozab2,\
$$(INCLUDE) \
))
$(eval $(call gb_Library_use_api,mozab2,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,mozab2))
$(eval $(call gb_Library_use_libraries,mozab2,\
cppu \
......
......@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,mozabdrv,\
$$(INCLUDE) \
))
$(eval $(call gb_Library_use_api,mozabdrv,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,mozabdrv))
$(eval $(call gb_Library_use_libraries,mozabdrv,\
comphelper \
......
......@@ -38,10 +38,7 @@ $(eval $(call gb_Library_set_include,mozbootstrap,\
$$(INCLUDE) \
))
$(eval $(call gb_Library_use_api,mozbootstrap,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,mozbootstrap))
$(eval $(call gb_Library_use_libraries,mozbootstrap,\
comphelper \
......
......@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,mysql))
$(eval $(call gb_Library_set_componentfile,mysql,connectivity/source/drivers/mysql/mysql))
$(eval $(call gb_Library_use_api,mysql,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,mysql))
$(eval $(call gb_Library_set_include,mysql,\
$$(INCLUDE) \
......
......@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_warnings_not_errors,odbc))
$(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc))
$(eval $(call gb_Library_use_api,odbc,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,odbc))
$(eval $(call gb_Library_set_include,odbc,\
$$(INCLUDE) \
......
......@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,odbcbase))
$(eval $(call gb_Library_set_warnings_not_errors,odbcbase))
$(eval $(call gb_Library_use_api,odbcbase,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,odbcbase))
$(eval $(call gb_Library_set_include,odbcbase,\
$$(INCLUDE) \
......
......@@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc-impl,\
-DPQ_SDBC_MICRO=2 \
))
$(eval $(call gb_Library_use_api,postgresql-sdbc-impl,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,postgresql-sdbc-impl))
$(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
cppu \
......
......@@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc,\
-DPQ_SDBC_MICRO=2 \
))
$(eval $(call gb_Library_use_api,postgresql-sdbc,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,postgresql-sdbc))
$(eval $(call gb_Library_use_libraries,postgresql-sdbc,\
cppu \
......
......@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,sdbc2))
$(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2))
$(eval $(call gb_Library_use_api,sdbc2,\
offapi \
udkapi \
))
$(eval $(call gb_Library_use_sdk_api,sdbc2))
$(eval $(call gb_Library_set_include,sdbc2,\
$$(INCLUDE) \
......
......@@ -33,10 +33,7 @@ $(eval $(call gb_Library_use_externals,tdeab1,\