diff options
| author | José Fonseca <jfonseca@vmware.com> | 2013-01-21 17:47:51 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2013-01-21 19:10:54 +0000 |
| commit | 71c87e42e17a160dfc5c2a47c9cbaa297c34c484 (patch) | |
| tree | 595b7d43b1a84ad9f1d37c1d3ce77d22bce503f4 /src/glx/SConscript | |
| parent | 75b7e1df139676f2456fea4d3a57cf0044d8409e (diff) | |
| download | external_mesa3d-71c87e42e17a160dfc5c2a47c9cbaa297c34c484.tar.gz external_mesa3d-71c87e42e17a160dfc5c2a47c9cbaa297c34c484.tar.bz2 external_mesa3d-71c87e42e17a160dfc5c2a47c9cbaa297c34c484.zip | |
scons: Fix dependencies of generated headers.
It appears that scons implicit dependency scanners fail to chain
dependencies of generated headers when these are outside the build tree.
This patch ensures generated source files are _always_ put in the build
tree. I'm not 100% this will fix all depency issues, but from my
experiments it does seem to fix this.
NOTE: For this to be effective it is necessary to clean the source tree
from generated header/source files.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/glx/SConscript')
| -rw-r--r-- | src/glx/SConscript | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/glx/SConscript b/src/glx/SConscript index c921eef703..09e0e16861 100644 --- a/src/glx/SConscript +++ b/src/glx/SConscript @@ -114,16 +114,14 @@ env.CodeGenerate( command = python_cmd + ' $SCRIPT -f $SOURCE -m init_c > $TARGET' ) -headers = [] - -headers += env.CodeGenerate( +env.CodeGenerate( target = 'indirect_size.h', script = GLAPI + 'gen/glX_proto_size.py', source = GLAPI + 'gen/gl_API.xml', command = python_cmd + ' $SCRIPT -f $SOURCE -m size_h --only-set -h _INDIRECT_SIZE_H > $TARGET' ) -headers += env.CodeGenerate( +env.CodeGenerate( target = 'indirect.h', script = GLAPI + 'gen/glX_proto_send.py', source = GLAPI + 'gen/gl_API.xml', @@ -131,9 +129,6 @@ headers += env.CodeGenerate( ) -env.Depends(sources, headers) - - libgl = env.InstallSharedLibrary(libgl, version=(1, 2)) env.Alias('glx', libgl) |