diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-04-20 17:26:23 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-05-01 08:38:03 +0100 |
| commit | b370ec7c76d098cca4d63561fa294a9088d60fcf (patch) | |
| tree | 668159f8395c8762dad82aa6a10cb64a66e58111 | |
| parent | abd360ab75b8c0ff157391bacd6d50c8e459fbf4 (diff) | |
| download | external_mesa3d-b370ec7c76d098cca4d63561fa294a9088d60fcf.zip external_mesa3d-b370ec7c76d098cca4d63561fa294a9088d60fcf.tar.gz external_mesa3d-b370ec7c76d098cca4d63561fa294a9088d60fcf.tar.bz2 | |
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 <jason@jlekstrand.net>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 57045ac..c7e3ebc 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. |