Mesa (master): make: Don't use builtin_stubs. cpp for standalone GLSL compiler.

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: dbae4960831d319ff2f536d88dc3104d9e031dfa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dbae4960831d319ff2f536d88dc3104d9e031dfa

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Sep 19 23:06:53 2011 -0700

make: Don't use builtin_stubs.cpp for standalone GLSL compiler.

builtin_stubs.cpp is only supposed to be used for builtin_compiler.  It
contains a stub version of _mesa_glsl_initialize_functions() that does
nothing.

libglsl.a already contains builtin_function.cpp, the generated file that
contains a version of _mesa_glsl_initialize_functions() that actually
initializes all the built-in functions.

By mistakenly linking to builtin_stubs, glsl_compiler and glsl_test are
unable to compile any shaders that use built-in functions.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>

---

 src/glsl/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index c20a6c9..00b7b91 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -188,11 +188,11 @@ install-dricore: default
 
 ##### RULES #####
 
-glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o
-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@
+glsl_compiler: $(GLSL2_OBJECTS) libglsl.a
+	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) $(LIBS) -o $@
 
-glsl_test: $(TEST_OBJECTS) libglsl.a builtin_stubs.o
-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TEST_OBJECTS) builtin_stubs.o $(LIBS) -o $@
+glsl_test: $(TEST_OBJECTS) libglsl.a
+	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TEST_OBJECTS) $(LIBS) -o $@
 
 glcpp: glcpp/glcpp
 glcpp/glcpp: $(GLCPP_OBJECTS)