Mesa (master): radv: Fix autotools build.

2018-03-09 Thread Bas Nieuwenhuizen 
Module: Mesa
Branch: master
Commit: 04ffabf17a116a19854fc5957d3e97805815b77c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=04ffabf17a116a19854fc5957d3e97805815b77c

Author: Bas Nieuwenhuizen 
Date:   Fri Mar  9 08:43:01 2018 +0100

radv: Fix autotools build.

Forgot it again 

Fixes: b6347807a9 "radv: Generate icd files."
Acked-by: Samuel Pitoiset 

---

 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.@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

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): radv: Fix autotools build.

2018-02-22 Thread Bas Nieuwenhuizen 
Module: Mesa
Branch: master
Commit: 032870bedad1fa6c367935dfc7f661d3698c21b1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=032870bedad1fa6c367935dfc7f661d3698c21b1

Author: Bas Nieuwenhuizen 
Date:   Fri Feb 23 01:42:07 2018 +0100

radv: Fix autotools build.

Somewhere along the way the Makefile changes got lost ...

Fixes: 4db78f3a6b "radv: Put supported extensions in a struct."
Acked-by: Dave Airlie 

---

 src/amd/vulkan/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
index 6102596894..80937e38d3 100644
--- a/src/amd/vulkan/Makefile.am
+++ b/src/amd/vulkan/Makefile.am
@@ -129,7 +129,9 @@ radv_extensions.c: radv_extensions.py \
$(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_extensions.py \
--xml $(vulkan_api_xml) \
--xml $(vk_android_native_buffer_xml) \
-   --out $@
+   --out-c radv_extensions.c \
+   --out-h radv_extensions.h
+radv_extensions.h: radv_extensions.c
 
 vk_format_table.c: vk_format_table.py \
   vk_format_parse.py \

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit