Remove hacks for static Makefiles

v2: Andreas Boll <[email protected]>
    - don't remove compatibility with scripts for the old build system

v3: Andreas Boll <[email protected]>
    - remove more obsolete hacks

v4: Andreas Boll <[email protected]>
    - add a previously removed TOP variable to fix vgapi build

11 files changed, 0 insertions, 44 deletions

diff --git a/src/gallium/winsys/i915/drm/Makefile.am b/src/gallium/winsys/i915/drm/Makefile.am
index b7b61454294..7a64925ba1c 100644
--- a/src/gallium/winsys/i915/drm/Makefile.am
+++ b/src/gallium/winsys/i915/drm/Makefile.am
@@ -32,7 +32,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libi915drm.la
 
 libi915drm_la_SOURCES = $(C_SOURCES)
-
-#XXX: Delete this when all targets using the i915 winsys are converted to automake.
-all-local: libi915drm.la
-	ln -f $(builddir)/.libs/libi915drm.a $(builddir)/libi915drm.a
diff --git a/src/gallium/winsys/i915/sw/Makefile.am b/src/gallium/winsys/i915/sw/Makefile.am
index 1cf3cbed3f7..2276f0d8c65 100644
--- a/src/gallium/winsys/i915/sw/Makefile.am
+++ b/src/gallium/winsys/i915/sw/Makefile.am
@@ -35,7 +35,3 @@ libi915sw_la_SOURCES = \
 	i915_sw_buffer.c \
 	i915_sw_fence.c \
 	i915_sw_winsys.c
-
-#XXX: Delete this when all targets using the i915 winsys are converted to automake.
-all-local: libi915sw.la
-	ln -f $(builddir)/.libs/libi915sw.a $(builddir)/libi915sw.a
diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am b/src/gallium/winsys/nouveau/drm/Makefile.am
index fb04b364d5e..14488779b9d 100644
--- a/src/gallium/winsys/nouveau/drm/Makefile.am
+++ b/src/gallium/winsys/nouveau/drm/Makefile.am
@@ -31,7 +31,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libnouveaudrm.la
 
 libnouveaudrm_la_SOURCES = nouveau_drm_winsys.c
-
-#XXX: Delete this when all targets using the nouveau winsys are converted to automake.
-all-local: libnouveaudrm.la
-	ln -f $(builddir)/.libs/libnouveaudrm.a $(builddir)/libnouveaudrm.a
diff --git a/src/gallium/winsys/radeon/drm/Makefile.am b/src/gallium/winsys/radeon/drm/Makefile.am
index 5b2506b35eb..184d2576a12 100644
--- a/src/gallium/winsys/radeon/drm/Makefile.am
+++ b/src/gallium/winsys/radeon/drm/Makefile.am
@@ -9,7 +9,3 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libradeonwinsys.la
 
 libradeonwinsys_la_SOURCES = $(C_SOURCES)
-
-#XXX: Delete this when all targets using the radeon winsys are converted to automake.
-all-local: libradeonwinsys.la
-	ln -f $(builddir)/.libs/libradeonwinsys.a $(builddir)/libradeonwinsys.a
diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am
index fadd750b057..452af3ae034 100644
--- a/src/gallium/winsys/svga/drm/Makefile.am
+++ b/src/gallium/winsys/svga/drm/Makefile.am
@@ -35,7 +35,3 @@ AM_CFLAGS = -std=gnu99 -D_FILE_OFFSET_BITS=64
 noinst_LTLIBRARIES = libsvgadrm.la
 
 libsvgadrm_la_SOURCES = $(C_SOURCES)
-
-#XXX: Delete this when all targets using the svga winsys are converted to automake.
-all-local: libsvgadrm.la
-	ln -f $(builddir)/.libs/libsvgadrm.a $(builddir)/libsvgadrm.a
diff --git a/src/gallium/winsys/sw/dri/Makefile.am b/src/gallium/winsys/sw/dri/Makefile.am
index c93ce3c0c98..e0f9451fe8a 100644
--- a/src/gallium/winsys/sw/dri/Makefile.am
+++ b/src/gallium/winsys/sw/dri/Makefile.am
@@ -28,7 +28,3 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libswdri.la
 
 libswdri_la_SOURCES = dri_sw_winsys.c
-
-#XXX: Delete this when all targets using the swdri winsys are converted to automake.
-all-local: libswdri.la
-	ln -f $(builddir)/.libs/libswdri.a $(builddir)/libswdri.a
diff --git a/src/gallium/winsys/sw/fbdev/Makefile.am b/src/gallium/winsys/sw/fbdev/Makefile.am
index ec06f7e5713..801f68993f7 100644
--- a/src/gallium/winsys/sw/fbdev/Makefile.am
+++ b/src/gallium/winsys/sw/fbdev/Makefile.am
@@ -28,7 +28,3 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libfbdev.la
 
 libfbdev_la_SOURCES = fbdev_sw_winsys.c
-
-#XXX: Delete this when all targets using the fbdev winsys are converted to automake.
-all-local: libfbdev.la
-	ln -f $(builddir)/.libs/libfbdev.a $(builddir)/libfbdev.a
diff --git a/src/gallium/winsys/sw/null/Makefile.am b/src/gallium/winsys/sw/null/Makefile.am
index 5a1e11dddfc..fb450dd0035 100644
--- a/src/gallium/winsys/sw/null/Makefile.am
+++ b/src/gallium/winsys/sw/null/Makefile.am
@@ -28,7 +28,3 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libws_null.la
 
 libws_null_la_SOURCES = null_sw_winsys.c
-
-#XXX: Delete this when all targets using the ws_null winsys are converted to automake.
-all-local: libws_null.la
-	ln -f $(builddir)/.libs/libws_null.a $(builddir)/libws_null.a
diff --git a/src/gallium/winsys/sw/wayland/Makefile.am b/src/gallium/winsys/sw/wayland/Makefile.am
index 1f61e58d679..40ec7d92d1e 100644
--- a/src/gallium/winsys/sw/wayland/Makefile.am
+++ b/src/gallium/winsys/sw/wayland/Makefile.am
@@ -29,7 +29,3 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libws_wayland.la
 
 libws_wayland_la_SOURCES = wayland_sw_winsys.c
-
-#XXX: Delete this when all targets using the ws_wayland winsys are converted to automake.
-all-local: libws_wayland.la
-	ln -f $(builddir)/.libs/libws_wayland.a $(builddir)/libws_wayland.a
diff --git a/src/gallium/winsys/sw/wrapper/Makefile.am b/src/gallium/winsys/sw/wrapper/Makefile.am
index 14f43827819..3dcd6ad488c 100644
--- a/src/gallium/winsys/sw/wrapper/Makefile.am
+++ b/src/gallium/winsys/sw/wrapper/Makefile.am
@@ -28,7 +28,3 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libwsw.la
 
 libwsw_la_SOURCES = wrapper_sw_winsys.c
-
-#XXX: Delete this when all targets using the wsw winsys are converted to automake.
-all-local: libwsw.la
-	ln -f $(builddir)/.libs/libwsw.a $(builddir)/libwsw.a
diff --git a/src/gallium/winsys/sw/xlib/Makefile.am b/src/gallium/winsys/sw/xlib/Makefile.am
index 76dbea315c4..59da37dbb47 100644
--- a/src/gallium/winsys/sw/xlib/Makefile.am
+++ b/src/gallium/winsys/sw/xlib/Makefile.am
@@ -29,7 +29,3 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libws_xlib.la
 
 libws_xlib_la_SOURCES = xlib_sw_winsys.c
-
-#XXX: Delete this when all targets using the ws_xlib winsys are converted to automake.
-all-local: libws_xlib.la
-	ln -f $(builddir)/.libs/libws_xlib.a $(builddir)/libws_xlib.a