radeon/vce: fix VCE fail after rebase

[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 ece2b384bcdba0402675b3a7275f45dc068b5a0c..fd0ccf88cc5a6a261bdf9641b4c8b0a6ccebd027 100644 (file)
--- a/src/gallium/state_trackers/clover/Makefile.am
+++ b/src/gallium/state_trackers/clover/Makefile.am
@@ -1,11 +1,10 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
 include Makefile.sources
 
 AM_CPPFLAGS = \
        $(GALLIUM_PIPE_LOADER_DEFINES) \
        -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \
        -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/drivers \
        -I$(top_srcdir)/src/gallium/auxiliary \
@@ -19,40 +18,44 @@ else
 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 \
-       $(top_srcdir)/include/CL/cl.hpp
+       $(top_srcdir)/include/CL/opencl.h
 endif
 
 noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
 
 libcltgsi_la_CXXFLAGS = \
-       -std=c++0x \
+       -std=c++11 \
        $(VISIBILITY_CXXFLAGS)
 
-libcltgsi_la_SOURCES = \
-       tgsi/compiler.cpp
+libcltgsi_la_SOURCES = $(TGSI_SOURCES)
 
 libclllvm_la_CXXFLAGS = \
-       -std=c++98 \
+       -std=c++11 \
        $(VISIBILITY_CXXFLAGS) \
-       $(LLVM_CPPFLAGS) \
+       $(LLVM_CXXFLAGS) \
        $(DEFINES) \
        -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 \
        $(VISIBILITY_CXXFLAGS)
 
 libclover_la_LIBADD = \
        libcltgsi.la libclllvm.la
 
 libclover_la_SOURCES = $(CPP_SOURCES)
+
+EXTRA_DIST = Doxyfile