summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-03-24 12:10:39 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-03-24 12:10:39 -0700
commitd00b7958c033a114d1d4005a7ed59653ca80d1ce (patch)
tree843e9776a9ced1aae3b28422173ec28d7e165b25
parent7d9bce35517f1a512943cf5e1165ff9e0db44e5f (diff)
parentf41fc537280d048bca2a3b23abd17d8bb3eff907 (diff)
Merge branch 'anholt'
-rw-r--r--Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 0865977329..48b4b3921c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,12 +29,13 @@ 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="$@" $<
builtin_types.h: builtin_types.sh
- sh ./builtin_types.sh > builtin_types.h
+ bash ./builtin_types.sh > builtin_types.h