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 f776410765c7ac5be930e8ad0b49fee8e3aa59d9..21762d838d0e30ea6ef8e42db08d7740d4694b83 100644 (file)
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -1,15 +1,15 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
        $(GALLIUM_DRIVER_CFLAGS) \
-       $(RADEON_CFLAGS)
+       $(RADEON_CFLAGS) \
+       -I$(top_srcdir)/src/amd/common
 
 AM_CXXFLAGS = \
        $(GALLIUM_DRIVER_CXXFLAGS) \
-       $(RADEON_CFLAGS)
+       $(RADEON_CFLAGS) \
+       -I$(top_srcdir)/src/amd/common
 
 noinst_LTLIBRARIES = libr600.la
 
@@ -17,20 +17,12 @@ libr600_la_SOURCES = \
        $(C_SOURCES) \
        $(CXX_SOURCES)
 
-if NEED_RADEON_LLVM
+if HAVE_GALLIUM_LLVM
 
 AM_CFLAGS += \
        $(LLVM_CFLAGS) \
        -I$(top_srcdir)/src/gallium/drivers/radeon/
 
-libr600_la_SOURCES += \
-       $(LLVM_C_SOURCES)
-
-endif
-
-if USE_R600_LLVM_COMPILER
-AM_CFLAGS += \
-       -DR600_USE_LLVM
 endif
 
 if HAVE_GALLIUM_COMPUTE
@@ -38,6 +30,6 @@ AM_CFLAGS += \
        -DHAVE_OPENCL
 endif
 
-EXTRA_DIST = Android.mk \
+EXTRA_DIST = \
        sb/notes.markdown \
        sb/sb_bc_fmt_def.inc