Merge branch 'master' into feature/gnumake4

Conflicts:
	connectivity/source/cpool/Zregistration.cxx
	connectivity/source/drivers/evoab/LCatalog.cxx
	connectivity/source/drivers/evoab/LColumnAlias.cxx
	connectivity/source/drivers/evoab/LColumnAlias.hxx
	connectivity/source/drivers/evoab/LColumns.cxx
	connectivity/source/drivers/evoab/LColumns.hxx
	connectivity/source/drivers/evoab/LConfigAccess.cxx
	connectivity/source/drivers/evoab/LConfigAccess.hxx
	connectivity/source/drivers/evoab/LConnection.cxx
	connectivity/source/drivers/evoab/LConnection.hxx
	connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
	connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
	connectivity/source/drivers/evoab/LDriver.cxx
	connectivity/source/drivers/evoab/LDriver.hxx
	connectivity/source/drivers/evoab/LFolderList.cxx
	connectivity/source/drivers/evoab/LFolderList.hxx
	connectivity/source/drivers/evoab/LNoException.cxx
	connectivity/source/drivers/evoab/LPreparedStatement.cxx
	connectivity/source/drivers/evoab/LPreparedStatement.hxx
	connectivity/source/drivers/evoab/LResultSet.cxx
	connectivity/source/drivers/evoab/LResultSet.hxx
	connectivity/source/drivers/evoab/LServices.cxx
	connectivity/source/drivers/evoab/LStatement.cxx
	connectivity/source/drivers/evoab/LStatement.hxx
	connectivity/source/drivers/evoab/LTable.cxx
	connectivity/source/drivers/evoab/LTable.hxx
	connectivity/source/drivers/evoab/LTables.cxx
	connectivity/source/drivers/evoab/LTables.hxx
	connectivity/source/drivers/evoab/evoab.xml
	connectivity/source/drivers/evoab/makefile.mk
	editeng/Library_editeng.mk
	framework/Library_fwe.mk
	framework/test/test.cxx
	idl/prj/d.lst
	idl/util/idlpch.cxx
	linguistic/Makefile
	linguistic/Module_linguistic.mk
	linguistic/inc/linguistic/lngdllapi.h
	linguistic/inc/linguistic/lngprophelp.hxx
	linguistic/inc/linguistic/misc.hxx
	linguistic/prj/build.lst
	linguistic/prj/d.lst
	linguistic/qa/unoapi/Test.java
	linguistic/source/grammarchecker.cxx
	linguistic/source/grammarchecker.hxx
	linguistic/source/hyphdta.cxx
	linguistic/source/lngprophelp.cxx
	linguistic/source/makefile.mk
	linguistic/source/spelldta.cxx
	sfx2/Library_qstart.mk
	sfx2/Library_sfx.mk
	sfx2/inc/sfx2/qswin32.h
	sfx2/prj/build.lst
	sfx2/qa/cppunit/makefile.mk
	xmlscript/inc/xmlscript/xcrdllapi.h
	xmlscript/prj/d.lst
	xmlscript/util/makefile.mk

1 files changed, 5 insertions, 7 deletions

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index a537258c4990..2cc9b4a0663f 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,svx))
 $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
 
 $(eval $(call gb_Library_set_include,svx,\
-    -I$(SRCDIR)/svx/inc \
-    -I$(SRCDIR)/svx/source/inc \
-    -I$(SRCDIR)/svx/inc/pch \
+    -I$(realpath $(SRCDIR)/svx/inc) \
+    -I$(realpath $(SRCDIR)/svx/source/inc) \
+    -I$(realpath $(SRCDIR)/svx/inc/pch) \
     $$(SOLARINC) \
     -I$(OUTDIR)/inc/offuh \
 ))
@@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     sal \
     sfx \
     sot \
-    stl \
     svl \
     svt \
     svxcore \
@@ -63,7 +62,6 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     ucbhelper \
     utl \
     vcl \
-    vos3 \
     xo \
     xcr \
     $(gb_STDLIBS) \
@@ -117,9 +115,9 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/dialog/grfflt \
     svx/source/dialog/hdft \
     svx/source/dialog/hyperdlg \
-    svx/source/dialog/hyprlink \
     svx/source/dialog/imapdlg \
     svx/source/dialog/imapwnd \
+    svx/source/dialog/linkwarn \
     svx/source/dialog/measctrl \
     svx/source/dialog/optgrid \
     svx/source/dialog/orienthelper \
@@ -214,7 +212,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/unogallery/unogalthemeprovider \
 ))
 
-ifeq ($(OS),LINUX)
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
 $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/dialog/sendreportunx \
 ))