From 4b30ec9def591ba77d5ec9ac09ded1e6782ede8d Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Sat, 21 Jan 2012 01:52:59 +0100
Subject: fdo#39491 -I$(OUTDIR)/inc is set in SOLARINC

---
 framework/AllLangResTarget_fwe.mk | 2 --
 framework/Library_fwe.mk          | 1 -
 framework/Library_fwi.mk          | 1 -
 framework/Library_fwk.mk          | 1 -
 framework/Library_fwl.mk          | 1 -
 framework/Library_fwm.mk          | 1 -
 6 files changed, 7 deletions(-)

(limited to 'framework')

diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
index 6b9474ec2421..fd27382427a1 100644
--- a/framework/AllLangResTarget_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(realpath $(SRCDIR)/framework/inc/classes) \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\
@@ -55,7 +54,6 @@ $(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(realpath $(SRCDIR)/framework/inc/services) \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,fwe/fwk_services,\
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 8f3df324c520..bc55447603cd 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,fwe,\
     -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/framework \
 ))
 
 $(eval $(call gb_Library_add_defs,fwe,\
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 91b1621372f1..017116a99304 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_set_include,fwi,\
     -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/framework \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,fwi,\
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 7d8d064c90bb..3d29ed1eed8f 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,fwk,\
     -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/framework \
 ))
 
 $(eval $(call gb_Library_add_api,fwk,\
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 8f1e72ffce47..eea9ef18460b 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,fwl,\
     -I$(realpath $(SRCDIR)/framework/source/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/framework \
 ))
 
 $(eval $(call gb_Library_add_api,fwl,\
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index cd88fb413a93..520302e06d1b 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,fwm,\
     -I$(realpath $(SRCDIR)/framework/source/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/framework \
 ))
 
 $(eval $(call gb_Library_add_api,fwm,\
-- 
cgit