[Mesa-dev] [PATCH v2 03/25] anv: tweak the %.json rule

[Jason Ekstrand]

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.

On Fri, Apr 22, 2016 at 11:55 AM, Emil Velikov <emil.l.velikov at gmail.com>
wrote:

> From: Emil Velikov <emil.velikov at collabora.com>
>
> 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.
>
> Cc: Jason Ekstrand <jason at jlekstrand.net>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> This commit replaces "anv: remove no longer needed %.json rule"
> ---
>  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 916f171..6d93906 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.8.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160422/1b7415aa/attachment.html>