automake: Make radeon-gallium build, almost.automake

A couple more things need to get ironed out.

22 files changed, 322 insertions, 182 deletions

diff --git a/configure.ac b/configure.ac
index 031067e5b0..fa33ee4df3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1281,6 +1281,15 @@ AC_OUTPUT([
 	src/gallium/drivers/r300/Makefile
 	src/gallium/drivers/softpipe/Makefile
 	src/gallium/drivers/trace/Makefile
+	src/gallium/state_trackers/Makefile
+	src/gallium/state_trackers/dri/Makefile
+	src/gallium/state_trackers/egl/Makefile
+	src/gallium/state_trackers/xorg/Makefile
+	src/gallium/winsys/Makefile
+	src/gallium/winsys/drm/Makefile
+	src/gallium/winsys/drm/radeon/Makefile
+	src/gallium/winsys/drm/radeon/core/Makefile
+	src/gallium/winsys/drm/radeon/dri/Makefile
 	src/glew/Makefile
 	src/glu/Makefile
 	src/glu/sgi/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 28f4f8032a..c674e565cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,4 +22,4 @@
 # Authors:
 #    Eric Anholt <eric@anholt.net>
 
-SUBDIRS = mesa glx glew egl glu glw glut/glx
+SUBDIRS = gallium mesa glx glew egl glu glw glut/glx
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index d8d0f4863d..1f67d8b455 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -22,6 +22,6 @@
 # Authors:
 #    Eric Anholt <eric@anholt.net>
 
-SUBDIRS = include auxiliary drivers state_trackers
+SUBDIRS = include auxiliary drivers state_trackers winsys
 
 EXTRA_DIST = README.portability
diff --git a/src/gallium/drivers/softpipe/Makefile.am b/src/gallium/drivers/softpipe/Makefile.am
index 63462f3989..8cdfbfb72b 100644
--- a/src/gallium/drivers/softpipe/Makefile.am
+++ b/src/gallium/drivers/softpipe/Makefile.am
@@ -37,25 +37,15 @@ libsoftpipe_la_SOURCES = \
 	sp_flush.h \
 	sp_fs_exec.c \
 	sp_fs.h \
-	sp_fs_llvm.c \
 	sp_fs_sse.c \
-	sp_prim_setup.c \
-	sp_prim_setup.h \
 	sp_prim_vbuf.c \
 	sp_prim_vbuf.h \
-	sp_quad_alpha_test.c \
 	sp_quad_blend.c \
-	sp_quad_colormask.c \
-	sp_quad_coverage.c \
 	sp_quad_depth_test.c \
-	sp_quad_earlyz.c \
 	sp_quad_fs.c \
 	sp_quad.h \
-	sp_quad_occlusion.c \
-	sp_quad_output.c \
 	sp_quad_pipe.c \
 	sp_quad_pipe.h \
-	sp_quad_stencil.c \
 	sp_quad_stipple.c \
 	sp_query.c \
 	sp_query.h \
diff --git a/src/gallium/state_trackers/Makefile b/src/gallium/state_trackers/Makefile
deleted file mode 100644
index 265ca468c2..0000000000
--- a/src/gallium/state_trackers/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-TOP = ../../..
-include $(TOP)/configs/current
-
-
-SUBDIRS = $(GALLIUM_STATE_TRACKERS_DIRS)
-
-
-default: subdirs
-
-
-subdirs:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE)) || exit 1 ; \
-		fi \
-	done
-
-
-clean:
-	rm -f `find . -name \*.[oa]`
-	rm -f `find . -name depend`
-
-
-# Dummy install target
-install:
diff --git a/src/gallium/state_trackers/Makefile.am b/src/gallium/state_trackers/Makefile.am
new file mode 100644
index 0000000000..a1fb91f8cd
--- /dev/null
+++ b/src/gallium/state_trackers/Makefile.am
@@ -0,0 +1,25 @@
+# Copyright © 2009 Corbin Simpson
+#
+# 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.
+#
+# Authors:
+#    Corbin Simpson <MostAwesomeDude@gmail.com>
+
+SUBDIRS = dri
diff --git a/src/gallium/state_trackers/dri/Makefile b/src/gallium/state_trackers/dri/Makefile
deleted file mode 100644
index ef8f19709a..0000000000
--- a/src/gallium/state_trackers/dri/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = dridrm
-
-LIBRARY_INCLUDES = \
-	-I$(TOP)/include \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/mesa/drivers/dri/common \
-	-I$(TOP)/src/mesa/main \
-         $(shell pkg-config --cflags-only-I libdrm)
-
-
-C_SOURCES = \
-	dri_context.c \
-	dri_screen.c \
-	dri_drawable.c \
-	dri_extensions.c
-
-#	$(TOP)/src/mesa/drivers/dri/common/utils.c \
-	$(TOP)/src/mesa/drivers/dri/common/vblank.c \
-	$(TOP)/src/mesa/drivers/dri/common/dri_util.c \
-	$(TOP)/src/mesa/drivers/dri/common/xmlconfig.c \
-	$(TOP)/src/mesa/drivers/common/driverfuncs.c \
-	$(TOP)/src/mesa/drivers/dri/common/texmem.c \
-	$(TOP)/src/mesa/drivers/dri/common/drirenderbuffer.c
-
-include ../../Makefile.template
diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am
new file mode 100644
index 0000000000..feaacd7516
--- /dev/null
+++ b/src/gallium/state_trackers/dri/Makefile.am
@@ -0,0 +1,48 @@
+# Copyright © 2009 Corbin Simpson
+#
+# 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.
+#
+# Authors:
+#    Corbin Simpson <MostAwesomeDude@gmail.com>
+
+# XXX
+AM_CFLAGS = \
+		-I$(top_builddir)/src/mesa/drivers/dri/common \
+		$(LIBDRM_CFLAGS) \
+		-I$(top_builddir)/include \
+		-I$(top_builddir)/src/mesa \
+		-I$(top_builddir)/src/mesa/main \
+		$(GALLIUM_CFLAGS)
+
+noinst_LTLIBRARIES = libdridrm.la
+
+libdridrm_la_SOURCES = \
+	dri_context.c \
+	dri_screen.c \
+	dri_drawable.c \
+	dri_extensions.c
+
+#	$(TOP)/src/mesa/drivers/dri/common/utils.c \
+	$(TOP)/src/mesa/drivers/dri/common/vblank.c \
+	$(TOP)/src/mesa/drivers/dri/common/dri_util.c \
+	$(TOP)/src/mesa/drivers/dri/common/xmlconfig.c \
+	$(TOP)/src/mesa/drivers/common/driverfuncs.c \
+	$(TOP)/src/mesa/drivers/dri/common/texmem.c \
+	$(TOP)/src/mesa/drivers/dri/common/drirenderbuffer.c
diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
deleted file mode 100644
index e825aa718b..0000000000
--- a/src/gallium/state_trackers/egl/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = egldrm
-
-LIBRARY_INCLUDES = \
-	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/auxiliary \
-	-I$(TOP)/src/mesa/drivers/dri/common \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/include \
-	-I$(TOP)/src/egl/main \
-	$(shell pkg-config --cflags-only-I libdrm)
-
-
-C_SOURCES = $(wildcard ./*.c)
-
-
-include ../../Makefile.template
diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
new file mode 100644
index 0000000000..1c4417a68d
--- /dev/null
+++ b/src/gallium/state_trackers/egl/Makefile.am
@@ -0,0 +1,34 @@
+# Copyright © 2009 Corbin Simpson
+#
+# 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.
+#
+# Authors:
+#    Corbin Simpson <MostAwesomeDude@gmail.com>
+
+AM_CFLAGS = \
+		$(GALLIUM_CFLAGS)
+
+noinst_LTLIBRARIES = libegldrm.la
+
+libegldrm_la_SOURCES = \
+		egl_context.c \
+		egl_surface.c \
+		egl_tracker.c \
+		egl_visual.c
diff --git a/src/gallium/state_trackers/xorg/Makefile b/src/gallium/state_trackers/xorg/Makefile
deleted file mode 100644
index 27a1990724..0000000000
--- a/src/gallium/state_trackers/xorg/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = xorgtracker
-
-LIBRARY_INCLUDES = \
-	-DHAVE_CONFIG_H \
-	$(shell pkg-config --cflags-only-I pixman-1 xorg-server libdrm xproto) \
-	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/auxiliary \
-	-I$(TOP)/include \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/mesa/drivers/dri/common \
-	-I$(TOP)/src/mesa/main
-
-C_SOURCES = $(wildcard ./*.c)
-
-include ../../Makefile.template
diff --git a/src/gallium/state_trackers/xorg/Makefile.am b/src/gallium/state_trackers/xorg/Makefile.am
new file mode 100644
index 0000000000..4f4778bff6
--- /dev/null
+++ b/src/gallium/state_trackers/xorg/Makefile.am
@@ -0,0 +1,49 @@
+# Copyright © 2009 Corbin Simpson
+#
+# 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.
+#
+# Authors:
+#    Corbin Simpson <MostAwesomeDude@gmail.com>
+
+AM_CFLAGS = \
+		$(GALLIUM_CFLAGS)
+
+noinst_LTLIBRARIES = libxorgtracker.la
+
+libxorgtracker_la_SOURCES = \
+		xorg_composite.c \
+		xorg_crtc.c \
+		xorg_dri2.c \
+		xorg_driver.c \
+		xorg_exa.c \
+		xorg_exa_tgsi.c \
+		xorg_output.c \
+		xorg_renderer.c \
+		xorg_xv.c
+
+LIBRARY_INCLUDES = \
+	-DHAVE_CONFIG_H \
+	$(shell pkg-config --cflags-only-I pixman-1 xorg-server libdrm xproto) \
+	-I$(TOP)/src/gallium/include \
+	-I$(TOP)/src/gallium/auxiliary \
+	-I$(TOP)/include \
+	-I$(TOP)/src/mesa \
+	-I$(TOP)/src/mesa/drivers/dri/common \
+	-I$(TOP)/src/mesa/main
diff --git a/src/gallium/winsys/Makefile b/src/gallium/winsys/Makefile
deleted file mode 100644
index bce5b3f9e0..0000000000
--- a/src/gallium/winsys/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/Makefile
-TOP = ../../..
-include $(TOP)/configs/current
-
-SUBDIRS = $(GALLIUM_WINSYS_DIRS)
-
-default install clean:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) $@) || exit 1; \
-		fi \
-	done
diff --git a/src/gallium/winsys/Makefile.am b/src/gallium/winsys/Makefile.am
new file mode 100644
index 0000000000..67570e5e23
--- /dev/null
+++ b/src/gallium/winsys/Makefile.am
@@ -0,0 +1,25 @@
+# Copyright © 2009 Corbin Simpson
+#
+# 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.
+#
+# Authors:
+#    Corbin Simpson <MostAwesomeDude@gmail.com>
+
+SUBDIRS = drm
diff --git a/src/gallium/winsys/drm/Makefile b/src/gallium/winsys/drm/Makefile
deleted file mode 100644
index fee0191643..0000000000
--- a/src/gallium/winsys/drm/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/Makefile
-TOP = ../../../..
-include $(TOP)/configs/current
-
-SUBDIRS = $(GALLIUM_WINSYS_DRM_DIRS)
-
-default install clean:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) $@) || exit 1; \
-		fi \
-	done
diff --git a/src/gallium/winsys/drm/Makefile.am b/src/gallium/winsys/drm/Makefile.am
new file mode 100644
index 0000000000..6d94cebcf0
--- /dev/null
+++ b/src/gallium/winsys/drm/Makefile.am
@@ -0,0 +1,25 @@
+# Copyright © 2009 Corbin Simpson
+#
+# 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.
+#
+# Authors:
+#    Corbin Simpson <MostAwesomeDude@gmail.com>
+
+SUBDIRS = radeon
diff --git a/src/gallium/winsys/drm/radeon/Makefile b/src/gallium/winsys/drm/radeon/Makefile
deleted file mode 100644
index bacdf3de28..0000000000
--- a/src/gallium/winsys/drm/radeon/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/drm/radeon/Makefile
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-SUBDIRS = core $(GALLIUM_STATE_TRACKERS_DIRS)
-
-default install clean:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) $@) || exit 1; \
-		fi \
-	done
diff --git a/src/gallium/winsys/drm/radeon/Makefile.am b/src/gallium/winsys/drm/radeon/Makefile.am
new file mode 100644
index 0000000000..b6a1cd7522
--- /dev/null
+++ b/src/gallium/winsys/drm/radeon/Makefile.am
@@ -0,0 +1,25 @@
+# Copyright © 2009 Corbin Simpson
+#
+# 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.
+#
+# Authors:
+#    Corbin Simpson <MostAwesomeDude@gmail.com>
+
+SUBDIRS = core dri
diff --git a/src/gallium/winsys/drm/radeon/core/Makefile b/src/gallium/winsys/drm/radeon/core/Makefile
deleted file mode 100644
index 42a6f4abc2..0000000000
--- a/src/gallium/winsys/drm/radeon/core/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-
-TOP = ../../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = radeonwinsys
-
-C_SOURCES = \
-	radeon_buffer.c \
-	radeon_drm.c \
-	radeon_r300.c \
-	radeon_winsys_softpipe.c
-
-LIBRARY_INCLUDES = -I$(TOP)/src/gallium/drivers/r300 \
-		   $(shell pkg-config libdrm --cflags-only-I)
-
-include ../../../../Makefile.template
-
-symlinks:
diff --git a/src/gallium/winsys/drm/radeon/core/Makefile.am b/src/gallium/winsys/drm/radeon/core/Makefile.am
new file mode 100644
index 0000000000..8fdd838e05
--- /dev/null
+++ b/src/gallium/winsys/drm/radeon/core/Makefile.am
@@ -0,0 +1,38 @@
+# Copyright © 2009 Corbin Simpson
+#
+# 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.
+#
+# Authors:
+#    Corbin Simpson <MostAwesomeDude@gmail.com>
+
+AM_CFLAGS = \
+	-I$(top_builddir)/src/gallium/drivers/r300 \
+	$(GALLIUM_CFLAGS) \
+	$(LIBDRM_CFLAGS)
+
+if HAVE_GALLIUM_RADEON
+noinst_LTLIBRARIES = libradeonwinsys.la
+endif
+
+libradeonwinsys_la_SOURCES = \
+	radeon_buffer.c \
+	radeon_drm.c \
+	radeon_r300.c \
+	radeon_winsys_softpipe.c
diff --git a/src/gallium/winsys/drm/radeon/dri/Makefile b/src/gallium/winsys/drm/radeon/dri/Makefile
deleted file mode 100644
index a9889444de..0000000000
--- a/src/gallium/winsys/drm/radeon/dri/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-
-TOP = ../../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = radeon_dri.so
-
-MINIGLX_SOURCES =
-
-PIPE_DRIVERS = \
-	$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
-	$(TOP)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.a \
-	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
-	$(TOP)/src/gallium/drivers/trace/libtrace.a \
-	$(TOP)/src/gallium/drivers/r300/libr300.a
-
-C_SOURCES = \
-	$(COMMON_GALLIUM_SOURCES) \
-	$(DRIVER_SOURCES)
-
-ASM_SOURCES = 
-
-include ../../Makefile.template
-
-DRI_LIB_DEPS += -ldrm_radeon
-
-symlinks:
diff --git a/src/gallium/winsys/drm/radeon/dri/Makefile.am b/src/gallium/winsys/drm/radeon/dri/Makefile.am
new file mode 100644
index 0000000000..0dbe17706f
--- /dev/null
+++ b/src/gallium/winsys/drm/radeon/dri/Makefile.am
@@ -0,0 +1,42 @@
+# Copyright © 2009 Corbin Simpson
+#
+# 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.
+#
+# Authors:
+#    Corbin Simpson <MostAwesomeDude@gmail.com>
+
+dridir = $(DRI_DRIVER_INSTALL_DIR)
+
+if HAVE_GALLIUM_RADEON
+dri_LTLIBRARIES = radeon_dri.la
+endif
+
+radeon_dri_la_LDFLAGS = -module -avoid-version -shared
+
+radeon_dri_la_DEPENDENCIES = \
+	$(top_builddir)/src/gallium/state_trackers/dri/libdridrm.la \
+	$(top_builddir)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.la \
+	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
+	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+	$(top_builddir)/src/gallium/drivers/r300/libr300.la
+
+radeon_dri_la_LIBADD = \
+	$(radeon_dri_la_DEPENDENCIES) \
+	-ldrm_radeon