[Libreoffice-commits] .: Branch 'integration/dev300_m101' - svl/AllLangResTarget_svl.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk

[Tor Lillqvist]

 svl/AllLangResTarget_svl.mk      |    4 ++--
 svl/Library_fsstorage.mk         |    8 ++++----
 svl/Library_passwordcontainer.mk |    8 ++++----
 svl/Library_svl.mk               |    4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 63a7c658d4f61ae6ed9d4b7a0603f0bd1a2d5245
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 18:59:00 2011 +0200

    Use realpath to avoid -I options containing symlinks on Cygwin

diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk
index 1ecd4dc..ead78dd 100644
--- a/svl/AllLangResTarget_svl.mk
+++ b/svl/AllLangResTarget_svl.mk
@@ -42,8 +42,8 @@ $(eval $(call gb_SrsTarget_set_include,svl/res,\
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svl/res,\
-    svl/source/misc/mediatyp.src \
-    svl/source/items/cstitem.src \
+    clone/libs-gui/svl/source/misc/mediatyp.src \
+    clone/libs-gui/svl/source/items/cstitem.src \
 ))
 
 
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index b3e0f02..3e27ae8 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -33,10 +33,10 @@ $(eval $(call gb_Library_set_include,fsstorage,\
     $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
     -I$(WORKDIR)/inc/ \
-    -I$(SRCDIR)/svl/inc \
-    -I$(SRCDIR)/svl/inc/svl \
-    -I$(SRCDIR)/svl/source/inc \
-    -I$(SRCDIR)/svl/inc/pch \
+    -I$(realpath $(SRCDIR)/svl/inc) \
+    -I$(realpath $(SRCDIR)/svl/inc/svl) \
+    -I$(realpath $(SRCDIR)/svl/source/inc) \
+    -I$(realpath $(SRCDIR)/svl/inc/pch) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index b4e807b..58b4b6e 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -33,10 +33,10 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\
     $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
     -I$(WORKDIR)/inc/ \
-    -I$(SRCDIR)/svl/inc \
-    -I$(SRCDIR)/svl/inc/svl \
-    -I$(SRCDIR)/svl/source/inc \
-    -I$(SRCDIR)/svl/inc/pch \
+    -I$(realpath $(SRCDIR)/svl/inc) \
+    -I$(realpath $(SRCDIR)/svl/inc/svl) \
+    -I$(realpath $(SRCDIR)/svl/source/inc) \
+    -I$(realpath $(SRCDIR)/svl/inc/pch) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 2d43441..246530a 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -35,8 +35,8 @@ $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
 
 $(eval $(call gb_Library_set_include,svl,\
     $$(SOLARINC) \
-    -I$(SRCDIR)/svl/source/inc \
-    -I$(SRCDIR)/svl/inc/pch \
+    -I$(realpath $(SRCDIR)/svl/source/inc) \
+    -I$(realpath $(SRCDIR)/svl/inc/pch) \
     -I$(OUTDIR)/inc/offuh \
 ))