commit a665cf1226b80ec52a0c1a4a38378df4389e8ebf
author Eric Anholt <eric@anholt.net> Tue Nov 06 23:18:38 2012 -0800
committer Chad Versace <chad.versace@linux.intel.com> Mon Nov 12 15:52:42 2012 -0800
tree 8d584081c8f73a06dd1a576bad0f4e371d4e648e
parent 34d4216e64101a692d5ffb3936e7261a1732953a

automake: Merge *_CXX_FILES variables in the glsl build.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

src/glsl/Android.mk

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index f975d03..f5006ab 100644
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -36,8 +36,7 @@
 
 LOCAL_SRC_FILES := \
 	$(LIBGLCPP_FILES) \
-	$(LIBGLSL_FILES) \
-	$(LIBGLSL_CXX_FILES)
+	$(LIBGLSL_FILES)
 
 LOCAL_C_INCLUDES := \
 	external/astl/include \
@@ -59,7 +58,6 @@
 LOCAL_SRC_FILES := \
 	$(LIBGLCPP_FILES) \
 	$(LIBGLSL_FILES) \
-	$(LIBGLSL_CXX_FILES) \
 	$(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \
 	$(GLSL_COMPILER_CXX_FILES)