Mesa (master): clover: Don't install headers when using the icd

Tom Stellard tstellar at kemper.freedesktop.org
Wed Oct 30 23:40:42 UTC 2013


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

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Tue Oct 29 12:48:37 2013 -0400

clover: Don't install headers when using the icd

The ICD loader should be responsible for installing headers.

Reviewed and Tested-by: Aaron Watry <awatry at gmail.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>

---

 src/gallium/state_trackers/clover/Makefile.am |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am
index 89e76a9..c79fd37 100644
--- a/src/gallium/state_trackers/clover/Makefile.am
+++ b/src/gallium/state_trackers/clover/Makefile.am
@@ -14,6 +14,17 @@ AM_CPPFLAGS = \
 
 if HAVE_CLOVER_ICD
 AM_CPPFLAGS += -DHAVE_CLOVER_ICD
+else
+# Only install the headers if we are building a stand-alone implementation
+cldir = $(includedir)/CL
+cl_HEADERS = \
+	$(top_srcdir)/include/CL/cl.h \
+	$(top_srcdir)/include/CL/cl_ext.h \
+	$(top_srcdir)/include/CL/cl_gl.h \
+	$(top_srcdir)/include/CL/cl_gl_ext.h \
+	$(top_srcdir)/include/CL/cl_platform.h \
+	$(top_srcdir)/include/CL/opencl.h \
+	$(top_srcdir)/include/CL/cl.hpp
 endif
 
 noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
@@ -45,13 +56,3 @@ libclover_la_LIBADD = \
 	libcltgsi.la libclllvm.la
 
 libclover_la_SOURCES = $(CPP_SOURCES)
-
-cldir = $(includedir)/CL
-cl_HEADERS = \
-	$(top_srcdir)/include/CL/cl.h \
-	$(top_srcdir)/include/CL/cl_ext.h \
-	$(top_srcdir)/include/CL/cl_gl.h \
-	$(top_srcdir)/include/CL/cl_gl_ext.h \
-	$(top_srcdir)/include/CL/cl_platform.h \
-	$(top_srcdir)/include/CL/opencl.h \
-	$(top_srcdir)/include/CL/cl.hpp




More information about the mesa-commit mailing list