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, 7 insertions, 14 deletions

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 68fca0719e93..bb57c4d59d57 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -39,10 +39,10 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
 $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
 
 $(eval $(call gb_Library_set_include,sfx,\
-    -I$(SRCDIR)/sfx2/inc \
-    -I$(SRCDIR)/sfx2/inc/sfx2 \
-    -I$(SRCDIR)/sfx2/source/inc \
-    -I$(SRCDIR)/sfx2/inc/pch \
+    -I$(realpath $(SRCDIR)/sfx2/inc) \
+    -I$(realpath $(SRCDIR)/sfx2/inc/sfx2) \
+    -I$(realpath $(SRCDIR)/sfx2/source/inc) \
+    -I$(realpath $(SRCDIR)/sfx2/inc/pch) \
     -I$(WORKDIR)/SdiTarget/sfx2/sdi \
     -I$(WORKDIR)/inc/ \
     $$(INCLUDE) \
@@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     sax \
     sb \
     sot \
-    stl \
     svl \
     svt \
     tk \
@@ -72,7 +71,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     ucbhelper \
     utl \
     vcl \
-    vos3 \
     $(gb_STDLIBS) \
 ))
 
@@ -240,9 +238,9 @@ $(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx))
 
 $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/sfx2/inc/sfx2 \
-    -I$(SRCDIR)/sfx2/inc \
-    -I$(SRCDIR)/sfx2/sdi \
+    -I$(realpath $(SRCDIR)/sfx2/inc/sfx2) \
+    -I$(realpath $(SRCDIR)/sfx2/inc) \
+    -I$(realpath $(SRCDIR)/sfx2/sdi) \
 ))
 
 ifeq ($(OS),$(filter WNT MACOSX,$(OS)))
@@ -251,11 +249,6 @@ $(eval $(call gb_Library_add_defs,sfx,\
 ))
 endif
 
-ifeq ($(OS),OS2)
-$(eval $(call gb_Library_add_exception_objects,sfx,\
-    sfx2/source/appl/shutdowniconOs2.ob \
-))
-endif
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_add_objcxxobjects,sfx,\
     sfx2/source/appl/shutdowniconaqua \