Source/Upstream: Git master, https://cgit.freedesktop.org/mesa/mesa/commit/?id=045f38a50759bb225cb179703bc7050f6de752b1 Reason: Collides with files installed by vulkan-loader: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/ From 045f38a50759bb225cb179703bc7050f6de752b1 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 23 Jan 2017 16:48:01 -0800 Subject: vulkan: Don't install vk_platform.h or vulkan.h. These files belong to the vulkan loader. Reviewed-by: Emil Velikov diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index fba3d66..95f276e 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -23,9 +23,11 @@ include Makefile.sources vulkan_includedir = $(includedir)/vulkan -vulkan_include_HEADERS = \ +noinst_HEADERS = \ $(top_srcdir)/include/vulkan/vk_platform.h \ - $(top_srcdir)/include/vulkan/vulkan.h \ + $(top_srcdir)/include/vulkan/vulkan.h + +vulkan_include_HEADERS = \ $(top_srcdir)/include/vulkan/vulkan_intel.h lib_LTLIBRARIES = libvulkan_intel.la @@ -189,7 +191,7 @@ libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS) include $(top_srcdir)/install-lib-links.mk -noinst_HEADERS = \ +noinst_HEADERS += \ tests/state_pool_test_helper.h LDADD = \ -- cgit v0.10.2