[Libreoffice-commits] .: Branch 'feature/gnumake4' - starmath/Library_smd.mk starmath/Library_sm.mk sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk

[Bjoern Michaelsen]

 starmath/Library_sm.mk  |    4 ----
 starmath/Library_smd.mk |    4 ----
 sw/Library_msword.mk    |    4 ----
 sw/Library_sw.mk        |    3 +--
 sw/Library_swd.mk       |    4 ----
 sw/Library_swui.mk      |    4 ----
 6 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 7fc148bb30b680784d369f0dab3abef174f98ddc
Author: Michael Stahl <mst at openoffice.org>
Date:   Wed Apr 13 16:11:41 2011 +0000

    gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]

diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index be2fecf..78648e0 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -42,10 +42,6 @@ $(eval $(call gb_Library_set_include,sm,\
 	-I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,sm,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,sm,\
 	comphelper \
 	cppu \
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index ae2dde0..5ea8fda 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -38,10 +38,6 @@ $(eval $(call gb_Library_set_include,smd,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,smd,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,smd,\
 	cppu \
 	cppuhelper \
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index b47fe49..b59967d 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -42,10 +42,6 @@ $(eval $(call gb_Library_set_include,msword,\
     -I$(OUTDIR)/inc/sw \
 ))
 
-$(eval $(call gb_Library_set_defs,msword,\
-    $$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,msword,\
     basegfx \
     comphelper \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 4dde29a..caffa13 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -46,8 +46,7 @@ $(eval $(call gb_Library_set_include,sw,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,sw,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sw,\
     -DSW_DLLIMPLEMENTATION \
 ))
 
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index a0dcfaf..67898f9 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Library_set_include,swd,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,swd,\
-    $$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,swd,\
     comphelper \
     cppu \
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index f7b3f52..9701339 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -39,10 +39,6 @@ $(eval $(call gb_Library_set_include,swui,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,swui,\
-    $$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,swui,\
     comphelper \
     cppu \