14 files changed, 0 insertions, 57 deletions
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index a70b8f7fe62..25d9533c949 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -64,17 +64,3 @@ endif
 ################################################################################
 
 SUBDIRS += $(GALLIUM_MAKE_DIRS)
-
-# FIXME: Remove when the rest of Gallium is converted to automake.
-default: all
-
-all-local: $(noinst_LTLIBRARIES)
-if HAVE_GALAHAD_GALLIUM
-	ln -f $(builddir)/galahad/.libs/libgalahad.a $(builddir)/galahad/libgalahad.a
-endif
-if HAVE_IDENTITY_GALLIUM
-	ln -f $(builddir)/identity/.libs/libidentity.a $(builddir)/identity/libidentity.a
-endif
-if HAVE_NOOP_GALLIUM
-	ln -f $(builddir)/noop/.libs/libnoop.a $(builddir)/noop/libnoop.a
-endif
diff --git a/src/gallium/drivers/i915/Makefile.am b/src/gallium/drivers/i915/Makefile.am
index 5c73811af0f..4e6f46411db 100644
--- a/src/gallium/drivers/i915/Makefile.am
+++ b/src/gallium/drivers/i915/Makefile.am
@@ -31,6 +31,3 @@ AM_CPPFLAGS = \
 	$(GALLIUM_CFLAGS)
 
 libi915_la_SOURCES = $(C_SOURCES)
-
-all-local: libi915.la
-	ln -f $(builddir)/.libs/libi915.a $(builddir)/libi915.a
diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am
index 1514f1634b3..78cb95deeee 100644
--- a/src/gallium/drivers/llvmpipe/Makefile.am
+++ b/src/gallium/drivers/llvmpipe/Makefile.am
@@ -105,5 +105,3 @@ lp_test_printf_SOURCES = lp_test_printf.c lp_test_main.c
 lp_test_printf_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS)
 nodist_EXTRA_lp_test_printf_SOURCES = dummy.cpp
 
-all-local: libllvmpipe.la
-	ln -f $(builddir)/.libs/libllvmpipe.a $(builddir)/libllvmpipe.a
diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am
index ca4623f0063..12e3da0334a 100644
--- a/src/gallium/drivers/nouveau/Makefile.am
+++ b/src/gallium/drivers/nouveau/Makefile.am
@@ -33,6 +33,3 @@ AM_CPPFLAGS = \
 	$(LIBDRM_CFLAGS)
 
 libnouveau_la_SOURCES = $(C_SOURCES)
-
-all-local: libnouveau.la
-	ln -f $(builddir)/.libs/libnouveau.a $(builddir)/libnouveau.a
diff --git a/src/gallium/drivers/nv30/Makefile.am b/src/gallium/drivers/nv30/Makefile.am
index 6a6cd1e3ce5..668a8b2fa7c 100644
--- a/src/gallium/drivers/nv30/Makefile.am
+++ b/src/gallium/drivers/nv30/Makefile.am
@@ -31,6 +31,3 @@ AM_CPPFLAGS = \
 	$(GALLIUM_CFLAGS)
 
 libnv30_la_SOURCES = $(C_SOURCES)
-
-all-local: libnv30.la
-	ln -f $(builddir)/.libs/libnv30.a $(builddir)/libnv30.a
diff --git a/src/gallium/drivers/nv50/Makefile.am b/src/gallium/drivers/nv50/Makefile.am
index d22e684d485..93eeb1f6a20 100644
--- a/src/gallium/drivers/nv50/Makefile.am
+++ b/src/gallium/drivers/nv50/Makefile.am
@@ -31,6 +31,3 @@ AM_CPPFLAGS = \
 	$(GALLIUM_CFLAGS)
 
 libnv50_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES)
-
-all-local: libnv50.la
-	ln -f $(builddir)/.libs/libnv50.a $(builddir)/libnv50.a
diff --git a/src/gallium/drivers/nvc0/Makefile.am b/src/gallium/drivers/nvc0/Makefile.am
index 8954f02b83e..6a245afcb6b 100644
--- a/src/gallium/drivers/nvc0/Makefile.am
+++ b/src/gallium/drivers/nvc0/Makefile.am
@@ -31,6 +31,3 @@ AM_CPPFLAGS = \
 	$(GALLIUM_CFLAGS)
 
 libnvc0_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES)
-
-all-local: libnvc0.la
-	ln -f $(builddir)/.libs/libnvc0.a $(builddir)/libnvc0.a
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index 3b88f7348f3..2da9bf9f41d 100644
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -38,8 +38,3 @@ libr300_la_SOURCES = $(C_SOURCES)
 libr300_helper_la_SOURCES = \
 	$(top_srcdir)/src/glsl/ralloc.c \
 	$(top_srcdir)/src/mesa/program/register_allocate.c
-
-#XXX: Delete this when all r300 targets are converted to automake.
-all-local: libr300.la libr300-helper.la
-	ln -f $(builddir)/.libs/libr300.a $(builddir)/libr300.a
-	ln -f $(builddir)/.libs/libr300-helper.a $(builddir)/libr300-helper.a
diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index 0fa1ffd960c..ac8e12b937d 100644
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -42,7 +42,3 @@ if HAVE_GALLIUM_COMPUTE
 AM_CFLAGS += \
 	-DHAVE_OPENCL
 endif
-
-#XXX: Delete this when all r600 targets are converted to automake.
-all-local: libr600.la
-	ln -f $(builddir)/.libs/libr600.a $(builddir)/libr600.a
diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index 595cf862744..e771d318525 100644
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -34,7 +34,3 @@ AM_CFLAGS = $(LLVM_CFLAGS)
 
 libradeonsi_la_SOURCES = $(C_SOURCES)
 libradeonsi_la_LIBADD = ../radeon/libllvmradeon@[email protected]
-
-#XXX: Delete this when all radeonsi targets are converted to automake.
-all-local: libradeonsi.la
-	ln -f $(builddir)/.libs/libradeonsi.a $(builddir)/libradeonsi.a
diff --git a/src/gallium/drivers/rbug/Makefile.am b/src/gallium/drivers/rbug/Makefile.am
index 43b5d6e64a2..655bfe1e40a 100644
--- a/src/gallium/drivers/rbug/Makefile.am
+++ b/src/gallium/drivers/rbug/Makefile.am
@@ -38,6 +38,3 @@ librbug_la_SOURCES = \
 	rbug_context.c \
 	rbug_objects.c \
 	rbug_screen.c
-
-all-local: librbug.la
-	ln -f $(builddir)/.libs/librbug.a $(builddir)/librbug.a
diff --git a/src/gallium/drivers/softpipe/Makefile.am b/src/gallium/drivers/softpipe/Makefile.am
index b6c3c6a4235..52ce958e20f 100644
--- a/src/gallium/drivers/softpipe/Makefile.am
+++ b/src/gallium/drivers/softpipe/Makefile.am
@@ -59,6 +59,3 @@ libsoftpipe_la_SOURCES = \
 	sp_tex_tile_cache.c \
 	sp_tile_cache.c \
 	sp_surface.c
-
-all-local: libsoftpipe.la
-	ln -f $(builddir)/.libs/libsoftpipe.a $(builddir)/libsoftpipe.a
diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am
index 426fc89ca5f..e08a133bf71 100644
--- a/src/gallium/drivers/svga/Makefile.am
+++ b/src/gallium/drivers/svga/Makefile.am
@@ -34,6 +34,3 @@ AM_CFLAGS = -std=gnu99
 noinst_LTLIBRARIES = libsvga.la
 
 libsvga_la_SOURCES = $(C_SOURCES)
-
-all-local: libsvga.la
-	ln -f $(builddir)/.libs/libsvga.a $(builddir)/libsvga.a
diff --git a/src/gallium/drivers/trace/Makefile.am b/src/gallium/drivers/trace/Makefile.am
index 9adcef1f53f..a9e1457d33e 100644
--- a/src/gallium/drivers/trace/Makefile.am
+++ b/src/gallium/drivers/trace/Makefile.am
@@ -11,7 +11,3 @@ libtrace_la_SOURCES = \
 	tr_dump_state.c \
 	tr_screen.c \
 	tr_texture.c
-
-#XXX: Delete this when all targets using libtrace are converted to automake
-all-local: libtrace.la
-	ln -f $(builddir)/.libs/libtrace.a $(builddir)/libtrace.a