[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - toolkit/AllLangResTarget_tk.mk toolkit/Library_tk.mk

[Tor Lillqvist]

 toolkit/AllLangResTarget_tk.mk |    2 +-
 toolkit/Library_tk.mk          |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit dad970a075863d91e3b6ce1a0a0c5455198afda1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 20:14:18 2011 +0200

    Use realpath to avoid -I options containing symlinks on Cygwin

diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index e0dbfd5..15c8692 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -35,9 +35,9 @@ $(eval $(call gb_Library_add_package_headers,tk,toolkit_inc))
 
 $(eval $(call gb_Library_set_include,tk,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/toolkit/inc \
-    -I$(SRCDIR)/toolkit/inc/pch \
-    -I$(SRCDIR)/toolkit/source \
+    -I$(realpath $(SRCDIR)/toolkit/inc) \
+    -I$(realpath $(SRCDIR)/toolkit/inc/pch) \
+    -I$(realpath $(SRCDIR)/toolkit/source) \
     -I$(OUTDIR)/inc/offuh \
 ))
 
commit 0a462f85e1b3fb0564dc7cd077b7ccfe2ec6ed67
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 20:11:04 2011 +0200

    Use manually expansion of the "toolkit" symlink
    
    rsc is not a Cygwin program, so it doesn't understand pathnames
    containing symlinks. I couldn't figure out a way to use Make's
    realpath function here, unfortunately. So expand the symlink manually,
    we know it is always clone/libs-gui/toolkit, isn't it?

diff --git a/toolkit/AllLangResTarget_tk.mk b/toolkit/AllLangResTarget_tk.mk
index e127bef..a9c8a2f 100644
--- a/toolkit/AllLangResTarget_tk.mk
+++ b/toolkit/AllLangResTarget_tk.mk
@@ -41,5 +41,5 @@ $(eval $(call gb_SrsTarget_set_include,toolkit/awt,\
 ))
 
 $(eval $(call gb_SrsTarget_add_files,toolkit/awt,\
-    toolkit/source/awt/xthrobber.src \
+    clone/libs-gui/toolkit/source/awt/xthrobber.src \
 ))