commit d3e9aa8d88e6684235bb0be549551d1402ef8881
author Jose Fonseca <jfonseca@vmware.com> Wed Mar 18 14:22:41 2015 +0000
committer Jose Fonseca <jfonseca@vmware.com> Wed Mar 18 21:51:54 2015 +0000
tree 0f75e66db5251673b08d3a72edb839001979d086
parent a56f1a8b32a2cafdd4e46c0d48a1a252d0e3c0ae

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>

src/mesa/SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 81939f9..cc5d242 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -40,17 +40,12 @@
 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']
 )