From ff4441cc5e473f7f1f8dd9a7fc46deaab445f7ae Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Wed, 2 Mar 2011 14:38:51 +0100
Subject: CWS gnumake4: some fixes for Windows [hg:9eb9b5d5181e]

---
 sax/Library_expwrap.mk | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'sax/Library_expwrap.mk')

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