winsys/amdgpu: pass PIPE_CONFIG to addrlib on texture import

[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 9203d03292b4412ea531331a462d0a6008e0c6c6..f3bb03e54bea8063758e11c72cda1f6237d68138 100644 (file)
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -1,35 +1,21 @@
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-noinst_LTLIBRARIES = libr600.la
-
 AM_CFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/include \
-       $(GALLIUM_CFLAGS) \
-       $(RADEON_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
+       $(GALLIUM_DRIVER_CFLAGS) \
+       $(RADEON_CFLAGS)
 
 AM_CXXFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src/gallium/include \
-       -I$(top_srcdir)/src/gallium/auxiliary \
-       $(RADEON_CFLAGS) \
-       $(DEFINES)
+       $(GALLIUM_DRIVER_CXXFLAGS) \
+       $(RADEON_CFLAGS)
+
+noinst_LTLIBRARIES = libr600.la
 
 libr600_la_SOURCES = \
        $(C_SOURCES) \
        $(CXX_SOURCES)
 
-libr600_la_LIBADD = ../radeon/libradeon.la
-
-if R600_NEED_RADEON_GALLIUM
-
-libr600_la_SOURCES += \
-       $(LLVM_C_SOURCES)
-
-libr600_la_LIBADD += ../radeon/libllvmradeon.la
+if NEED_RADEON_LLVM
 
 AM_CFLAGS += \
        $(LLVM_CFLAGS) \
@@ -37,12 +23,11 @@ AM_CFLAGS += \
 
 endif
 
-if USE_R600_LLVM_COMPILER
-AM_CFLAGS += \
-       -DR600_USE_LLVM
-endif
-
 if HAVE_GALLIUM_COMPUTE
 AM_CFLAGS += \
        -DHAVE_OPENCL
 endif
+
+EXTRA_DIST = \
+       sb/notes.markdown \
+       sb/sb_bc_fmt_def.inc