Replace accesses to glsl_type data with query functions

[mesa.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b2c49b018bb73c18d5557654ab8267489f6550b2..48b4b3921c061fab1d6a1251dc08c96d702c25ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,16 +25,17 @@ AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS = glsl
 glsl_SOURCES = symbol_table.c hash_table.c glsl_types.cpp \
        glsl_parser.ypp glsl_lexer.lpp glsl_parser_extras.cpp \
-       ast_expr.cpp ast_to_hir.cpp ast_function.cpp \
+       ast_expr.cpp ast_to_hir.cpp ast_function.cpp ast_type.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