[Libreoffice-commits] .: Branch 'feature/gnumake4' - chart2/JunitTest_chart2_unoapi.mk chart2/Library_charttools.mk chart2/Library_chartview.mk sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scui.mk sc/Library_sd.mk sc/Library_vbaobj.mk

[Bjoern Michaelsen]

 chart2/JunitTest_chart2_unoapi.mk |    2 +-
 chart2/Library_charttools.mk      |    3 +--
 chart2/Library_chartview.mk       |    3 +--
 sc/Library_sc.mk                  |    3 +--
 sc/Library_scd.mk                 |    4 ----
 sc/Library_scfilt.mk              |    4 ----
 sc/Library_scui.mk                |    4 ----
 sc/Library_vbaobj.mk              |   10 +---------
 8 files changed, 5 insertions(+), 28 deletions(-)

New commits:
commit aedf5d7f42f7adafa201fbe811e663d5340e4cd3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jun 21 12:54:01 2011 +0200

    gnumake4: postmerge fixes in sc

diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk
index 1571f3d..da35eea 100644
--- a/chart2/JunitTest_chart2_unoapi.mk
+++ b/chart2/JunitTest_chart2_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,chart2_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,chart2_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\
     $$(DEFS) \
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index 2bf40ca..6f4660b 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,charttools,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,charttools,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,charttools,\
     -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
 ))
 
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index 802a13d..82f29ac 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,chartview,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,chartview,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,chartview,\
     -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
 ))
 
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 5e93753..7f1f36a 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,sc,\
         -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,sc,\
-        $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sc,\
         -DSC_DLLIMPLEMENTATION \
         -DSC_INFO_OSVERSION=\"$(OS)\" \
 ))
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 0331df2..6286845 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -33,10 +33,6 @@ $(eval $(call gb_Library_set_include,scd,\
         -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,scd,\
-        $$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,scd,\
         cppu \
         cppuhelper \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index edcfd7c..5c74d09 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -37,10 +37,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
         -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,scfilt,\
-        $$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,scfilt,\
         basegfx \
         comphelper \
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index c85de9f..3473fa7 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -33,10 +33,6 @@ $(eval $(call gb_Library_set_include,scui,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,scui,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,scui,\
 	comphelper \
 	cppu \
diff --git a/sc/Library_sd.mk b/sc/Library_sd.mk
new file mode 100644
index 0000000..e69de29
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 6ef54b3..437607d 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -35,8 +35,7 @@ $(eval $(call gb_Library_set_include,vbaobj,\
 
 $(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj))
 
-$(eval $(call gb_Library_set_defs,vbaobj,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vbaobj,\
 	-DVBA_OOBUILD_HACK \
 ))
 
@@ -133,13 +132,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
         sc/source/ui/vba/vbawsfunction \
 ))
 
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
-$(eval $(call gb_Library_set_ldflags,vbaobj,\
-	$$(LDFLAGS) \
-	-Wl$(COMMA)-z$(COMMA)noexecstack \
-))
-endif
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,vbaobj,\
 	advapi32 \