scons: Fix dependencies of generated headers.

It appears that scons implicit dependency scanners fail to chain
dependencies of generated headers when these are outside the build tree.

This patch ensures generated source files are _always_ put in the build
tree. I'm not 100% this will fix all depency issues, but from my
experiments it does seem to fix this.

NOTE: For this to be effective it is necessary to clean the source tree
from generated header/source files.

Reviewed-by: Brian Paul <[email protected]>

3 files changed, 24 insertions, 31 deletions

diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index 153374cc551..00cce3e7fda 100644
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -26,6 +26,7 @@ if env['platform'] == 'windows':
 env.Append(CPPPATH = [
     '#/src/mapi',
     '#/src/mesa',
+    Dir('..'), # src/mapi build path
 ])
 
 glapi_sources = [
@@ -103,6 +104,3 @@ glapi = env.ConvenienceLibrary(
     source = glapi_sources,
 )
 Export('glapi')
-
-
-env.Depends(glapi_sources, glapi_headers)
diff --git a/src/mapi/glapi/gen/SConscript b/src/mapi/glapi/gen/SConscript
index 353d0217591..6d36248e783 100644
--- a/src/mapi/glapi/gen/SConscript
+++ b/src/mapi/glapi/gen/SConscript
@@ -7,43 +7,37 @@ from sys import executable as python_cmd
 # Mesa and GLX tree.  Other .c and .h files are generated elsewhere
 # if they're only used in one place.
 
-GLAPI = '#src/mapi/glapi/'
-
-glapi_headers = []
-
-glapi_headers += env.CodeGenerate(
-    target = '#src/mesa/main/dispatch.h',
-    script = GLAPI + 'gen/gl_table.py',
-    source = GLAPI + 'gen/gl_and_es_API.xml',
+env.CodeGenerate(
+    target = '../../../mesa/main/dispatch.h',
+    script = 'gl_table.py',
+    source = 'gl_and_es_API.xml',
     command = python_cmd + ' $SCRIPT -m remap_table -f $SOURCE > $TARGET',
     )
 
-glapi_headers += env.CodeGenerate(
-    target = '#src/mapi/glapi/glapitable.h',
-    script = GLAPI + 'gen/gl_table.py',
-    source = GLAPI + 'gen/gl_and_es_API.xml',
+env.CodeGenerate(
+    target = '../../../mapi/glapi/glapitable.h',
+    script = 'gl_table.py',
+    source = 'gl_and_es_API.xml',
     command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
     )
 
-glapi_headers += env.CodeGenerate(
-    target = '#src/mapi/glapi/glapitemp.h',
-    script = GLAPI + 'gen/gl_apitemp.py',
-    source = GLAPI + 'gen/gl_and_es_API.xml',
+env.CodeGenerate(
+    target = '../../../mapi/glapi/glapitemp.h',
+    script = 'gl_apitemp.py',
+    source = 'gl_and_es_API.xml',
     command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
     )
 
-glapi_headers += env.CodeGenerate(
-    target = '#src/mapi/glapi/glprocs.h',
-    script = GLAPI + 'gen/gl_procs.py',
-    source = GLAPI + 'gen/gl_and_es_API.xml',
+env.CodeGenerate(
+    target = '../../../mapi/glapi/glprocs.h',
+    script = 'gl_procs.py',
+    source = 'gl_and_es_API.xml',
     command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
     )
 
-glapi_headers += env.CodeGenerate(
-    target = '#src/mesa/main/remap_helper.h',
-    script = GLAPI + 'gen/remap_helper.py',
-    source = GLAPI + 'gen/gl_and_es_API.xml',
+env.CodeGenerate(
+    target = '../../../mesa/main/remap_helper.h',
+    script = 'remap_helper.py',
+    source = 'gl_and_es_API.xml',
     command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
     )
-
-env.Export('glapi_headers')
diff --git a/src/mapi/vgapi/SConscript b/src/mapi/vgapi/SConscript
index 10241fd08c7..fd4467bb231 100644
--- a/src/mapi/vgapi/SConscript
+++ b/src/mapi/vgapi/SConscript
@@ -7,8 +7,8 @@ Import('*')
 
 env = env.Clone()
 
-vgapi_header = env.CodeGenerate(
-    target = '#src/mapi/vgapi/vgapi_tmp.h',
+vgapi_header, = env.CodeGenerate(
+    target = 'vgapi_tmp.h',
     script = '../mapi/mapi_abi.py',
     source = 'vgapi.csv',
     command = python_cmd + ' $SCRIPT --printer vgapi --mode lib $SOURCE > $TARGET'
@@ -23,6 +23,7 @@ env.Append(CPPDEFINES = [
 env.Append(CPPPATH = [
     '#/include',
     '#/src/mapi',
+    Dir('..'), # vgapi/vgapi_tmp.h build path
 ])
 
 mapi_sources = [