X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2FMakefile;h=83869b1d846704cf34a10a130d1e3ab7ed5651b5;hb=3cdff41d9245f997c465869148a74a2041739504;hp=844385792aa9f5c05f82a8555159de9757a6057f;hpb=2e853ca23c8670246dd4efcee0706f68097652f7;p=mesa.git

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 844385792aa..83869b1d846 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -28,12 +28,14 @@ CXX_SOURCES = \
 	glsl_parser.cpp \
 	glsl_parser_extras.cpp \
 	glsl_types.cpp \
+	glsl_symbol_table.cpp \
 	hir_field_selection.cpp \
 	ir_algebraic.cpp \
 	ir_basic_block.cpp \
 	ir_clone.cpp \
 	ir_constant_expression.cpp \
 	ir_constant_folding.cpp \
+	ir_constant_propagation.cpp \
 	ir_constant_variable.cpp \
 	ir_copy_propagation.cpp \
 	ir.cpp \
@@ -41,20 +43,26 @@ CXX_SOURCES = \
 	ir_dead_code_local.cpp \
 	ir_dead_functions.cpp \
 	ir_div_to_mul_rcp.cpp \
+	ir_explog_to_explog2.cpp \
 	ir_expression_flattening.cpp \
 	ir_function_can_inline.cpp \
 	ir_function.cpp \
 	ir_function_inlining.cpp \
 	ir_hierarchical_visitor.cpp \
 	ir_hv_accept.cpp \
-	ir_if_return.cpp \
 	ir_if_simplification.cpp \
 	ir_if_to_cond_assign.cpp \
 	ir_import_prototypes.cpp \
+	ir_lower_jumps.cpp \
 	ir_mat_op_to_vec.cpp \
 	ir_mod_to_fract.cpp \
+	ir_noop_swizzle.cpp \
 	ir_print_visitor.cpp \
 	ir_reader.cpp \
+	ir_rvalue_visitor.cpp \
+	ir_set_program_inouts.cpp \
+	ir_structure_splitting.cpp \
+	ir_sub_to_add_neg.cpp \
 	ir_swizzle_swizzle.cpp \
 	ir_tree_grafting.cpp \
 	ir_validate.cpp \
@@ -64,11 +72,18 @@ CXX_SOURCES = \
 	ir_vec_index_to_swizzle.cpp \
 	linker.cpp \
 	link_functions.cpp \
+	loop_analysis.cpp \
+	loop_controls.cpp \
+	loop_unroll.cpp \
+	lower_noise.cpp \
+	lower_texture_projection.cpp \
+	lower_variable_index_to_cond_assign.cpp \
+	opt_redundant_jumps.cpp \
 	s_expression.cpp
 
 LIBS = \
 	$(TOP)/src/glsl/libglsl.a \
-	$(shell pkg-config --libs talloc)
+	$(TALLOC_LIBS)
 
 APPS = glsl_compiler glcpp/glcpp
 
@@ -97,6 +112,7 @@ OBJECTS = \
 	$(CXX_SOURCES:.cpp=.o)
 
 INCLUDES = \
+	$(TALLOC_CFLAGS) \
 	-I. \
 	-I../mesa \
 	-I../mapi \
@@ -123,7 +139,7 @@ depend: $(ALL_SOURCES) Makefile
 
 # Remove .o and backup files
 clean:
-	rm -f $(OBJECTS) lib$(LIBNAME).a depend depend.bak
+	rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak
 	-rm -f $(APPS)
 
 # Dummy target
@@ -146,18 +162,24 @@ glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
 	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
 glsl_lexer.cpp: glsl_lexer.lpp
-	flex --never-interactive --outfile="$@"  $<
+	flex --nounistd -o$@  $<
 
 glsl_parser.cpp: glsl_parser.ypp
-	bison -v -o "$@" --defines=glsl_parser.h $<
+	bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
 
 glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
-	flex --never-interactive --outfile="$@" $<
+	flex --nounistd -o$@  $<
 
 glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
 	bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
 
-builtin_function.cpp: builtins/*/*
-	./builtins/tools/generate_builtins.pl > builtin_function.cpp
+builtins: builtin_function.cpp builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py
+	@echo Bootstrapping the compiler...
+	cp builtins/tools/builtin_function.cpp .
+	make glsl_compiler
+	@echo Regenerating builtin_function.cpp...
+	./builtins/tools/generate_builtins.py > builtin_function.cpp
+	@echo Rebuilding the real compiler...
+	make glsl_compiler
 
 -include depend