diff options
author | Michael Stahl <mst@openoffice.org> | 2011-04-13 16:11:41 +0000 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 14:24:10 +0200 |
commit | bd162cb75a4115affb5451584bd9f094f3e37905 (patch) | |
tree | 462c5ae1fbb5bf3a6b40398a8f32aefda886d980 /vcl | |
parent | e9f6edc64553e458e15111aca6f3e778eb7afa2c (diff) |
gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/Library_desktop_detector.mk | 3 | ||||
-rwxr-xr-x | vcl/Library_vcl.mk | 18 | ||||
-rwxr-xr-x | vcl/Library_vclplug_gen.mk | 18 | ||||
-rwxr-xr-x | vcl/Library_vclplug_gtk.mk | 6 | ||||
-rwxr-xr-x | vcl/Library_vclplug_kde.mk | 3 | ||||
-rwxr-xr-x | vcl/Library_vclplug_kde4.mk | 3 | ||||
-rwxr-xr-x | vcl/Library_vclplug_svp.mk | 3 |
7 files changed, 18 insertions, 36 deletions
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 \ )) |