scons: Don't link program_lexer.l/y twice.
authorJose Fonseca <jfonseca@vmware.com>
Wed, 18 Mar 2015 14:22:41 +0000 (14:22 +0000)
committerJose Fonseca <jfonseca@vmware.com>
Wed, 18 Mar 2015 21:51:54 +0000 (21:51 +0000)
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

index 81939f981ca112d7435f08cc87a4155911e4b528..cc5d24221c3fcc8d9322b93f6dd36e2c17939e4c 100644 (file)
@@ -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']
 )