util/tgsi: use ASSERT_BITFIELD_SIZE() to check opcode field size

[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 3c9421692fc00a4306c9269a62a591972de243eb..7167bc1c5cf12d0656e3d920532ed0767b9341e1 100644 (file)
--- a/src/gallium/state_trackers/clover/Makefile.am
+++ b/src/gallium/state_trackers/clover/Makefile.am
@@ -2,12 +2,12 @@ include Makefile.sources
 
 AM_CPPFLAGS = \
        -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
@@ -31,16 +31,19 @@ endif
 noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
 
 libcltgsi_la_CXXFLAGS = \
-       -std=c++11 \
+       $(CXX11_CXXFLAGS) \
+       $(CLOVER_STD_OVERRIDE) \
        $(VISIBILITY_CXXFLAGS)
 
 libcltgsi_la_SOURCES = $(TGSI_SOURCES)
 
 libclllvm_la_CXXFLAGS = \
-       -std=c++11 \
+       $(CXX11_CXXFLAGS) \
        $(VISIBILITY_CXXFLAGS) \
        $(LLVM_CXXFLAGS) \
+       $(CLOVER_STD_OVERRIDE) \
        $(DEFINES) \
+       $(LIBELF_CFLAGS) \
        -DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \
        -DLIBCLC_LIBEXECDIR=\"$(LIBCLC_LIBEXECDIR)/\" \
        -DCLANG_RESOURCE_DIR=\"$(CLANG_RESOURCE_DIR)\"
@@ -48,7 +51,8 @@ libclllvm_la_CXXFLAGS = \
 libclllvm_la_SOURCES = $(LLVM_SOURCES)
 
 libclover_la_CXXFLAGS = \
-       -std=c++11 \
+       $(CXX11_CXXFLAGS) \
+       $(CLOVER_STD_OVERRIDE) \
        $(VISIBILITY_CXXFLAGS)
 
 libclover_la_LIBADD = \