From f79e31be8c0b96116c71362fcf804ae1a5ffd48d Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Wed, 13 Apr 2011 16:11:41 +0000
Subject: gnumake4: #i116959#: kill
 gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]

---
 editeng/Library_editeng.mk        | 6 ++----
 framework/Library_fwe.mk          | 3 +--
 framework/Library_fwi.mk          | 3 +--
 linguistic/Library_lng.mk         | 9 ++++-----
 sfx2/Library_qstart.mk            | 3 +--
 sfx2/Library_sfx.mk               | 6 ++----
 svx/Library_svx.mk                | 3 +--
 svx/Library_svxcore.mk            | 3 +--
 svx/Library_textconversiondlgs.mk | 4 ----
 vbahelper/Library_vbahelper.mk    | 3 +--
 xmloff/Library_xo.mk              | 3 +--
 xmlscript/Library_xcr.mk          | 3 +--
 12 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 2682943e7d6d..45683df80d78 100755
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -38,14 +38,12 @@ $(eval $(call gb_Library_set_include,editeng,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,editeng,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,editeng,\
     -DEDITENG_DLLIMPLEMENTATION \
 ))
 
 ifneq ($(strip $(EDITDEBUG)),)
-$(eval $(call gb_Library_set_defs,editeng,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,editeng,\
     -DEDITDEBUG \
 ))
 endif
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index a7cc4cc9df6f..87dc9bfeca82 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,fwe,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,fwe,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,fwe,\
     -DFWE_DLLIMPLEMENTATION\
 ))
 
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 046c7230e35f..33b7bc94b2b4 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -29,8 +29,7 @@ $(eval $(call gb_Library_Library,fwi))
 
 $(eval $(call gb_Library_add_package_headers,fwi,framework_inc))
 
-$(eval $(call gb_Library_set_defs,fwi,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,fwi,\
     -DFWI_DLLIMPLEMENTATION \
 ))
 
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 2fa36b1d5682..d97278d9d819 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -24,7 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-	
+
 $(eval $(call gb_Library_Library,lng))
 
 $(eval $(call gb_Library_add_package_headers,lng,linguistic_inc))
@@ -39,9 +39,8 @@ $(eval $(call gb_Library_set_include,lng,\
 	-I$(SRCDIR)/linguistic/inc/pch \
 	-I$(OUTDIR)/inc/offuh \
 ))
-	
-$(eval $(call gb_Library_set_defs,lng,\
-	$$(DEFS) \
+
+$(eval $(call gb_Library_add_defs,lng,\
 	-DLNG_DLLIMPLEMENTATION \
 ))
 
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 9a21ef5659b7..ab8ced21b275 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\
     $(filter -I%,$(GTK_CFLAGS)) \
 ))
 
-$(eval $(call gb_Library_set_defs,qstart_gtk,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,qstart_gtk,\
     -DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \
     -DENABLE_QUICKSTART_APPLET \
 ))
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index a41404109d97..68fca0719e93 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -50,8 +50,7 @@ $(eval $(call gb_Library_set_include,sfx,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,sfx,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
     -DSFX2_DLLIMPLEMENTATION \
 ))
 
@@ -247,8 +246,7 @@ $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
 ))
 
 ifeq ($(OS),$(filter WNT MACOSX,$(OS)))
-$(eval $(call gb_Library_set_defs,sfx,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
     -DENABLE_QUICKSTART_APPLET \
 ))
 endif
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index db42baec6b3c..a537258c4990 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,svx,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,svx,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svx,\
     -DSVX_DLLIMPLEMENTATION \
     -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
 ))
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 2437ae996c27..5769a7f6b9ca 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -51,8 +51,7 @@ $(eval $(call gb_Library_set_include,svxcore,\
 #CFLAGS+= -DUNICODE -D_UNICODE
 #.ENDIF
 
-$(eval $(call gb_Library_set_defs,svxcore,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svxcore,\
     -DSVX_DLLIMPLEMENTATION \
     -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
 ))
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index c2ddae4fe131..1677d630faa5 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -36,10 +36,6 @@ $(eval $(call gb_Library_set_include,textconversiondlgs,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,textconversiondlgs,\
-    $$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
     comphelper \
     cppuhelper \
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index af6b4089ada8..5475b211c210 100755
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,vbahelper,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,vbahelper,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vbahelper,\
     -DVBAHELPER_DLLIMPLEMENTATION \
 ))
 
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 0544171dbfbd..ff2a0401181c 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,xo,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,xo,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,xo,\
     -DXMLOFF_DLLIMPLEMENTATION \
 ))
 
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
index 06bd76db9e19..d3bb35c4fddf 100644
--- a/xmlscript/Library_xcr.mk
+++ b/xmlscript/Library_xcr.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,xcr,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,xcr,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,xcr,\
 	-DXCR_DLLIMPLEMENTATION \
 ))
 
-- 
cgit v1.2.3