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/Library_vcl.mk | |
| parent | e9f6edc64553e458e15111aca6f3e778eb7afa2c (diff) | |
gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rwxr-xr-x | vcl/Library_vcl.mk | 18 |
1 files changed, 6 insertions, 12 deletions
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,\ |