[Mesa-dev] [PATCH] Android: fix spirv_info.c generation

[Tapani Pälli]

Nice, I think it was done like this in some other occurence too;

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 07/20/2017 01:30 PM, Chih-Wei Huang wrote:
> It's incorrect to use $(LOCAL_PATH) in makefile recipes since it's
> changing. The typical way to handle it is to use private variable.
> Fortunately in this case we can just simplify them to $^.
>
> See further:
> https://patchwork.freedesktop.org/patch/167718/
>
> Also simplify LOCAL_GENERATED_SOURCES.
>
> Fixes: 2dd4e2ec (spirv: Generate spirv_info.c)
>
> Signed-off-by: Chih-Wei Huang <cwhuang at linux.org.tw>
> ---
>   src/compiler/Android.nir.gen.mk | 7 ++-----
>   1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk
> index 4507ac4..e2187d0 100644
> --- a/src/compiler/Android.nir.gen.mk
> +++ b/src/compiler/Android.nir.gen.mk
> @@ -41,7 +41,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS += \
>   	$(MESA_TOP)/src/compiler/nir
>   
>   LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
> -	$(NIR_GENERATED_FILES))
> +	$(NIR_GENERATED_FILES) $(SPIRV_GENERATED_FILES))
>   
>   # Modules using libmesa_nir must set LOCAL_GENERATED_SOURCES to this
>   MESA_GEN_NIR_H := $(addprefix $(call local-generated-sources-dir)/, \
> @@ -95,9 +95,6 @@ $(intermediates)/nir/nir_opt_algebraic.c: $(nir_opt_algebraic_deps)
>   	@mkdir -p $(dir $@)
>   	$(hide) $(MESA_PYTHON2) $(nir_opt_algebraic_gen) $< > $@
>   
> -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
> -	$(SPIRV_GENERATED_FILES))
> -
>   $(intermediates)/spirv/spirv_info.c: $(LOCAL_PATH)/spirv/spirv_info_c.py $(LOCAL_PATH)/spirv/spirv.core.grammar.json
>   	@mkdir -p $(dir $@)
> -	$(hide) $(MESA_PYTHON2) $(LOCAL_PATH)/spirv/spirv_info_c.py $(LOCAL_PATH)/spirv/spirv.core.grammar.json $@ || ($(RM) $@; false)
> +	$(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false)