18 files changed, 49 insertions, 16 deletions
diff --git a/src/gallium/drivers/.gitignore b/src/gallium/drivers/.gitignore
new file mode 100644
index 00000000000..a963aad2d31
--- /dev/null
+++ b/src/gallium/drivers/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+.deps/
diff --git a/src/gallium/drivers/Makefile b/src/gallium/drivers/Makefile
deleted file mode 100644
index 9fe9b2c11d0..00000000000
--- a/src/gallium/drivers/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/drivers/Makefile
-TOP = ../../..
-include $(TOP)/configs/current
-
-SUBDIRS = $(GALLIUM_DRIVERS_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/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
new file mode 100644
index 00000000000..b6954e2d94a
--- /dev/null
+++ b/src/gallium/drivers/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = $(GALLIUM_DRIVERS_DIRS)
+
+# FIXME: Remove when the rest of Gallium is converted to automake.
+default: all
diff --git a/src/gallium/drivers/galahad/Makefile b/src/gallium/drivers/galahad/Makefile
index e9c4f7e28c8..15ea136a819 100644
--- a/src/gallium/drivers/galahad/Makefile
+++ b/src/gallium/drivers/galahad/Makefile
@@ -9,3 +9,6 @@ C_SOURCES = \
 	glhd_screen.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/i915/Makefile b/src/gallium/drivers/i915/Makefile
index 0e576784846..b7d8a1f1d40 100644
--- a/src/gallium/drivers/i915/Makefile
+++ b/src/gallium/drivers/i915/Makefile
@@ -7,3 +7,6 @@ LIBNAME = i915
 include Makefile.sources
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/identity/Makefile b/src/gallium/drivers/identity/Makefile
index 74692d97610..a15e17e0d4a 100644
--- a/src/gallium/drivers/identity/Makefile
+++ b/src/gallium/drivers/identity/Makefile
@@ -9,3 +9,6 @@ C_SOURCES = \
 	id_screen.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 1a4e93d7ce3..8df891cd1b2 100644
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -62,6 +62,9 @@ CLEAN_EXTRA = *.o
 
 include ../../Makefile.template
 
+# FIXME: Remove when this driver is converted to automake.
+all: default
+
 PROGS_DEPS := ../../auxiliary/libgallium.a
 
 lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_pack.py ../../auxiliary/util/u_format.csv
diff --git a/src/gallium/drivers/noop/Makefile b/src/gallium/drivers/noop/Makefile
index 29b8d73de22..75e65ed60f4 100644
--- a/src/gallium/drivers/noop/Makefile
+++ b/src/gallium/drivers/noop/Makefile
@@ -11,3 +11,6 @@ C_SOURCES = \
 	noop_state.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/nouveau/Makefile b/src/gallium/drivers/nouveau/Makefile
index d583324b021..cfb8831582f 100644
--- a/src/gallium/drivers/nouveau/Makefile
+++ b/src/gallium/drivers/nouveau/Makefile
@@ -14,3 +14,6 @@ LIBRARY_DEFINES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-oth
 include Makefile.sources
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/nv50/Makefile b/src/gallium/drivers/nv50/Makefile
index 18e30b0a54f..2dd37eeace6 100644
--- a/src/gallium/drivers/nv50/Makefile
+++ b/src/gallium/drivers/nv50/Makefile
@@ -10,3 +10,6 @@ LIBRARY_INCLUDES = \
 	$(LIBDRM_CFLAGS)
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/nvc0/Makefile b/src/gallium/drivers/nvc0/Makefile
index c41262559cd..a60127fe2d5 100644
--- a/src/gallium/drivers/nvc0/Makefile
+++ b/src/gallium/drivers/nvc0/Makefile
@@ -10,3 +10,6 @@ LIBRARY_INCLUDES = \
 	$(LIBDRM_CFLAGS)
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/nvfx/Makefile b/src/gallium/drivers/nvfx/Makefile
index 53292d6da12..9b6ed1cad6a 100644
--- a/src/gallium/drivers/nvfx/Makefile
+++ b/src/gallium/drivers/nvfx/Makefile
@@ -11,3 +11,6 @@ LIBRARY_INCLUDES = \
 	-I$(TOP)/src/gallium/drivers/nouveau/include
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index 8ec47d77ec1..af352aa23e4 100644
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -32,7 +32,3 @@ r300_compiler_tests_SOURCES = \
 	$(testdir)/radeon_compiler_util_tests.c \
 	$(testdir)/rc_test_helpers.c \
 	$(testdir)/unit_test.c
-
-# FIXME: remove this when the rest of the gallium
-# build system is converted to automake.
-default: libr300.a
diff --git a/src/gallium/drivers/r600/Makefile b/src/gallium/drivers/r600/Makefile
index 62e760c78a5..e15e2ff2667 100644
--- a/src/gallium/drivers/r600/Makefile
+++ b/src/gallium/drivers/r600/Makefile
@@ -12,3 +12,6 @@ LIBRARY_INCLUDES = -I$(TOP)/include
 include Makefile.sources
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/rbug/Makefile b/src/gallium/drivers/rbug/Makefile
index 64e172fe5c1..a426727c83f 100644
--- a/src/gallium/drivers/rbug/Makefile
+++ b/src/gallium/drivers/rbug/Makefile
@@ -10,3 +10,6 @@ C_SOURCES = \
 	rbug_screen.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/softpipe/Makefile b/src/gallium/drivers/softpipe/Makefile
index 27b5d991a75..bcafa3c7fcb 100644
--- a/src/gallium/drivers/softpipe/Makefile
+++ b/src/gallium/drivers/softpipe/Makefile
@@ -35,3 +35,6 @@ C_SOURCES = \
 	sp_surface.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/svga/Makefile b/src/gallium/drivers/svga/Makefile
index 97f68f06f47..825f15b84cb 100644
--- a/src/gallium/drivers/svga/Makefile
+++ b/src/gallium/drivers/svga/Makefile
@@ -17,3 +17,6 @@ LIBRARY_DEFINES = \
 	-DHAVE_STDINT_H -DHAVE_SYS_TYPES_H
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default
diff --git a/src/gallium/drivers/trace/Makefile b/src/gallium/drivers/trace/Makefile
index 99e5fb81c22..c842be80594 100644
--- a/src/gallium/drivers/trace/Makefile
+++ b/src/gallium/drivers/trace/Makefile
@@ -11,3 +11,6 @@ C_SOURCES = \
 	tr_texture.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default