diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-07-17 13:30:51 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-09-11 19:19:31 +0100 |
| commit | 1f2b601f8b5855f1c01d81527d0692946c16791b (patch) | |
| tree | 6c08424dd539ce8eb53cf2b2ff9f19a12368f7a9 | |
| parent | 4ca5756766d538a30a12d37ec88f85c679da0c1f (diff) | |
glsl: build: use makefile.sources variables when possible
Rather than folding one variable within the other only to unwrap them,
just use the ones we need.
v2: bring back LOCAL_PATH prefix for nir_constant_expressions,h
Cc: 11.0 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com> (v1)
(cherry picked from commit a3b05e04921a4fcc05cfc994e415e3ceb39fd184)
| -rw-r--r-- | src/glsl/Android.gen.mk | 19 | ||||
| -rw-r--r-- | src/glsl/Makefile.am | 7 | ||||
| -rw-r--r-- | src/glsl/Makefile.sources | 3 |
3 files changed, 11 insertions, 18 deletions
diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk index 0835871f912..798884f2602 100644 --- a/src/glsl/Android.gen.mk +++ b/src/glsl/Android.gen.mk @@ -29,18 +29,7 @@ endif intermediates := $(call local-generated-sources-dir) -sources := \ - glsl_lexer.cpp \ - glsl_parser.cpp \ - glcpp/glcpp-lex.c \ - glcpp/glcpp-parse.c \ - nir/nir_builder_opcodes.h \ - nir/nir_constant_expressions.c \ - nir/nir_opcodes.c \ - nir/nir_opcodes.h \ - nir/nir_opt_algebraic.c - -LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES)) +LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) LOCAL_C_INCLUDES += \ $(intermediates)/glcpp \ @@ -51,8 +40,10 @@ LOCAL_C_INCLUDES += \ LOCAL_EXPORT_C_INCLUDE_DIRS += \ $(intermediates)/nir -sources := $(addprefix $(intermediates)/, $(sources)) -LOCAL_GENERATED_SOURCES += $(sources) +LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ + $(LIBGLCPP_GENERATED_FILES) \ + $(NIR_GENERATED_FILES) \ + $(LIBGLSL_GENERATED_CXX_FILES)) define local-l-or-ll-to-c-or-cpp @mkdir -p $(dir $@) diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index 831849859ac..7dfd60404ee 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -140,13 +140,16 @@ libglsl_la_SOURCES = \ glsl_parser.cpp \ glsl_parser.h \ $(LIBGLSL_FILES) \ - $(NIR_FILES) + $(NIR_FILES) \ + $(NIR_GENERATED_FILES) + libnir_la_SOURCES = \ glsl_types.cpp \ builtin_types.cpp \ glsl_symbol_table.cpp \ - $(NIR_FILES) + $(NIR_FILES) \ + $(NIR_GENERATED_FILES) glsl_compiler_SOURCES = \ $(GLSL_COMPILER_CXX_FILES) diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index 0b77244ac03..cd9c32e033e 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -69,8 +69,7 @@ NIR_FILES = \ nir/nir_vla.h \ nir/nir_worklist.c \ nir/nir_worklist.h \ - nir/nir_types.cpp \ - $(NIR_GENERATED_FILES) + nir/nir_types.cpp # libglsl |