scons: Take indirect gl_and_es_API.xml dependencies in consideration.

Same as 26a8f76ba1a0229ee3332eaa6f1aea89d617cf3d.

Trivial.

diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript
index fc51c3a02062dc33986e16ee2638bebb329bc85b..e5d45db5949c4a58c867b628706a237fe36afc1d 100644 (file)
--- 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 05aa66011106027701d38349585e789c8d836318..13a2e6a7a2c91715f3f43138b917f33ad91a3b5e 100644 (file)
--- 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'
 )