[Libreoffice-commits] .: sc/AllLangResTarget_sc.mk sc/Library_scd.mk sc/Library_sc.mk sc/Library_scui.mk

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Thu Apr 28 17:38:16 PDT 2011


 sc/AllLangResTarget_sc.mk |    1 -
 sc/Library_sc.mk          |    1 -
 sc/Library_scd.mk         |    1 -
 sc/Library_scui.mk        |    5 ++---
 4 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit bef6285629ada7a520f659929010fb41c7dc65f7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Apr 28 19:31:23 2011 -0500

    Remove unnecessary include in sc build

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 611df16..9c88013 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sc/res))
 
 $(eval $(call gb_SrsTarget_set_include,sc/res,\
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc \
 	-I$(WORKDIR)/inc/sc \
 	-I$(realpath $(SRCDIR)/sc/inc) \
 	-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 59d6617..d32c432 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_set_include,sc,\
         -I$(WORKDIR)/Misc/sc/ \
         $$(INCLUDE) \
         -I$(OUTDIR)/inc/offuh \
-        -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_Library_set_defs,sc,\
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 9dcb7d1..0331df2 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,scd,\
         -I$(WORKDIR)/Misc/sc/ \
         $$(INCLUDE) \
         -I$(OUTDIR)/inc/offuh \
-        -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_Library_set_defs,scd,\
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index f774d3d..1e0ef6b 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -22,15 +22,14 @@
 $(eval $(call gb_Library_Library,scui))
 
 $(eval $(call gb_Library_set_include,scui,\
-	-I$(realpath $(SRCDIR)/sc/inc) \
-	-I$(realpath $(SRCDIR)/sc/inc/pch) \
 	-I$(realpath $(SRCDIR)/sc/source/core/inc) \
 	-I$(realpath $(SRCDIR)/sc/source/filter/inc) \
 	-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+	-I$(realpath $(SRCDIR)/sc/inc) \
+	-I$(realpath $(SRCDIR)/sc/inc/pch) \
 	-I$(WORKDIR)/SdiTarget/sc/sdi \
 	-I$(WORKDIR)/Misc/sc \
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/sc \
 	-I$(OUTDIR)/inc/offuh \
 ))
 


More information about the Libreoffice-commits mailing list