summaryrefslogtreecommitdiffstats
path: root/src/mesa/SConscript
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2015-03-18 14:22:41 +0000
committerJose Fonseca <jfonseca@vmware.com>2015-03-18 21:51:54 +0000
commitd3e9aa8d88e6684235bb0be549551d1402ef8881 (patch)
tree0f75e66db5251673b08d3a72edb839001979d086 /src/mesa/SConscript
parenta56f1a8b32a2cafdd4e46c0d48a1a252d0e3c0ae (diff)
scons: Don't link program_lexer.l/y twice.
program/lex.yy.c and program/program_parse.tab.c is already included in the PROGRAM_FILES variable. We still need to specify the dependency relationship though. Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/SConscript')
-rw-r--r--src/mesa/SConscript11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 81939f981ca..cc5d24221c3 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -40,17 +40,12 @@ else:
source_lists = env.ParseSourceList('Makefile.sources')
env.Append(YACCFLAGS = '-d -p "_mesa_program_"')
-program_lex = env.CFile('program/lex.yy.c', 'program/program_lexer.l')
-program_parse = env.CFile('program/program_parse.tab.c',
- 'program/program_parse.y')
-program_sources = source_lists['PROGRAM_FILES'] + [
- program_lex,
- program_parse[0],
-]
+env.CFile('program/lex.yy.c', 'program/program_lexer.l')
+env.CFile('program/program_parse.tab.c', 'program/program_parse.y')
mesa_sources = (
source_lists['MESA_FILES'] +
- program_sources +
+ source_lists['PROGRAM_FILES'] +
source_lists['STATETRACKER_FILES']
)