summaryrefslogtreecommitdiff
path: root/sax/Library_expwrap.mk
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-03-02 14:38:51 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 01:02:37 +0200
commitff4441cc5e473f7f1f8dd9a7fc46deaab445f7ae (patch)
tree159986dafd43a378e7bbd2b775bac997d4ed8d2e /sax/Library_expwrap.mk
parentfa4ec3c338e5b33e9886ee489bbe38ddd7dfae3c (diff)
CWS gnumake4: some fixes for Windows [hg:9eb9b5d5181e]
Diffstat (limited to 'sax/Library_expwrap.mk')
-rw-r--r--sax/Library_expwrap.mk21
1 files changed, 14 insertions, 7 deletions
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 58afe9ded9f4..9c73522b8212 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -46,25 +46,32 @@ $(eval $(call gb_Library_set_defs,expwrap,\
))
endif
+$(eval $(call gb_Library_add_linked_libs,expwrap,\
+ sal \
+ cppu \
+ cppuhelper \
+ stl \
+ $(gb_STDLIBS) \
+))
+
ifeq ($(SYSTEM_EXPAT),YES)
$(eval $(call gb_Library_set_defs,expwrap,\
$$(DEFS) \
-DSYSTEM_EXPAT \
))
+$(eval $(call gb_Library_add_linked_libs,expwrap,\
+ expat \
+))
else
$(eval $(call gb_Library_set_defs,expwrap,\
$$(DEFS) \
-DXML_UNICODE \
))
-endif
-
$(eval $(call gb_Library_add_linked_libs,expwrap,\
- sal \
- cppu \
- cppuhelper \
- expat \
- $(gb_STDLIBS) \
+ expat_xmlparse \
+ expat_xmltok \
))
+endif
$(eval $(call gb_Library_add_exception_objects,expwrap,\
sax/source/expatwrap/attrlistimpl \