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>

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

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 6fb3d2d..ea76176 100644 (file)
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -43,7 +43,6 @@ libglsl_la_SOURCES = \
        glsl_lexer.ll \
        glsl_parser.cc \
        $(LIBGLSL_FILES) \
-       $(LIBGLSL_CXX_FILES) \
        builtin_function.cpp
 
 libglsl_la_LIBADD = glcpp/libglcpp.la

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index 0da6958..6c031b6 100644 (file)
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -15,10 +15,6 @@ LIBGLCPP_GENERATED_FILES = \
 # libglsl
 
 LIBGLSL_FILES = \
-       $(GLSL_SRCDIR)/strtod.c \
-       $(GLSL_SRCDIR)/ralloc.c
-
-LIBGLSL_CXX_FILES = \
        $(GLSL_SRCDIR)/ast_expr.cpp \
        $(GLSL_SRCDIR)/ast_function.cpp \
        $(GLSL_SRCDIR)/ast_to_hir.cpp \
@@ -85,7 +81,10 @@ LIBGLSL_CXX_FILES = \
        $(GLSL_SRCDIR)/opt_structure_splitting.cpp \
        $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \
        $(GLSL_SRCDIR)/opt_tree_grafting.cpp \
-       $(GLSL_SRCDIR)/s_expression.cpp
+       $(GLSL_SRCDIR)/s_expression.cpp \
+       $(GLSL_SRCDIR)/strtod.c \
+       $(GLSL_SRCDIR)/ralloc.c \
+       $()
 
 # glsl_compiler
 

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 89014ee..0cf25c0 100644 (file)
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -46,7 +46,7 @@ glsl_sources = [
 source_lists = env.ParseSourceList('Makefile.sources')
 
 # add non-generated sources
-for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES', 'LIBGLSL_CXX_FILES'):
+for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES'):
     glsl_sources += source_lists[l]
 
 if env['msvc']:

diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index 1de6df8..6958e32 100644 (file)
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
@@ -38,7 +38,6 @@ libdricore@VERSION@_la_SOURCES = \
        $(LIBGLCPP_GENERATED_FILES) \
        $(LIBGLCPP_FILES) \
        $(LIBGLSL_FILES) \
-       $(LIBGLSL_CXX_FILES) \
        $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
        $(top_builddir)/src/glsl/builtin_function.cpp
 libdricore@VERSION@_la_LDFLAGS = -version-number 1:0