From bd162cb75a4115affb5451584bd9f094f3e37905 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]

---
 canvas/Library_canvastools.mk | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'canvas/Library_canvastools.mk')

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
-- 
cgit