anv: tweak the %.json rule
authorEmil Velikov <emil.velikov@collabora.com>
Wed, 20 Apr 2016 16:26:23 +0000 (17:26 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Sun, 1 May 2016 07:38:03 +0000 (08:38 +0100)
It's used only by dev_icd.json so just call it that way. While we're
here, manually expand $< (as it might cause issue on some systems)
and drop the unneeded install_libdir substitution.

Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
src/intel/vulkan/Makefile.am

index 57045ac60015e601a23b02c8a5fe7ead16c45e1e..c7e3ebcaadee8793981a9fb8218947a5b1c59206 100644 (file)
@@ -190,11 +190,10 @@ icdconf_DATA = intel_icd.json
 # The following is used for development purposes, by setting VK_ICD_FILENAMES.
 noinst_DATA = dev_icd.json
 
-%.json : %.json.in
+dev_icd.json : dev_icd.json.in
        $(AM_V_GEN) $(SED) \
-               -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \
-               -e "s#@install_libdir@#${libdir}#" < $< > $@
-
+               -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#"
+               < $(srcdir)/dev_icd.json.in > $@
 
 # Libvulkan with dummy gem. Used for unit tests.