summaryrefslogtreecommitdiff
path: root/slideshow/Library_slideshow.mk
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-21 13:17:18 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-21 13:17:18 +0200
commit4eac26400b8ef08331938d3513c762abfb7b142e (patch)
tree54f2dbd588b546bdc41d378fdd9f9660ecdfde09 /slideshow/Library_slideshow.mk
parent26da7ac79406d09252ce4ba964c1893e19a03021 (diff)
gnumake4: postmerge fixes in sd and slideshow
Diffstat (limited to 'slideshow/Library_slideshow.mk')
-rw-r--r--slideshow/Library_slideshow.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 3823474b2976..e5cce315359a 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -37,15 +37,13 @@ $(eval $(call gb_Library_set_include,slideshow,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,slideshow,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,slideshow,\
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
$(if $(filter TRUE,$(VERBOSE)),-DVERBOSE) \
))
ifneq ($(strip $(debug)$(DEBUG)),)
-$(eval $(call gb_Library_set_defs,slideshow,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,slideshow,\
-DBOOST_SP_ENABLE_DEBUG_HOOKS \
))
endif