diff options
| author | Eric Anholt <[email protected]> | 2012-11-06 23:18:38 -0800 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2012-11-12 15:52:42 -0800 |
| commit | a665cf1226b80ec52a0c1a4a38378df4389e8ebf (patch) | |
| tree | 8d584081c8f73a06dd1a576bad0f4e371d4e648e | |
| parent | 34d4216e64101a692d5ffb3936e7261a1732953a (diff) | |
automake: Merge *_CXX_FILES variables in the glsl build.
Reviewed-by: Chad Versace <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/glsl/Android.mk | 4 | ||||
| -rw-r--r-- | src/glsl/Makefile.am | 1 | ||||
| -rw-r--r-- | src/glsl/Makefile.sources | 9 | ||||
| -rw-r--r-- | src/glsl/SConscript | 2 | ||||
| -rw-r--r-- | src/mesa/libdricore/Makefile.am | 1 |
5 files changed, 6 insertions, 11 deletions
diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk index f975d03d1bb..f5006ab03f6 100644 --- 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 6fb3d2d9dc7..ea7617685dc 100644 --- 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 0da6958d1a7..6c031b69981 100644 --- 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 89014ee3c42..0cf25c07b92 100644 --- 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 1de6df80ff1..6958e327a3e 100644 --- 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 |