From: Jose Fonseca <jfonseca@vmware.com>
Date: Sat, 27 Aug 2016 20:30:38 +0000 (+0100)
Subject: scons: Take indirect gl_and_es_API.xml dependencies in consideration.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=09dafb96301415df000e212925245f8014ec2d11;p=mesa.git

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 fc51c3a0206..e5d45db5949 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 05aa6601110..13a2e6a7a2c 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'
 )