Cygwin fixes and cleanups

With realpath now called in AllLangResTarget.mk, we can revert the
explicit expansion of the symlinks to clone/libs-gui/toolkit in the
makefiles for the resources. Also remove unnecessary -I switches that
apparently have just been copy-pasted blindly.

Add realpath calls for -I switches to the makefiles for the
executables.

11 files changed, 22 insertions, 33 deletions

diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk
index ead78ddc4139..d004cb1b24fb 100644
--- a/svl/AllLangResTarget_svl.mk
+++ b/svl/AllLangResTarget_svl.mk
@@ -36,14 +36,11 @@ $(eval $(call gb_SrsTarget_SrsTarget,svl/res))
 $(eval $(call gb_SrsTarget_set_include,svl/res,\
     $$(INCLUDE) \
     -I$(WORKDIR)/inc \
-    -I$(SRCDIR)/svl/source/inc \
-    -I$(SRCDIR)/svl/inc/ \
-    -I$(SRCDIR)/svl/inc/svl \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svl/res,\
-    clone/libs-gui/svl/source/misc/mediatyp.src \
-    clone/libs-gui/svl/source/items/cstitem.src \
+    svl/source/misc/mediatyp.src \
+    svl/source/items/cstitem.src \
 ))
 
 
diff --git a/svtools/AllLangResTarget_productregistration.mk b/svtools/AllLangResTarget_productregistration.mk
index e6f2fd093f07..888e342fad64 100644
--- a/svtools/AllLangResTarget_productregistration.mk
+++ b/svtools/AllLangResTarget_productregistration.mk
@@ -38,9 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svt/productregistration))
 $(eval $(call gb_SrsTarget_set_include,svt/productregistration,\
     $$(INCLUDE) \
     -I$(WORKDIR)/inc \
-    -I$(SRCDIR)/svtools/source/inc \
-    -I$(SRCDIR)/svtools/inc/ \
-    -I$(SRCDIR)/svtools/inc/svtools \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svt/productregistration,\
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 6c13a6fcdb3f..0311c80d1316 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,svt/res))
 $(eval $(call gb_SrsTarget_set_include,svt/res,\
     $$(INCLUDE) \
     -I$(WORKDIR)/inc \
-    -I$(SRCDIR)/svtools/source/uno \
-    -I$(SRCDIR)/svtools/source/inc \
-    -I$(SRCDIR)/svtools/inc/ \
-    -I$(SRCDIR)/svtools/inc/svtools \
+    -I$(realpath $(SRCDIR)/svtools/source/inc) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svt/res,\
@@ -71,5 +68,4 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
     svtools/source/toolpanel/toolpanel.src \
 ))
 
-
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 4672bc41a86f..3b2fd2a1203c 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -32,10 +32,10 @@ $(eval $(call gb_Executable_set_include,bmp,\
     -I$(WORKDIR)/inc/svtools \
     -I$(WORKDIR)/inc/ \
     -I$(OUTDIR)/inc/ \
-    -I$(SRCDIR)/svtools/inc \
-    -I$(SRCDIR)/svtools/inc/svtools \
-    -I$(SRCDIR)/svtools/source/inc \
-    -I$(SRCDIR)/svtools/inc/pch \
+    -I$(realpath $(SRCDIR)/svtools/inc) \
+    -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
+    -I$(realpath $(SRCDIR)/svtools/source/inc) \
+    -I$(realpath $(SRCDIR)/svtools/inc/pch) \
     -I$(OUTDIR)/inc/offuh \
 ))
 
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index becfa3e00d70..492dabeb58f8 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -31,9 +31,9 @@ $(eval $(call gb_Executable_set_include,bmpsum,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/ \
     -I$(OUTDIR)/inc/offuh/ \
-    -I$(SRCDIR)/svtools/inc/ \
-    -I$(SRCDIR)/svtools/inc/pch/ \
-    -I$(SRCDIR)/svtools/inc/svtools/ \
+    -I$(realpath $(SRCDIR)/svtools/inc) \
+    -I$(realpath $(SRCDIR)/svtools/inc/pch) \
+    -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 064c7ffe6d93..c817cff43ccd 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -31,9 +31,9 @@ $(eval $(call gb_Executable_set_include,g2g,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/ \
     -I$(OUTDIR)/inc/offuh/ \
-    -I$(SRCDIR)/svtools/inc/ \
-    -I$(SRCDIR)/svtools/inc/pch/ \
-    -I$(SRCDIR)/svtools/inc/svtools/ \
+    -I$(realpath $(SRCDIR)/svtools/inc) \
+    -I$(realpath $(SRCDIR)/svtools/inc/pch) \
+    -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,g2g,\
diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk
index baaefc84c5be..baaefc84c5be 100755..100644
--- a/svtools/JunitTest_svtools_unoapi.mk
+++ b/svtools/JunitTest_svtools_unoapi.mk
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index b92313e446d7..96e8f10c3306 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -33,9 +33,9 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\
     $$(INCLUDE) \
     -I$(WORKDIR)/inc/svtools \
     -I$(WORKDIR)/inc/ \
-    -I$(SRCDIR)/svtools/inc/pch/ \
+    -I$(realpath $(SRCDIR)/svtools/inc/pch) \
     -I$(OUTDIR)/inc/ \
-    -I$(SRCDIR)/svtools/inc \
+    -I$(realpath $(SRCDIR)/svtools/inc) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk
index 0732d909c32b..726e5a3b664b 100644
--- a/svtools/Library_productregistration.mk
+++ b/svtools/Library_productregistration.mk
@@ -33,9 +33,9 @@ $(eval $(call gb_Library_set_include,productregistration,\
     $$(SOLARINC) \
     -I$(WORKDIR)/inc/svtools \
     -I$(WORKDIR)/inc/ \
-    -I$(SRCDIR)/svtools/inc/pch/ \
+    -I$(realpath $(SRCDIR)/svtools/inc/pch) \
     -I$(OUTDIR)/inc/ \
-    -I$(SRCDIR)/svtools/inc \
+    -I$(realpath $(SRCDIR)/svtools/inc) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index b0fa12e3a2c4..da2721476c70 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -38,10 +38,10 @@ $(eval $(call gb_Library_set_include,svt,\
     -I$(WORKDIR)/inc/svtools \
     -I$(WORKDIR)/inc/ \
     -I$(OUTDIR)/inc/ \
-    -I$(SRCDIR)/svtools/inc \
-    -I$(SRCDIR)/svtools/inc/svtools \
-    -I$(SRCDIR)/svtools/source/inc \
-    -I$(SRCDIR)/svtools/inc/pch \
+    -I$(realpath $(SRCDIR)/svtools/inc) \
+    -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
+    -I$(realpath $(SRCDIR)/svtools/source/inc) \
+    -I$(realpath $(SRCDIR)/svtools/inc/pch) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
diff --git a/toolkit/AllLangResTarget_tk.mk b/toolkit/AllLangResTarget_tk.mk
index a9c8a2fa279e..1879f436c84b 100644
--- a/toolkit/AllLangResTarget_tk.mk
+++ b/toolkit/AllLangResTarget_tk.mk
@@ -37,9 +37,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,toolkit/awt))
 
 $(eval $(call gb_SrsTarget_set_include,toolkit/awt,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/toolkit/source/awt \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,toolkit/awt,\
-    clone/libs-gui/toolkit/source/awt/xthrobber.src \
+    toolkit/source/awt/xthrobber.src \
 ))