Can't use LTLIBRARIES here yet, since libradeon isn't converted.
---
configure.ac | 1 +
src/gallium/drivers/radeonsi/.gitignore | 1 +
src/gallium/drivers/radeonsi/Makefile | 21 ---------------------
src/gallium/drivers/radeonsi/Makefile.am | 19 +++++++++++++++++++
4 files changed, 21 insertions(+), 21 deletions(-)
create mode 100644 src/gallium/drivers/radeonsi/.gitignore
delete mode 100644 src/gallium/drivers/radeonsi/Makefile
create mode 100644 src/gallium/drivers/radeonsi/Makefile.am
diff --git a/configure.ac b/configure.ac
index 36869f7..9bbe598 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2027,6 +2027,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/drivers/nvc0/Makefile
src/gallium/drivers/r300/Makefile
src/gallium/drivers/r600/Makefile
+ src/gallium/drivers/radeonsi/Makefile
src/gallium/drivers/rbug/Makefile
src/gallium/drivers/softpipe/Makefile
src/gallium/drivers/svga/Makefile
diff --git a/src/gallium/drivers/radeonsi/.gitignore
b/src/gallium/drivers/radeonsi/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/drivers/radeonsi/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/drivers/radeonsi/Makefile
b/src/gallium/drivers/radeonsi/Makefile
deleted file mode 100644
index 5d16b41..0000000
--- a/src/gallium/drivers/radeonsi/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = radeonsi
-
-LIBRARY_INCLUDES = \
- -I$(TOP)/include \
- -I$(TOP)/src/gallium/drivers/radeon/
-
-
-# get C_SOURCES
-include Makefile.sources
-
-LIBRADEON = $(TOP)/src/gallium/drivers/radeon/libradeon.a
-
-EXTRA_OBJECTS = \
- $(LIBRADEON)
-
-CFLAGS+=$(RADEON_CFLAGS)
-
-include ../../Makefile.template
diff --git a/src/gallium/drivers/radeonsi/Makefile.am
b/src/gallium/drivers/radeonsi/Makefile.am
new file mode 100644
index 0000000..991a914
--- /dev/null
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -0,0 +1,19 @@
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+noinst_LIBRARIES = libradeonsi.a
+
+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)
+
+# 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
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
