Mesa (master): glsl/Makefile.sources: Correct BUILTIN_COMPILER_CXX_FILES

[Matt Turner]

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

Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Jan 17 23:28:42 2013 -0800

glsl/Makefile.sources: Correct BUILTIN_COMPILER_CXX_FILES

Squashed with two reverts:

Revert "android: Update for builtin_stubs.cpp move"

This reverts commit c0def90ede1e939173041b8785303de90f8fdc6c.

Revert "scons: Update for builtin_stubs.cpp"

This reverts commit 8ac4b82699ad0a59ae6ae6d3415702eaa5d4fe3b.

Tested-by: Andreas Boll <andreas.boll.dev at gmail.com>
Tested-on-Android-by: Chad Versace <chad.versace at linux.intel.com>

---

 src/glsl/Android.mk       |    2 +-
 src/glsl/Makefile.sources |    2 +-
 src/glsl/SConscript       |    5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index f5006ab..f088e67 100644
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -58,7 +58,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
 	$(LIBGLCPP_FILES) \
 	$(LIBGLSL_FILES) \
-	$(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \
+	$(BUILTIN_COMPILER_CXX_FILES) \
 	$(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index 7955d34..de63c32 100644
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -100,7 +100,7 @@ GLSL_COMPILER_CXX_FILES = \
 # builtin_stubs.cpp, is used.
 
 BUILTIN_COMPILER_CXX_FILES = \
-	$(GLSL_SRCDIR)/builtin_stubs.cpp
+	$(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp
 
 BUILTIN_COMPILER_GENERATED_CXX_FILES = \
 	$(GLSL_BUILDDIR)/glsl_lexer.cpp \
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 6abba2a..6981f04 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -76,9 +76,8 @@ else:
 
     builtin_compiler = env.Program(
         target = 'builtin_compiler/builtin_compiler',
-        source = compiler_objs + glsl_sources + [
-            'builtin_compiler/builtin_stubs.cpp',
-        ]
+        source = compiler_objs + glsl_sources + \
+            source_lists['BUILTIN_COMPILER_CXX_FILES'],
     )
 
     # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll