[Mesa-dev] [PATCH] radv: Fix autotools build.

[Samuel Pitoiset]

Acked-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

Can you please push this asap?

On 03/09/2018 08:44 AM, Bas Nieuwenhuizen wrote:
> Forgot it again ....
> 
> Fixes: b6347807a9 "radv: Generate icd files."
> ---
>   src/amd/vulkan/Makefile.am | 17 +++++++----------
>   1 file changed, 7 insertions(+), 10 deletions(-)
> 
> diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
> index 80937e38d3..99d9e578d8 100644
> --- a/src/amd/vulkan/Makefile.am
> +++ b/src/amd/vulkan/Makefile.am
> @@ -142,10 +142,9 @@ BUILT_SOURCES = $(VULKAN_GENERATED_FILES)
>   CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd. at host_cpu@.json
>   EXTRA_DIST = \
>   	$(top_srcdir)/include/vulkan/vk_icd.h \
> -	dev_icd.json.in \
> -	radeon_icd.json.in \
>   	radv_entrypoints_gen.py \
>   	radv_extensions.py \
> +	radv_icd.py \
>   	vk_format_layout.csv \
>   	vk_format_parse.py \
>   	vk_format_table.py \
> @@ -169,14 +168,12 @@ icdconf_DATA = radeon_icd. at host_cpu@.json
>   # The following is used for development purposes, by setting VK_ICD_FILENAMES.
>   noinst_DATA = dev_icd.json
>   
> -dev_icd.json : dev_icd.json.in
> -	$(AM_V_GEN) $(SED) \
> -		-e "s#@libvulkan_radeon_path@#${abs_top_builddir}/${LIB_DIR}/libvulkan_radeon.so#" \
> -		< $(srcdir)/dev_icd.json.in > $@
> +dev_icd.json : radv_extensions.py radv_icd.py
> +	$(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_icd.py \
> +		--lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
>   
> -radeon_icd. at host_cpu@.json : radeon_icd.json.in
> -	$(AM_V_GEN) $(SED) \
> -		-e "s#@install_libdir@#${libdir}#" \
> -		< $(srcdir)/radeon_icd.json.in > $@
> +vulkan/radeon_icd. at host_cpu@.json : radv_extensions.py radv_icd.py
> +	$(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_icd.py \
> +		--lib-path="${libdir}" --out $@
>   
>   include $(top_srcdir)/install-lib-links.mk
>