From d3e9aa8d88e6684235bb0be549551d1402ef8881 Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Wed, 18 Mar 2015 14:22:41 +0000 Subject: [PATCH] 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 --- src/mesa/SConscript | 11 +++-------- 1 file 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'] )