From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Fri, 9 Mar 2018 07:43:01 +0000 (+0100)
Subject: radv: Fix autotools build.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=04ffabf17a116a19854fc5957d3e97805815b77c;p=mesa.git

radv: Fix autotools build.

Forgot it again ....

Fixes: b6347807a9 "radv: Generate icd files."
Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
---

diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
index 80937e38d38..99d9e578d8c 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.@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.@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.@host_cpu@.json : radeon_icd.json.in
-	$(AM_V_GEN) $(SED) \
-		-e "s#@install_libdir@#${libdir}#" \
-		< $(srcdir)/radeon_icd.json.in > $@
+vulkan/radeon_icd.@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