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 | f79e31be8c0b96116c71362fcf804ae1a5ffd48d (patch) | |
tree | 561f012e1685b0af081bb5c6379b1dbf807272a0 /sfx2 | |
parent | 0b83137921ec8ad03e7e8bb34921510083e00dcc (diff) |
gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]
Diffstat (limited to 'sfx2')
-rwxr-xr-x | sfx2/Library_qstart.mk | 3 | ||||
-rwxr-xr-x | sfx2/Library_sfx.mk | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 9a21ef5659b7..ab8ced21b275 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\ $(filter -I%,$(GTK_CFLAGS)) \ )) -$(eval $(call gb_Library_set_defs,qstart_gtk,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,qstart_gtk,\ -DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \ -DENABLE_QUICKSTART_APPLET \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index a41404109d97..68fca0719e93 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -50,8 +50,7 @@ $(eval $(call gb_Library_set_include,sfx,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_defs,sfx,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sfx,\ -DSFX2_DLLIMPLEMENTATION \ )) @@ -247,8 +246,7 @@ $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\ )) ifeq ($(OS),$(filter WNT MACOSX,$(OS))) -$(eval $(call gb_Library_set_defs,sfx,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sfx,\ -DENABLE_QUICKSTART_APPLET \ )) endif |