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 /sd/Library_sdfilt.mk | |
parent | Merge branch 'master' into feature/gnumake4 (diff) | |
download | core-4eac26400b8ef08331938d3513c762abfb7b142e.tar.gz core-4eac26400b8ef08331938d3513c762abfb7b142e.zip |
gnumake4: postmerge fixes in sd and slideshow
Diffstat (limited to 'sd/Library_sdfilt.mk')
-rw-r--r-- | sd/Library_sdfilt.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index b1bb3de9a8eb..94563c6ff5ff 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -37,14 +37,12 @@ $(eval $(call gb_Library_set_include,sdfilt,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,sdfilt,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sdfilt,\ -DSD_DLLIMPLEMENTATION \ )) ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),) -$(eval $(call gb_Library_set_defs,sdfilt,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sdfilt,\ -DDBG_ANIM_LOG \ )) endif |