r600g: Use automake to generate Makefile

diff --git a/configure.ac b/configure.ac
index 9d6cbeb96dc84978289f358aa3850a3887c10559..4f84b774c44ca91d7528d96cdb22b35c1b504b4f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1993,6 +1993,7 @@ dnl Substitute the config
 AC_CONFIG_FILES([configs/autoconf
                src/gallium/drivers/Makefile
                src/gallium/drivers/r300/Makefile
+               src/gallium/drivers/r600/Makefile
                src/gbm/Makefile
                src/gbm/main/gbm.pc
                src/egl/drivers/Makefile

diff --git a/src/gallium/drivers/r600/Makefile b/src/gallium/drivers/r600/Makefile
deleted file mode 100644 (file)
index e15e2ff..0000000
--- a/src/gallium/drivers/r600/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = r600
-
-#This is for libdrm include path
-CFLAGS+=$(RADEON_CFLAGS)
-
-LIBRARY_INCLUDES = -I$(TOP)/include
-
-# get C_SOURCES
-include Makefile.sources
-
-include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
new file mode 100644 (file)
index 0000000..8acd36a
--- /dev/null
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -0,0 +1,17 @@
+include Makefile.sources
+
+noinst_LIBRARIES = libr600.a
+
+AM_CFLAGS = \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       -I$(top_srcdir)/src/gallium/drivers \
+       -I$(top_srcdir)/include \
+       $(RADEON_CFLAGS) \
+       $(DEFINES) \
+       $(ASM_FLAGS) \
+       $(PIC_FLAGS) \
+       $(VISIBILITY_CFLAGS)
+
+libr600_a_SOURCES = \
+       $(C_SOURCES)