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 | |
| parent | 26da7ac79406d09252ce4ba964c1893e19a03021 (diff) | |
gnumake4: postmerge fixes in sd and slideshow
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/CppunitTest_sd_uimpress.mk | 3 | ||||
| -rw-r--r-- | sd/JunitTest_sd_unoapi.mk | 2 | ||||
| -rw-r--r-- | sd/Library_sd.mk | 3 | ||||
| -rw-r--r-- | sd/Library_sdfilt.mk | 6 | ||||
| -rw-r--r-- | sd/Library_sdui.mk | 3 |
5 files changed, 6 insertions, 11 deletions
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 69db5c2b6247..a348884af285 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -35,8 +35,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_uimpress,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_CppunitTest_set_defs,sd_uimpress,\ - $$(DEFS) \ +$(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\ -DSD_DLLIMPLEMENTATION \ )) diff --git a/sd/JunitTest_sd_unoapi.mk b/sd/JunitTest_sd_unoapi.mk index 6afd01f60d8b..0d845d54da5a 100644 --- a/sd/JunitTest_sd_unoapi.mk +++ b/sd/JunitTest_sd_unoapi.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_JunitTest_JunitTest,sd_unoapi)) +$(eval $(call gb_JunitTest_JunitTest,sd_unoapi,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,sd_unoapi,\ $$(DEFS) \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index a96e3b8e2594..900e76017f50 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -47,8 +47,7 @@ $(eval $(call gb_Library_set_include,sd,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,sd,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sd,\ -DSD_DLLIMPLEMENTATION \ )) 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 diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index e74e965781ac..a46d95cbd1a2 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,sdui,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,sdui,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,sdui,\ -DSD_DLLIMPLEMENTATION \ )) |