Mesa (master): scons: Take indirect gl_and_es_API.xml dependencies in consideration.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sun Aug 28 06:52:09 UTC 2016
Module: Mesa
Branch: master
Commit: 09dafb96301415df000e212925245f8014ec2d11
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=09dafb96301415df000e212925245f8014ec2d11
Author: Jose Fonseca <jfonseca at vmware.com>
Date: Sat Aug 27 21:30:38 2016 +0100
scons: Take indirect gl_and_es_API.xml dependencies in consideration.
Same as 26a8f76ba1a0229ee3332eaa6f1aea89d617cf3d.
Trivial.
---
src/mapi/shared-glapi/SConscript | 3 ++-
src/mesa/SConscript | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript
index fc51c3a..e5d45db 100644
--- a/src/mapi/shared-glapi/SConscript
+++ b/src/mapi/shared-glapi/SConscript
@@ -26,10 +26,11 @@ def mapi_objects(env, printer, mode):
header_name = '%s-tmp.h' % (printer)
# generate ABI header
+ GLAPI = '../glapi/'
header = env.CodeGenerate(
target = header_name,
script = '../mapi_abi.py',
- source = '../glapi/gen/gl_and_es_API.xml',
+ source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'),
command = python_cmd + ' $SCRIPT ' + \
'--printer %s --mode lib $SOURCE > $TARGET' % (printer),
)
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 05aa660..13a2e6a 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -53,7 +53,7 @@ GLAPI = '#src/mapi/glapi/'
get_hash_header = env.CodeGenerate(
target = 'main/get_hash.h',
script = 'main/get_hash_generator.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
+ source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'),
command = python_cmd + ' $SCRIPT ' + ' -f $SOURCE > $TARGET'
)
More information about the mesa-commit
mailing list