mesa: EXT_framebuffer_sRGB interface additions.

[mesa.git] / src / glsl / Makefile

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index f5aadc347bd5e20f86ef92521a32a82a4a405b77..c9525446633aa9a02ad6964add8279e359f74c67 100644 (file)
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -16,6 +16,7 @@ GLCPP_SOURCES = \
        glcpp/glcpp.c
 
 C_SOURCES = \
+       strtod.c \
        $(LIBGLCPP_SOURCES)
 
 CXX_SOURCES = \
@@ -23,7 +24,6 @@ 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 \
@@ -52,6 +52,7 @@ CXX_SOURCES = \
        loop_analysis.cpp \
        loop_controls.cpp \
        loop_unroll.cpp \
+       lower_discard.cpp \
        lower_if_to_cond_assign.cpp \
        lower_instructions.cpp \
        lower_jumps.cpp \
@@ -70,6 +71,7 @@ CXX_SOURCES = \
        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 \
@@ -127,8 +129,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
@@ -137,7 +139,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
@@ -171,13 +173,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...
-       $(PYTHON2) $(PYTHON_FLAGS) 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