Mesa (master): vulkan: Don't install vk_platform.h or vulkan.h.

Matt Turner mattst88 at kemper.freedesktop.org
Tue Jan 24 19:27:48 UTC 2017


Module: Mesa
Branch: master
Commit: 045f38a50759bb225cb179703bc7050f6de752b1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=045f38a50759bb225cb179703bc7050f6de752b1

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Jan 23 16:48:01 2017 -0800

vulkan: Don't install vk_platform.h or vulkan.h.

These files belong to the vulkan loader.

Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/intel/vulkan/Makefile.am | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 = \




More information about the mesa-commit mailing list