From b370ec7c76d098cca4d63561fa294a9088d60fcf Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 20 Apr 2016 17:26:23 +0100 Subject: [PATCH] anv: tweak the %.json rule 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 Signed-off-by: Emil Velikov --- src/intel/vulkan/Makefile.am | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 57045ac6001..c7e3ebcaade 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -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. -- 2.30.2