4 files changed, 99 insertions, 54 deletions
diff --git a/src/mesa/drivers/dri/radeon/.gitignore b/src/mesa/drivers/dri/radeon/.gitignore
new file mode 100644
index 00000000000..2592dc3b57c
--- /dev/null
+++ b/src/mesa/drivers/dri/radeon/.gitignore
@@ -0,0 +1,5 @@
+.deps
+.libs
+Makefile
+Makefile.in
+radeon_dri.la
diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile
deleted file mode 100644
index 87af26ec220..00000000000
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# src/mesa/drivers/dri/radeon/Makefile
-# Note, this Makefile requires GNU make
-
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = radeon_dri.so
-
-include ../Makefile.defines
-
-RADEON_COMMON_SOURCES = \
-	radeon_buffer_objects.c \
-	radeon_common_context.c \
-	radeon_common.c \
-	radeon_dma.c \
-	radeon_debug.c \
-	radeon_fbo.c \
-	radeon_mipmap_tree.c \
-	radeon_pixel_read.c \
-	radeon_queryobj.c \
-	radeon_span.c \
-	radeon_texture.c \
-	radeon_tex_copy.c \
-	radeon_tile.c \
-	radeon_fog.c
-
-DRIVER_SOURCES = \
-	radeon_context.c \
-	radeon_ioctl.c \
-	radeon_screen.c \
-	radeon_state.c \
-	radeon_state_init.c \
-	radeon_tex.c \
-	radeon_texstate.c \
-	radeon_tcl.c \
-	radeon_swtcl.c \
-	radeon_maos.c \
-	radeon_sanity.c \
-	radeon_blit.c \
-	$(RADEON_COMMON_SOURCES)
-
-C_SOURCES = \
-	$(COMMON_SOURCES) \
-	$(DRIVER_SOURCES)
-
-DRIVER_DEFINES = -DRADEON_R100
-
-INCLUDES += $(RADEON_CFLAGS)
-DRI_LIB_DEPS += $(RADEON_LIBS)
-
-X86_SOURCES = 
-
-include ../Makefile.targets
-
diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
new file mode 100644
index 00000000000..27e6ea58d69
--- /dev/null
+++ b/src/mesa/drivers/dri/radeon/Makefile.am
@@ -0,0 +1,61 @@
+
+
+# Copyright © 2012 Matt Turner <[email protected]>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+include Makefile.sources
+
+# Hack to make some of the non-automake variables work.
+TOP=$(top_builddir)
+
+AM_CFLAGS = \
+	-DRADEON_R100 \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/ \
+	-I$(top_srcdir)/src/mapi \
+	-I$(top_srcdir)/src/mesa/ \
+	-I$(top_srcdir)/src/mesa/drivers/dri/common \
+	-I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
+	$(DEFINES) \
+	$(ASM_FLAGS) \
+	$(API_DEFINES) \
+	$(RADEON_CFLAGS)
+
+dridir = $(DRI_DRIVER_INSTALL_DIR)
+
+if HAVE_RADEON_DRI
+dri_LTLIBRARIES = radeon_dri.la
+endif
+
+radeon_dri_la_SOURCES = \
+        $(RADEON_C_FILES)
+
+radeon_dri_la_LDFLAGS = -module -avoid-version -shared
+radeon_dri_la_LIBADD = \
+	$(DRI_LIB_DEPS) \
+	$(DRICORE_LIB_DEPS) \
+	$(RADEON_LIBS)
+
+# Provide compatibility with scripts for the old Mesa build system for
+# a while by putting a link to the driver into /lib of the build tree.
+all-local: radeon_dri.la
+	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+	ln -f .libs/radeon_dri.so $(top_builddir)/$(LIB_DIR)/radeon_dri.so;
diff --git a/src/mesa/drivers/dri/radeon/Makefile.sources b/src/mesa/drivers/dri/radeon/Makefile.sources
new file mode 100644
index 00000000000..ee146aa01bf
--- /dev/null
+++ b/src/mesa/drivers/dri/radeon/Makefile.sources
@@ -0,0 +1,33 @@
+RADEON_COMMON_FILES = \
+	radeon_buffer_objects.c \
+	radeon_common_context.c \
+	radeon_common.c \
+	radeon_dma.c \
+	radeon_debug.c \
+	radeon_fbo.c \
+	radeon_fog.c \
+	radeon_mipmap_tree.c \
+	radeon_pixel_read.c \
+	radeon_queryobj.c \
+	radeon_span.c \
+	radeon_texture.c \
+	radeon_tex_copy.c \
+	radeon_tile.c
+
+DRIVER_FILES = \
+	radeon_context.c \
+	radeon_ioctl.c \
+	radeon_screen.c \
+	radeon_state.c \
+	radeon_state_init.c \
+	radeon_tex.c \
+	radeon_texstate.c \
+	radeon_tcl.c \
+	radeon_swtcl.c \
+	radeon_maos.c \
+	radeon_sanity.c \
+	radeon_blit.c
+
+RADEON_C_FILES = \
+	$(RADEON_COMMON_FILES) \
+	$(DRIVER_FILES)