From 6985a43832fa170d62ef08f831210248b4a4b03e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 23 Mar 2010 20:24:11 -0700 Subject: [PATCH 1/3] Clean the built sources with make clean. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 0865977329d..03aae628f1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,7 @@ glsl_SOURCES = symbol_table.c hash_table.c glsl_types.cpp \ ir_print_visitor.cpp ir_variable.cpp ir_function.cpp BUILT_SOURCES = glsl_parser.h builtin_types.h +CLEANFILES = $(BUILT_SOURCES) glsl_parser.h: glsl_parser.ypp From e5ba18083b20da540ea0dc216e744a4c3e550833 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 23 Mar 2010 20:24:33 -0700 Subject: [PATCH 2/3] Use bash for the built file generation since builtin_types.sh requires it. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 03aae628f1f..f299c3fc4f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,4 +38,4 @@ glsl_parser.h: glsl_parser.ypp $(LEXCOMPILE) --outfile="$@" $< builtin_types.h: builtin_types.sh - sh ./builtin_types.sh > builtin_types.h + bash ./builtin_types.sh > builtin_types.h From f41fc537280d048bca2a3b23abd17d8bb3eff907 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 23 Mar 2010 20:43:10 -0700 Subject: [PATCH 3/3] Include other generated sources in BUILT_SOURCES. Otherwise, having cleaned glsl_parser.h, we'd never regenerate it because glsl_parser.cpp was already right where it needed to be. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f299c3fc4f9..48b4b3921c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,10 +29,10 @@ glsl_SOURCES = symbol_table.c hash_table.c glsl_types.cpp \ ir.cpp hir_field_selection.cpp \ ir_print_visitor.cpp ir_variable.cpp ir_function.cpp -BUILT_SOURCES = glsl_parser.h builtin_types.h +BUILT_SOURCES = glsl_parser.h builtin_types.h glsl_parser.cpp glsl_lexer.cpp CLEANFILES = $(BUILT_SOURCES) -glsl_parser.h: glsl_parser.ypp +glsl_parser.h: glsl_parser.cpp .lpp.cpp: $(LEXCOMPILE) --outfile="$@" $<