[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - xmloff/Library_xof.mk xmloff/Library_xo.mk

[Tor Lillqvist]

 xmloff/Library_xo.mk  |    6 ++----
 xmloff/Library_xof.mk |    6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 02dcdeb3d995f77beb2d03c51a7d5a705dd523e5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 11:05:13 2011 +0200

    chmod -x

diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
old mode 100755
new mode 100644
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
old mode 100755
new mode 100644
commit 84d3da35f367611b3bb68c88e7e5f53ea8b22d1b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 11:03:38 2011 +0200

    Use realpath for Cygwin goodness, drop -I options to nonexistent directories

diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 4e91bd8..2789710 100755
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -35,10 +35,8 @@ $(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/prec
 
 $(eval $(call gb_Library_set_include,xo,\
     $$(SOLARINC) \
-    -I. \
-    -I$(SRCDIR)/xmloff/inc \
-    -I$(SRCDIR)/xmloff/source/inc \
-    -I$(SRCDIR)/xmloff/inc/pch \
+    -I$(realpath $(SRCDIR)/xmloff/inc) \
+    -I$(realpath $(SRCDIR)/xmloff/inc/pch) \
     -I$(OUTDIR)/inc/offuh \
 ))
 
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index d891888..2ed555d 100755
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -30,9 +30,8 @@ $(eval $(call gb_Library_Library,xof))
 $(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof))
 
 $(eval $(call gb_Library_set_include,xof,\
-    -I$(SRCDIR)/xmloff/inc/pch \
-    -I$(SRCDIR)/xmloff/inc \
-    -I$(SRCDIR)/xmloff/source/inc \
+    -I$(realpath $(SRCDIR)/xmloff/inc/pch) \
+    -I$(realpath $(SRCDIR)/xmloff/inc) \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/offuh \
 ))
@@ -44,6 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\
     sal \
     salhelper \
     xo \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,xof,\