gnumake4: fix buildbreakers from merge

5 files changed, 41 insertions, 8 deletions

diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
index b870f4045a18..d29632de5fae 100644
--- a/sax/CppunitTest_sax.mk
+++ b/sax/CppunitTest_sax.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sax_cppunit, \
 	cppunit \
 	sax \
 	sal \
-	stl \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 174d22227c1c..05bddd0a03b5 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -36,10 +36,9 @@ $(eval $(call gb_Library_set_include,expwrap,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,expwrap,\
-	sal \
 	cppu \
 	cppuhelper \
-	stl \
+	sal \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 62e4570a113f..2dd9dccf0e52 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -36,11 +36,10 @@ $(eval $(call gb_Library_set_include,fastsax,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,fastsax,\
-	sal \
 	cppu \
 	cppuhelper \
+	sal \
 	sax \
-	stl \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index d43c7f854307..f3e089ea8375 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -42,11 +42,10 @@ $(eval $(call gb_Library_add_defs,sax,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,sax,\
-	sal \
+	comphelper \
 	cppu \
 	cppuhelper \
-	comphelper \
-	stl \
+	sal \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sax/source/expatwrap/expwrap.component b/sax/source/expatwrap/expwrap.component
new file mode 100644
index 000000000000..5e6699d9dd33
--- /dev/null
+++ b/sax/source/expatwrap/expwrap.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.extensions.xml.sax.ParserExpat">
+    <service name="com.sun.star.xml.sax.Parser"/>
+  </implementation>
+  <implementation name="com.sun.star.extensions.xml.sax.Writer">
+    <service name="com.sun.star.xml.sax.Writer"/>
+  </implementation>
+</component>