gnumake4: fix buildbreakers from merge

21 files changed, 99 insertions, 78 deletions

diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index 719b97b6b553..eb39b981c858 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -41,10 +41,9 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \
 
 $(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \
 	basebmp \
-	sal \
-	stl \
 	basegfx \
 	cppunit \
+	sal \
     $(gb_STDLIBS) \
 ))
 
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 0a2dffde48f1..97fcb79329ea 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -41,9 +41,8 @@ $(eval $(call gb_Library_add_defs,basebmp,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,basebmp,\
-    sal \
     basegfx \
-    stl \
+    sal \
     $(gb_STDLIBS) \
 ))
 
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index d8eeff5fe21e..51cdcc699ae0 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -40,11 +40,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_test, \
 
 $(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
 	basegfx \
-	sal \
-	stl \
+	cppu \
 	cppuhelper \
 	cppunit \
-	cppu \
+	sal \
     $(gb_STDLIBS) \
 ))
 
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 7fc527f3f103..c510b5f52571 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -44,10 +44,9 @@ $(eval $(call gb_Library_add_defs,basegfx,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,basegfx,\
-	sal \
-	stl \
 	cppu \
 	cppuhelper \
+	sal \
     $(gb_STDLIBS) \
 ))
 
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index 8078e48e8a5b..ce02c19bee28 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,canvasfactory,\
-	sal \
-	stl \
 	cppu \
 	cppuhelper \
+	sal \
     $(gb_STDLIBS) \
 ))
 
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 32f6ff5037f4..dc424edde0e0 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -55,15 +55,14 @@ $(eval $(call gb_Library_add_defs,canvastools,\
 endif
 
 $(eval $(call gb_Library_add_linked_libs,canvastools,\
-	sal \
-	stl \
-	cppu \
 	basegfx \
-	cppuhelper \
 	comphelper \
-	vcl \
+	cppu \
+	cppuhelper \
+	sal \
 	tk \
 	tl \
+	vcl \
     $(gb_STDLIBS) \
 ))
 
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index ecd7b862b101..e17980422bff 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -41,13 +41,12 @@ $(eval $(call gb_Library_add_defs,nullcanvas,\
 endif
 
 $(eval $(call gb_Library_add_linked_libs,nullcanvas,\
-	cppu \
-	sal \
-	comphelper \
-	cppuhelper \
-	stl \
 	basegfx \
 	canvastools \
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
 	vcl \
     $(gb_STDLIBS) \
 ))
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 831177f05f9e..5f1f2d760fb1 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -43,13 +43,12 @@ $(eval $(call gb_Library_add_defs,simplecanvas,\
 endif
 
 $(eval $(call gb_Library_add_linked_libs,simplecanvas,\
-	sal \
-	stl \
-	cppu \
 	basegfx \
-	cppuhelper \
-	comphelper \
 	canvastools \
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
     $(gb_STDLIBS) \
 ))
 
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 5d5cf7825a02..9cc7405c3a8a 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -43,18 +43,17 @@ $(eval $(call gb_Library_add_defs,vclcanvas,\
 endif
 
 $(eval $(call gb_Library_add_linked_libs,vclcanvas,\
-	sal \
-	stl \
-	cppu \
 	basegfx \
-	cppuhelper \
+	canvastools \
 	comphelper \
-	vcl \
+	cppu \
+	cppuhelper \
+	i18nisolang1 \
+	sal \
+	svt \
 	tk \
 	tl \
-	svt \
-	i18nisolang1 \
-	canvastools \
+	vcl \
     $(gb_STDLIBS) \
 ))
 
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index 81aeb9863a45..bf1e794dc2cd 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -44,44 +44,45 @@ $(eval $(call gb_Library_add_defs,cppcanvas,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,cppcanvas,\
-	tl \
-	cppu \
-	sal \
-	vcl \
-	stl \
-	comphelper \
+	basegfx \
 	canvastools \
+	comphelper \
+	cppu \
 	cppuhelper \
-	basegfx \
 	i18nisolang1 \
+	sal \
+	svt \
+	tl \
+	vcl \
     $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,cppcanvas,\
-	cppcanvas/source/wrapper/vclfactory \
-	cppcanvas/source/wrapper/implcolor \
-	cppcanvas/source/wrapper/basegfxfactory \
-	cppcanvas/source/wrapper/implcustomsprite \
-	cppcanvas/source/wrapper/implspritecanvas \
-	cppcanvas/source/wrapper/implsprite \
-	cppcanvas/source/wrapper/implpolypolygon \
-	cppcanvas/source/wrapper/implcanvas \
-	cppcanvas/source/wrapper/implbitmap \
-	cppcanvas/source/wrapper/implfont \
-	cppcanvas/source/wrapper/impltext \
-	cppcanvas/source/wrapper/implbitmapcanvas \
-	cppcanvas/source/tools/tools \
-	cppcanvas/source/tools/canvasgraphichelper \
-	cppcanvas/source/mtfrenderer/transparencygroupaction \
+	cppcanvas/source/mtfrenderer/bitmapaction \
 	cppcanvas/source/mtfrenderer/cachedprimitivebase \
+	cppcanvas/source/mtfrenderer/emfplus \
+	cppcanvas/source/mtfrenderer/implrenderer \
 	cppcanvas/source/mtfrenderer/lineaction \
+	cppcanvas/source/mtfrenderer/mtftools \
 	cppcanvas/source/mtfrenderer/pointaction \
 	cppcanvas/source/mtfrenderer/polypolyaction \
 	cppcanvas/source/mtfrenderer/rendergraphicaction \
 	cppcanvas/source/mtfrenderer/textaction \
-	cppcanvas/source/mtfrenderer/implrenderer \
-	cppcanvas/source/mtfrenderer/mtftools \
-	cppcanvas/source/mtfrenderer/bitmapaction \
+	cppcanvas/source/mtfrenderer/transparencygroupaction \
+	cppcanvas/source/tools/canvasgraphichelper \
+	cppcanvas/source/tools/tools \
+	cppcanvas/source/wrapper/basegfxfactory \
+	cppcanvas/source/wrapper/implbitmap \
+	cppcanvas/source/wrapper/implbitmapcanvas \
+	cppcanvas/source/wrapper/implcanvas \
+	cppcanvas/source/wrapper/implcolor \
+	cppcanvas/source/wrapper/implcustomsprite \
+	cppcanvas/source/wrapper/implfont \
+	cppcanvas/source/wrapper/implpolypolygon \
+	cppcanvas/source/wrapper/implsprite \
+	cppcanvas/source/wrapper/implspritecanvas \
+	cppcanvas/source/wrapper/impltext \
+	cppcanvas/source/wrapper/vclfactory \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/prj/build.lst b/cppcanvas/prj/build.lst
index 2dfe3a2c101e..2e4230956e32 100644
--- a/cppcanvas/prj/build.lst
+++ b/cppcanvas/prj/build.lst
@@ -1,4 +1,2 @@
 cx	cppcanvas	:	comphelper cppuhelper offuh tools vcl basegfx canvas NULL
 cx	cppcanvas\prj						nmake	-	all	cx_prj NULL
-
-cx	cppcanvas\source\uno				nmake	-	all	cx_uno cx_tools cx_wrapper cx_mtfrenderer cx_util NULL
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>
diff --git a/tools/Package_reversemap.mk b/tools/Package_reversemap.mk
index ae739de09294..9abc71ba4122 100644
--- a/tools/Package_reversemap.mk
+++ b/tools/Package_reversemap.mk
@@ -24,7 +24,7 @@
 # instead of those above.
 
 $(eval $(call gb_Package_Package,tools_reversemap,$(WORKDIR)/CustomTarget/tools/source/reversemap))
-$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap))
+$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap,SRCDIR))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,tools/source/reversemap,\
 	$(call gb_Executable_get_target_for_build,bestreversemap) \
diff --git a/tools/StaticLibrary_toolshelpers.mk b/tools/StaticLibrary_toolshelpers.mk
index a63ac47a7eac..f8e306aab99d 100644
--- a/tools/StaticLibrary_toolshelpers.mk
+++ b/tools/StaticLibrary_toolshelpers.mk
@@ -34,8 +34,7 @@ $(eval $(call gb_StaticLibrary_set_include,toolshelpers,\
     -I$(realpath $(SRCDIR)/tools/bootstrp) \
 ))
 
-$(eval $(call gb_StaticLibrary_set_cxxflags,toolshelpers,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_StaticLibrary_add_cxxflags,toolshelpers,\
     -D_TOOLS_STRINGLIST \
 ))
 
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index 754c1e704010..f1df8477ae1f 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -43,10 +43,9 @@ $(eval $(call gb_Library_add_defs,ucbhelper,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,ucbhelper,\
-	stl \
-	sal \
 	cppu \
 	cppuhelper \
+	sal \
 	salhelper \
     $(gb_STDLIBS) \
 ))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index db96844e1de9..fb7ab96aada3 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -28,11 +28,11 @@
 $(eval $(call gb_Library_Library,vcl))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
 else ifeq ($(OS),WNT)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
 else
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx,vcl/vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
 endif
 
 $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
diff --git a/vcl/Package_afmhash.mk b/vcl/Package_afmhash.mk
index d3de8357eb93..38b9f0db7896 100644
--- a/vcl/Package_afmhash.mk
+++ b/vcl/Package_afmhash.mk
@@ -24,6 +24,6 @@
 # instead of those above.
 
 $(eval $(call gb_Package_Package,vcl_afmhash,$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager))
-$(eval $(call gb_Package_add_customtarget,vcl_afmhash,vcl/unx/generic/fontmanager))
+$(eval $(call gb_Package_add_customtarget,vcl_afmhash,vcl/unx/generic/fontmanager,SRCDIR))
 
 # vim: set noet sw=4: