summaryrefslogtreecommitdiff
path: root/canvas/Library_canvastools.mk
diff options
context:
space:
mode:
Diffstat (limited to 'canvas/Library_canvastools.mk')
-rw-r--r--canvas/Library_canvastools.mk18
1 files changed, 7 insertions, 11 deletions
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