diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:12:12 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:12:12 +0200 |
| commit | 906cd25f188b50546df808bc82ec557d3a6e404f (patch) | |
| tree | 0cfbeac129f7c37690c591f208d860ad4941f7a6 /sfx2 | |
| parent | 200bc6c582d6cf2365001f27928c1e3d1f9c9845 (diff) | |
postmerge fixes for gnumake4
Diffstat (limited to 'sfx2')
| -rwxr-xr-x | sfx2/Library_qstart.mk | 3 | ||||
| -rwxr-xr-x | sfx2/Library_sfx.mk | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 3e63dc9959c6..1c33b5279bc0 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -48,8 +48,7 @@ $(eval $(call gb_Library_add_defs,qstart_gtk,\ )) ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) -$(eval $(call gb_Library_set_defs,qstart_gtk,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,qstart_gtk,\ -DENABLE_SYSTRAY_GTK \ )) endif diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index d3d294158532..5b7999e873a4 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -59,8 +59,7 @@ $(eval $(call gb_Library_add_defs,sfx,\ )) ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) -$(eval $(call gb_Library_set_defs,sfx,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sfx,\ -DENABLE_QUICKSTART_APPLET \ -DENABLE_SYSTRAY_GTK \ -DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \ |