diff options
34 files changed, 51 insertions, 131 deletions
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index ae4b6bbe0463..719b97b6b553 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -48,8 +48,4 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_set_include,basebmp_test,\ - $$(INCLUDE) \ -)) - # vim: set noet sw=4 ts=4: diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index a835c417d214..0a2dffde48f1 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -36,8 +36,7 @@ $(eval $(call gb_Library_set_include,basebmp,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,basebmp,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,basebmp,\ -DBASEBMP_DLLIMPLEMENTATION \ )) diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index cef63ab4f72a..7fc527f3f103 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,basegfx,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,basegfx,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,basegfx,\ -DBASEGFX_DLLIMPLEMENTATION \ )) diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk index 3c871fd293c9..36f6117a1171 100644 --- a/basegfx/StaticLibrary_basegfx_s.mk +++ b/basegfx/StaticLibrary_basegfx_s.mk @@ -44,8 +44,7 @@ $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\ # this means that all code of this static library will end in a dll # thus the _DLL define must be set to avoid link problems with stlport symbols # the BASEGFX_STATICLIBRARY define will expand all BASEGFX_DLLPRIVATE/PUBLIC macros to nothing -$(eval $(call gb_StaticLibrary_set_defs,basegfx_s,\ - $$(DEFS) \ +$(eval $(call gb_StaticLibrary_add_defs,basegfx_s,\ -DBASEGFX_STATICLIBRARY \ -D_DLL \ )) diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 02b7fc323a59..e1b7182100f3 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -36,13 +36,8 @@ $(eval $(call gb_Library_set_include,cairocanvas,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,cairocanvas,\ - $$(DEFS) \ -)) - ifneq ($(strip $(VERBOSE)$(verbose)),) -$(eval $(call gb_Library_set_defs,cairocanvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,cairocanvas,\ -DVERBOSE \ )) endif diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 4992f9ca8e6c..8078e48e8a5b 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -36,10 +36,6 @@ $(eval $(call gb_Library_set_include,canvasfactory,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,canvasfactory,\ - $$(DEFS) \ -)) - $(eval $(call gb_Library_add_linked_libs,canvasfactory,\ sal \ stl \ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index f686e749c8b9..32f6ff5037f4 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -38,21 +38,18 @@ $(eval $(call gb_Library_set_include,canvastools,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,canvastools,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,canvastools,\ -DCANVASTOOLS_DLLIMPLEMENTATION \ )) ifneq ($(strip $(VERBOSE)$(verbose)),) -$(eval $(call gb_Library_set_defs,canvastools,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,canvastools,\ -DVERBOSE \ )) endif ifneq ($(strip $(PROFILER)$(profiler)),) -$(eval $(call gb_Library_set_defs,canvastools,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,canvastools,\ -DPROFILER \ )) endif @@ -87,7 +84,7 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/verifyinput \ )) -ifeq ($(strip $(ENABLE_AGG)),YES) +ifeq ($(strip $(ENABLE_AGG)),YES) $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/bitmap \ canvas/source/tools/image \ @@ -95,9 +92,8 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\ $(eval $(call gb_Library_add_linked_libs,canvastools,\ agg \ )) -ifneq ($(strip $(AGG_VERSION)),) -$(eval $(call gb_Library_set_defs,canvastools,\ - $$(DEFS) \ +ifneq ($(strip $(AGG_VERSION)),) +$(eval $(call gb_Library_add_defs,canvastools,\ -DAGG_VERSION=$(AGG_VERSION) \ )) endif diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk index f3356fd24b80..44139093817f 100644 --- a/canvas/Library_directx5canvas.mk +++ b/canvas/Library_directx5canvas.mk @@ -37,14 +37,12 @@ $(eval $(call gb_Library_set_include,directx5canvas,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,directx5canvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,directx5canvas,\ -DDIRECTX_VERSION=0x0500 \ )) ifneq ($(strip $(VERBOSE)$(verbose)),) -$(eval $(call gb_Library_set_defs,directx5canvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,directx5canvas,\ -DVERBOSE \ )) endif diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 06a4dc064d9a..cb8264d01c8d 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -36,14 +36,12 @@ $(eval $(call gb_Library_set_include,directx9canvas,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,directx9canvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,directx9canvas,\ -DDIRECTX_VERSION=0x0900 \ )) ifneq ($(strip $(VERBOSE)$(verbose)),) -$(eval $(call gb_Library_set_defs,directx9canvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,directx9canvas,\ -DVERBOSE \ )) endif diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index db295261b73f..f5b2bc32e18e 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -36,14 +36,12 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,gdipluscanvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,gdipluscanvas,\ -DDIRECTX_VERSION=0x0900 \ )) ifneq ($(strip $(VERBOSE)$(verbose)),) -$(eval $(call gb_Library_set_defs,gdipluscanvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,gdipluscanvas,\ -DVERBOSE \ )) endif diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index e2403d325c3f..ecd7b862b101 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -34,13 +34,8 @@ $(eval $(call gb_Library_set_include,nullcanvas,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,nullcanvas,\ - $$(DEFS) \ -)) - ifneq ($(strip $(VERBOSE)$(verbose)),) -$(eval $(call gb_Library_set_defs,nullcanvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,nullcanvas,\ -DVERBOSE \ )) endif diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index 570e728d2056..831177f05f9e 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -36,13 +36,8 @@ $(eval $(call gb_Library_set_include,simplecanvas,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,simplecanvas,\ - $$(DEFS) \ -)) - ifneq ($(strip $(VERBOSE)$(verbose)),) -$(eval $(call gb_Library_set_defs,simplecanvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,simplecanvas,\ -DVERBOSE \ )) endif diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 501fe3a71b80..5d5cf7825a02 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -36,13 +36,8 @@ $(eval $(call gb_Library_set_include,vclcanvas,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,vclcanvas,\ - $$(DEFS) \ -)) - ifneq ($(strip $(VERBOSE)$(verbose)),) -$(eval $(call gb_Library_set_defs,vclcanvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclcanvas,\ -DVERBOSE \ )) endif diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 0228d80b2f89..c50153b4f015 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -40,8 +40,7 @@ $(eval $(call gb_Library_set_include,comphelper,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,comphelper,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,comphelper,\ -DCOMPHELPER_DLLIMPLEMENTATION \ )) diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index c772811e9dca..81aeb9863a45 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,cppcanvas,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,cppcanvas,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,cppcanvas,\ -DCPPCANVAS_DLLIMPLEMENTATION \ )) diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index cb74c4fe15c5..5793f793fead 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -33,8 +33,7 @@ $(eval $(call gb_Library_set_include,spa,\ -I$(OUTDIR)/inc/stl \ )) -$(eval $(call gb_Library_set_defs,spa,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,spa,\ -DSPA_DLLIMPLEMENTATION \ )) diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index 4f6f0ec89f8b..463892dd2903 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -34,8 +34,7 @@ $(eval $(call gb_Library_set_include,i18nregexp,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,i18nregexp,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,i18nregexp,\ -DREGEXP_DLLIMPLEMENTATION \ )) diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index 6bea2f3e077b..174d22227c1c 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -35,10 +35,6 @@ $(eval $(call gb_Library_set_include,expwrap,\ -I$(SRCDIR)/sax/inc \ )) -$(eval $(call gb_Library_set_defs,expwrap,\ - $$(DEFS) \ -)) - $(eval $(call gb_Library_add_linked_libs,expwrap,\ sal \ cppu \ diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index e45fa5021311..62e4570a113f 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -35,10 +35,6 @@ $(eval $(call gb_Library_set_include,fastsax,\ -I$(SRCDIR)/sax/inc \ )) -$(eval $(call gb_Library_set_defs,fastsax,\ - $$(DEFS) \ -)) - $(eval $(call gb_Library_add_linked_libs,fastsax,\ sal \ cppu \ @@ -49,8 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,fastsax,\ )) ifeq ($(SYSTEM_ZLIB),YES) -$(eval $(call gb_Library_set_defs,fastsax,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,fastsax,\ -DSYSTEM_ZLIB \ )) endif diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 36e0066f60aa..d43c7f854307 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,sax,\ -I$(SRCDIR)/sax/inc \ )) -$(eval $(call gb_Library_set_defs,sax,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sax,\ -DSAX_DLLIMPLEMENTATION \ )) diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index ef7d22c35081..2f851f13c89e 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,sot,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,sot,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sot,\ -DSOT_DLLIMPLEMENTATION \ )) diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 0ad3ecc4aa87..97a8ae111da7 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -40,8 +40,7 @@ $(eval $(call gb_Library_set_include,svl,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,svl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,svl,\ -DSVL_DLLIMPLEMENTATION \ )) diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index a06a238bcce3..a21f3594014f 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -46,8 +46,7 @@ $(eval $(call gb_Library_set_include,svt,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,svt,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,svt,\ -DSVT_DLLIMPLEMENTATION \ )) diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index b370793f7eab..44bd96e02a3e 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,tk,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,tk,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,tk,\ -DTOOLKIT_DLLIMPLEMENTATION \ )) diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 234ff7c6ec75..72a4e679bec7 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,tl,\ -I$(OUTDIR)/inc/stl \ )) -$(eval $(call gb_Library_set_defs,tl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,tl,\ -DTOOLS_DLLIMPLEMENTATION \ -DVCL \ )) diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index 108c6192b833..754c1e704010 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,ucbhelper,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,ucbhelper,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,ucbhelper,\ -DUCBHELPER_DLLIMPLEMENTATION \ )) diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index dbd32accf47e..19909abc82af 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -52,8 +52,7 @@ $(eval $(call gb_Library_set_include,utl,\ # add any additional definitions to be set for compilation here # (e.g. -DLIB_DLLIMPLEMENTATION) -$(eval $(call gb_Library_set_defs,utl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,utl,\ -DUNOTOOLS_DLLIMPLEMENTATION \ )) diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 8f18f7af961c..33ef2145e03b 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,desktop_detector,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_defs,desktop_detector,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,desktop_detector,\ -DDESKTOP_DETECTOR_IMPLEMENTATION \ )) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 2b1c0dfcc00a..900ac3aca526 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -53,8 +53,7 @@ $(eval $(call gb_Library_set_include,vcl,\ )) endif -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vcl,\ -DVCL_DLLIMPLEMENTATION \ -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \ -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \ @@ -95,8 +94,7 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\ $(gb_OBJCXXFLAGS) \ )) ifeq ($(ENABLE_CAIRO),TRUE) -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vcl,\ -DCAIRO \ )) endif @@ -170,22 +168,19 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ endif ifeq ($(GUIBASE),unx) -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vcl,\ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ )) ## handle fontconfig ifneq ($(ENABLE_FONTCONFIG),) -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vcl,\ -DENABLE_FONTCONFIG \ )) ## handle CUPS ifneq ($(ENABLE_CUPS),) -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vcl,\ -DENABLE_CUPS \ )) endif @@ -419,8 +414,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ ## handle Graphite ifneq ($(ENABLE_GRAPHITE),) # add defines, graphite sources for all platforms -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vcl,\ -DENABLE_GRAPHITE \ )) $(eval $(call gb_Library_add_exception_objects,vcl,\ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 1c79bda510ee..4eec27640da4 100755 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -115,8 +115,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/window/salobj \ )) -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ -DVCLPLUG_GEN_IMPLEMENTATION \ )) @@ -124,8 +123,7 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\ ## handle RandR ifneq ($(ENABLE_RANDR),) -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_RANDR \ )) ifeq ($(XRANDR_DLOPEN),FALSE) @@ -137,8 +135,7 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ $(XRANDR_LIBS) \ )) else -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DXRANDR_DLOPEN \ )) endif @@ -148,8 +145,7 @@ endif ifneq ($(USE_XINERAMA),NO) ifneq ($(OS),SOLARIS) # not Solaris -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XORG \ )) ifeq ($(XINERAMA_LINK),dynamic) @@ -163,8 +159,7 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ endif else # Solaris -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XSUN \ )) ifeq ($(USE_XINERAMA_VERSION),Xorg) @@ -184,8 +179,7 @@ endif ## handle Render linking ifeq ($(XRENDER_LINK),YES) -$(eval $(call gb_Library_set_defs,vclplug_gen,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gen,\ -DXRENDER_LINK \ )) $(eval $(call gb_Library_add_libs,vclplug_gen,\ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 59aa6e845cc1..039ab3434d84 100755 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -42,15 +42,13 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ $$(GTK_CFLAGS) \ )) -$(eval $(call gb_Library_set_defs,vclplug_gtk,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gtk,\ -DVCLPLUG_GTK_IMPLEMENTATION \ -DVERSION=\"$(UPD)$(LAST_MINOR)\" \ )) ifneq ($(ENABLE_DBUS),) -$(eval $(call gb_Library_set_defs,vclplug_gtk,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gtk,\ -DENABLE_DBUS \ )) $(eval $(call gb_Library_add_libs,vclplug_gtk,\ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 5658b1eb672c..b751630353cc 100755 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,vclplug_kde,\ $$(KDE_CFLAGS) \ )) -$(eval $(call gb_Library_set_defs,vclplug_kde,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_kde,\ -DVCLPLUG_KDE_IMPLEMENTATION \ )) diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 317f10c0ea57..49626f4f70a3 100755 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,vclplug_kde4,\ $$(KDE4_CFLAGS) \ )) -$(eval $(call gb_Library_set_defs,vclplug_kde4,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_kde4,\ -DVCLPLUG_KDE4_IMPLEMENTATION \ )) diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 64b5f5656af8..e68d6c289e48 100755 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_defs,vclplug_svp,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_svp,\ -DVCLPLUG_SVP_IMPLEMENTATION \ )) |