Merge branch 'master' into feature/gnumake4

Conflicts:
	basebmp/prj/d.lst
	basebmp/test/basictest.cxx
	basebmp/test/makefile.mk
	basegfx/inc/basegfx/basegfxdllapi.h
	basegfx/inc/basegfx/tools/debugplotter.hxx
	basegfx/inc/basegfx/tuple/b2ituple.hxx
	basegfx/prj/d.lst
	basegfx/source/numeric/makefile.mk
	basegfx/source/polygon/makefile.mk
	basegfx/source/range/makefile.mk
	basegfx/source/raster/makefile.mk
	basegfx/source/tuple/makefile.mk
	basegfx/source/vector/makefile.mk
	basegfx/test/basegfx1d.cxx
	basegfx/test/makefile.mk
	basegfx/util/makefile.mk
	canvas/Library_canvasfactory.mk
	canvas/Module_canvas.mk
	canvas/prj/build.lst
	canvas/prj/d.lst
	canvas/source/cairo/cairo_canvashelper_texturefill.cxx
	canvas/source/cairo/makefile.mk
	canvas/source/tools/makefile.mk
	comphelper/qa/string/makefile.mk
	cppcanvas/Module_cppcanvas.mk
	cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
	cppcanvas/prj/build.lst
	cppcanvas/prj/d.lst
	cppcanvas/source/mtfrenderer/makefile.mk
	cppcanvas/util/makefile.mk
	i18npool/source/search/makefile.mk
	regexp/Library_regexp.mk
	regexp/prj/d.lst
	sax/CppunitTest_sax.mk
	sax/Library_sax.mk
	sax/prj/d.lst
	sax/qa/cppunit/test_converter.cxx
	sax/source/expatwrap/attrlistimpl.hxx
	sax/util/makefile.mk
	svtools/Library_svt.mk
	tools/Executable_sspretty.mk
	ucbhelper/prj/d.lst
	ucbhelper/source/provider/configureucb.cxx
	ucbhelper/source/provider/provconf.cxx
	ucbhelper/util/makefile.mk
	unotools/Library_utl.mk
	unotools/Module_unotools.mk
	unotools/Package_inc.mk
	unotools/prj/build.lst
	vcl/Library_desktop_detector.mk
	vcl/Library_vcl.mk
	vcl/Library_vclplug_gtk.mk
	vcl/aqua/source/gdi/salprn.cxx
	vcl/inc/aqua/saldata.hxx
	vcl/unx/generic/gdi/salgdi3.cxx

1 files changed, 7 insertions, 9 deletions

diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 72a4e679bec7..297484b39583 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -28,17 +28,18 @@
 $(eval $(call gb_Library_Library,tl))
 
 $(eval $(call gb_Library_add_package_headers,tl,tools_inc))
+$(eval $(call gb_Library_add_package_headers,tl,tools_reversemap))
 
 $(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools))
 
 $(eval $(call gb_Library_set_include,tl,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/tools/inc \
-    -I$(SRCDIR)/tools/inc/pch \
+    -I$(realpath $(SRCDIR)/tools/inc) \
+    -I$(realpath $(SRCDIR)/tools/inc/pch) \
     -I$(SRCDIR)/solenv/inc \
     -I$(SRCDIR)/solenv/inc/Xp31 \
     -I$(OUTDIR)/inc/offuh \
-    -I$(OUTDIR)/inc/stl \
+    -I$(WORKDIR)/CustomTarget/tools/source/reversemap \
 ))
 
 $(eval $(call gb_Library_add_defs,tl,\
@@ -50,17 +51,13 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
     basegfx \
     comphelper \
     i18nisolang1 \
-    stl \
     cppu \
     sal \
-    vos3 \
     $(gb_STDLIBS) \
 ))
 
 
 $(eval $(call gb_Library_add_exception_objects,tl,\
-    tools/source/communi/geninfo \
-    tools/source/communi/parser \
     tools/source/datetime/datetime \
     tools/source/datetime/tdate \
     tools/source/datetime/ttime \
@@ -115,6 +112,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/source/string/tenccvt \
     tools/source/string/tstring \
     tools/source/string/tustring \
+    tools/source/string/reversemap \
     tools/source/testtoolloader/testtoolloader \
     tools/source/zcodec/zcodec \
 ))
@@ -131,7 +129,7 @@ ifeq ($(OS),WNT)
 
 $(eval $(call gb_Library_set_include,tl,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/tools/win/inc \
+    -I$(realpath $(SRCDIR)/tools/win/inc) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,tl,\
@@ -151,5 +149,5 @@ endif
 # tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g
 # -DOPTIMIZE
 # no -DTOOLS_DLLIMPLEMENTATION on toolsdll
-# -DEXCEPTIONS_OFF -fno-exceptions on geninfo parser datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader
+# -DEXCEPTIONS_OFF -fno-exceptions on datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader
 # vim: set noet sw=4 ts=4: