[Mesa-dev] [PATCH] compiler: simplify building glsl shader cache

[Timothy Arceri]

Actually please ignore this one. It's going to be a pain to build these 
with scons so its better to leave them here.

On 17/02/17 16:07, Timothy Arceri wrote:
> I think this made sense at one point when you could disable building
> of the cache. Now it's always built so just merge it into
> LIBGLSL_FILES.
>
> This partially fixes scons builds.
> ---
>  src/compiler/Makefile.glsl.am | 3 +--
>  src/compiler/Makefile.sources | 4 +---
>  2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
> index 41edb3c..f673196 100644
> --- a/src/compiler/Makefile.glsl.am
> +++ b/src/compiler/Makefile.glsl.am
> @@ -131,8 +131,7 @@ glsl_libglsl_la_LIBADD = \
>
>  glsl_libglsl_la_SOURCES =				\
>  	$(LIBGLSL_GENERATED_FILES)			\
> -	$(LIBGLSL_FILES)				\
> -	$(LIBGLSL_SHADER_CACHE_FILES)
> +	$(LIBGLSL_FILES)
>
>  glsl_libstandalone_la_SOURCES = \
>  	$(GLSL_COMPILER_CXX_FILES)
> diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
> index 1e8edc0..04a44cf 100644
> --- a/src/compiler/Makefile.sources
> +++ b/src/compiler/Makefile.sources
> @@ -140,9 +140,7 @@ LIBGLSL_FILES = \
>  	glsl/program.h \
>  	glsl/propagate_invariance.cpp \
>  	glsl/s_expression.cpp \
> -	glsl/s_expression.h
> -
> -LIBGLSL_SHADER_CACHE_FILES = \
> +	glsl/s_expression.h \
>  	glsl/shader_cache.cpp \
>  	glsl/shader_cache.h
>
>