4 files changed, 100 insertions, 58 deletions
diff --git a/src/mesa/drivers/dri/r200/.gitignore b/src/mesa/drivers/dri/r200/.gitignore
new file mode 100644
index 00000000000..5112c58dccb
--- /dev/null
+++ b/src/mesa/drivers/dri/r200/.gitignore
@@ -0,0 +1,5 @@
+.deps
+.libs
+Makefile
+Makefile.in
+r200_dri.la
diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
deleted file mode 100644
index e53d64bf215..00000000000
--- a/src/mesa/drivers/dri/r200/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# src/mesa/drivers/dri/r200/Makefile
-
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = r200_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 = r200_context.c \
-		 r200_ioctl.c \
-		 r200_state.c \
-		 r200_state_init.c \
-		 r200_cmdbuf.c \
-		 r200_tex.c \
-		 r200_texstate.c \
-		 r200_tcl.c \
-		 r200_swtcl.c \
-		 r200_maos.c \
-		 r200_sanity.c \
-		 r200_fragshader.c \
-		 r200_vertprog.c \
-		 r200_blit.c \
-		 radeon_screen.c \
-		 $(RADEON_COMMON_SOURCES)
-
-C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
-
-X86_SOURCES = 
-
-DRIVER_DEFINES = -DRADEON_R200
-
-INCLUDES += $(RADEON_CFLAGS)
-DRI_LIB_DEPS += $(RADEON_LIBS)
-
-##### TARGETS #####
-
-
-include ../Makefile.targets
-
-#INCLUDES += -I../radeon/server
-
diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
new file mode 100644
index 00000000000..e83c5b71374
--- /dev/null
+++ b/src/mesa/drivers/dri/r200/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_R200 \
+	-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/r200/server \
+	$(DEFINES) \
+	$(ASM_FLAGS) \
+	$(API_DEFINES) \
+	$(RADEON_CFLAGS)
+
+dridir = $(DRI_DRIVER_INSTALL_DIR)
+
+if HAVE_R200_DRI
+dri_LTLIBRARIES = r200_dri.la
+endif
+
+r200_dri_la_SOURCES = \
+        $(R200_C_FILES)
+
+r200_dri_la_LDFLAGS = -module -avoid-version -shared
+r200_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: r200_dri.la
+	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+	ln -f .libs/r200_dri.so $(top_builddir)/$(LIB_DIR)/r200_dri.so;
diff --git a/src/mesa/drivers/dri/r200/Makefile.sources b/src/mesa/drivers/dri/r200/Makefile.sources
new file mode 100644
index 00000000000..1bc75d1d961
--- /dev/null
+++ b/src/mesa/drivers/dri/r200/Makefile.sources
@@ -0,0 +1,34 @@
+R200_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 = \
+	r200_context.c \
+	r200_ioctl.c \
+	r200_state.c \
+	r200_state_init.c \
+	r200_cmdbuf.c \
+	r200_tex.c \
+	r200_texstate.c \
+	r200_tcl.c \
+	r200_swtcl.c \
+	r200_maos.c \
+	r200_sanity.c \
+	r200_fragshader.c \
+	r200_vertprog.c \
+	r200_blit.c \
+	radeon_screen.c
+
+R200_C_FILES = $(R200_COMMON_FILES) $(DRIVER_FILES)