summaryrefslogtreecommitdiff
path: root/src/glx
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/glx
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/glx')
-rw-r--r--src/glx/SConscript11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/glx/SConscript b/src/glx/SConscript
index 09e0e16861c..887ac61cf02 100644
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -92,39 +92,40 @@ libgl = env.SharedLibrary(
# used by other targets as well.
GLAPI = '#src/mapi/glapi/'
+sources = [GLAPI + 'gen/gl_API.xml'] + env.Glob(GLAPI + 'gen/*.xml')
env.CodeGenerate(
target = 'indirect.c',
script = GLAPI + 'gen/glX_proto_send.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
+ source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE -m proto > $TARGET'
)
env.CodeGenerate(
target = 'indirect_size.c',
script = GLAPI + 'gen/glX_proto_size.py',
- source = GLAPI + 'gen/gl_API.xml',
+ source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE -m size_c --only-set > $TARGET'
)
env.CodeGenerate(
target = 'indirect_init.c',
script = GLAPI + 'gen/glX_proto_send.py',
- source = GLAPI + 'gen/gl_API.xml',
+ source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE -m init_c > $TARGET'
)
env.CodeGenerate(
target = 'indirect_size.h',
script = GLAPI + 'gen/glX_proto_size.py',
- source = GLAPI + 'gen/gl_API.xml',
+ source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE -m size_h --only-set -h _INDIRECT_SIZE_H > $TARGET'
)
env.CodeGenerate(
target = 'indirect.h',
script = GLAPI + 'gen/glX_proto_send.py',
- source = GLAPI + 'gen/gl_API.xml',
+ source = sources,
command = python_cmd + ' $SCRIPT -m init_h -f $SOURCE > $TARGET',
)