[Mesa-dev] [PATCH] clover: Don't install headers when using the icd

[Tom Stellard]

On Wed, Oct 30, 2013 at 08:38:37AM -0500, Aaron Watry wrote:
> Reviewed and Tested-by: Aaron Watry <awatry at gmail.com>

I have pushed this patch, thanks for testing.

> 
> On Tue, Oct 29, 2013 at 11:48 AM, Tom Stellard <tom at stellard.net> wrote:
> > From: Tom Stellard <thomas.stellard at amd.com>
> >
> > The ICD loader should be responsible for installing headers.
> > ---
> >  src/gallium/state_trackers/clover/Makefile.am | 21 +++++++++++----------
> >  1 file 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
> > --
> > 1.8.1.5
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/mesa-dev