summaryrefslogtreecommitdiffstats
path: root/src/intel
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2016-04-20 17:26:23 +0100
committerEmil Velikov <[email protected]>2016-05-01 08:38:03 +0100
commitb370ec7c76d098cca4d63561fa294a9088d60fcf (patch)
tree668159f8395c8762dad82aa6a10cb64a66e58111 /src/intel
parentabd360ab75b8c0ff157391bacd6d50c8e459fbf4 (diff)
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 <[email protected]> Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/intel')
-rw-r--r--src/intel/vulkan/Makefile.am7
1 files 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.