On Fri, Aug 19, 2016 at 09:04:14 -0700, Jason Ekstrand wrote:
> diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
> index ad0148d..9fef960 100644
> --- a/src/intel/vulkan/Makefile.am
> +++ b/src/intel/vulkan/Makefile.am
> @@ -141,7 +141,7 @@ anv_timestamp.h:
> $(AM_V_GEN) echo "#define ANV_TIMESTAMP \"$(TIMESTAMP_CMD)\"" > $@
>
> BUILT_SOURCES = $(VULKAN_GENERATED_FILES)
> -CLEANFILES = $(BUILT_SOURCES) dev_icd.json
> +CLEANFILES = $(BUILT_SOURCES) dev_icd.json intel_icd.json
> EXTRA_DIST = \
> $(top_srcdir)/include/vulkan/vk_icd.h \
> anv_entrypoints_gen.py \
> @@ -170,6 +170,11 @@ dev_icd.json : dev_icd.json.in
> -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \
> < $(srcdir)/dev_icd.json.in > $@
>
> +intel_icd.json : intel_icd.json.in
> + $(AM_V_GEN) $(SED) \
> + -e "s#@install_libdir@#${libdir}#" \
> + < $(srcdir)/intel_icd.json.in > $@
> +
> # Libvulkan with dummy gem. Used for unit tests.
> libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES)
> libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS) -lX11-xcb
Incidentally, if intel_icd.json is generated then it should be removed
from EXTRA_DIST (but maybe intel_icd.json.in needs to be added?).
Cheers,
Julien
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
