ir: Give ir_instruction a print visitor helper.

[mesa.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 48b4b3921c061fab1d6a1251dc08c96d702c25ff..f24f06d0aa737f22a1d595c3eb904553f0c8759b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,20 +22,49 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+SUBDIRS = glcpp
+
 bin_PROGRAMS = glsl
-glsl_SOURCES = symbol_table.c hash_table.c glsl_types.cpp \
+
+glsl_LDADD = ./glcpp/libglcpp.la
+glsl_LDFLAGS = @LDFLAGS@ $(talloc_LIBS)
+glsl_SOURCES = \
+       main.cpp \
+       builtin_types.h \
+       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_type.cpp \
-       ir.cpp hir_field_selection.cpp \
-       ir_print_visitor.cpp ir_variable.cpp ir_function.cpp
+       ir.cpp hir_field_selection.cpp builtin_function.cpp \
+       ir_print_visitor.cpp ir_variable.cpp ir_function.cpp \
+       ir_basic_block.cpp \
+       ir_basic_block.h \
+       ir_constant_expression.cpp \
+       ir_constant_folding.cpp \
+       ir_constant_variable.cpp \
+       ir_copy_propagation.cpp \
+       ir_copy_propagation.h \
+       ir_dead_code.cpp \
+       ir_dead_code.h \
+       ir_dead_code_local.cpp \
+       ir_expression_flattening.cpp \
+       ir_function_can_inline.cpp \
+       ir_function_inlining.cpp \
+       ir_if_simplification.cpp \
+       ir_optimization.h \
+       ir_reader.cpp s_expression.cpp \
+       ir_hv_accept.cpp \
+       ir_hierarchical_visitor.h \
+       ir_hierarchical_visitor.cpp \
+       ir_swizzle_swizzle.cpp \
+       ir_vec_index_to_swizzle.cpp \
+       linker.cpp
 
-BUILT_SOURCES = glsl_parser.h builtin_types.h glsl_parser.cpp glsl_lexer.cpp
+BUILT_SOURCES = glsl_parser.h glsl_parser.cpp glsl_lexer.cpp
 CLEANFILES = $(BUILT_SOURCES)
 
+builtin_function.cpp: builtins/*/*
+       ./builtins/tools/generate_builtins.pl > builtin_function.cpp
 glsl_parser.h: glsl_parser.cpp
 
 .lpp.cpp:
        $(LEXCOMPILE) --outfile="$@" $<
-
-builtin_types.h: builtin_types.sh
-       bash ./builtin_types.sh > builtin_types.h