diff options
273 files changed, 289 insertions, 1080 deletions
diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk index 1bedad8f1fcc..0727c5f2780e 100644 --- a/UnoControls/Library_ctl.mk +++ b/UnoControls/Library_ctl.mk @@ -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 \ diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index af15243a53bc..9693ddf8e151 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -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 \ diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk index dcf0acc0eddc..40f209fe2966 100644 --- a/accessibility/Library_java_uno_accessbridge.mk +++ b/accessibility/Library_java_uno_accessbridge.mk @@ -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 \ diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index 7154286831bf..1ff89b446e2d 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -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 \ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 316b6d61c45c..03f0441d7ac7 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -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 \ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index d471c0321c8e..3b40326dc954 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -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 \ diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index b6323bbb2f42..6336ee44b2db 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -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,\ diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 39a065cfbfda..9bca5f1fa89a 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -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 \ diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 897600b30e69..fc1e077671c6 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -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 \ diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 1d92e050bbde..756840bbc2d1 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -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 \ diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index d002f3615451..c2c9230794c5 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -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 \ diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index acf3996613b3..71c0090c6c4f 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -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 \ diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index f0b51739d934..2b936fb85d1d 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -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 \ diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index d7d09e62c57f..9f59fef1e4e8 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -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) diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index cbdb02ce81a1..8ee787685098 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -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 \ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 558cd24d27e2..156608221eda 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -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 \ diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index ab9ec64a59d4..1a01475e263e 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -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,\ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index f3ddcb8ddf3f..da8ffa62552a 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -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,\ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index 42260bf4aa11..689bd7eef377 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -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 \ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index a76bfafb6013..470a99314db3 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -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 \ diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 43cdc961877a..911858385b44 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -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 \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index ea0b2c28301c..b42c0e8f328e 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -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) diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk index c1da053d8485..b4213242df97 100644 --- a/chart2/Library_chartmodel.mk +++ b/chart2/Library_chartmodel.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) diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk index 0c55770f306e..d38804d512ed 100644 --- a/chart2/Library_charttools.mk +++ b/chart2/Library_charttools.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 \ diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk index ab3952e1d7af..c5487a8635da 100644 --- a/chart2/Library_chartview.mk +++ b/chart2/Library_chartview.mk @@ -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 \ diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 09a55b28da6f..5a2074a2746d 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -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 \ diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 13cbdd854165..68f9306f6991 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -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 \ diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index a4f2f41d5431..d9d120f88594 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -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,\ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index c9a83d123405..93431fcf3b4b 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -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) \ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index d26cc3b6ca27..5dd69321af53 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -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) \ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index 008a6581e802..127a3e7cfad9 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -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 \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 93539deb6f33..442eb1be68a4 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -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 \ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 852685d910ae..882cdb0da054 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -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 \ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index b1757c146921..08754335d78b 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -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 \ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 82885ceb2e90..a69d0f221ae9 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -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) \ diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index 8421818195d9..a3aef6d8906f 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -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 \ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 470c19f6b6f3..70e553d0d3b8 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -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) \ diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk index 7480d29c05ab..86f713d15ef9 100644 --- a/connectivity/Library_kab1.mk +++ b/connectivity/Library_kab1.mk @@ -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 \ diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index e5a1673d22f3..6a0f16c427f0 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -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 \ diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk index cf5168c87213..842394c40bfa 100644 --- a/connectivity/Library_macab1.mk +++ b/connectivity/Library_macab1.mk @@ -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 \ diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index 0f15bb4c0c04..471c6c777ff3 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -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 \ diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index 4339ebac3728..afde265bf630 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -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 \ diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index 14dd78783a82..b1c29ee0f811 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -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 \ diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index 36c7486df15a..aab40dcc030b 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -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 \ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 73de22f1181c..5e17042fd5e0 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -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) \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 797c1e7ddb50..d6c3dc547cf6 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -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) \ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 5336326180ba..4d25b1c9fdd4 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -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) \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index da6fe98d480c..979d166c3e9a 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -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 \ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 292db43d84f2..202614dd52ff 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -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 \ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index cb43941c5f51..eb8789caacd6 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -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) \ diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 63602f490306..eb6c10242bb3 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_use_externals,tdeab1,\ $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1)) -$(eval $(call gb_Library_use_api,tdeab1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,tdeab1)) $(eval $(call gb_Library_use_libraries,tdeab1,\ comphelper \ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index 1f3a8ea80f9f..fbbd57d6c149 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -27,10 +27,7 @@ $(eval $(call gb_Library_Library,tdeabdrv1)) -$(eval $(call gb_Library_use_api,tdeabdrv1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,tdeabdrv1)) $(eval $(call gb_Library_add_libs,tdeabdrv1,\ -lkabc \ diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index aa768db92bdd..7b9ff2ff6557 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,cppcanvas,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,cppcanvas,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,cppcanvas)) $(eval $(call gb_Library_add_defs,cppcanvas,\ -DCPPCANVAS_DLLIMPLEMENTATION \ )) diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index f49134463ead..4c4575d2763a 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -40,10 +40,7 @@ $(eval $(call gb_Library_use_libraries,mtfrenderer,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_use_api,mtfrenderer,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,mtfrenderer)) $(eval $(call gb_Library_add_exception_objects,mtfrenderer,\ cppcanvas/source/uno/uno_mtfrenderer \ diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk index b4ab2fddfa68..68cf8d9b5b7c 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno.mk @@ -27,10 +27,7 @@ $(eval $(call gb_Library_Library,affine_uno)) -$(eval $(call gb_Library_use_api,affine_uno,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,affine_uno)) $(eval $(call gb_Library_use_libraries,affine_uno,\ purpenvhelper \ diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index cc96d046fbc4..3a2ed529b3dd 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.ma $(eval $(call gb_Library_use_package,cppu,cppu_inc)) -$(eval $(call gb_Library_use_api,cppu,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,cppu)) $(eval $(call gb_Library_add_defs,cppu,\ -DCPPU_DLLIMPLEMENTATION \ diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index 7e371e934555..b0fa63ed720f 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -27,10 +27,7 @@ $(eval $(call gb_Library_Library,log_uno)) -$(eval $(call gb_Library_use_api,log_uno,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,log_uno)) $(eval $(call gb_Library_use_libraries,log_uno,\ cppu \ diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index 1deaca40b2bc..db2a90e54909 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,purpenvhelper,\ -DPURPENV_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,purpenvhelper,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,purpenvhelper)) $(eval $(call gb_Library_use_libraries,purpenvhelper,\ cppu \ diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk index bd680c0b35cb..be343aa2e99a 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno.mk @@ -27,10 +27,7 @@ $(eval $(call gb_Library_Library,unsafe_uno)) -$(eval $(call gb_Library_use_api,unsafe_uno,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,unsafe_uno)) $(eval $(call gb_Library_use_libraries,unsafe_uno,\ purpenvhelper \ diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 4da2f8fa6761..bfde9e1a75cf 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -41,10 +41,7 @@ $(eval $(call gb_Library_add_defs,cui,\ $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \ )) -$(eval $(call gb_Library_use_api,cui,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,cui)) $(eval $(call gb_Library_use_libraries,cui,\ avmedia \ diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index b81dc7376c62..1e0f87eaa062 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\ -I$(SRCDIR)/dbaccess/inc \ )) -$(eval $(call gb_Library_use_api,odbcconfig,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,odbcconfig)) $(eval $(call gb_Executable_use_libraries,odbcconfig,\ $(gb_STDLIBS) \ diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 0e71fd3d4a5d..e32b93dca420 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -42,10 +42,7 @@ $(eval $(call gb_Library_add_defs,dba,\ -DOOO_DLLIMPLEMENTATION_DBA \ )) -$(eval $(call gb_Library_use_api,dba,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,dba)) $(eval $(call gb_Library_use_libraries,dba,\ comphelper \ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index 0854533af62e..e8b063a7b6c2 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,dbaxml,\ -I$(SRCDIR)/dbaccess/source/inc \ )) -$(eval $(call gb_Library_use_api,dbaxml,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,dbaxml)) $(eval $(call gb_Library_use_libraries,dbaxml,\ comphelper \ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index cb9dc74fdfb9..bb45c275f3d9 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,dbmm,\ -I$(SRCDIR)/dbaccess/inc \ )) -$(eval $(call gb_Library_use_api,dbmm,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,dbmm)) $(eval $(call gb_Library_use_libraries,dbmm,\ comphelper \ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 2f8fdb032b79..80d32b19ccff 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,dbu,\ -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \ )) -$(eval $(call gb_Library_use_api,dbu,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,dbu)) $(eval $(call gb_Library_add_defs,dbu,\ -DDBACCESS_DLLIMPLEMENTATION \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index fa49d961902d..3e5aca5e54ce 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -38,10 +38,7 @@ $(eval $(call gb_Library_set_include,sdbt,\ -I$(SRCDIR)/dbaccess/source/sdbtools/inc \ )) -$(eval $(call gb_Library_use_api,sdbt,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sdbt)) $(eval $(call gb_Library_use_libraries,sdbt,\ comphelper \ diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index 3314c2e14ab9..2cde4bae0ce9 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,deployment,\ -I$(SRCDIR)/desktop/source/deployment/registry/inc \ )) -$(eval $(call gb_Library_use_api,deployment,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,deployment)) $(eval $(call gb_Library_use_libraries,deployment,\ comphelper \ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index c27c07752ae2..f5f48e47d118 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,deploymentgui,\ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Library_use_api,deploymentgui,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,deploymentgui)) $(eval $(call gb_Library_use_libraries,deploymentgui,\ comphelper \ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index c03017759228..551c6392c918 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,deploymentmisc,\ -I$(SRCDIR)/desktop/source/deployment/inc \ )) -$(eval $(call gb_Library_use_api,deploymentmisc,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,deploymentmisc)) $(eval $(call gb_Library_add_defs,deploymentmisc,\ -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION \ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 4c1d51d7fd68..838b475da267 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,migrationoo2,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,migrationoo2,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,migrationoo2)) $(eval $(call gb_Library_use_libraries,migrationoo2,\ cppu \ diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index 9689749e50b4..d39497e32ea3 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,migrationoo3,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,migrationoo3,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,migrationoo3)) $(eval $(call gb_Library_use_libraries,migrationoo3,\ cppu \ diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index cb088c026b73..f75728dab7bc 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,offacc,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,offacc,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,offacc)) $(eval $(call gb_Library_use_libraries,offacc,\ cppu \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 4ed40fd0d5b3..94958838e9de 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,sofficeapp,\ -I$(SRCDIR)/desktop/source/deployment/inc \ )) -$(eval $(call gb_Library_use_api,sofficeapp,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sofficeapp)) $(eval $(call gb_Library_add_defs,sofficeapp,\ -DDESKTOP_DLLIMPLEMENTATION \ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index 35529052813c..0d45c5991078 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,spl,\ -I$(SRCDIR)/desktop/inc \ )) -$(eval $(call gb_Library_use_api,spl,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,spl)) $(eval $(call gb_Library_use_libraries,spl,\ comphelper \ diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk index 9fd065cb2b44..08412d5ac192 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -27,10 +27,7 @@ $(eval $(call gb_Library_Library,spl_unx)) -$(eval $(call gb_Library_use_api,spl_unx,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,spl_unx)) $(eval $(call gb_Library_use_libraries,spl_unx,\ cppu \ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 93ca09b87ff2..081fee923a33 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,unopkgapp,\ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Library_use_api,unopkgapp,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,unopkgapp)) $(eval $(call gb_Library_add_defs,unopkgapp,\ -DDESKTOP_DLLIMPLEMENTATION \ diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index b59bd12adca8..cfbf6b010dd8 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_add_defs,drawinglayer,\ -DDRAWINGLAYER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,drawinglayer,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,drawinglayer)) $(eval $(call gb_Library_use_libraries,drawinglayer,\ avmedia \ diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index f567a7435793..8331586779a3 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,dnd,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,dnd,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,dnd)) $(eval $(call gb_Library_use_libraries,dnd,\ advapi32 \ diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk index a043b5849325..79f18d82dfed 100644 --- a/dtrans/Library_dtrans.mk +++ b/dtrans/Library_dtrans.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,dtrans,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,dtrans,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,dtrans)) $(eval $(call gb_Library_use_libraries,dtrans,\ cppu \ diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index 97825315ba44..1b9e8735aef9 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,ftransl,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,ftransl,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ftransl)) $(eval $(call gb_Library_use_libraries,ftransl,\ advapi32 \ diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index 4baffdcff580..04ae079e6672 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,mcnttype,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,mcnttype,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,mcnttype)) $(eval $(call gb_Library_use_libraries,mcnttype,\ cppu \ diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 270bbc0dbf2c..1b87a60417c5 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,sysdtrans,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,sysdtrans,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sysdtrans)) $(eval $(call gb_Library_add_defs,sysdtrans,\ -D_UNICODE \ diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 5d106139d22c..276e0625ad7c 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -39,10 +39,7 @@ $(eval $(call gb_Library_add_defs,editeng,\ -DEDITENG_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,editeng,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,editeng)) $(eval $(call gb_Library_add_exception_objects,editeng,\ editeng/source/accessibility/AccessibleComponentBase \ diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 307dac579ab2..58e3f02a74af 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,embobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,embobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,embobj)) $(eval $(call gb_Library_use_libraries,embobj,\ comphelper \ diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 5c9712a4c977..97801d9bc798 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,emboleobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,emboleobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,emboleobj)) $(eval $(call gb_Library_use_libraries,emboleobj,\ comphelper \ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index ebf7e6324d21..9872b4f82db7 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -39,10 +39,8 @@ $(eval $(call gb_Library_add_defs,emser,\ -UNOMINMAX \ )) +$(eval $(call gb_Library_use_api,emser)) $(eval $(call gb_Library_use_api,emser,\ - offapi \ - udkapi \ -)) $(eval $(call gb_Library_use_libraries,emser,\ comphelper \ diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index d327c0769c26..92f0848491cb 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -51,10 +51,7 @@ $(eval $(call gb_Library_add_defs,abp,\ -DCOMPMOD_RESPREFIX=abp \ )) -$(eval $(call gb_Library_use_api,abp,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,abp)) $(eval $(call gb_Library_add_exception_objects,abp,\ extensions/source/abpilot/abpfinalpage \ diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index e31a42984562..5ce36cddc0de 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,bib,\ -I$(SRCDIR)/extensions/inc \ )) -$(eval $(call gb_Library_use_api,bib,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,bib)) $(eval $(call gb_Library_add_exception_objects,bib,\ extensions/source/bibliography/bibbeam \ diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index 988464dd8d90..cb52f4d32e6f 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -42,10 +42,7 @@ $(eval $(call gb_Library_add_defs,dbp,\ -DCOMPMOD_NAMESPACE=dbp \ )) -$(eval $(call gb_Library_use_api,dbp,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,dbp)) $(eval $(call gb_Library_add_exception_objects,dbp,\ extensions/source/dbpilots/commonpagesdbp \ diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index 37442a80b257..4dd04a45fef2 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,ldapbe2)) $(eval $(call gb_Library_set_componentfile,ldapbe2,extensions/source/config/ldap/ldapbe2)) -$(eval $(call gb_Library_use_api,ldapbe2,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ldapbe2)) ifeq ($(LDAPSDKINCLUDES),) ifneq ($(WITH_OPENLDAP),YES) diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index 247deb3f467a..4e7e0d0f6be3 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,log)) $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log)) -$(eval $(call gb_Library_use_api,log,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,log)) $(eval $(call gb_Library_add_exception_objects,log,\ extensions/source/logging/consolehandler \ diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index 668e9167ea4d..e02f65d0e428 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_Library,oleautobridge)) $(eval $(call gb_Library_set_componentfile,oleautobridge,extensions/source/ole/oleautobridge)) -$(eval $(call gb_Library_use_api,oleautobridge,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,oleautobridge)) $(eval $(call gb_Library_set_include,oleautobridge,\ $(foreach inc,$(ATL_INCLUDE),-I$(inc)) \ diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk index 697818e04718..5bbc832668cf 100644 --- a/extensions/Library_oleautobridge2.mk +++ b/extensions/Library_oleautobridge2.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_add_defs,oleautobridge2,\ -DOWNGUID \ )) -$(eval $(call gb_Library_use_api,oleautobridge2,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,oleautobridge2)) $(eval $(call gb_Library_set_include,oleautobridge2,\ -I$(SRCDIR)/extensions/source/ole \ diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 0221489e8540..3504126847ef 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,pcr)) $(eval $(call gb_Library_set_componentfile,pcr,extensions/source/propctrlr/pcr)) -$(eval $(call gb_Library_use_api,pcr,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,pcr)) $(eval $(call gb_Library_set_include,pcr,\ -I$(SRCDIR)/extensions/inc \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index cbcfc795e233..c1451f8c3519 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -41,10 +41,7 @@ $(eval $(call gb_Library_set_include,pl,\ -I$(SRCDIR)/extensions/source/plugin/inc \ )) -$(eval $(call gb_Library_use_api,pl,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,pl)) ifeq ($(SOLAR_JAVA),TRUE) $(eval $(call gb_Library_add_defs,pl,\ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index 2e03681243ef..bc3de6021b89 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,res)) $(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res)) -$(eval $(call gb_Library_use_api,res,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,res)) $(eval $(call gb_Library_use_libraries,res,\ vcl \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 83a0b6d74d73..4dd0044941c8 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,scn)) $(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn)) -$(eval $(call gb_Library_use_api,scn,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,scn)) $(eval $(call gb_Library_use_libraries,scn,\ svt \ diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 899745b9e713..33cccab682fd 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,so_activex,\ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) -$(eval $(call gb_Library_use_api,so_activex,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,so_activex)) $(eval $(call gb_Library_add_nativeres,so_activex,activex_res)) diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index ea01b58520f5..7bcf286cb4f0 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,so_activex_x64,\ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) -$(eval $(call gb_Library_use_api,so_activex_x64,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,so_activex_x64)) $(eval $(call gb_Library_add_nativeres,so_activex_x64,activex_res)) diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk index 196fe7f3d314..75ac53f00829 100644 --- a/extensions/Library_updatecheckui.mk +++ b/extensions/Library_updatecheckui.mk @@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,updatecheckui)) $(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk)) -$(eval $(call gb_Library_use_api,updatecheckui,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,updatecheckui)) $(eval $(call gb_Library_use_libraries,updatecheckui,\ vcl \ diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk index cd1b581e7830..354834d7205f 100644 --- a/extensions/Library_updatefeed.mk +++ b/extensions/Library_updatefeed.mk @@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,updatefeed)) $(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed)) -$(eval $(call gb_Library_use_api,updatefeed,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,updatefeed)) $(eval $(call gb_Library_use_libraries,updatefeed,\ cppuhelper \ diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index 98577ee3941a..cd291c8b695d 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,updchk,\ -I$(SRCDIR)/extensions/inc \ )) -$(eval $(call gb_Library_use_api,updchk,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,updchk)) $(eval $(call gb_Library_use_libraries,updchk,\ cppuhelper \ diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk index 01300bb5e279..88ca91d609dc 100644 --- a/fileaccess/Library_fileacc.mk +++ b/fileaccess/Library_fileacc.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,fileacc,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,fileacc,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fileacc)) $(eval $(call gb_Library_use_libraries,fileacc,\ cppu \ diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index f62f77b3c0d4..abd5af774dc4 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,PptImporter)) -$(eval $(call gb_Library_use_api,PptImporter,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,PptImporter)) $(eval $(call gb_Library_set_include,PptImporter,\ $$(INCLUDE) \ diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index 5e04dc4d07bb..d7537892529c 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,egi)) -$(eval $(call gb_Library_use_api,egi,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,egi)) $(eval $(call gb_Library_set_include,egi,\ $$(INCLUDE) \ diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index 0a7bf20fe5e3..efd589924959 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,eme)) -$(eval $(call gb_Library_use_api,eme,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,eme)) $(eval $(call gb_Library_set_include,eme,\ $$(INCLUDE) \ diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index eb38ca4f000e..63f630c3c1df 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,epb)) -$(eval $(call gb_Library_use_api,epb,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,epb)) $(eval $(call gb_Library_set_include,epb,\ $$(INCLUDE) \ diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index 935ab824e0fd..51666771c8f9 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,epg)) -$(eval $(call gb_Library_use_api,epg,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,epg)) $(eval $(call gb_Library_set_include,epg,\ $$(INCLUDE) \ diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 385a6763314f..83469263cd83 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,epp)) -$(eval $(call gb_Library_use_api,epp,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,epp)) $(eval $(call gb_Library_set_include,epp,\ $$(INCLUDE) \ diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index 285533421a35..2ba9b40a7051 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,eps)) -$(eval $(call gb_Library_use_api,eps,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,eps)) $(eval $(call gb_Library_set_include,eps,\ $$(INCLUDE) \ diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index 1ebfe322252b..c1d9267ec555 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,ept)) -$(eval $(call gb_Library_use_api,ept,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ept)) $(eval $(call gb_Library_set_include,ept,\ $$(INCLUDE) \ diff --git a/filter/Library_era.mk b/filter/Library_era.mk index a647f9364b70..5035ab350a7f 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,era)) -$(eval $(call gb_Library_use_api,era,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,era)) $(eval $(call gb_Library_set_include,era,\ $$(INCLUDE) \ diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index 00c1e42db7e1..3d634045ecf1 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,eti)) -$(eval $(call gb_Library_use_api,eti,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,eti)) $(eval $(call gb_Library_set_include,eti,\ $$(INCLUDE) \ diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index 67d3937b4f14..b447fdbf4134 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,exp)) -$(eval $(call gb_Library_use_api,exp,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,exp)) $(eval $(call gb_Library_set_include,exp,\ $$(INCLUDE) \ diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index 627b186d2893..3dd322a7ad69 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,filterconfig)) $(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1)) -$(eval $(call gb_Library_use_api,filterconfig,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,filterconfig)) $(eval $(call gb_Library_set_include,filterconfig,\ $$(INCLUDE) \ diff --git a/filter/Library_filtertracer.mk b/filter/Library_filtertracer.mk index 72d83430bbd8..efd029a6c765 100644 --- a/filter/Library_filtertracer.mk +++ b/filter/Library_filtertracer.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,filtertracer)) -$(eval $(call gb_Library_use_api,filtertracer,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,filtertracer)) $(eval $(call gb_Library_set_include,filtertracer,\ $$(INCLUDE) \ diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index 80b2b3e4d877..77668e02bd38 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,flash)) $(eval $(call gb_Library_set_componentfile,flash,filter/source/flash/flash)) -$(eval $(call gb_Library_use_api,flash,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,flash)) $(eval $(call gb_Library_set_include,flash,\ $$(INCLUDE) \ diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index fbfa2ac1fa34..e38f7451fbf7 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,icd)) -$(eval $(call gb_Library_use_api,icd,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,icd)) $(eval $(call gb_Library_set_include,icd,\ $$(INCLUDE) \ diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index 5d90f0e85f48..0e319abf9ec3 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,icg)) -$(eval $(call gb_Library_use_api,icg,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,icg)) $(eval $(call gb_Library_set_include,icg,\ $$(INCLUDE) \ diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index f610be588284..62fb96d71d40 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,idx)) -$(eval $(call gb_Library_use_api,idx,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,idx)) $(eval $(call gb_Library_set_include,idx,\ $$(INCLUDE) \ diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index b5662c5afeaf..65927bb255b2 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,ime)) -$(eval $(call gb_Library_use_api,ime,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ime)) $(eval $(call gb_Library_set_include,ime,\ $$(INCLUDE) \ diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index 00581826f719..281d832bfa08 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,ipb)) -$(eval $(call gb_Library_use_api,ipb,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ipb)) $(eval $(call gb_Library_set_include,ipb,\ $$(INCLUDE) \ diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index 1b37d127babf..c81aeb264354 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,ipd)) -$(eval $(call gb_Library_use_api,ipd,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ipd)) $(eval $(call gb_Library_set_include,ipd,\ $$(INCLUDE) \ diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index 74bee0b4c238..19a908e0f1a1 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,ips)) -$(eval $(call gb_Library_use_api,ips,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ips)) $(eval $(call gb_Library_set_include,ips,\ $$(INCLUDE) \ diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index 7f73f83cccda..5924518751b2 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,ipt)) -$(eval $(call gb_Library_use_api,ipt,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ipt)) $(eval $(call gb_Library_set_include,ipt,\ $$(INCLUDE) \ diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index ea377a33525a..8382b1aec39d 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,ipx)) -$(eval $(call gb_Library_use_api,ipx,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ipx)) $(eval $(call gb_Library_set_include,ipx,\ $$(INCLUDE) \ diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index 3729daf6ae08..31d689cda70c 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,ira)) -$(eval $(call gb_Library_use_api,ira,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ira)) $(eval $(call gb_Library_set_include,ira,\ $$(INCLUDE) \ diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index 3362d63c8f8c..5ce1c045892a 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,itg)) -$(eval $(call gb_Library_use_api,itg,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,itg)) $(eval $(call gb_Library_set_include,itg,\ $$(INCLUDE) \ diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index c02894d87a01..85a4ac75354d 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -18,10 +18,7 @@ $(eval $(call gb_Library_Library,iti)) -$(eval $(call gb_Library_use_api,iti,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,iti)) $(eval $(call gb_Library_set_include,iti,\ $$(INCLUDE) \ diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 339f5c4226dc..ceb7d0a1f5d9 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -22,10 +22,7 @@ $(eval $(call gb_Library_use_package,msfilter,filter_inc)) $(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter)) -$(eval $(call gb_Library_use_api,msfilter,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,msfilter)) $(eval $(call gb_Library_set_include,msfilter,\ $$(INCLUDE) \ diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index 2e2d03b35168..a3d28afe39e2 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,odfflatxml)) $(eval $(call gb_Library_set_componentfile,odfflatxml,filter/source/odfflatxml/odfflatxml)) -$(eval $(call gb_Library_use_api,odfflatxml,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,odfflatxml)) $(eval $(call gb_Library_set_include,odfflatxml,\ $$(INCLUDE) \ diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index c3c9e2c99866..46e9973c4e4e 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,pdffilter)) $(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter)) -$(eval $(call gb_Library_use_api,pdffilter,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,pdffilter)) $(eval $(call gb_Library_set_include,pdffilter,\ -I$(SRCDIR)/filter/inc \ diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index 1cc69aca9379..4bb4ef1d29d3 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,placeware)) $(eval $(call gb_Library_set_componentfile,placeware,filter/source/placeware/placeware)) -$(eval $(call gb_Library_use_api,placeware,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,placeware)) $(eval $(call gb_Library_set_include,placeware,\ $$(INCLUDE) \ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index af281e2389c4..f2927556848f 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,svgfilter,\ -I$(SRCDIR)/filter/inc \ )) -$(eval $(call gb_Library_use_api,svgfilter,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,svgfilter)) $(eval $(call gb_Library_use_libraries,svgfilter,\ svxcore \ diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index a866b25fa76b..8bf24468a019 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,t602filter)) $(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter)) -$(eval $(call gb_Library_use_api,t602filter,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,t602filter)) $(eval $(call gb_Library_set_include,t602filter,\ $$(INCLUDE) \ diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk index ac7303aa1905..9ab5a7c45572 100644 --- a/filter/Library_textfd.mk +++ b/filter/Library_textfd.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,textfd)) $(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect/textfd)) -$(eval $(call gb_Library_use_api,textfd,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,textfd)) $(eval $(call gb_Library_set_include,textfd,\ $$(INCLUDE) \ diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index 7dd33643ab6a..f9260d57f8c2 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xmlfa)) $(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa)) -$(eval $(call gb_Library_use_api,xmlfa,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xmlfa)) $(eval $(call gb_Library_set_include,xmlfa,\ $$(INCLUDE) \ diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index faa5e81af97b..19f0509f44fa 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xmlfd)) $(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/xmlfd)) -$(eval $(call gb_Library_use_api,xmlfd,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xmlfd)) $(eval $(call gb_Library_set_include,xmlfd,\ $$(INCLUDE) \ diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index c85f046ef06b..ba4f0435ea5b 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xsltdlg)) $(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg)) -$(eval $(call gb_Library_use_api,xsltdlg,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xsltdlg)) $(eval $(call gb_Library_set_include,xsltdlg,\ $$(INCLUDE) \ diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index 36c68147fdd4..9688d59c79d8 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xsltfilter)) $(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/xsltfilter)) -$(eval $(call gb_Library_use_api,xsltfilter,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xsltfilter)) $(eval $(call gb_Library_set_include,xsltfilter,\ $$(INCLUDE) \ diff --git a/formula/Library_for.mk b/formula/Library_for.mk index 1c4852c4a67d..90820c331122 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -40,10 +40,7 @@ $(eval $(call gb_Library_add_defs,for,\ -DFORMULA_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,for,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,for)) $(eval $(call gb_Library_use_libraries,for,\ comphelper \ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index a2a90a8a8578..5aaea81d65b7 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_add_defs,forui,\ -DFORMULA_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,forui,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,forui)) $(eval $(call gb_Library_use_libraries,forui,\ comphelper \ diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index ba14d33261d0..780a28a4fd88 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,fpicker)) $(eval $(call gb_Library_set_componentfile,fpicker,fpicker/source/generic/fpicker)) -$(eval $(call gb_Library_use_api,fpicker,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fpicker)) $(eval $(call gb_Library_use_libraries,fpicker,\ cppu \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 000a4cf49470..431fc279fe00 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_use_packages,fps,\ vcl_inc \ )) -$(eval $(call gb_Library_use_api,fps,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fps)) $(eval $(call gb_Library_add_defs,fps,\ -D_UNICODE \ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index 12e36d6f24ce..cb7e1a9e7c77 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_use_packages,fps_aqua,\ vcl_inc \ )) -$(eval $(call gb_Library_use_api,fps_aqua,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fps_aqua)) $(eval $(call gb_Library_add_libs,fps_aqua,\ -framework Cocoa \ diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index d55c1d1a2a48..1eae7a8585f9 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -27,10 +27,7 @@ $(eval $(call gb_Library_Library,fps_odma)) -$(eval $(call gb_Library_use_api,fps_odma,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fps_odma)) $(eval $(call gb_Library_use_libraries,fps_odma,\ comphelper \ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index b9c94146b976..6a80ed9f9c11 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,fps_office)) $(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office)) -$(eval $(call gb_Library_use_api,fps_office,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fps_office)) $(eval $(call gb_Library_set_include,fps_office,\ $$(INCLUDE) \ diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 4513bcca8b68..b517187eb621 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -38,10 +38,7 @@ $(eval $(call gb_Library_add_defs,fwe,\ -DFWE_DLLIMPLEMENTATION\ )) -$(eval $(call gb_Library_use_api,fwe,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fwe)) $(eval $(call gb_Library_use_libraries,fwe,\ comphelper \ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 9b15a2d2acf7..5d51f55caa4f 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_add_defs,fwi,\ -DFWI_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,fwi,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fwi)) $(eval $(call gb_Library_set_include,fwi,\ -I$(SRCDIR)/framework/source/inc \ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index b78dd0c4aa06..b312d88dad76 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,fwk,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,fwk,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fwk)) $(eval $(call gb_Library_use_libraries,fwk,\ comphelper \ diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index c9bda5bb1be2..155af1aec42d 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,fwl,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,fwl,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fwl)) $(eval $(call gb_Library_use_libraries,fwl,\ comphelper \ diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index d704d162e5b0..5043a3d121d1 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,fwm,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,fwm,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fwm)) $(eval $(call gb_Library_use_libraries,fwm,\ comphelper \ diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk index 302ad5a3a740..7ce6d1058938 100644 --- a/framework/Library_lomenubar.mk +++ b/framework/Library_lomenubar.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_Library,lomenubar)) $(eval $(call gb_Library_set_componentfile,lomenubar,framework/util/lomenubar)) -$(eval $(call gb_Library_use_api,lomenubar,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,lomenubar)) $(eval $(call gb_Library_use_externals,lomenubar,\ gtk \ diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index ec189cd94bdf..bc51391349e0 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,hwp,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,hwp,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,hwp)) $(eval $(call gb_Library_use_libraries,hwp,\ comphelper \ diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 2ed16de42769..c41f71e635b7 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,i18nisolang1,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,i18nisolang1,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,i18nisolang1)) $(eval $(call gb_Library_add_defs,i18nisolang1,\ -DI18NISOLANG_DLLIMPLEMENTATION \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index fd85033d8c5e..6d3eeadc2f7a 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,i18npool,\ -I$(SRCDIR)/i18npool/inc \ )) -$(eval $(call gb_Library_use_api,i18npool,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,i18npool)) $(eval $(call gb_Library_use_libraries,i18npool,\ comphelper \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index 4194c53c5031..bfe6450c5899 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,i18nsearch,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,i18nsearch,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,i18nsearch)) $(eval $(call gb_Library_use_libraries,i18nsearch,\ cppu \ diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index 675f61530a68..e98a4525bf6f 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,textconv_dict,\ -I$(SRCDIR)/i18npool/inc \ )) -$(eval $(call gb_Library_use_api,textconv_dict,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,textconv_dict)) $(eval $(call gb_Library_use_libraries,textconv_dict,\ $(gb_STDLIBS) \ diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index 216dbec10d93..10cdad6d0e56 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,i18nutil)) $(eval $(call gb_Library_use_package,i18nutil,i18nutil_inc)) -$(eval $(call gb_Library_use_api,i18nutil,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,i18nutil)) $(eval $(call gb_Library_add_defs,i18nutil,\ -DI18NUTIL_DLLIMPLEMENTATION \ diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk index 4c99452fe4d0..f3f37e2f7b69 100644 --- a/lingucomponent/Library_MacOSXSpell.mk +++ b/lingucomponent/Library_MacOSXSpell.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,MacOSXSpell,\ -I$(SRCDIR)/lingucomponent/source/lingutil \ )) -$(eval $(call gb_Library_use_api,MacOSXSpell,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,MacOSXSpell)) $(eval $(call gb_Library_use_libraries,MacOSXSpell,\ $(gb_STDLIBS) \ diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk index 0e1ea8d6bb3e..a2e3ad8bbbc3 100644 --- a/lingucomponent/Library_guesslang.mk +++ b/lingucomponent/Library_guesslang.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,guesslang)) $(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/languageguessing/guesslang)) -$(eval $(call gb_Library_use_api,guesslang,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,guesslang)) $(eval $(call gb_Library_use_libraries,guesslang,\ $(gb_STDLIBS) \ diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index d518d6331f43..1fd9e79aaa61 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,hyphen,\ -I$(SRCDIR)/lingucomponent/source/lingutil \ )) -$(eval $(call gb_Library_use_api,hyphen,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,hyphen)) $(eval $(call gb_Library_use_libraries,hyphen,\ $(gb_STDLIBS) \ diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index ae392621d26b..a406d83ada5b 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,lnth,\ -I$(SRCDIR)/lingucomponent/source/lingutil \ )) -$(eval $(call gb_Library_use_api,lnth,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,lnth)) $(eval $(call gb_Library_use_libraries,lnth,\ $(gb_STDLIBS) \ diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index 1914917bae83..a9349e089ca6 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,spell,\ -I$(SRCDIR)/lingucomponent/source/lingutil \ )) -$(eval $(call gb_Library_use_api,spell,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,spell)) $(eval $(call gb_Library_use_libraries,spell,\ $(gb_STDLIBS) \ diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index f9a363bc7d99..4459c458405d 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,lng,\ -I$(SRCDIR)/linguistic/inc \ )) -$(eval $(call gb_Library_use_api,lng,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,lng)) $(eval $(call gb_Library_add_defs,lng,\ -DLNG_DLLIMPLEMENTATION \ diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index b6e92cd5af5d..5d6ffb2e99d1 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,lwpft,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,lwpft,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,lwpft)) $(eval $(call gb_Library_use_libraries,lwpft,\ comphelper \ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 928e0b641b1d..8a48bdca2efb 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -54,10 +54,7 @@ $(eval $(call gb_Library_add_defs,oox,\ -DOOX_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,oox,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,oox)) $(eval $(call gb_Library_use_libraries,oox,\ basegfx \ diff --git a/package/Library_package2.mk b/package/Library_package2.mk index 987c34296f59..e5b5023de7a8 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,package2,\ -I$(SRCDIR)/package/inc \ )) -$(eval $(call gb_Library_use_api,package2,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,package2)) $(eval $(call gb_Library_add_defs,package2,\ -DDLLIMPLEMENTATION_PACKAGE \ diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 458e4a0426dd..a91533f98f87 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,xstor,\ -I$(SRCDIR)/package/inc \ )) -$(eval $(call gb_Library_use_api,xstor,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xstor)) $(eval $(call gb_Library_use_libraries,xstor,\ comphelper \ diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index cfae49a93b05..bdfec9f9cf33 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_add_defs,spa,\ -DSPA_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,spa,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,spa)) $(eval $(call gb_Library_use_libraries,spa,\ svt \ diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index 4599c7696d34..e7714c4bddd3 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,i18nregexp)) $(eval $(call gb_Library_use_package,i18nregexp,regexp_inc)) -$(eval $(call gb_Library_use_api,i18nregexp,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,i18nregexp)) $(eval $(call gb_Library_add_defs,i18nregexp,\ -DREGEXP_DLLIMPLEMENTATION \ diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 0e18a8e9c736..ae4318ffea52 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -38,10 +38,7 @@ $(eval $(call gb_Library_add_defs,rpt,\ -DREPORTDESIGN_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,rpt,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,rpt)) $(eval $(call gb_Library_use_libraries,rpt,\ comphelper \ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 83d91f36c8c2..3755165032b1 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,rptui,\ -I$(SRCDIR)/reportdesign/source/ui/inc \ )) -$(eval $(call gb_Library_use_api,rptui,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,rptui)) $(eval $(call gb_Library_use_libraries,rptui,\ comphelper \ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index d27e64b91cff..bdc3cdaeda02 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,rptxml,\ -I$(SRCDIR)/reportdesign/source/inc \ )) -$(eval $(call gb_Library_use_api,rptxml,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,rptxml)) $(eval $(call gb_Library_use_libraries,rptxml,\ comphelper \ diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index dca2b33d461c..9710431c2337 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -12,10 +12,7 @@ $(eval $(call gb_Library_Library,expwrap)) $(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap)) -$(eval $(call gb_Library_use_api,expwrap,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,expwrap)) $(eval $(call gb_Library_use_externals,expwrap,\ expat_utf16 \ diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index e866cb89bdd5..212752bdc47b 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -11,10 +11,7 @@ $(eval $(call gb_Library_Library,fastsax)) $(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax)) -$(eval $(call gb_Library_use_api,fastsax,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fastsax)) $(eval $(call gb_Library_use_externals,fastsax,\ expat_utf8 \ diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 9b6b8600188a..690bff77d22f 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -13,10 +13,7 @@ $(eval $(call gb_Library_use_package,sax,\ sax_inc \ )) -$(eval $(call gb_Library_use_api,sax,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sax)) $(eval $(call gb_Library_use_libraries,sax,\ comphelper \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 274c50470b7d..cba0dabd5c5c 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -40,10 +40,7 @@ $(eval $(call gb_Library_add_defs,sc,\ -DSC_INFO_OSVERSION=\"$(OS)\" \ )) -$(eval $(call gb_Library_use_api,sc,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sc)) $(eval $(call gb_Library_use_libraries,sc,\ avmedia \ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index c85f0397d040..6b74917f62f6 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_set_include,scd,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,scd,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,scd)) $(eval $(call gb_Library_use_libraries,scd,\ comphelper \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 388686ca4c74..76066b64d0ad 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,scfilt,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,scfilt,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,scfilt)) $(eval $(call gb_Library_use_libraries,scfilt,\ basegfx \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 0cb2780a6f25..bcde415a7544 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,scui,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,scui,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,scui)) $(eval $(call gb_Library_use_libraries,scui,\ comphelper \ diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index a889f4416e8f..2db18f5c22dd 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,solver)) $(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/solver)) -$(eval $(call gb_Library_use_api,solver,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,solver)) $(eval $(call gb_Library_use_libraries,solver,\ comphelper \ diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index 0bc98fd77db3..a71e3e61dcee 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,basprov,\ -I$(SRCDIR)/scripting/source/inc \ )) -$(eval $(call gb_Library_use_api,basprov,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,basprov)) $(eval $(call gb_Library_use_libraries,basprov,\ comphelper \ diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index dcac02f836e1..35e47be7047a 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,protocolhandler,\ -I$(SRCDIR)/scripting/source/inc \ )) -$(eval $(call gb_Library_use_api,protocolhandler,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,protocolhandler)) $(eval $(call gb_Library_use_libraries,protocolhandler,\ cppu \ diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index 1c3a1030ecc5..ee5f420e9e08 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,scriptframe,\ -I$(SRCDIR)/scripting/source/inc \ )) -$(eval $(call gb_Library_use_api,scriptframe,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,scriptframe)) $(eval $(call gb_Library_use_libraries,scriptframe,\ comphelper \ diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index 271ec3de0b7f..faca2a0f660c 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,stringresource,\ -I$(SRCDIR)/scripting/source/inc \ )) -$(eval $(call gb_Library_use_api,stringresource,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,stringresource)) $(eval $(call gb_Library_use_libraries,stringresource,\ cppu \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 2f3c0d0bc4c4..07b85ea726fd 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -71,10 +71,7 @@ $(eval $(call gb_Library_set_defs,sd,\ )) endif -$(eval $(call gb_Library_use_api,sd,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sd)) $(eval $(call gb_Library_use_libraries,sd,\ avmedia \ diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index 5fe3c0da4c30..68d6b6dd8b64 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,sdd,\ -I$(SRCDIR)/sd/inc \ )) -$(eval $(call gb_Library_use_api,sdd,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sdd)) $(eval $(call gb_Library_use_libraries,sdd,\ cppu \ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 327ac8b5cc8b..3250fbfa114b 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -42,10 +42,7 @@ $(eval $(call gb_Library_add_defs,sdfilt,\ )) endif -$(eval $(call gb_Library_use_api,sdfilt,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sdfilt)) $(eval $(call gb_Library_use_libraries,sdfilt,\ comphelper \ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index a83d9449f018..102f88bbcf2f 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_add_defs,sdui,\ -DSD_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,sdui,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sdui)) $(eval $(call gb_Library_use_libraries,sdui,\ basegfx \ diff --git a/sdext/Library_minimizer.mk b/sdext/Library_minimizer.mk index 5c918c390b51..409b146d48f4 100644 --- a/sdext/Library_minimizer.mk +++ b/sdext/Library_minimizer.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,SunPresentationMinimizer)) $(eval $(call gb_Library_set_componentfile,SunPresentationMinimizer,sdext/source/minimizer/minimizer)) -$(eval $(call gb_Library_use_api,SunPresentationMinimizer,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,SunPresentationMinimizer)) $(eval $(call gb_Library_use_libraries,SunPresentationMinimizer,\ cppu \ diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk index ddc6f3baed32..11f4f07473c7 100644 --- a/sdext/Library_pdfimport.mk +++ b/sdext/Library_pdfimport.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,pdfimport)) $(eval $(call gb_Library_set_componentfile,pdfimport,sdext/source/pdfimport/pdfimport)) -$(eval $(call gb_Library_use_api,pdfimport,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,pdfimport)) $(eval $(call gb_Library_set_include,pdfimport,\ -I$(SRCDIR)/sdext/source/pdfimport/inc \ diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk index 058d8be025fc..ca404ca9f33d 100644 --- a/sdext/Library_presenter.mk +++ b/sdext/Library_presenter.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,PresenterScreen)) $(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter)) -$(eval $(call gb_Library_use_api,PresenterScreen,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,PresenterScreen)) $(eval $(call gb_Library_add_defs,PresenterScreen,\ -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(sdext_PLATFORM)\" \ diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index a1372e5d94f0..2ed08afa1c24 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\ -I$(SRCDIR)/sfx2/inc/sfx2 \ )) -$(eval $(call gb_Library_use_api,qstart_gtk,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,qstart_gtk)) $(eval $(call gb_Library_add_defs,qstart_gtk,\ -DENABLE_QUICKSTART_APPLET \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 6da9165dbcc3..562d3c24454e 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx)) -$(eval $(call gb_Library_use_api,sfx,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sfx)) $(eval $(call gb_Library_set_include,sfx,\ -I$(SRCDIR)/sfx2/inc \ diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index 0c2fad896c0f..90821f6c1822 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -27,10 +27,7 @@ $(eval $(call gb_Library_Library,desktopbe1)) -$(eval $(call gb_Library_use_api,desktopbe1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,desktopbe1)) $(eval $(call gb_Library_use_libraries,desktopbe1,\ cppu \ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index 061689863b91..5e513237caba 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,gconfbe1,\ )) endif -$(eval $(call gb_Library_use_api,gconfbe1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,gconfbe1)) $(eval $(call gb_Library_use_externals,gconfbe1,\ gconf \ diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk index 4aa63bd4755a..c31fb68afea8 100644 --- a/shell/Library_kde4be.mk +++ b/shell/Library_kde4be.mk @@ -27,10 +27,7 @@ $(eval $(call gb_Library_Library,kde4be1)) -$(eval $(call gb_Library_use_api,kde4be1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,kde4be1)) $(eval $(call gb_Library_use_externals,kde4be1,\ kde4 \ diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index 3761a8bdd559..a367c8d62bf8 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_add_libs,kdebe1,\ -lkio \ )) -$(eval $(call gb_Library_use_api,kdebe1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,kdebe1)) $(eval $(call gb_Library_use_externals,kdebe1,\ kde \ diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index bb305c11a46c..425124717272 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -27,10 +27,7 @@ $(eval $(call gb_Library_Library,macbe1)) -$(eval $(call gb_Library_use_api,macbe1,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,macbe1)) $(eval $(call gb_Library_use_internal_api,macbe1,\ macbe \ diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index aea171af95f8..a6ca92b2e391 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_use_packages,tdebe1,\ shell_inc \ )) -$(eval $(call gb_Library_use_api,tdebe1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,tdebe1)) $(eval $(call gb_Library_use_externals,tdebe1,\ tde \ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 91e6a02d78fa..f658f7f1eb9c 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -48,10 +48,7 @@ $(eval $(call gb_Executable_set_defs,demoshow,\ )) endif -$(eval $(call gb_Library_use_api,demoshow,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,demoshow)) $(eval $(call gb_Executable_use_libraries,demoshow,\ basegfx \ diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index b4f634f5da9c..51e9bbdffe16 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -43,10 +43,7 @@ $(eval $(call gb_Library_add_defs,OGLTrans,\ )) endif -$(eval $(call gb_Library_use_api,OGLTrans,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,OGLTrans)) $(eval $(call gb_Library_use_libraries,OGLTrans,\ canvastools \ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 658456d0a8ba..68c940aa21ca 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -47,10 +47,7 @@ $(eval $(call gb_Library_add_defs,slideshow,\ )) endif -$(eval $(call gb_Library_use_api,slideshow,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,slideshow)) $(eval $(call gb_Library_use_libraries,slideshow,\ avmedia \ diff --git a/smoketest/Library_smoketest.mk b/smoketest/Library_smoketest.mk index c62e015c08fd..5832bd471e0c 100644 --- a/smoketest/Library_smoketest.mk +++ b/smoketest/Library_smoketest.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,smoketest,\ -DCPPUNIT_PLUGIN_EXPORT='extern "C" SAL_DLLPUBLIC_EXPORT' \ )) -$(eval $(call gb_Library_use_api,smoketest,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,smoketest)) $(eval $(call gb_Library_use_libraries,smoketest,\ cppu \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index a89676edeed7..fd3269c01f8a 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -109,6 +109,10 @@ $(eval $(foreach method,\ set_library_path_flags \ add_api \ use_api \ + use_sdk_api \ + use_sdk_api \ + use_udk_api \ + use_udk_api \ add_internal_api \ use_internal_api \ add_internal_bootstrap_api \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index cb043d0f4350..1471b040be5c 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -190,6 +190,10 @@ $(eval $(foreach method,\ set_library_path_flags \ add_api \ use_api \ + use_sdk_api \ + use_sdk_api \ + use_udk_api \ + use_udk_api \ add_internal_api \ use_internal_api \ add_internal_bootstrap_api \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index e4185a03ed47..7036bfa4f8f3 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -642,6 +642,15 @@ $(foreach api,$(2),$(call gb_LinkTarget__use_api,$(1),$(api))) endef +define gb_LinkTarget_use_udk_api +$(call gb_LinkTarget__use_api,$(1),udkapi) +endef + +define gb_LinkTarget_use_sdk_api +$(call gb_LinkTarget__use_api,$(1),udkapi) +$(call gb_LinkTarget__use_api,$(1),offapi) +endef + define gb_LinkTarget__use_internal_api_one $(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ $(call gb_UnoApiHeadersTarget_get_$(3)target,$(2)) diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index 5f620bc06fb2..ddb21b2ce9a6 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,sot,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,sot,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sot)) $(eval $(call gb_Library_add_defs,sot,\ -DSOT_DLLIMPLEMENTATION \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 6546f5fd9f68..f23cfd94eb0c 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,sm,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,sm,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sm)) $(eval $(call gb_Library_use_libraries,sm,\ comphelper \ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index e47a54746c67..86d4fb28f8ed 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_set_include,smd,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,smd,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,smd)) $(eval $(call gb_Library_use_libraries,smd,\ cppu \ diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 48a06d94f2a0..fc65cb13aa8a 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,fsstorage,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,fsstorage,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,fsstorage)) $(eval $(call gb_Library_use_libraries,fsstorage,\ comphelper \ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index d09ad30b40d7..b9d5dc0e2a09 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,passwordcontainer,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,passwordcontainer)) $(eval $(call gb_Library_use_libraries,passwordcontainer,\ cppu \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 603154f7ff1a..41f91b5d062d 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,svl,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,svl,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,svl)) $(eval $(call gb_Library_add_defs,svl,\ -DSVL_DLLIMPLEMENTATION \ diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index fd89a7dd4933..52ab67c58d82 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\ -I$(SRCDIR)/svtools/inc \ )) -$(eval $(call gb_Library_use_api,hatchwindowfactory,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,hatchwindowfactory)) $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ cppu \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 139e632cbf07..7ae873aa1f14 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -32,10 +32,7 @@ $(eval $(call gb_Library_use_package,svt,svtools_inc)) $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt)) -$(eval $(call gb_Library_use_api,svt,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,svt)) $(eval $(call gb_Library_set_include,svt,\ $$(INCLUDE) \ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index c294c73d39da..3ce31edd0a48 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,svx,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,svx,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,svx)) $(eval $(call gb_Library_add_defs,svx,\ -DSVX_DLLIMPLEMENTATION \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 3dfdc2389203..605cea73a8c2 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_use_packages,svxcore,\ svx_sdi \ )) -$(eval $(call gb_Library_use_api,svxcore,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,svxcore)) $(eval $(call gb_Library_set_include,svxcore,\ -I$(SRCDIR)/svx/inc \ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 70ba60699ac9..50b5074adbb7 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,textconversiondlgs,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,textconversiondlgs,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,textconversiondlgs)) $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ comphelper \ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 8507bc1d7ddb..54bb731aee69 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,msword,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,msword,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,msword)) $(eval $(call gb_Library_use_libraries,msword,\ basegfx \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index dc25ed8acc57..0e85e0e61b03 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -41,10 +41,7 @@ $(eval $(call gb_Library_set_include,sw,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,sw,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,sw)) $(eval $(call gb_Library_add_defs,sw,\ -DSW_DLLIMPLEMENTATION \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index e084ea7f02cf..be6ea9fed723 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -38,10 +38,7 @@ $(eval $(call gb_Library_set_include,swd,\ -I$(SRCDIR)/sw/source/ui/inc \ )) -$(eval $(call gb_Library_use_api,swd,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,swd)) $(eval $(call gb_Library_add_defs,swd,\ -DSWD_DLLIMPLEMENTATION \ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 3dd01176f8c0..86c7372b2eee 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,swui,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,swui,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,swui)) ifeq ($(SYSTEM_LIBXML),YES) $(eval $(call gb_Library_add_cxxflags,swui,\ diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 90a6647c87ac..b829dd46d7c5 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -31,10 +31,7 @@ $(eval $(call gb_Library_add_defs,subsequenttest,\ -DOOO_DLLIMPLEMENTATION_TEST \ )) -$(eval $(call gb_Library_use_api,subsequenttest,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,subsequenttest)) $(eval $(call gb_Library_use_libraries,subsequenttest,\ comphelper \ diff --git a/test/Library_test.mk b/test/Library_test.mk index 8ca0289364e5..d641b9ca61d3 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,test,\ -DOOO_DLLIMPLEMENTATION_TEST \ )) -$(eval $(call gb_Library_use_api,test,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,test)) $(eval $(call gb_Library_use_externals,test,\ libxml2 \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index ddcfa82f7a85..b242b84adf73 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -42,10 +42,7 @@ $(eval $(call gb_Library_add_defs,tk,\ -DTOOLKIT_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,tk,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,tk)) $(eval $(call gb_Library_use_libraries,tk,\ comphelper \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index b8cb8f45936e..1cb91c6da67a 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -41,10 +41,7 @@ $(eval $(call gb_Library_add_defs,tl,\ -DTOOLS_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,tl,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,tl)) $(eval $(call gb_Library_use_libraries,tl,\ basegfx \ diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk index 17d1f4529084..fda47419328f 100644 --- a/touch/Library_libotouch.mk +++ b/touch/Library_libotouch.mk @@ -13,10 +13,7 @@ $(eval $(call gb_Library_set_include,libotouch,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,libotouch,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,libotouch)) $(eval $(call gb_Library_use_internal_comprehensive_api,libotouch,\ touch \ diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index 2ef218a4f4b9..e548fa710099 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,cached1)) $(eval $(call gb_Library_set_componentfile,cached1,ucb/source/cacher/cached1)) -$(eval $(call gb_Library_use_api,cached1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,cached1)) $(eval $(call gb_Library_use_libraries,cached1,\ cppu \ diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index 09f3302088c5..7beb741e7465 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,srtrs1)) $(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1)) -$(eval $(call gb_Library_use_api,srtrs1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,srtrs1)) $(eval $(call gb_Library_use_libraries,srtrs1,\ cppu \ diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 32ca8baee823..a501f877a184 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,ucb1,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,ucb1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucb1)) $(eval $(call gb_Library_use_libraries,ucb1,\ comphelper \ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index 8237f6c85951..635aaa2cac87 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpcmis1)) $(eval $(call gb_Library_set_componentfile,ucpcmis1,ucb/source/ucp/cmis/ucpcmis1)) -$(eval $(call gb_Library_use_api,ucpcmis1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucpcmis1)) $(eval $(call gb_Library_use_libraries,ucpcmis1,\ cppu \ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 3d7d8d306bd9..91b3a975c1ce 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpdav1)) $(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1)) -$(eval $(call gb_Library_use_api,ucpdav1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucpdav1)) $(eval $(call gb_Library_use_libraries,ucpdav1,\ comphelper \ diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index 962cf2d90324..51c79e703c5c 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpexpand1)) $(eval $(call gb_Library_set_componentfile,ucpexpand1,ucb/source/ucp/expand/ucpexpand1)) -$(eval $(call gb_Library_use_api,ucpexpand1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucpexpand1)) $(eval $(call gb_Library_use_libraries,ucpexpand1,\ cppu \ diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index 9d648fbd8cc8..9e730003d3e9 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpext)) $(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext)) -$(eval $(call gb_Library_use_api,ucpext,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucpext)) $(eval $(call gb_Library_use_libraries,ucpext,\ comphelper \ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index db3e2739f72a..d0b301e12d6a 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpfile1)) $(eval $(call gb_Library_set_componentfile,ucpfile1,ucb/source/ucp/file/ucpfile1)) -$(eval $(call gb_Library_use_api,ucpfile1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucpfile1)) $(eval $(call gb_Library_use_libraries,ucpfile1,\ cppu \ diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index f0c6fc2b5d25..69e938ce9d8d 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpftp1)) $(eval $(call gb_Library_set_componentfile,ucpftp1,ucb/source/ucp/ftp/ucpftp1)) -$(eval $(call gb_Library_use_api,ucpftp1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucpftp1)) $(eval $(call gb_Library_use_libraries,ucpftp1,\ cppu \ diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk index c01b1255b93a..d986f2c3737c 100644 --- a/ucb/Library_ucpgio1.mk +++ b/ucb/Library_ucpgio1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpgio1)) $(eval $(call gb_Library_set_componentfile,ucpgio1,ucb/source/ucp/gio/ucpgio)) -$(eval $(call gb_Library_use_api,ucpgio1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucpgio1)) $(eval $(call gb_Library_use_libraries,ucpgio1,\ cppu \ diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk index 321359c20d04..213c7fc789de 100644 --- a/ucb/Library_ucpgvfs1.mk +++ b/ucb/Library_ucpgvfs1.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,ucpgvfs1,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,ucpgvfs1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucpgvfs1)) $(eval $(call gb_Library_add_libs,ucpgvfs1,\ $(GNOMEVFS_LIBS) \ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index d3c7030be320..ac33d001c686 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucphier1)) $(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucphier1)) -$(eval $(call gb_Library_use_api,ucphier1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucphier1)) $(eval $(call gb_Library_use_libraries,ucphier1,\ cppu \ diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk index 8536de71324b..84300e59ae63 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucpodma1)) $(eval $(call gb_Library_set_componentfile,ucpodma1,ucb/source/ucp/odma/ucpodma1)) -$(eval $(call gb_Library_use_api,ucpodma1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucpodma1)) $(eval $(call gb_Library_use_libraries,ucpodma1,\ cppu \ diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index 5f0aa247173a..8b0e8ec0fe12 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucppkg1)) $(eval $(call gb_Library_set_componentfile,ucppkg1,ucb/source/ucp/package/ucppkg1)) -$(eval $(call gb_Library_use_api,ucppkg1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucppkg1)) $(eval $(call gb_Library_use_libraries,ucppkg1,\ comphelper \ diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index d79f42e9b056..82b8aba0fc37 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,ucptdoc1)) $(eval $(call gb_Library_set_componentfile,ucptdoc1,ucb/source/ucp/tdoc/ucptdoc1)) -$(eval $(call gb_Library_use_api,ucptdoc1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucptdoc1)) $(eval $(call gb_Library_use_libraries,ucptdoc1,\ comphelper \ diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index 676741e2b8da..0c761a659d3b 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -11,10 +11,7 @@ $(eval $(call gb_Library_Library,ucbhelper)) $(eval $(call gb_Library_use_package,ucbhelper,ucbhelper_inc)) -$(eval $(call gb_Library_use_api,ucbhelper,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucbhelper)) $(eval $(call gb_Library_use_libraries,ucbhelper,\ cppu \ diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index 26b7a2cbf732..0119fbdea40a 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,unobootstrapprotector)) $(eval $(call gb_Library_use_package,unobootstrapprotector,unotest_inc)) -$(eval $(call gb_Library_use_api,unobootstrapprotector,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,unobootstrapprotector)) $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\ comphelper \ diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index fc850fc584c9..1f5a584d11b6 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,unoexceptionprotector)) $(eval $(call gb_Library_use_package,unoexceptionprotector,unotest_inc)) -$(eval $(call gb_Library_use_api,unoexceptionprotector,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,unoexceptionprotector)) $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ cppu \ diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index 0d3672e33fae..f4dd2222a007 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,unotest,\ -DOOO_DLLIMPLEMENTATION_UNOTEST \ )) -$(eval $(call gb_Library_use_api,unotest,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,unotest)) $(eval $(call gb_Library_use_libraries,unotest,\ comphelper \ diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 69708a12737f..97e1d70f35fd 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -47,10 +47,7 @@ $(eval $(call gb_Library_add_defs,utl,\ -DUNOTOOLS_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,utl,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,utl)) # add libraries to be linked to utl; again these names need to be given as # specified in Repository.mk diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index a14ec7846007..df9cd450cd63 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,unordf,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,unordf,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,unordf)) $(eval $(call gb_Library_use_libraries,unordf,\ comphelper \ diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index b744d00eaab5..880efc1edfa0 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,unoxml,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,unoxml,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,unoxml)) $(eval $(call gb_Library_use_libraries,unoxml,\ ucbhelper \ diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index b91002c7adb8..87cff350a831 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,uui)) $(eval $(call gb_Library_set_componentfile,uui,uui/util/uui)) -$(eval $(call gb_Library_use_api,uui,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,uui)) $(eval $(call gb_Library_use_libraries,uui,\ comphelper \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 4aa4609931be..91438e9c2d54 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -39,10 +39,7 @@ $(eval $(call gb_Library_add_defs,desktop_detector,\ -DDESKTOP_DETECTOR_IMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,desktop_detector,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,desktop_detector)) $(eval $(call gb_Library_use_libraries,desktop_detector,\ vcl \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 451c15b4f709..4079e3a697c6 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -65,10 +65,7 @@ $(eval $(call gb_Library_add_defs,vcl,\ -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ )) -$(eval $(call gb_Library_use_api,vcl,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,vcl)) $(eval $(call gb_Library_use_libraries,vcl,\ tl \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index c018a9d1c728..845c568bfdb1 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,vclplug_gen,\ -I$(SRCDIR)/vcl/inc \ )) -$(eval $(call gb_Library_use_api,vclplug_gen,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,vclplug_gen)) $(eval $(call gb_Library_use_libraries,vclplug_gen,\ vcl \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index e816fcf1758b..4684aa18f474 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -40,10 +40,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\ -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) -$(eval $(call gb_Library_use_api,vclplug_gtk,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,vclplug_gtk)) $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ vclplug_gen \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 120199c310aa..187773c6b719 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -47,10 +47,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\ -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) -$(eval $(call gb_Library_use_api,vclplug_gtk3,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,vclplug_gtk3)) $(eval $(call gb_Library_add_libs,vclplug_gtk3,\ $$(GTK3_LIBS) \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 95cd1c32ac69..5f405cc6f47a 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -41,10 +41,7 @@ $(eval $(call gb_Library_add_defs,vclplug_kde,\ -DVCLPLUG_KDE_IMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,vclplug_kde,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,vclplug_kde)) $(eval $(call gb_Library_use_libraries,vclplug_kde,\ vclplug_gen \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 256d2eecfdaa..057ea274354a 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -39,10 +39,7 @@ $(eval $(call gb_Library_add_defs,vclplug_kde4,\ -DVCLPLUG_KDE4_IMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,vclplug_kde4,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,vclplug_kde4)) $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ vclplug_gen \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index ba0831ff9498..f859b1ef4104 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -41,10 +41,7 @@ $(eval $(call gb_Library_add_defs,vclplug_svp,\ -DVCLPLUG_SVP_IMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,vclplug_svp,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,vclplug_svp)) $(eval $(call gb_Library_use_libraries,vclplug_svp,\ vcl \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index d4bf1efd5d41..b698cb45552f 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -42,10 +42,7 @@ $(eval $(call gb_Library_add_defs,vclplug_tde,\ -DVCLPLUG_TDE_IMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,vclplug_tde,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,vclplug_tde)) $(eval $(call gb_Library_add_libs,vclplug_tde,\ $$(TDE_LIBS) \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 2efffc394090..a405090f9ca3 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,writerfilter,\ -I$(SRCDIR)/writerfilter/source \ )) -$(eval $(call gb_Library_use_api,writerfilter,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,writerfilter)) $(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter)) diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index 9ad3021b7f07..ddf51243f4d9 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -36,10 +36,7 @@ $(eval $(call gb_Library_add_defs,writerfilter_uno,\ -DWRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,writerfilter_uno,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,writerfilter_uno)) $(eval $(call gb_Library_use_libraries,writerfilter_uno,\ comphelper \ diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index bd792f759455..4e42a1489596 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,wpftdraw,\ -I$(SRCDIR)/writerperfect/source \ )) -$(eval $(call gb_Library_use_api,wpftdraw,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,wpftdraw)) $(eval $(call gb_Library_use_libraries,wpftdraw,\ comphelper \ diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index 047f2cf52b7a..f71c87c36d6b 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,wpftwriter,\ -I$(SRCDIR)/writerperfect/source \ )) -$(eval $(call gb_Library_use_api,wpftwriter,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,wpftwriter)) $(eval $(call gb_Library_use_libraries,wpftwriter,\ comphelper \ diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk index 8ea50cd443f9..d9ad22fcfe30 100644 --- a/xmlhelp/Library_tvhlp1.mk +++ b/xmlhelp/Library_tvhlp1.mk @@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,tvhlp1)) $(eval $(call gb_Library_set_componentfile,tvhlp1,xmlhelp/source/treeview/tvhlp1)) -$(eval $(call gb_Library_use_api,tvhlp1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,tvhlp1)) $(eval $(call gb_Library_use_externals,tvhlp1,\ expat_utf8 \ diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index 2dfe46f4edcf..d98200da17aa 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -53,10 +53,7 @@ $(eval $(call gb_Library_set_include,ucpchelp1,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,ucpchelp1,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,ucpchelp1)) $(eval $(call gb_Library_use_externals,ucpchelp1,\ berkeleydb \ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index bd3bdb066607..468f966a90f5 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -41,10 +41,7 @@ $(eval $(call gb_Library_add_defs,xo,\ -DXMLOFF_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_api,xo,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xo)) $(eval $(call gb_Library_use_libraries,xo,\ basegfx \ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 2b7f17af91c9..4efd62b0ff72 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,xof,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_api,xof,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xof)) $(eval $(call gb_Library_use_libraries,xof,\ comphelper \ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index 2e6b0bffbdd3..e254b197b22b 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -47,9 +47,6 @@ $(eval $(call gb_Library_add_exception_objects,xmlreader,\ xmlreader/source/xmlreader \ )) -$(eval $(call gb_Library_use_api,xmlreader,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xmlreader)) # vim: set noet sw=4 ts=4: diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk index d3aa64294104..7bdcf4827ffc 100644 --- a/xmlscript/Library_xcr.mk +++ b/xmlscript/Library_xcr.mk @@ -13,10 +13,7 @@ $(eval $(call gb_Library_use_package,xcr,xmlscript_inc)) $(eval $(call gb_Library_set_componentfile,xcr,xmlscript/util/xcr)) -$(eval $(call gb_Library_use_api,xcr,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xcr)) $(eval $(call gb_Library_use_libraries,xcr,\ comphelper \ diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index ad8c0971910f..aae123bd8c47 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,xmlsecurity,\ -I$(SRCDIR)/xmlsecurity/inc \ )) -$(eval $(call gb_Library_use_api,xmlsecurity,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xmlsecurity)) $(eval $(call gb_Library_use_libraries,xmlsecurity,\ comphelper \ diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 74a55d14adbd..4ea0768b4d51 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,xsec_fw,\ -I$(SRCDIR)/xmlsecurity/inc \ )) -$(eval $(call gb_Library_use_api,xsec_fw,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xsec_fw)) $(eval $(call gb_Library_use_libraries,xsec_fw,\ cppu \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 915acab22a7d..a6beb3513a94 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\ -I$(SRCDIR)/xmlsecurity/source/xmlsec \ )) -$(eval $(call gb_Library_use_api,xsec_xmlsec,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_Library_use_sdk_api,xsec_xmlsec)) $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXMLSEC_NO_XSLT \ |