Kaydet (Commit) af130785 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Sprinkle some realpath goodness here, too

(cherry picked from commit f60ac8bb5f2a22fa2826cf08589976cb4a259d74)
üst 7a1438d5
......@@ -37,32 +37,32 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
-I$(WORKDIR)/inc/sw \
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/core/undo \
-I$(SRCDIR)/sw/source/core/unocore \
-I$(SRCDIR)/sw/source/ui/chrdlg \
-I$(SRCDIR)/sw/source/ui/config \
-I$(SRCDIR)/sw/source/ui/dbui \
-I$(SRCDIR)/sw/source/ui/dialog \
-I$(SRCDIR)/sw/source/ui/docvw \
-I$(SRCDIR)/sw/source/ui/envelp \
-I$(SRCDIR)/sw/source/ui/fldui \
-I$(SRCDIR)/sw/source/ui/fmtui \
-I$(SRCDIR)/sw/source/ui/frmdlg \
-I$(SRCDIR)/sw/source/ui/globdoc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/source/ui/index \
-I$(SRCDIR)/sw/source/ui/lingu \
-I$(SRCDIR)/sw/source/ui/misc \
-I$(SRCDIR)/sw/source/ui/ribbar \
-I$(SRCDIR)/sw/source/ui/shells \
-I$(SRCDIR)/sw/source/ui/smartmenu \
-I$(SRCDIR)/sw/source/ui/table \
-I$(SRCDIR)/sw/source/ui/uiview \
-I$(SRCDIR)/sw/source/ui/utlui \
-I$(SRCDIR)/sw/source/ui/web \
-I$(SRCDIR)/sw/source/ui/wrtsh \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
-I$(realpath $(SRCDIR)/sw/source/core/undo) \
-I$(realpath $(SRCDIR)/sw/source/core/unocore) \
-I$(realpath $(SRCDIR)/sw/source/ui/chrdlg) \
-I$(realpath $(SRCDIR)/sw/source/ui/config) \
-I$(realpath $(SRCDIR)/sw/source/ui/dbui) \
-I$(realpath $(SRCDIR)/sw/source/ui/dialog) \
-I$(realpath $(SRCDIR)/sw/source/ui/docvw) \
-I$(realpath $(SRCDIR)/sw/source/ui/envelp) \
-I$(realpath $(SRCDIR)/sw/source/ui/fldui) \
-I$(realpath $(SRCDIR)/sw/source/ui/fmtui) \
-I$(realpath $(SRCDIR)/sw/source/ui/frmdlg) \
-I$(realpath $(SRCDIR)/sw/source/ui/globdoc) \
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/source/ui/index) \
-I$(realpath $(SRCDIR)/sw/source/ui/lingu) \
-I$(realpath $(SRCDIR)/sw/source/ui/misc) \
-I$(realpath $(SRCDIR)/sw/source/ui/ribbar) \
-I$(realpath $(SRCDIR)/sw/source/ui/shells) \
-I$(realpath $(SRCDIR)/sw/source/ui/smartmenu) \
-I$(realpath $(SRCDIR)/sw/source/ui/table) \
-I$(realpath $(SRCDIR)/sw/source/ui/uiview) \
-I$(realpath $(SRCDIR)/sw/source/ui/utlui) \
-I$(realpath $(SRCDIR)/sw/source/ui/web) \
-I$(realpath $(SRCDIR)/sw/source/ui/wrtsh) \
))
$(eval $(call gb_SrsTarget_add_files,sw/res,\
......
......@@ -30,11 +30,11 @@ $(eval $(call gb_Library_Library,msword))
$(eval $(call gb_Library_set_componentfile,msword,sw/util/msword))
$(eval $(call gb_Library_set_include,msword,\
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/inc/pch \
-I$(SRCDIR)/sw/inc \
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/inc/pch) \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(WORKDIR)/inc/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
......
......@@ -34,11 +34,11 @@ $(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompi
$(eval $(call gb_Library_set_componentfile,sw,sw/util/sw))
$(eval $(call gb_Library_set_include,sw,\
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/inc/pch \
-I$(SRCDIR)/sw/inc \
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/inc/pch) \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
......@@ -732,8 +732,8 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/sdi \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(realpath $(SRCDIR)/sw/sdi) \
$$(INCLUDE) \
))
......
......@@ -33,11 +33,11 @@ $(eval $(call gb_Library_set_include,swd,\
$$(INCLUDE) \
-I$(WORKDIR)/inc/sw/sdi \
-I$(WORKDIR)/inc/sw \
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/inc/pch \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(realpath $(SRCDIR)/sw/inc/pch) \
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(OUTDIR)/inc/offuh \
))
......
......@@ -28,11 +28,11 @@
$(eval $(call gb_Library_Library,swui))
$(eval $(call gb_Library_set_include,swui,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/inc/pch \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(realpath $(SRCDIR)/sw/inc/pch) \
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw \
$$(INCLUDE) \
......
......@@ -30,11 +30,11 @@ $(eval $(call gb_Library_Library,vbaswobj))
$(eval $(call gb_Library_set_componentfile,vbaswobj,sw/util/vbaswobj))
$(eval $(call gb_Library_set_include,vbaswobj,\
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/inc/pch \
-I$(SRCDIR)/sw/inc \
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/inc/pch) \
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment