summaryrefslogtreecommitdiff
path: root/sax
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2011-04-13 16:11:41 +0000
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 14:24:10 +0200
commitbd162cb75a4115affb5451584bd9f094f3e37905 (patch)
tree462c5ae1fbb5bf3a6b40398a8f32aefda886d980 /sax
parente9f6edc64553e458e15111aca6f3e778eb7afa2c (diff)
gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]
Diffstat (limited to 'sax')
-rw-r--r--sax/Library_expwrap.mk4
-rw-r--r--sax/Library_fastsax.mk7
-rw-r--r--sax/Library_sax.mk3
3 files changed, 2 insertions, 12 deletions
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 6bea2f3e077b..174d22227c1c 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_Library_set_include,expwrap,\
-I$(SRCDIR)/sax/inc \
))
-$(eval $(call gb_Library_set_defs,expwrap,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,expwrap,\
sal \
cppu \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index e45fa5021311..62e4570a113f 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_Library_set_include,fastsax,\
-I$(SRCDIR)/sax/inc \
))
-$(eval $(call gb_Library_set_defs,fastsax,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,fastsax,\
sal \
cppu \
@@ -49,8 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,fastsax,\
))
ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_defs,fastsax,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,fastsax,\
-DSYSTEM_ZLIB \
))
endif
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index 36e0066f60aa..d43c7f854307 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,sax,\
-I$(SRCDIR)/sax/inc \
))
-$(eval $(call gb_Library_set_defs,sax,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sax,\
-DSAX_DLLIMPLEMENTATION \
))