summaryrefslogtreecommitdiff
path: root/src/mapi
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2013-10-30 12:21:54 +0000
committerJosé Fonseca <jfonseca@vmware.com>2013-10-30 12:21:54 +0000
commit26a8f76ba1a0229ee3332eaa6f1aea89d617cf3d (patch)
tree5b1ed13a03b16424846d4b1dc981231f067e6016 /src/mapi
parente929e2773736cdb05c8cbd2188360c58e5802978 (diff)
scons: Add missing dependencies to src/mapi/glapi/gen/*.xml
Incremental builds were failing because not all generated source files were missing dependencies to src/mapi/glapi/gen/*.xml. Hopefully this change will be the end of these incremental build failures.
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/glapi/SConscript7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index c4ac080aaa8..152818d223f 100644
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -52,6 +52,7 @@ for s in mapi_sources:
if (env['gcc'] or env['clang']) and \
env['platform'] not in ('cygwin', 'darwin', 'windows'):
GLAPI = '#src/mapi/glapi/'
+ sources = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml')
if env['machine'] == 'x86':
env.Append(CPPDEFINES = [
@@ -63,7 +64,7 @@ if (env['gcc'] or env['clang']) and \
env.CodeGenerate(
target = 'glapi_x86.S',
script = GLAPI + 'gen/gl_x86_asm.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
+ source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
)
elif env['machine'] == 'x86_64':
@@ -76,7 +77,7 @@ if (env['gcc'] or env['clang']) and \
env.CodeGenerate(
target = 'glapi_x86-64.S',
script = GLAPI + 'gen/gl_x86-64_asm.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
+ source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
)
elif env['machine'] == 'sparc':
@@ -89,7 +90,7 @@ if (env['gcc'] or env['clang']) and \
env.CodeGenerate(
target = 'glapi_sparc.S',
script = GLAPI + 'gen/gl_SPARC_asm.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
+ source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
)
else: