[Libreoffice-commits] .: Branch 'feature/gnumake4' - sd/CppunitTest_sd_uimpress.mk sd/JunitTest_sd_unoapi.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk

[Bjoern Michaelsen]

 sd/CppunitTest_sd_uimpress.mk  |    3 +--
 sd/JunitTest_sd_unoapi.mk      |    2 +-
 sd/Library_sd.mk               |    3 +--
 sd/Library_sdfilt.mk           |    6 ++----
 sd/Library_sdui.mk             |    3 +--
 slideshow/Library_OGLTrans.mk  |    6 ++----
 slideshow/Library_slideshow.mk |    6 ++----
 7 files changed, 10 insertions(+), 19 deletions(-)

New commits:
commit 9c7db8b754c8525d1bc3d9d996d42048555bf323
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jun 21 13:17:18 2011 +0200

    gnumake4: postmerge fixes in sd and slideshow

diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 69db5c2..a348884 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 6afd01f..0d845d5 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 a96e3b8..900e760 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 b1bb3de..94563c6 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 e74e965..a46d95c 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 \
 ))
 
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 3a04c1e..3d59377 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 3823474..e5cce31 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