ralloc: a new MIT-licensed recursive memory allocator.

[mesa.git] / src / glsl / Makefile

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 83869b1d846704cf34a10a130d1e3ab7ed5651b5..b8e11e6251f257731b475d04fbdf444f079f0263 100644 (file)
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -16,6 +16,8 @@ GLCPP_SOURCES = \
        glcpp/glcpp.c
 
 C_SOURCES = \
+       strtod.c \
+       ralloc.c \
        $(LIBGLCPP_SOURCES)
 
 CXX_SOURCES = \
@@ -23,62 +25,61 @@ CXX_SOURCES = \
        ast_function.cpp \
        ast_to_hir.cpp \
        ast_type.cpp \
-       builtin_function.cpp \
        glsl_lexer.cpp \
        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 \
-       ir_dead_code.cpp \
-       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_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 \
        ir_variable.cpp \
        ir_variable_refcount.cpp \
-       ir_vec_index_to_cond_assign.cpp \
-       ir_vec_index_to_swizzle.cpp \
        linker.cpp \
        link_functions.cpp \
        loop_analysis.cpp \
        loop_controls.cpp \
        loop_unroll.cpp \
+       lower_discard.cpp \
+       lower_if_to_cond_assign.cpp \
+       lower_instructions.cpp \
+       lower_jumps.cpp \
+       lower_mat_op_to_vec.cpp \
        lower_noise.cpp \
        lower_texture_projection.cpp \
        lower_variable_index_to_cond_assign.cpp \
+       lower_vec_index_to_cond_assign.cpp \
+       lower_vec_index_to_swizzle.cpp \
+       lower_vector.cpp \
+       opt_algebraic.cpp \
+       opt_constant_folding.cpp \
+       opt_constant_propagation.cpp \
+       opt_constant_variable.cpp \
+       opt_copy_propagation.cpp \
+       opt_dead_code.cpp \
+       opt_dead_code_local.cpp \
+       opt_dead_functions.cpp \
+       opt_discard_simplification.cpp \
+       opt_function_inlining.cpp \
+       opt_if_simplification.cpp \
+       opt_noop_swizzle.cpp \
        opt_redundant_jumps.cpp \
+       opt_structure_splitting.cpp \
+       opt_swizzle_swizzle.cpp \
+       opt_tree_grafting.cpp \
        s_expression.cpp
 
 LIBS = \
@@ -129,8 +130,8 @@ ALL_SOURCES = \
 
 default: depend lib$(LIBNAME).a $(APPS)
 
-lib$(LIBNAME).a: $(OBJECTS) Makefile $(TOP)/src/glsl/Makefile.template
-       $(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS)
+lib$(LIBNAME).a: $(OBJECTS) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template
+       $(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS) builtin_function.o
 
 depend: $(ALL_SOURCES) Makefile
        rm -f depend
@@ -139,7 +140,7 @@ depend: $(ALL_SOURCES) Makefile
 
 # Remove .o and backup files
 clean:
-       rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak
+       rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak builtin_function.cpp builtin_function.o builtin_stubs.o builtin_compiler
        -rm -f $(APPS)
 
 # Dummy target
@@ -173,13 +174,11 @@ glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
 glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
        bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
 
-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
+builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
+       $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o $(TALLOC_LIBS) -o $@
+
+builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler
        @echo Regenerating builtin_function.cpp...
-       ./builtins/tools/generate_builtins.py > builtin_function.cpp
-       @echo Rebuilding the real compiler...
-       make glsl_compiler
+       $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py $(PWD)/builtin_compiler > builtin_function.cpp
 
 -include depend