<div dir="ltr">I'm not sure what I think of this. I don't think dev_icd is the only icd file we're going to need to build. Right now, we don't build the regular ICD but I think we want to eventually in which case having a general rule is a good thing.<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Apr 22, 2016 at 11:55 AM, Emil Velikov <span dir="ltr"><<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br>
<br>
It's used only by dev_icd.json so just call it that way. While we're<br>
here, manually expand $< (as it might cause issue on some systems)<br>
and drop the unneeded install_libdir substitution.<br>
<br>
Cc: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br>
Signed-off-by: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br>
---<br>
This commit replaces "anv: remove no longer needed %.json rule"<br>
---<br>
src/intel/vulkan/Makefile.am | 7 +++----<br>
1 file changed, 3 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am<br>
index 916f171..6d93906 100644<br>
--- a/src/intel/vulkan/Makefile.am<br>
+++ b/src/intel/vulkan/Makefile.am<br>
@@ -190,11 +190,10 @@ icdconf_DATA = intel_icd.json<br>
# The following is used for development purposes, by setting VK_ICD_FILENAMES.<br>
noinst_DATA = dev_icd.json<br>
<br>
-%.json : %.<a href="http://json.in" rel="noreferrer" target="_blank">json.in</a><br>
+dev_icd.json : <a href="http://dev_icd.json.in" rel="noreferrer" target="_blank">dev_icd.json.in</a><br>
$(AM_V_GEN) $(SED) \<br>
- -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \<br>
- -e "s#@install_libdir@#${libdir}#" < $< > $@<br>
-<br>
+ -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#"<br>
+ < $(srcdir)/<a href="http://dev_icd.json.in" rel="noreferrer" target="_blank">dev_icd.json.in</a> > $@<br>
<br>
# Libvulkan with dummy gem. Used for unit tests.<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.8.0<br>
<br>
</font></span></blockquote></div><br></div>