r600g/radeonsi: use the correct types (taken from pipe_draw_info)

[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..21762d838d0e30ea6ef8e42db08d7740d4694b83 100644 (file)
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -1,43 +1,35 @@
 include Makefile.sources
-
-noinst_LIBRARIES = libr600.a
+include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       -I$(top_srcdir)/src/gallium/include \
-       -I$(top_srcdir)/src/gallium/auxiliary \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/include \
+       $(GALLIUM_DRIVER_CFLAGS) \
        $(RADEON_CFLAGS) \
-       $(DEFINES) \
-       $(ARCH_FLAGS) \
-       $(ASM_FLAGS) \
-       $(OPT_FLAGS) \
-       $(PIC_FLAGS) \
-       $(VISIBILITY_CFLAGS)
-
-libr600_a_SOURCES = \
-       $(C_SOURCES)
+       -I$(top_srcdir)/src/amd/common
 
-if USE_R600_LLVM_COMPILER
+AM_CXXFLAGS = \
+       $(GALLIUM_DRIVER_CXXFLAGS) \
+       $(RADEON_CFLAGS) \
+       -I$(top_srcdir)/src/amd/common
 
-# 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
-# so that we can link it with the r600 objects.
-libr600_a_AR = $(top_srcdir)/bin/mklib -o r600 -static
+noinst_LTLIBRARIES = libr600.la
 
-libr600_a_SOURCES += \
-       $(LLVM_C_SOURCES)
+libr600_la_SOURCES = \
+       $(C_SOURCES) \
+       $(CXX_SOURCES)
 
-libr600_a_LIBADD = \
-       $(top_builddir)/src/gallium/drivers/radeon/libradeon.a
+if HAVE_GALLIUM_LLVM
 
 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 HAVE_GALLIUM_COMPUTE
+AM_CFLAGS += \
+       -DHAVE_OPENCL
+endif
+
+EXTRA_DIST = \
+       sb/notes.markdown \
+       sb/sb_bc_fmt_def.inc