From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 3 Mar 2011 15:43:18 +0000 (+0000)
Subject: scons: Ensure generated headers are in the include path.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dbfbb8cf6da472e9000481ebd6a2a6b4e4845560;p=mesa.git

scons: Ensure generated headers are in the include path.
---

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 10abab6f945..c2e5d45ebad 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -24,6 +24,9 @@ glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')
 glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')
 glsl_parser = parser_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')
 
+# Make glcpp/glcpp-parse.h reacheable from the include path
+env.Append(CPPPATH = [glcpp_parser[0].dir.up()])
+
 sources = [
     glcpp_lexer,
     glcpp_parser[0],
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index acbf86ebd2d..ca36bf27f94 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -218,6 +218,10 @@ env.Append(YACCFLAGS = '-d')
 program_lex = env.CFile('program/lex.yy.c', 'program/program_lexer.l')
 program_parse = env.CFile('program/program_parse.tab.c',
                           'program/program_parse.y')
+
+# Make program/program_parse.tab.h reacheable from the include path
+env.Append(CPPPATH = [program_parse[0].dir.up()])
+
 program_sources = [
     'program/arbprogparse.c',
     'program/hash_table.c',