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, 8 insertions, 12 deletions

diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 88d23965ab76..c81bfb19b4b3 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -29,9 +29,9 @@ $(eval $(call gb_Executable_Executable,mkunroll))
 
 $(eval $(call gb_Executable_set_include,mkunroll,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/tools/inc/ \
-    -I$(SRCDIR)/tools/inc/pch \
-    -I$(SRCDIR)/tools/bootstrp/ \
+    -I$(realpath $(SRCDIR)/tools/inc) \
+    -I$(realpath $(SRCDIR)/tools/inc/pch) \
+    -I$(realpath $(SRCDIR)/tools/bootstrp) \
 ))
 
 $(eval $(call gb_Executable_add_defs,mkunroll,\
@@ -41,20 +41,16 @@ $(eval $(call gb_Executable_add_defs,mkunroll,\
 $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
     basegfx \
     sal \
-    stl \
     tl \
-    vos3 \
     $(gb_STDLIBS) \
 ))
 
-# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
-
 $(eval $(call gb_Executable_add_exception_objects,mkunroll,\
-    tools/bootstrp/addexes2/mkfilt \
-    tools/bootstrp/appdef \
-    tools/bootstrp/cppdep \
-    tools/bootstrp/inimgr \
-    tools/bootstrp/prj \
+    tools/bootstrp/mkunroll/mkunroll \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,rscdep,\
+	toolshelpers \
 ))
 
 # vim: set noet sw=4 ts=4: