r600: refactor out CB setup.

[mesa.git] / src / gallium / state_trackers / clover / Makefile.am

diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am
index 8390bda4aeb7c2e77d1952a53972b81a718a5ba6..321393536dc6939019dcd13ac3d723c110f5112e 100644 (file)
--- a/src/gallium/state_trackers/clover/Makefile.am
+++ b/src/gallium/state_trackers/clover/Makefile.am
@@ -1,86 +1,63 @@
-AUTOMAKE_OPTIONS = subdir-objects
+include Makefile.sources
 
 AM_CPPFLAGS = \
-       $(GALLIUM_PIPE_LOADER_DEFINES) \
-       -DMESA_VERSION=\"$(MESA_VERSION)\" \
-       -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \
        -I$(top_srcdir)/include \
+       -I$(top_builddir)/src \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/drivers \
        -I$(top_srcdir)/src/gallium/auxiliary \
-       -I$(top_srcdir)/src/gallium/winsys \
-       -I$(srcdir)
+       -I$(top_srcdir)/src/gallium/winsys
+
+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.hpp \
+       $(top_srcdir)/include/CL/cl_d3d10.h \
+       $(top_srcdir)/include/CL/cl_d3d11.h \
+       $(top_srcdir)/include/CL/cl_dx9_media_sharing.h \
+       $(top_srcdir)/include/CL/cl_egl.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
+endif
 
 noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
 
 libcltgsi_la_CXXFLAGS = \
-       -std=c++0x
+       -std=c++11 \
+       $(CLOVER_STD_OVERRIDE) \
+       $(VISIBILITY_CXXFLAGS)
 
-libcltgsi_la_SOURCES = \
-       tgsi/compiler.cpp
+libcltgsi_la_SOURCES = $(TGSI_SOURCES)
 
 libclllvm_la_CXXFLAGS = \
-       -std=c++98 \
-       $(LLVM_CPPFLAGS) \
+       -std=c++11 \
+       $(VISIBILITY_CXXFLAGS) \
+       $(LLVM_CXXFLAGS) \
+       $(CLOVER_STD_OVERRIDE) \
        $(DEFINES) \
+       $(LIBELF_CFLAGS) \
        -DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \
        -DLIBCLC_LIBEXECDIR=\"$(LIBCLC_LIBEXECDIR)/\" \
        -DCLANG_RESOURCE_DIR=\"$(CLANG_RESOURCE_DIR)\"
 
-libclllvm_la_SOURCES = \
-       llvm/invocation.cpp
+libclllvm_la_SOURCES = $(LLVM_SOURCES)
 
 libclover_la_CXXFLAGS = \
-       -std=c++0x
+       -std=c++11 \
+       $(CLOVER_STD_OVERRIDE) \
+       $(VISIBILITY_CXXFLAGS)
 
 libclover_la_LIBADD = \
        libcltgsi.la libclllvm.la
 
-libclover_la_SOURCES = \
-       core/base.hpp \
-       core/compat.hpp \
-       core/compiler.hpp \
-       core/geometry.hpp \
-       core/device.hpp \
-       core/device.cpp \
-       core/context.hpp \
-       core/context.cpp \
-       core/queue.hpp \
-       core/queue.cpp \
-       core/format.hpp \
-       core/format.cpp \
-       core/memory.hpp \
-       core/memory.cpp \
-       core/resource.hpp \
-       core/resource.cpp \
-       core/sampler.hpp \
-       core/sampler.cpp \
-       core/event.hpp \
-       core/event.cpp \
-       core/program.hpp \
-       core/program.cpp \
-       core/kernel.hpp \
-       core/kernel.cpp \
-       core/module.hpp \
-       core/module.cpp \
-       api/util.hpp \
-       api/platform.cpp \
-       api/device.cpp \
-       api/context.cpp \
-       api/queue.cpp \
-       api/memory.cpp \
-       api/transfer.cpp \
-       api/sampler.cpp \
-       api/event.cpp \
-       api/program.cpp \
-       api/kernel.cpp
+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
+EXTRA_DIST = Doxyfile