r600g: implement timestamp query and get_timestamp hook

[mesa.git] / src / gallium / drivers / r600 / Makefile.am

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index 77d2674d262276197ff719e65d335a92d354251f..628eaab568584bdcc025f20e8f88f530a3d97040 100644 (file)
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -9,16 +9,13 @@ AM_CFLAGS = \
        -I$(top_srcdir)/include \
        $(RADEON_CFLAGS) \
        $(DEFINES) \
-       $(ARCH_FLAGS) \
-       $(ASM_FLAGS) \
-       $(OPT_FLAGS) \
        $(PIC_FLAGS) \
        $(VISIBILITY_CFLAGS)
 
 libr600_a_SOURCES = \
        $(C_SOURCES)
 
-if USE_R600_LLVM_COMPILER
+if NEED_RADEON_GALLIUM
 
 # This is a hack until we can move the backend into the LLVM project.
 # We need to use mklib, because it splits up libradeon.a into object files
@@ -26,18 +23,28 @@ if USE_R600_LLVM_COMPILER
 libr600_a_AR = $(top_srcdir)/bin/mklib -o r600 -static
 
 libr600_a_SOURCES += \
-       $(LLVM_C_SOURCES)
+       $(LLVM_C_SOURCES) \
+       $(LLVM_CXX_SOURCES)
 
 libr600_a_LIBADD = \
        $(top_builddir)/src/gallium/drivers/radeon/libradeon.a
 
 AM_CFLAGS += \
        $(LLVM_CFLAGS) \
-       -I$(top_srcdir)/src/gallium/drivers/radeon/ \
-       -DR600_USE_LLVM
+       -I$(top_srcdir)/src/gallium/drivers/radeon/
 
 AM_CXXFLAGS= \
        $(LLVM_CXXFLAGS)
 else
 libr600_a_AR = $(AR) $(ARFLAGS)
 endif
+
+if USE_R600_LLVM_COMPILER
+AM_CFLAGS += \
+       -DR600_USE_LLVM
+endif
+
+if HAVE_GALLIUM_COMPUTE
+AM_CFLAGS += \
+       -DHAVE_OPENCL
+endif