diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 13:17:18 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 13:17:18 +0200 |
| commit | 4eac26400b8ef08331938d3513c762abfb7b142e (patch) | |
| tree | 54f2dbd588b546bdc41d378fdd9f9660ecdfde09 /slideshow | |
| parent | 26da7ac79406d09252ce4ba964c1893e19a03021 (diff) | |
gnumake4: postmerge fixes in sd and slideshow
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 6 | ||||
| -rw-r--r-- | slideshow/Library_slideshow.mk | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 3a04c1e4fcce..3d59377a1588 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -37,15 +37,13 @@ $(eval $(call gb_Library_set_include,OGLTrans,\ )) ifeq ($(strip $(VERBOSE)),TRUE) -$(eval $(call gb_Library_set_defs,OGLTrans,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,OGLTrans,\ -DVERBOSE \ )) endif ifneq ($(strip $(debug)$(DEBUG)),) -$(eval $(call gb_Library_set_defs,OGLTrans,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,OGLTrans,\ -DBOOST_SP_ENABLE_DEBUG_HOOKS \ )) endif 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 |