X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fradeonsi%2FMakefile.am;h=2d5c1a38220f22d3746d6b75ca895ecc8c17bc77;hb=36f21017237ab536db74c84e0f778d3a58271c75;hp=7906fb6aa5ff4c2d72b81fe963393c440d32f93f;hpb=da2d98fac778ed717919c89395ea7c66f2d9c1b1;p=mesa.git

diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index 7906fb6aa5f..2d5c1a38220 100644
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -23,19 +23,13 @@
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-noinst_LIBRARIES = libradeonsi.a
+AM_CFLAGS = \
+	$(GALLIUM_DRIVER_CFLAGS) \
+	-I$(top_builddir)/src/amd/common \
+	-I$(top_srcdir)/src/amd/common \
+	$(RADEON_CFLAGS) \
+	$(LLVM_CFLAGS)
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers/radeon \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/include \
-	$(GALLIUM_CFLAGS)
-AM_CFLAGS = $(LLVM_CFLAGS)
+noinst_LTLIBRARIES = libradeonsi.la
 
-# 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 radeonsi objects.
-libradeonsi_a_AR = $(top_srcdir)/bin/mklib -o radeonsi -static
-
-libradeonsi_a_SOURCES = $(C_SOURCES)
-libradeonsi_a_LIBADD = ../radeon/libradeon.a
+libradeonsi_la_SOURCES = $(C_SOURCES)