summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-03-17 11:03:38 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-03-17 11:04:32 +0200
commit84d3da35f367611b3bb68c88e7e5f53ea8b22d1b (patch)
tree9ffb175c063ec3a20f7e81cfe6e02e4c2c3d07d0
parent2996d639b245fc99d43b5ea03481ee9df279d4c5 (diff)
Use realpath for Cygwin goodness, drop -I options to nonexistent directories
-rwxr-xr-xxmloff/Library_xo.mk6
-rwxr-xr-xxmloff/Library_xof.mk6
2 files changed, 5 insertions, 7 deletions
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 4e91bd83f7..2789710884 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 d891888645..2ed555d7ac 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,\