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

9 files changed, 17 insertions, 51 deletions

diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 02b7fc323a59..e1b7182100f3 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -36,13 +36,8 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,cairocanvas,\
-	$$(DEFS) \
-))
-
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,cairocanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,cairocanvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index 4992f9ca8e6c..8078e48e8a5b 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -36,10 +36,6 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,canvasfactory,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,canvasfactory,\
 	sal \
 	stl \
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index f686e749c8b9..32f6ff5037f4 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.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
@@ -38,21 +38,18 @@ $(eval $(call gb_Library_set_include,canvastools,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,canvastools,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,canvastools,\
 	-DCANVASTOOLS_DLLIMPLEMENTATION \
 ))
 
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,canvastools,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,canvastools,\
 	-DVERBOSE \
 ))
 endif
 
 ifneq ($(strip $(PROFILER)$(profiler)),)
-$(eval $(call gb_Library_set_defs,canvastools,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,canvastools,\
 	-DPROFILER \
 ))
 endif
@@ -87,7 +84,7 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\
 	canvas/source/tools/verifyinput \
 ))
 
-ifeq ($(strip $(ENABLE_AGG)),YES) 
+ifeq ($(strip $(ENABLE_AGG)),YES)
 $(eval $(call gb_Library_add_exception_objects,canvastools,\
 	canvas/source/tools/bitmap \
 	canvas/source/tools/image \
@@ -95,9 +92,8 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\
 $(eval $(call gb_Library_add_linked_libs,canvastools,\
 	agg \
 ))
-ifneq ($(strip $(AGG_VERSION)),) 
-$(eval $(call gb_Library_set_defs,canvastools,\
-	$$(DEFS) \
+ifneq ($(strip $(AGG_VERSION)),)
+$(eval $(call gb_Library_add_defs,canvastools,\
 	-DAGG_VERSION=$(AGG_VERSION) \
 ))
 endif
diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk
index f3356fd24b80..44139093817f 100644
--- a/canvas/Library_directx5canvas.mk
+++ b/canvas/Library_directx5canvas.mk
@@ -37,14 +37,12 @@ $(eval $(call gb_Library_set_include,directx5canvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,directx5canvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx5canvas,\
 	-DDIRECTX_VERSION=0x0500 \
 ))
 
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,directx5canvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx5canvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 06a4dc064d9a..cb8264d01c8d 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -36,14 +36,12 @@ $(eval $(call gb_Library_set_include,directx9canvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,directx9canvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx9canvas,\
 	-DDIRECTX_VERSION=0x0900 \
 ))
 
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,directx9canvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx9canvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index db295261b73f..f5b2bc32e18e 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -36,14 +36,12 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,gdipluscanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,gdipluscanvas,\
 	-DDIRECTX_VERSION=0x0900 \
 ))
 
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,gdipluscanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,gdipluscanvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index e2403d325c3f..ecd7b862b101 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -34,13 +34,8 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,nullcanvas,\
-	$$(DEFS) \
-))
-
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,nullcanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,nullcanvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 570e728d2056..831177f05f9e 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -36,13 +36,8 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,simplecanvas,\
-	$$(DEFS) \
-))
-
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,simplecanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,simplecanvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 501fe3a71b80..5d5cf7825a02 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -36,13 +36,8 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,vclcanvas,\
-	$$(DEFS) \
-))
-
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,vclcanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclcanvas,\
 	-DVERBOSE \
 ))
 endif