Delete autotools

Acked-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Acked-by: Marek Olšák <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Acked-by: Bas Nieuwenhuizen <[email protected]>
Acked-by: Matt Turner <[email protected]>

149 files changed, 0 insertions, 13771 deletions

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 6d3c8cc19b4..00000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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.
-
-SUBDIRS = src
-
-AM_DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-autotools \
-	--enable-dri \
-	--enable-dri3 \
-	--enable-egl \
-	--enable-gallium-tests \
-	--enable-gallium-osmesa \
-	--enable-llvm \
-	--enable-gbm \
-	--enable-gles1 \
-	--enable-gles2 \
-	--enable-glx \
-	--enable-glx-tls \
-	--enable-nine \
-	--enable-opencl \
-	--enable-opencl-icd \
-	--enable-opengl \
-	--enable-va \
-	--enable-vdpau \
-	--enable-xa \
-	--enable-xvmc \
-	--enable-llvm-shared-libs \
-	--enable-libunwind \
-	--with-platforms=x11,wayland,drm,surfaceless \
-	--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast \
-	--with-gallium-drivers=i915,nouveau,r300,kmsro,r600,radeonsi,freedreno,svga,swrast,vc4,tegra,virgl,swr,etnaviv \
-	--with-vulkan-drivers=intel,radeon
-
-ACLOCAL_AMFLAGS = -I m4
-
-EXTRA_DIST = \
-	autogen.sh \
-	common.py \
-	docs \
-	doxygen \
-	bin/git_sha1_gen.py \
-	scons \
-	SConstruct \
-	build-support/conftest.dyn \
-	build-support/conftest.map \
-	meson.build \
-	meson_options.txt \
-	bin/meson.build \
-	include/meson.build \
-	bin/install_megadrivers.py \
-	bin/meson_get_version.py
-
-noinst_HEADERS = \
-	include/c99_alloca.h \
-	include/c99_compat.h \
-	include/c99_math.h \
-	include/c11 \
-	include/drm-uapi/drm.h \
-	include/drm-uapi/drm_fourcc.h \
-	include/drm-uapi/drm_mode.h \
-	include/drm-uapi/i915_drm.h \
-	include/drm-uapi/tegra_drm.h \
-	include/drm-uapi/v3d_drm.h \
-	include/drm-uapi/vc4_drm.h \
-	include/D3D9 \
-	include/GL/wglext.h \
-	include/HaikuGL \
-	include/no_extern_c.h \
-	include/pci_ids \
-	include/vulkan
-
-# We list some directories in EXTRA_DIST, but don't actually want to include
-# the .gitignore files in the tarball.
-dist-hook:
-	find $(distdir) -name .gitignore -exec $(RM) {} +
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index c8960971d24..00000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname "$0"`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd "$srcdir"
-
-autoreconf --force --verbose --install || exit 1
-cd "$ORIGDIR" || exit $?
-
-if test -z "$NOCONFIGURE"; then
-    "$srcdir"/configure "$@"
-fi
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 7980493d086..00000000000
--- a/configure.ac
+++ /dev/null
@@ -1,3409 +0,0 @@
-dnl Copyright © 2011-2014 Intel Corporation
-dnl Copyright © 2011-2014 Emil Velikov <[email protected]>
-dnl Copyright © 2007-2010 Dan Nicholson
-dnl Copyright © 2010-2014 Marek Olšák <[email protected]>
-dnl Copyright © 2010-2014 Christian König
-dnl Copyright © 2012-2014 Tom Stellard <[email protected]>
-dnl Copyright © 2009-2012 Jakob Bornecrantz
-dnl Copyright © 2009-2014 Jon TURNEY
-dnl Copyright © 2011-2012 Benjamin Franzke
-dnl Copyright © 2008-2014 David Airlie
-dnl Copyright © 2009-2013 Brian Paul
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the "Software"),
-dnl to deal in the Software without restriction, including without limitation
-dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
-dnl and/or sell copies of the Software, and to permit persons to whom the
-dnl Software is furnished to do so, subject to the following conditions:
-dnl
-dnl The above copyright notice and this permission notice (including the next
-dnl paragraph) shall be included in all copies or substantial portions of the
-dnl Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-dnl DEALINGS IN THE SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
-
-AC_PREREQ([2.60])
-
-dnl Tell the user about autoconf.html in the --help output
-m4_divert_once([HELP_END], [
-See docs/autoconf.html for more details on the options for Mesa.])
-
-m4_define(MESA_VERSION, m4_normalize(m4_include(VERSION)))
-AC_INIT([Mesa], [MESA_VERSION],
-    [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
-AC_CONFIG_AUX_DIR([bin])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([foreign tar-ustar dist-xz subdir-objects])
-
-dnl We only support native Windows builds (MinGW/MSVC) through SCons.
-case "$host_os" in
-mingw*)
-    AC_MSG_ERROR([MinGW build not supported through autoconf/automake, use SCons instead])
-    ;;
-esac
-
-AC_ARG_ENABLE(autotools,
-   [AS_HELP_STRING([--enable-autotools],
-                   [Enable the use of this autotools based build configuration])],
-   [enable_autotools=$enableval], [enable_autotools=no])
-
-if test "x$enable_autotools" != "xyes" ; then
-    AC_MSG_ERROR([the autotools build system has been deprecated in favour of
-    meson and will be removed eventually. For instructions on how to use meson
-    see https://www.mesa3d.org/meson.html.
-    If you still want to use the autotools build, then add --enable-autotools
-    to the configure command line.])
-fi
-
-# Support silent build rules, requires at least automake-1.11. Disable
-# by either passing --disable-silent-rules to configure or passing V=1
-# to make
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
-    [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
-
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-
-dnl Set internal versions
-OSMESA_VERSION=8
-AC_SUBST([OSMESA_VERSION])
-OPENCL_VERSION=1
-AC_SUBST([OPENCL_VERSION])
-
-# The idea is that libdrm is distributed as one cohesive package, even
-# though it is composed of multiple libraries. However some drivers
-# may have different version requirements than others. This list
-# codifies which drivers need which version of libdrm. Any libdrm
-# version dependencies in non-driver-specific code should be reflected
-# in the first entry.
-LIBDRM_REQUIRED=2.4.75
-LIBDRM_RADEON_REQUIRED=2.4.71
-LIBDRM_AMDGPU_REQUIRED=2.4.97
-LIBDRM_INTEL_REQUIRED=2.4.75
-LIBDRM_NVVIEUX_REQUIRED=2.4.66
-LIBDRM_NOUVEAU_REQUIRED=2.4.66
-LIBDRM_ETNAVIV_REQUIRED=2.4.89
-LIBDRM_VC4_REQUIRED=2.4.89
-
-dnl Versions for external dependencies
-DRI2PROTO_REQUIRED=2.8
-GLPROTO_REQUIRED=1.4.14
-LIBOMXIL_BELLAGIO_REQUIRED=0.0
-LIBOMXIL_TIZONIA_REQUIRED=0.10.0
-LIBVA_REQUIRED=0.39.0
-VDPAU_REQUIRED=1.1
-WAYLAND_REQUIRED=1.11
-WAYLAND_EGL_BACKEND_REQUIRED=3
-WAYLAND_PROTOCOLS_REQUIRED=1.8
-XCB_REQUIRED=1.9.3
-XCBDRI2_REQUIRED=1.8
-XCBDRI3_MODIFIERS_REQUIRED=1.13
-XCBGLX_REQUIRED=1.8.1
-XCBPRESENT_MODIFIERS_REQUIRED=1.13
-XDAMAGE_REQUIRED=1.1
-XSHMFENCE_REQUIRED=1.1
-XVMC_REQUIRED=1.0.6
-PYTHON_MAKO_REQUIRED=0.8.0
-LIBSENSORS_REQUIRED=4.0.0
-ZLIB_REQUIRED=1.2.3
-
-dnl LLVM versions
-LLVM_REQUIRED_GALLIUM=3.3.0
-LLVM_REQUIRED_OPENCL=3.9.0
-LLVM_REQUIRED_R600=3.9.0
-LLVM_REQUIRED_RADEONSI=7.0.0
-LLVM_REQUIRED_RADV=7.0.0
-LLVM_REQUIRED_SWR=6.0.0
-
-dnl Check for progs
-AC_PROG_CPP
-AC_PROG_CC
-AC_PROG_CXX
-dnl add this here, so the help for this environmnet variable is close to
-dnl other CC/CXX flags related help
-AC_ARG_VAR([CXX11_CXXFLAGS], [Compiler flag to enable C++11 support (only needed if not
-                              enabled by default and different  from -std=c++11)])
-AM_PROG_CC_C_O
-AC_PROG_GREP
-AC_PROG_NM
-AM_PROG_AS
-AX_CHECK_GNU_MAKE
-AM_PATH_PYTHON([2.7],, [AM_PATH_PYTHON([3.4],, [:])])
-
-AC_PROG_SED
-AC_PROG_MKDIR_P
-
-AC_SYS_LARGEFILE
-
-
-LT_PREREQ([2.2])
-LT_INIT([disable-static])
-
-AC_CHECK_PROG(RM, rm, [rm -f])
-
-AX_PROG_BISON([],
-              AS_IF([test ! -f "$srcdir/src/compiler/glsl/glcpp/glcpp-parse.c"],
-                    [AC_MSG_ERROR([bison not found - unable to compile glcpp-parse.y])]))
-AX_PROG_FLEX([],
-             AS_IF([test ! -f "$srcdir/src/compiler/glsl/glcpp/glcpp-lex.c"],
-                   [AC_MSG_ERROR([flex not found - unable to compile glcpp-lex.l])]))
-
-AC_CHECK_PROG(INDENT, indent, indent, cat)
-if test "x$INDENT" != "xcat"; then
-    # Only GNU indent is supported
-    INDENT_VERSION=`indent --version | grep GNU`
-    if test $? -eq 0; then
-       AC_SUBST(INDENT_FLAGS, '-i4 -nut -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool')
-    else
-       INDENT="cat"
-    fi
-fi
-
-AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)
-
-if test "$PYTHON" = ":"; then
-    if test ! -f "$srcdir/src/util/format_srgb.c"; then
-        AC_MSG_ERROR([Python not found - unable to generate sources])
-    fi
-else
-    if test "x$acv_mako_found" = xno; then
-        if test ! -f "$srcdir/src/mesa/main/format_unpack.c"; then
-            AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found])
-        fi
-    fi
-fi
-
-AC_PROG_INSTALL
-
-dnl We need a POSIX shell for parts of the build. Assume we have one
-dnl in most cases.
-case "$host_os" in
-solaris*)
-    # Solaris /bin/sh is too old/non-POSIX compliant
-    AC_PATH_PROGS(POSIX_SHELL, [ksh93 ksh sh])
-    SHELL="$POSIX_SHELL"
-    ;;
-esac
-
-dnl clang is mostly GCC-compatible, but its version is much lower,
-dnl so we have to check for it.
-AC_MSG_CHECKING([if compiling with clang])
-
-AC_COMPILE_IFELSE(
-[AC_LANG_PROGRAM([], [[
-#ifndef __clang__
-       not clang
-#endif
-]])],
-[acv_mesa_CLANG=yes], [acv_mesa_CLANG=no])
-
-AC_MSG_RESULT([$acv_mesa_CLANG])
-
-dnl If we're using GCC, make sure that it is at least version 4.2.0.  Older
-dnl versions are explictly not supported.
-GEN_ASM_OFFSETS=no
-USE_GNU99=no
-if test "x$GCC" = xyes -a "x$acv_mesa_CLANG" = xno; then
-    AC_MSG_CHECKING([whether gcc version is sufficient])
-    major=0
-    minor=0
-
-    GCC_VERSION=`$CC -dumpversion`
-    if test $? -eq 0; then
-        GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1`
-        GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2`
-    fi
-
-    if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 2 ; then
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([If using GCC, version 4.2.0 or later is required.])
-    else
-        AC_MSG_RESULT([yes])
-    fi
-
-    if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 6 ; then
-        USE_GNU99=yes
-    fi
-    if test "x$cross_compiling" = xyes; then
-        GEN_ASM_OFFSETS=yes
-    fi
-fi
-
-dnl We don't support building Mesa with Sun C compiler
-dnl https://bugs.freedesktop.org/show_bug.cgi?id=93189
-AC_CHECK_DECL([__SUNPRO_C], [SUNCC=yes], [SUNCC=no])
-if test "x$SUNCC" = xyes; then
-    AC_MSG_ERROR([Building with Sun C compiler is not supported, use GCC instead.])
-fi
-
-dnl Check for compiler builtins
-AX_GCC_BUILTIN([__builtin_bswap32])
-AX_GCC_BUILTIN([__builtin_bswap64])
-AX_GCC_BUILTIN([__builtin_clz])
-AX_GCC_BUILTIN([__builtin_clzll])
-AX_GCC_BUILTIN([__builtin_ctz])
-AX_GCC_BUILTIN([__builtin_expect])
-AX_GCC_BUILTIN([__builtin_ffs])
-AX_GCC_BUILTIN([__builtin_ffsll])
-AX_GCC_BUILTIN([__builtin_popcount])
-AX_GCC_BUILTIN([__builtin_popcountll])
-AX_GCC_BUILTIN([__builtin_unreachable])
-
-AX_GCC_FUNC_ATTRIBUTE([const])
-AX_GCC_FUNC_ATTRIBUTE([flatten])
-AX_GCC_FUNC_ATTRIBUTE([format])
-AX_GCC_FUNC_ATTRIBUTE([malloc])
-AX_GCC_FUNC_ATTRIBUTE([packed])
-AX_GCC_FUNC_ATTRIBUTE([pure])
-AX_GCC_FUNC_ATTRIBUTE([returns_nonnull])
-AX_GCC_FUNC_ATTRIBUTE([unused])
-AX_GCC_FUNC_ATTRIBUTE([visibility])
-AX_GCC_FUNC_ATTRIBUTE([warn_unused_result])
-AX_GCC_FUNC_ATTRIBUTE([weak])
-AX_GCC_FUNC_ATTRIBUTE([alias])
-AX_GCC_FUNC_ATTRIBUTE([noreturn])
-
-AM_CONDITIONAL([GEN_ASM_OFFSETS], test "x$GEN_ASM_OFFSETS" = xyes)
-
-dnl Make sure the pkg-config macros are defined
-m4_ifndef([PKG_PROG_PKG_CONFIG],
-    [m4_fatal([Could not locate the pkg-config autoconf macros.
-  These are usually located in /usr/share/aclocal/pkg.m4. If your macros
-  are in a different location, try setting the environment variable
-  ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])
-PKG_PROG_PKG_CONFIG()
-
-dnl LIB_DIR - library basename
-LIB_DIR=`echo $libdir | $SED 's%.*/%%'`
-AC_SUBST([LIB_DIR])
-
-dnl Cache LDFLAGS and CPPFLAGS so we can add to them and restore later
-_SAVE_LDFLAGS="$LDFLAGS"
-_SAVE_CPPFLAGS="$CPPFLAGS"
-
-dnl Compiler macros
-DEFINES="-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
-AC_SUBST([DEFINES])
-android=no
-case "$host_os" in
-*-android*)
-    android=yes
-    ;;
-linux*|*-gnu*|gnu*|cygwin*)
-    DEFINES="$DEFINES -D_GNU_SOURCE"
-    ;;
-solaris*)
-    DEFINES="$DEFINES -DSVR4"
-    ;;
-esac
-
-AM_CONDITIONAL(HAVE_ANDROID, test "x$android" = xyes)
-
-# Toggle Werror since at some point clang started treating unknown -W
-# flags as warnings, succeeding with the build, yet issuing an annoying
-# warning.
-save_CFLAGS="$CFLAGS"
-export CFLAGS="$CFLAGS -Werror"
-
-dnl
-dnl Check compiler flags
-dnl
-AX_CHECK_COMPILE_FLAG([-Wall],                                 [CFLAGS="$CFLAGS -Wall"])
-AX_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration], [CFLAGS="$CFLAGS -Werror=implicit-function-declaration"])
-AX_CHECK_COMPILE_FLAG([-Werror=missing-prototypes],            [CFLAGS="$CFLAGS -Werror=missing-prototypes"])
-AX_CHECK_COMPILE_FLAG([-Werror=incompatible-pointer-types],    [CFLAGS="$CFLAGS -Werror=incompatible-pointer-types"])
-AX_CHECK_COMPILE_FLAG([-Wmissing-prototypes],                  [CFLAGS="$CFLAGS -Wmissing-prototypes"])
-dnl Dylan Baker: gcc and clang always accepr -Wno-*, hence check for the original warning, then set the no-* flag
-AX_CHECK_COMPILE_FLAG([-Wmissing-field-initializers],          [CFLAGS="$CFLAGS -Wno-missing-field-initializers"])
-AX_CHECK_COMPILE_FLAG([-Wformat-truncation],                   [CFLAGS="$CFLAGS -Wno-format-truncation"])
-AX_CHECK_COMPILE_FLAG([-fno-math-errno],                       [CFLAGS="$CFLAGS -fno-math-errno"])
-
-AX_CHECK_COMPILE_FLAG([-fno-trapping-math],                    [CFLAGS="$CFLAGS -fno-trapping-math"])
-AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],                   [VISIBILITY_CFLAGS="-fvisibility=hidden"])
-
-CFLAGS="$save_CFLAGS"
-
-# Toggle Werror since at some point clang started treating unknown -W
-# flags as warnings, succeeding with the build, yet issuing an annoying
-# warning.
-dnl
-dnl Check C++ compiler flags
-dnl
-AC_LANG_PUSH([C++])
-AX_CHECK_COMPILE_FLAG([-Wall],                                 [CXXFLAGS="$CXXFLAGS -Wall"])
-AX_CHECK_COMPILE_FLAG([-fno-math-errno],                       [CXXFLAGS="$CXXFLAGS -fno-math-errno"])
-AX_CHECK_COMPILE_FLAG([-fno-trapping-math],                    [CXXFLAGS="$CXXFLAGS -fno-trapping-math"])
-AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],                   [VISIBILITY_CXXFLAGS="-fvisibility=hidden"])
-AX_CHECK_COMPILE_FLAG([-Wmissing-field-initializers],          [CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers"])
-AX_CHECK_COMPILE_FLAG([-Wformat-truncation],                   [CXXFLAGS="$CXXFLAGS -Wno-format-truncation"])
-AC_LANG_POP([C++])
-
-# Flags to help ensure that certain portions of the code -- and only those
-# portions -- can be built with MSVC:
-# - src/util, src/gallium/auxiliary, rc/gallium/drivers/llvmpipe, and
-# - non-Linux/Posix OpenGL portions needs to build on MSVC 2013 (which
-#   supports most of C99)
-# - the rest has no compiler compiler restrictions
-AX_CHECK_COMPILE_FLAG([-Werror=pointer-arith],                 [MSVC2013_COMPAT_CFLAGS="$MSVC2013_COMPAT_CFLAGS -Werror=pointer-arith"])
-AX_CHECK_COMPILE_FLAG([-Werror=vla],                           [MSVC2013_COMPAT_CFLAGS="$MSVC2013_COMPAT_CFLAGS -Werror=vla"])
-AC_LANG_PUSH([C++])
-AX_CHECK_COMPILE_FLAG([-Werror=pointer-arith],                 [MSVC2013_COMPAT_CXXFLAGS="$MSVC2013_COMPAT_CXXFLAGS -Werror=pointer-arith"])
-AX_CHECK_COMPILE_FLAG([-Werror=vla],                           [MSVC2013_COMPAT_CXXFLAGS="$MSVC2013_COMPAT_CXXFLAGS -Werror=vla"])
-AC_LANG_POP([C++])
-
-AC_SUBST([MSVC2013_COMPAT_CFLAGS])
-AC_SUBST([MSVC2013_COMPAT_CXXFLAGS])
-
-if test "x$GCC" = xyes; then
-    if test "x$USE_GNU99" = xyes; then
-        CFLAGS="$CFLAGS -std=gnu99"
-    else
-        CFLAGS="$CFLAGS -std=c99"
-    fi
-fi
-
-dnl
-dnl Check whether C++11 is supported, if the environment variable
-dnl CXX11_CXXFLAGS is set it takes precedence.
-dnl
-
-AC_LANG_PUSH([C++])
-
-check_cxx11_available() {
-    output_support=$1
-    AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([
-             #if !(__cplusplus >= 201103L)
-             #error
-             #endif
-             #include <tuple>
-        ])
-    ], [
-         AC_MSG_RESULT(yes)
-         cxx11_support=yes
-    ], AC_MSG_RESULT(no))
-    eval "$output_support=\$cxx11_support"
-}
-
-HAVE_CXX11=no
-save_CXXFLAGS="$CXXFLAGS"
-
-dnl If the user provides a flag to enable c++11, then we test only this
-if test "x$CXX11_CXXFLAGS" != "x"; then
-   CXXFLAGS="$CXXFLAGS $CXX11_CXXFLAGS"
-   AC_MSG_CHECKING(whether c++11 is enabled by via $CXX11_CXXFLAGS)
-   check_cxx11_available HAVE_CXX11
-else
-   dnl test whether c++11 is enabled by default
-   AC_MSG_CHECKING(whether c++11 is enabled by default)
-   check_cxx11_available HAVE_CXX11
-
-   dnl C++11 not enabled by default, test whether -std=c++11 does the job
-   if test "x$HAVE_CXX11" != "xyes"; then
-       CXX11_CXXFLAGS=-std=c++11
-       CXXFLAGS="$CXXFLAGS $CXX11_CXXFLAGS"
-       AC_MSG_CHECKING(whether c++11 is enabled by via $CXX11_CXXFLAGS)
-       check_cxx11_available HAVE_CXX11
-   fi
-fi
-
-CXXFLAGS="$save_CXXFLAGS"
-AM_CONDITIONAL(HAVE_STD_CXX11, test "x$HAVE_CXX11" = "xyes")
-AC_SUBST(CXX11_CXXFLAGS)
-AC_LANG_POP([C++])
-
-dnl even if the compiler appears to support it, using visibility attributes isn't
-dnl going to do anything useful currently on cygwin apart from emit lots of warnings
-case "$host_os" in
-cygwin*)
-    VISIBILITY_CFLAGS=""
-    VISIBILITY_CXXFLAGS=""
-    ;;
-esac
-
-AC_SUBST([VISIBILITY_CFLAGS])
-AC_SUBST([VISIBILITY_CXXFLAGS])
-
-dnl For some reason, the test for -Wno-foo always succeeds with gcc, even if the
-dnl option is not supported. Hence, check for -Wfoo instead.
-AX_CHECK_COMPILE_FLAG([-Woverride-init],                    [WNO_OVERRIDE_INIT="$WNO_OVERRIDE_INIT -Wno-override-init"])         # gcc
-AX_CHECK_COMPILE_FLAG([-Winitializer-overrides],            [WNO_OVERRIDE_INIT="$WNO_OVERRIDE_INIT -Wno-initializer-overrides"]) # clang
-AC_SUBST([WNO_OVERRIDE_INIT])
-
-dnl
-dnl Optional flags, check for compiler support
-dnl
-SSE41_CFLAGS="-msse4.1"
-dnl Code compiled by GCC with -msse* assumes a 16 byte aligned
-dnl stack, but on x86-32 such alignment is not guaranteed.
-case "$target_cpu" in
-i?86)
-    SSE41_CFLAGS="$SSE41_CFLAGS -mstackrealign"
-    ;;
-esac
-save_CFLAGS="$CFLAGS"
-CFLAGS="$SSE41_CFLAGS $CFLAGS"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-#include <smmintrin.h>
-int param;
-int main () {
-    __m128i a = _mm_set1_epi32 (param), b = _mm_set1_epi32 (param + 1), c;
-    c = _mm_max_epu32(a, b);
-    return _mm_cvtsi128_si32(c);
-}]])], SSE41_SUPPORTED=1)
-CFLAGS="$save_CFLAGS"
-if test "x$SSE41_SUPPORTED" = x1; then
-    DEFINES="$DEFINES -DUSE_SSE41"
-fi
-AM_CONDITIONAL([SSE41_SUPPORTED], [test x$SSE41_SUPPORTED = x1])
-AC_SUBST([SSE41_CFLAGS], $SSE41_CFLAGS)
-
-dnl Check for new-style atomic builtins. We first check without linking to
-dnl -latomic.
-AC_MSG_CHECKING(whether __atomic_load_n is supported)
-AC_LINK_IFELSE([AC_LANG_SOURCE([[
-#include <stdint.h>
-int main() {
-    struct {
-        uint64_t *v;
-    } x;
-    return (int)__atomic_load_n(x.v, __ATOMIC_ACQUIRE) &
-           (int)__atomic_add_fetch(x.v, (uint64_t)1, __ATOMIC_ACQ_REL);
-}]])], GCC_ATOMIC_BUILTINS_SUPPORTED=yes, GCC_ATOMIC_BUILTINS_SUPPORTED=no)
-
-dnl If that didn't work, we try linking with -latomic, which is needed on some
-dnl platforms.
-if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" != xyes; then
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS -latomic"
-   AC_LINK_IFELSE([AC_LANG_SOURCE([[
-   #include <stdint.h>
-   int main() {
-        struct {
-            uint64_t *v;
-        } x;
-        return (int)__atomic_load_n(x.v, __ATOMIC_ACQUIRE) &
-               (int)__atomic_add_fetch(x.v, (uint64_t)1, __ATOMIC_ACQ_REL);
-   }]])], GCC_ATOMIC_BUILTINS_SUPPORTED=yes LIBATOMIC_LIBS="-latomic",
-          GCC_ATOMIC_BUILTINS_SUPPORTED=no)
-   LDFLAGS=$save_LDFLAGS
-fi
-AC_MSG_RESULT($GCC_ATOMIC_BUILTINS_SUPPORTED)
-
-if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" = xyes; then
-    DEFINES="$DEFINES -DUSE_GCC_ATOMIC_BUILTINS"
-fi
-AC_SUBST([LIBATOMIC_LIBS])
-
-dnl Check if host supports 64-bit atomics
-dnl note that lack of support usually results in link (not compile) error
-AC_MSG_CHECKING(whether __sync_add_and_fetch_8 is supported)
-AC_LINK_IFELSE([AC_LANG_SOURCE([[
-#include <stdint.h>
-uint64_t v;
-int main() {
-    return __sync_add_and_fetch(&v, (uint64_t)1);
-}]])], GCC_64BIT_ATOMICS_SUPPORTED=yes, GCC_64BIT_ATOMICS_SUPPORTED=no)
-if test "x$GCC_64BIT_ATOMICS_SUPPORTED" != xyes; then
-    DEFINES="$DEFINES -DMISSING_64BIT_ATOMICS"
-fi
-AC_MSG_RESULT($GCC_64BIT_ATOMICS_SUPPORTED)
-
-dnl Check for Endianness
-AC_C_BIGENDIAN(
-   little_endian=no,
-   little_endian=yes,
-   little_endian=no,
-   little_endian=no
-)
-
-dnl Check for POWER8 Architecture
-PWR8_CFLAGS="-mpower8-vector"
-have_pwr8_intrinsics=no
-AC_MSG_CHECKING(whether gcc supports -mpower8-vector)
-save_CFLAGS=$CFLAGS
-CFLAGS="$PWR8_CFLAGS $CFLAGS"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8))
-#error "Need GCC >= 4.8 for sane POWER8 support"
-#endif
-#include <altivec.h>
-int main () {
-    vector unsigned char r;
-    vector unsigned int v = vec_splat_u32 (1);
-    r = __builtin_vec_vgbbd ((vector unsigned char) v);
-    return 0;
-}]])], have_pwr8_intrinsics=yes)
-CFLAGS=$save_CFLAGS
-
-AC_ARG_ENABLE(pwr8,
-   [AS_HELP_STRING([--disable-pwr8],
-                   [disable POWER8-specific instructions])],
-   [enable_pwr8=$enableval], [enable_pwr8=auto])
-
-if test "x$enable_pwr8" = xno ; then
-   have_pwr8_intrinsics=disabled
-fi
-
-if test $have_pwr8_intrinsics = yes && test $little_endian = yes ; then
-   DEFINES="$DEFINES -D_ARCH_PWR8"
-   CXXFLAGS="$CXXFLAGS $PWR8_CFLAGS"
-   CFLAGS="$CFLAGS $PWR8_CFLAGS"
-else
-   PWR8_CFLAGS=
-fi
-
-AC_MSG_RESULT($have_pwr8_intrinsics)
-if test "x$enable_pwr8" = xyes && test $have_pwr8_intrinsics = no ; then
-   AC_MSG_ERROR([POWER8 compiler support not detected])
-fi
-
-if test $have_pwr8_intrinsics = yes && test $little_endian = no ; then
-   AC_MSG_WARN([POWER8 optimization is enabled only on POWER8 Little-Endian])
-fi
-
-AC_SUBST([PWR8_CFLAGS], $PWR8_CFLAGS)
-
-dnl Can't have static and shared libraries, default to static if user
-dnl explicitly requested. If both disabled, set to static since shared
-dnl was explicitly requested.
-case "x$enable_static$enable_shared" in
-xyesyes)
-    AC_MSG_ERROR([Cannot enable both static and shared. Building using --enable-shared is strongly recommended])
-    ;;
-xnono)
-    AC_MSG_ERROR([Cannot disable both static and shared. Building using --enable-shared is strongly recommended])
-    ;;
-esac
-
-AM_CONDITIONAL(BUILD_SHARED, test "x$enable_shared" = xyes)
-
-dnl
-dnl other compiler options
-dnl
-AC_ARG_ENABLE([debug],
-    [AS_HELP_STRING([--enable-debug],
-        [use debug compiler flags and macros @<:@default=disabled@:>@])],
-    [enable_debug="$enableval"],
-    [enable_debug=no]
-)
-
-AC_ARG_ENABLE([profile],
-    [AS_HELP_STRING([--enable-profile],
-        [enable profiling of code @<:@default=disabled@:>@])],
-    [enable_profile="$enableval"],
-    [enable_profile=no]
-)
-
-AC_ARG_ENABLE([sanitize],
-    [AS_HELP_STRING([--enable-sanitize@<:@=address|undefined@:>@],
-        [enable code sanitizer @<:@default=disabled@:>@])],
-    [enable_sanitize="$enableval"],
-    [enable_sanitize=no])
-
-if test "x$enable_profile" = xyes; then
-    DEFINES="$DEFINES -DPROFILE"
-    if test "x$GCC" = xyes; then
-        CFLAGS="$CFLAGS -fno-omit-frame-pointer"
-    fi
-    if test "x$GXX" = xyes; then
-        CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer"
-    fi
-fi
-
-if test "x$enable_debug" = xyes; then
-    DEFINES="$DEFINES -DDEBUG"
-    if test "x$enable_profile" = xyes; then
-        AC_MSG_WARN([Debug and Profile are enabled at the same time])
-    fi
-    if test "x$GCC" = xyes; then
-        if ! echo "$CFLAGS" | grep -q -e '-g'; then
-            CFLAGS="$CFLAGS -g"
-        fi
-        if ! echo "$CFLAGS" | grep -q -e '-O'; then
-            CFLAGS="$CFLAGS -O0"
-        fi
-    fi
-    if test "x$GXX" = xyes; then
-        if ! echo "$CXXFLAGS" | grep -q -e '-g'; then
-            CXXFLAGS="$CXXFLAGS -g"
-        fi
-        if ! echo "$CXXFLAGS" | grep -q -e '-O'; then
-            CXXFLAGS="$CXXFLAGS -O0"
-        fi
-    fi
-else
-   DEFINES="$DEFINES -DNDEBUG"
-fi
-
-if test "x$enable_sanitize" != xno; then
-    if test "x$enable_profile" = xyes; then
-        AC_MSG_WARN([Sanitize and Profile are enabled at the same time])
-    fi
-
-    CFLAGS="$CFLAGS -fsanitize=$enable_sanitize"
-    CXXFLAGS="$CXXFLAGS -fsanitize=$enable_sanitize"
-    LDFLAGS="$LDFLAGS -fsanitize=$enable_sanitize"
-
-    AC_LINK_IFELSE(
-        [AC_LANG_SOURCE([int main(){return 0;}])],
-        [],
-        [AC_MSG_FAILURE([sanitize flags '$enable_sanitize' not supported])])
-fi
-
-dnl
-dnl Check if linker supports -Bsymbolic
-dnl
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
-AC_MSG_CHECKING([if ld supports -Bsymbolic])
-AC_LINK_IFELSE(
-    [AC_LANG_SOURCE([int main() { return 0;}])],
-    [AC_MSG_RESULT([yes])
-        BSYMBOLIC="-Wl,-Bsymbolic";],
-    [AC_MSG_RESULT([no])
-        BSYMBOLIC="";])
-LDFLAGS=$save_LDFLAGS
-
-AC_SUBST([BSYMBOLIC])
-
-dnl
-dnl Check if linker supports garbage collection
-dnl
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,--gc-sections"
-AC_MSG_CHECKING([whether ld supports --gc-sections])
-AC_LINK_IFELSE(
-    [AC_LANG_SOURCE([static char UnusedFunc() { return 5; } int main() { return 0;}])],
-    [AC_MSG_RESULT([yes])
-        GC_SECTIONS="-Wl,--gc-sections";],
-    [AC_MSG_RESULT([no])
-        GC_SECTIONS="";])
-LDFLAGS=$save_LDFLAGS
-
-AC_SUBST([GC_SECTIONS])
-
-dnl
-dnl OpenBSD does not have DT_NEEDED entries for libc by design
-dnl so when these flags are passed to ld via libtool the checks will fail
-dnl
-case "$host_os" in
-openbsd* | darwin* )
-    LD_NO_UNDEFINED="" ;;
-*)
-    if test "x$enable_sanitize" = xno; then
-        LD_NO_UNDEFINED="-Wl,--no-undefined"
-    else
-        LD_NO_UNDEFINED=""
-    fi
-    ;;
-esac
-
-AC_SUBST([LD_NO_UNDEFINED])
-
-dnl
-dnl Check if linker supports version scripts
-dnl
-AC_MSG_CHECKING([if the linker supports version-scripts])
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,--version-script=$srcdir/build-support/conftest.map"
-AC_LINK_IFELSE(
-    [AC_LANG_SOURCE([int main() { return 0;}])],
-    [have_ld_version_script=yes;AC_MSG_RESULT(yes)],
-    [have_ld_version_script=no; AC_MSG_RESULT(no)])
-LDFLAGS=$save_LDFLAGS
-AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
-
-dnl
-dnl Check if linker supports dynamic list files
-dnl
-AC_MSG_CHECKING([if the linker supports --dynamic-list])
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,--dynamic-list=$srcdir/build-support/conftest.dyn"
-AC_LINK_IFELSE(
-    [AC_LANG_SOURCE([int main() { return 0;}])],
-    [have_ld_dynamic_list=yes;AC_MSG_RESULT(yes)],
-    [have_ld_dynamic_list=no; AC_MSG_RESULT(no)])
-LDFLAGS=$save_LDFLAGS
-AM_CONDITIONAL(HAVE_LD_DYNAMIC_LIST, test "$have_ld_dynamic_list" = "yes")
-
-dnl
-dnl OSX linker does not support build-id
-dnl
-case "$host_os" in
-darwin*)
-    LD_BUILD_ID=""
-    ;;
-*)
-    LD_BUILD_ID="-Wl,--build-id=sha1"
-    ;;
-esac
-AC_SUBST([LD_BUILD_ID])
-
-dnl
-dnl compatibility symlinks
-dnl
-case "$host_os" in
-linux* )
-    HAVE_COMPAT_SYMLINKS=yes ;;
-* )
-    HAVE_COMPAT_SYMLINKS=no ;;
-esac
-
-AM_CONDITIONAL(HAVE_COMPAT_SYMLINKS, test "x$HAVE_COMPAT_SYMLINKS" = xyes)
-
-dnl
-dnl library names
-dnl
-dnl Unfortunately we need to do a few things that libtool can't help us with,
-dnl so we need some knowledge of shared library filenames:
-dnl
-dnl LIB_EXT is the extension used when creating symlinks for alternate
-dnl filenames for a shared library which will be dynamically loaded
-dnl
-dnl IMP_LIB_EXT is the extension used when checking for the presence of a
-dnl the file for a shared library we wish to link with
-dnl
-case "$host_os" in
-darwin* )
-    LIB_EXT='dylib'
-    IMP_LIB_EXT=$LIB_EXT
-    ;;
-cygwin* )
-    LIB_EXT='dll'
-    IMP_LIB_EXT='dll.a'
-    ;;
-aix* )
-    LIB_EXT='a'
-    IMP_LIB_EXT=$LIB_EXT
-    ;;
-* )
-    LIB_EXT='so'
-    IMP_LIB_EXT=$LIB_EXT
-    ;;
-esac
-
-AC_SUBST([LIB_EXT])
-
-dnl
-dnl Arch/platform-specific settings
-dnl
-AC_ARG_ENABLE([asm],
-    [AS_HELP_STRING([--disable-asm],
-        [disable assembly usage @<:@default=enabled on supported platforms@:>@])],
-    [enable_asm="$enableval"],
-    [enable_asm=yes]
-)
-asm_arch=""
-AC_MSG_CHECKING([whether to enable assembly])
-test "x$enable_asm" = xno && AC_MSG_RESULT([no])
-# disable if cross compiling on x86/x86_64 since we must run gen_matypes
-if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then
-    case "$host_cpu" in
-    i?86 | x86_64 | amd64)
-        if test "x$host_cpu" != "x$target_cpu"; then
-            enable_asm=no
-            AC_MSG_RESULT([no, cross compiling])
-        fi
-        ;;
-    esac
-fi
-# check for supported arches
-if test "x$enable_asm" = xyes; then
-    case "$host_cpu" in
-    i?86)
-        case "$host_os" in
-        linux* | *freebsd* | dragonfly* | *netbsd* | openbsd* | gnu*)
-            asm_arch=x86
-            ;;
-        esac
-        ;;
-    x86_64|amd64)
-        case "$host_os" in
-        linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*)
-            asm_arch=x86_64
-            ;;
-        esac
-        ;;
-    sparc*)
-        case "$host_os" in
-        linux*)
-            asm_arch=sparc
-            ;;
-        esac
-        ;;
-    powerpc64le)
-        case "$host_os" in
-        linux*)
-            asm_arch=ppc64le
-            ;;
-        esac
-        ;;
-    aarch64)
-        case "$host_os" in
-        linux*)
-            asm_arch=aarch64
-            ;;
-        esac
-        ;;
-    arm)
-        case "$host_os" in
-        linux*)
-            asm_arch=arm
-            ;;
-        esac
-        ;;
-    esac
-
-    case "$asm_arch" in
-    x86)
-        DEFINES="$DEFINES -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"
-        AC_MSG_RESULT([yes, x86])
-        ;;
-    x86_64|amd64)
-        DEFINES="$DEFINES -DUSE_X86_64_ASM"
-        AC_MSG_RESULT([yes, x86_64])
-        ;;
-    sparc)
-        DEFINES="$DEFINES -DUSE_SPARC_ASM"
-        AC_MSG_RESULT([yes, sparc])
-        ;;
-    ppc64le)
-        DEFINES="$DEFINES -DUSE_PPC64LE_ASM"
-        AC_MSG_RESULT([yes, ppc64le])
-        ;;
-    aarch64)
-        DEFINES="$DEFINES -DUSE_AARCH64_ASM"
-        AC_MSG_RESULT([yes, aarch64])
-        ;;
-    arm)
-        DEFINES="$DEFINES -DUSE_ARM_ASM"
-        AC_MSG_RESULT([yes, arm])
-        ;;
-    *)
-        AC_MSG_RESULT([no, platform not supported])
-        ;;
-    esac
-fi
-
-AC_HEADER_MAJOR
-AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"])
-AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"])
-AC_CHECK_HEADERS([endian.h])
-AC_CHECK_HEADER([dlfcn.h], [DEFINES="$DEFINES -DHAVE_DLFCN_H"])
-AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"])
-AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"])
-AC_CHECK_FUNC([timespec_get], [DEFINES="$DEFINES -DHAVE_TIMESPEC_GET"])
-AC_CHECK_FUNC([memfd_create], [DEFINES="$DEFINES -DHAVE_MEMFD_CREATE"])
-
-AC_MSG_CHECKING([whether strtod has locale support])
-AC_LINK_IFELSE([AC_LANG_SOURCE([[
-    #define _GNU_SOURCE
-    #include <stdlib.h>
-    #include <locale.h>
-    #ifdef HAVE_XLOCALE_H
-    #include <xlocale.h>
-    #endif
-    int main() {
-       locale_t loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-       const char *s = "1.0";
-       char *end;
-       double d = strtod_l(s, end, loc);
-       float f = strtof_l(s, end, loc);
-       freelocale(loc);
-       return 0;
-    }]])],
-  [DEFINES="$DEFINES -DHAVE_STRTOD_L"];
-   AC_MSG_RESULT([yes]),
-   AC_MSG_RESULT([no]))
-
-dnl Check to see if dlopen is in default libraries (like Solaris, which
-dnl has it in libc), or if libdl is needed to get it.
-AC_CHECK_FUNC([dlopen], [],
-    [AC_CHECK_LIB([dl], [dlopen],
-       [DLOPEN_LIBS="-ldl"])])
-AC_SUBST([DLOPEN_LIBS])
-
-dnl Check if that library also has dladdr
-save_LIBS="$LIBS"
-LIBS="$LIBS $DLOPEN_LIBS"
-AC_CHECK_FUNCS([dladdr])
-LIBS="$save_LIBS"
-
-AC_CHECK_FUNC([dl_iterate_phdr], [DEFINES="$DEFINES -DHAVE_DL_ITERATE_PHDR"])
-
-case "$host_os" in
-darwin*)
-    ;;
-*)
-    AC_CHECK_FUNCS([clock_gettime], [CLOCK_LIB=],
-                   [AC_CHECK_LIB([rt], [clock_gettime], [CLOCK_LIB=-lrt],
-                                 [AC_MSG_ERROR([Could not find clock_gettime])])])
-    AC_SUBST([CLOCK_LIB])
-    ;;
-esac
-
-dnl See if posix_memalign is available
-AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
-
-dnl Check for zlib
-PKG_CHECK_MODULES([ZLIB], [zlib >= $ZLIB_REQUIRED])
-DEFINES="$DEFINES -DHAVE_ZLIB"
-
-dnl Check for pthreads
-AX_PTHREAD
-if test "x$ax_pthread_ok" = xno; then
-    AC_MSG_ERROR([Building mesa on this platform requires pthreads])
-fi
-dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS
-dnl to -pthread, which causes problems if we need -lpthread to appear in
-dnl pkgconfig files.  Since Android doesn't have a pthread lib, this check
-dnl is not valid for that platform.
-if test "x$android" = xno; then
-    test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
-fi
-dnl According to the manual when using pthreads, one should add -pthread to
-dnl both compile and link-time arguments.
-dnl In practise that should be sufficient for all platforms, since any
-dnl platforms build with GCC and Clang support the flag.
-PTHREAD_LIBS="$PTHREAD_LIBS -pthread"
-
-dnl pthread-stubs is mandatory on some BSD platforms, due to the nature of the
-dnl project. Even then there's a notable issue as described in the project README
-case "$host_os" in
-linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu* | openbsd*)
-    pthread_stubs_possible="no"
-    ;;
-* )
-    pthread_stubs_possible="yes"
-    ;;
-esac
-
-if test "x$pthread_stubs_possible" = xyes; then
-    PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs >= 0.4)
-fi
-
-save_LIBS="$LIBS"
-LIBS="$PTHREAD_LIBS"
-AC_MSG_CHECKING(whether pthread_setaffinity_np is supported)
-AC_LINK_IFELSE([AC_LANG_SOURCE([[
-    #define _GNU_SOURCE
-    #include <pthread.h>
-    int main() {
-       void *a = (void*) &pthread_setaffinity_np;
-       long b = (long) a;
-       return (int) b;
-    }]])],
-  [DEFINES="$DEFINES -DHAVE_PTHREAD_SETAFFINITY"];
-   AC_MSG_RESULT([yes]),
-   AC_MSG_RESULT([no]))
-LIBS="$save_LIBS"
-
-dnl Check for futex for fast inline simple_mtx_t.
-AC_CHECK_HEADER([linux/futex.h], [DEFINES="$DEFINES -DHAVE_LINUX_FUTEX_H"])
-
-dnl SELinux awareness.
-AC_ARG_ENABLE([selinux],
-    [AS_HELP_STRING([--enable-selinux],
-        [Build SELinux-aware Mesa @<:@default=disabled@:>@])],
-    [MESA_SELINUX="$enableval"],
-    [MESA_SELINUX=no])
-if test "x$enable_selinux" = "xyes"; then
-    PKG_CHECK_MODULES([SELINUX], [libselinux], [],
-        [AC_CHECK_HEADER([selinux/selinux.h],[],
-                         [AC_MSG_ERROR([SELinux headers not found])])
-         AC_CHECK_LIB([selinux],[is_selinux_enabled],[],
-                      [AC_MSG_ERROR([SELinux library not found])])
-         SELINUX_LIBS="-lselinux"])
-    DEFINES="$DEFINES -DMESA_SELINUX"
-fi
-AC_SUBST([SELINUX_CFLAGS])
-AC_SUBST([SELINUX_LIBS])
-
-dnl
-dnl LLVM
-dnl
-AC_ARG_ENABLE([llvm-shared-libs],
-    [AS_HELP_STRING([--enable-llvm-shared-libs],
-        [link with LLVM shared libraries @<:@default=enabled@:>@])],
-    [enable_llvm_shared_libs="$enableval"],
-    [enable_llvm_shared_libs=yes])
-
-AC_ARG_WITH([llvm-prefix],
-    [AS_HELP_STRING([--with-llvm-prefix],
-        [Prefix for LLVM installations in non-standard locations])],
-    [llvm_prefix="$withval"],
-    [llvm_prefix=''])
-
-PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=no])
-if test "x$have_libelf" = xno; then
-   LIBELF_LIBS=''
-   LIBELF_CFLAGS=''
-   AC_CHECK_LIB([elf], [elf_memory], [have_libelf=yes;LIBELF_LIBS=-lelf], [have_libelf=no])
-   AC_SUBST([LIBELF_LIBS])
-   AC_SUBST([LIBELF_CFLAGS])
-fi
-
-if test -z "$LLVM_CONFIG"; then
-    if test -n "$llvm_prefix"; then
-        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
-    else
-        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no])
-    fi
-fi
-
-llvm_add_component() {
-    new_llvm_component=$1
-    driver_name=$2
-
-    if $LLVM_CONFIG --components | grep -iqw $new_llvm_component ; then
-        LLVM_COMPONENTS="${LLVM_COMPONENTS} ${new_llvm_component}"
-    else
-        AC_MSG_ERROR([LLVM component '$new_llvm_component' not enabled in your LLVM build. Required by $driver_name.])
-    fi
-}
-
-llvm_add_optional_component() {
-    new_llvm_component=$1
-    driver_name=$2
-
-    if $LLVM_CONFIG --components | grep -iqw $new_llvm_component ; then
-        LLVM_COMPONENTS="${LLVM_COMPONENTS} ${new_llvm_component}"
-    fi
-}
-
-llvm_add_default_components() {
-    driver_name=$1
-
-    # Required default components
-    llvm_add_component "bitwriter" $driver_name
-    llvm_add_component "engine" $driver_name
-    llvm_add_component "mcdisassembler" $driver_name
-    llvm_add_component "mcjit" $driver_name
-
-    # Optional default components
-    llvm_add_optional_component "inteljitevents" $driver_name
-}
-
-llvm_add_target() {
-    new_llvm_target=$1
-    driver_name=$2
-
-    if $LLVM_CONFIG --targets-built | grep -iqw $new_llvm_target ; then
-        llvm_add_component $new_llvm_target $driver_name
-    else
-        AC_MSG_ERROR([LLVM target '$new_llvm_target' not enabled in your LLVM build. Required by $driver_name.])
-    fi
-}
-
-# Call this inside ` ` to get the return value.
-# $1 is the llvm-config command with arguments.
-strip_unwanted_llvm_flags() {
-    echo " `$1` " | sed -E \
-        -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
-        -e 's/[[[:space:]]]+-DNDEBUG[[[:space:]]]/ /g' \
-        -e 's/[[[:space:]]]+-D_GNU_SOURCE[[[:space:]]]/ /g' \
-        -e 's/[[[:space:]]]+-pedantic[[[:space:]]]/ /g' \
-        -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
-        -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
-        -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
-        -e 's/-fno-rtti[[[:space:]]]/-Fno-rtti /g' \
-        -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
-        -e 's/-Fno-rtti[[[:space:]]]/-fno-rtti /g' \
-        -e 's/^[[[:space:]]]//' \
-        -e 's/[[[:space:]]]$//'
-}
-
-llvm_set_environment_variables() {
-    if test "x$LLVM_CONFIG" != xno; then
-        LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'`
-        LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
-        LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
-        LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
-
-        # We need to respect LLVM_CPPFLAGS when compiling LLVM headers.
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $LLVM_CPPFLAGS"
-
-        AC_COMPUTE_INT([LLVM_VERSION_MAJOR], [LLVM_VERSION_MAJOR],
-            [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"])
-        AC_COMPUTE_INT([LLVM_VERSION_MINOR], [LLVM_VERSION_MINOR],
-            [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"])
-        AC_COMPUTE_INT([LLVM_VERSION_PATCH], [LLVM_VERSION_PATCH],
-            [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"])
-
-        CFLAGS="$save_CFLAGS"
-
-        # Only needed for LLVM < 3.6.0
-        if test -z "$LLVM_VERSION_PATCH"; then
-            LLVM_VERSION_PATCH=0
-        fi
-
-        LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}"
-
-        FOUND_LLVM=yes
-    else
-        FOUND_LLVM=no
-        LLVM_VERSION_INT=0
-    fi
-}
-
-require_llvm() {
-    if test "x$enable_llvm" != "xyes"; then
-        AC_MSG_ERROR([--enable-llvm is required when building $1])
-    fi
-}
-
-llvm_require_version() {
-    require_llvm $2
-
-    llvm_target_version_major=`echo $1 | cut -d. -f1 | egrep -o '^[[0-9]]+'`
-    llvm_target_version_minor=`echo $1 | cut -d. -f2 | egrep -o '^[[0-9]]+'`
-    llvm_target_version_patch=`echo $1 | cut -d. -f3 | egrep -o '^[[0-9]]+'`
-
-    if test "$LLVM_VERSION_MAJOR" -gt "$llvm_target_version_major"; then
-        # major > required major
-        #  --> OK
-        return
-    fi
-
-    if test "$LLVM_VERSION_MAJOR" -eq "$llvm_target_version_major"; then
-        if test "$LLVM_VERSION_MINOR" -gt "$llvm_target_version_minor"; then
-            # major = required major and
-            # minor > required minor
-            #  --> OK
-            return
-        else
-            if test "$LLVM_VERSION_MINOR" -eq "$llvm_target_version_minor"; then
-                if test "$LLVM_VERSION_PATCH" -ge "$llvm_target_version_patch"; then
-                    # major = required major and
-                    # minor = required minor and
-                    # patch >= required patch
-                    #  --> OK
-                    return
-                fi
-            fi
-        fi
-    fi
-
-    AC_MSG_ERROR([LLVM $1 or newer is required for $2])
-}
-
-radeon_llvm_check() {
-    if test ${LLVM_VERSION_INT} -lt 307; then
-        amdgpu_llvm_target_name='r600'
-    else
-        amdgpu_llvm_target_name='amdgpu'
-    fi
-
-    llvm_require_version $*
-
-    llvm_add_target $amdgpu_llvm_target_name $2
-
-    llvm_add_default_components $2
-    llvm_add_component "bitreader" $2
-    llvm_add_component "ipo" $2
-
-    if test "x$have_libelf" != xyes; then
-       AC_MSG_ERROR([$2 requires libelf when using llvm])
-    fi
-}
-
-llvm_set_environment_variables
-
-AC_SUBST([LLVM_CFLAGS])
-AC_SUBST([LLVM_CXXFLAGS])
-AC_SUBST([LLVM_LIBS])
-AC_SUBST([LLVM_LDFLAGS])
-AC_SUBST([LLVM_INCLUDEDIR])
-
-dnl
-dnl libunwind
-dnl
-PKG_CHECK_EXISTS(libunwind, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no])
-AC_ARG_ENABLE([libunwind],
-    [AS_HELP_STRING([--enable-libunwind],
-            [Use libunwind for backtracing (default: auto)])],
-        [LIBUNWIND="$enableval"],
-        [LIBUNWIND="$HAVE_LIBUNWIND"])
-
-if test "x$LIBUNWIND" = "xyes"; then
-    PKG_CHECK_MODULES(LIBUNWIND, libunwind)
-    AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support])
-fi
-
-
-dnl Options for APIs
-AC_ARG_ENABLE([opengl],
-    [AS_HELP_STRING([--disable-opengl],
-        [disable support for standard OpenGL API @<:@default=enabled@:>@])],
-    [enable_opengl="$enableval"],
-    [enable_opengl=yes])
-AC_ARG_ENABLE([gles1],
-    [AS_HELP_STRING([--disable-gles1],
-        [disable support for OpenGL ES 1.x API @<:@default=enabled@:>@])],
-    [enable_gles1="$enableval"],
-    [enable_gles1=yes])
-AC_ARG_ENABLE([gles2],
-    [AS_HELP_STRING([--disable-gles2],
-        [disable support for OpenGL ES 2.x API @<:@default=enabled@:>@])],
-    [enable_gles2="$enableval"],
-    [enable_gles2=yes])
-
-AC_ARG_ENABLE([dri],
-    [AS_HELP_STRING([--enable-dri],
-        [enable DRI modules @<:@default=enabled@:>@])],
-    [enable_dri="$enableval"],
-    [enable_dri=yes])
-
-AC_ARG_ENABLE([gallium-extra-hud],
-    [AS_HELP_STRING([--enable-gallium-extra-hud],
-        [enable HUD block/NIC I/O HUD stats support @<:@default=disabled@:>@])],
-    [enable_gallium_extra_hud="$enableval"],
-    [enable_gallium_extra_hud=no])
-AM_CONDITIONAL(HAVE_GALLIUM_EXTRA_HUD, test "x$enable_gallium_extra_hud" = xyes)
-if test "x$enable_gallium_extra_hud" = xyes ; then
-    DEFINES="${DEFINES} -DHAVE_GALLIUM_EXTRA_HUD=1"
-fi
-
-#TODO: no pkgconfig .pc available for libsensors.
-#PKG_CHECK_MODULES([LIBSENSORS], [libsensors >= $LIBSENSORS_REQUIRED], [enable_lmsensors=yes], [enable_lmsensors=no])
-AC_ARG_ENABLE([lmsensors],
-    [AS_HELP_STRING([--enable-lmsensors],
-        [enable HUD lmsensor support @<:@default=disabled@:>@])],
-    [enable_lmsensors="$enableval"],
-    [enable_lmsensors=no])
-AM_CONDITIONAL(HAVE_LIBSENSORS, test "x$enable_lmsensors" = xyes)
-if test "x$enable_lmsensors" = xyes ; then
-    DEFINES="${DEFINES} -DHAVE_LIBSENSORS=1"
-    LIBSENSORS_LIBS="-lsensors"
-else
-    LIBSENSORS_LIBS=""
-fi
-AC_SUBST(LIBSENSORS_LIBS)
-
-case "$host_os" in
-linux*)
-    dri3_default=yes
-    ;;
-*)
-    dri3_default=no
-    ;;
-esac
-
-if test "x$enable_dri" = xno; then
-    dri3_default=no
-fi
-
-AC_ARG_ENABLE([dri3],
-    [AS_HELP_STRING([--enable-dri3],
-        [enable DRI3 @<:@default=auto@:>@])],
-    [enable_dri3="$enableval"],
-    [enable_dri3="$dri3_default"])
-AC_ARG_ENABLE([glx],
-    [AS_HELP_STRING([--enable-glx@<:@=dri|xlib|gallium-xlib@:>@],
-        [enable the GLX library and choose an implementation @<:@default=auto@:>@])],
-    [enable_glx="$enableval"],
-    [enable_glx=yes])
-AC_ARG_ENABLE([osmesa],
-    [AS_HELP_STRING([--enable-osmesa],
-        [enable OSMesa library @<:@default=disabled@:>@])],
-    [enable_osmesa="$enableval"],
-    [enable_osmesa=no])
-AC_ARG_ENABLE([gallium-osmesa],
-    [AS_HELP_STRING([--enable-gallium-osmesa],
-        [enable Gallium implementation of the OSMesa library @<:@default=disabled@:>@])],
-    [enable_gallium_osmesa="$enableval"],
-    [enable_gallium_osmesa=no])
-AC_ARG_ENABLE([egl],
-    [AS_HELP_STRING([--disable-egl],
-        [disable EGL library @<:@default=enabled@:>@])],
-    [enable_egl="$enableval"],
-    [enable_egl=yes])
-
-AC_ARG_ENABLE([xa],
-    [AS_HELP_STRING([--enable-xa],
-        [enable build of the XA X Acceleration API @<:@default=disabled@:>@])],
-    [enable_xa="$enableval"],
-    [enable_xa=no])
-AC_ARG_ENABLE([gbm],
-   [AS_HELP_STRING([--enable-gbm],
-         [enable gbm library @<:@default=yes except cygwin and macOS@:>@])],
-   [enable_gbm="$enableval"],
-   [case "$host_os" in
-       cygwin* | darwin*)
-          enable_gbm=no
-          ;;
-       *)
-          enable_gbm=yes
-          ;;
-    esac])
-AC_ARG_ENABLE([nine],
-    [AS_HELP_STRING([--enable-nine],
-        [enable build of the nine Direct3D9 API @<:@default=no@:>@])],
-    [enable_nine="$enableval"],
-    [enable_nine=no])
-
-AC_ARG_ENABLE([xvmc],
-   [AS_HELP_STRING([--enable-xvmc],
-         [enable xvmc library @<:@default=auto@:>@])],
-   [enable_xvmc="$enableval"],
-   [enable_xvmc=auto])
-AC_ARG_ENABLE([vdpau],
-   [AS_HELP_STRING([--enable-vdpau],
-         [enable vdpau library @<:@default=auto@:>@])],
-   [enable_vdpau="$enableval"],
-   [enable_vdpau=auto])
-AC_ARG_ENABLE([omx],
-   [AS_HELP_STRING([--enable-omx],
-         [DEPRECATED: Use --enable-omx-bellagio or --enable-omx-tizonia instead @<:@default=auto@:>@])],
-   [AC_MSG_ERROR([--enable-omx is deprecated. Use --enable-omx-bellagio or --enable-omx-tizonia instead.])],
-   [])
-AC_ARG_ENABLE([omx-bellagio],
-   [AS_HELP_STRING([--enable-omx-bellagio],
-         [enable OpenMAX Bellagio library @<:@default=disabled@:>@])],
-   [enable_omx_bellagio="$enableval"],
-   [enable_omx_bellagio=no])
-AC_ARG_ENABLE([omx-tizonia],
-   [AS_HELP_STRING([--enable-omx-tizonia],
-         [enable OpenMAX Tizonia library @<:@default=disabled@:>@])],
-   [enable_omx_tizonia="$enableval"],
-   [enable_omx_tizonia=no])
-AC_ARG_ENABLE([va],
-   [AS_HELP_STRING([--enable-va],
-         [enable va library @<:@default=auto@:>@])],
-   [enable_va="$enableval"],
-   [enable_va=auto])
-AC_ARG_ENABLE([opencl],
-   [AS_HELP_STRING([--enable-opencl],
-         [enable OpenCL library @<:@default=disabled@:>@])],
-   [enable_opencl="$enableval"],
-   [enable_opencl=no])
-AC_ARG_ENABLE([opencl_icd],
-   [AS_HELP_STRING([--enable-opencl-icd],
-          [Build an OpenCL ICD library to be loaded by an ICD implementation
-           @<:@default=enabled@:>@])],
-    [enable_opencl_icd="$enableval"],
-    [enable_opencl_icd=yes])
-
-AC_ARG_ENABLE([gallium-tests],
-    [AS_HELP_STRING([--enable-gallium-tests],
-        [Enable optional Gallium tests) @<:@default=disabled@:>@])],
-    [enable_gallium_tests="$enableval"],
-    [enable_gallium_tests=no])
-
-# Option for Gallium drivers
-
-# Keep this in sync with the --with-gallium-drivers help string default value
-GALLIUM_DRIVERS_DEFAULT="r300,r600,svga,swrast"
-
-AC_ARG_WITH([gallium-drivers],
-    [AS_HELP_STRING([--with-gallium-drivers@<:@=DIRS...@:>@],
-        [comma delimited Gallium drivers list, e.g.
-        "i915,nouveau,r300,r600,radeonsi,freedreno,kmsro,svga,swrast,swr,tegra,v3d,vc4,virgl,etnaviv"
-        @<:@default=r300,r600,svga,swrast@:>@])],
-    [with_gallium_drivers="$withval"],
-    [with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT"])
-
-# Doing '--without-gallium-drivers' will set this variable to 'no'.  Clear it
-# here so that the script doesn't choke on an unknown driver name later.
-case "$with_gallium_drivers" in
-    yes) with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT" ;;
-    no) with_gallium_drivers='' ;;
-esac
-
-if test "x$enable_opengl" = xno -a \
-        "x$enable_gles1" = xno -a \
-        "x$enable_gles2" = xno -a \
-        "x$enable_nine" = xno -a \
-        "x$enable_xa" = xno -a \
-        "x$enable_xvmc" = xno -a \
-        "x$enable_vdpau" = xno -a \
-        "x$enable_omx_bellagio" = xno -a \
-        "x$enable_omx_tizonia" = xno -a \
-        "x$enable_va" = xno -a \
-        "x$enable_opencl" = xno; then
-    AC_MSG_ERROR([at least one API should be enabled])
-fi
-
-if test "x$enable_omx_bellagio" = xyes -a \
-        "x$enable_omx_tizonia" = xyes; then
-   AC_MSG_ERROR([Can't enable both bellagio and tizonia at same time])
-fi
-
-# Building OpenGL ES1 and/or ES2 without OpenGL is not supported on mesa 9.0.x
-if test "x$enable_opengl" = xno -a \
-        "x$enable_gles1" = xyes; then
-    AC_MSG_ERROR([Building OpenGL ES1 without OpenGL is not supported])
-fi
-
-if test "x$enable_opengl" = xno -a \
-        "x$enable_gles2" = xyes; then
-    AC_MSG_ERROR([Building OpenGL ES2 without OpenGL is not supported])
-fi
-
-AM_CONDITIONAL(HAVE_OPENGL, test "x$enable_opengl" = xyes)
-AM_CONDITIONAL(HAVE_OPENGL_ES1, test "x$enable_gles1" = xyes)
-AM_CONDITIONAL(HAVE_OPENGL_ES2, test "x$enable_gles2" = xyes)
-AM_CONDITIONAL(NEED_OPENGL_COMMON, test "x$enable_opengl" = xyes -o \
-                                        "x$enable_gles1" = xyes -o \
-                                        "x$enable_gles2" = xyes)
-AM_CONDITIONAL(NEED_KHRPLATFORM, test "x$enable_egl" = xyes -o \
-                                      "x$enable_opengl" = xyes -o \
-                                      "x$enable_gles1" = xyes -o \
-                                      "x$enable_gles2" = xyes)
-
-# Validate GLX options
-if test "x$enable_glx" = xyes; then
-    if test "x$enable_dri" = xyes; then
-        enable_glx=dri
-    elif test -n "$with_gallium_drivers"; then
-        enable_glx=gallium-xlib
-    else
-        enable_glx=xlib
-    fi
-fi
-case "x$enable_glx" in
-xdri | xxlib | xgallium-xlib)
-    # GLX requires OpenGL
-    if test "x$enable_opengl" = xno; then
-        AC_MSG_ERROR([GLX cannot be built without OpenGL])
-    fi
-
-    # Check individual dependencies
-    case "x$enable_glx" in
-    xdri)
-        if test "x$enable_dri" = xno; then
-            AC_MSG_ERROR([DRI-based GLX requires DRI to be enabled])
-        fi
-        ;;
-    xxlib)
-        if test "x$enable_dri" = xyes; then
-            AC_MSG_ERROR([Xlib-based GLX cannot be built with DRI enabled])
-        fi
-        ;;
-    xgallium-xlib )
-        if test "x$enable_dri" = xyes; then
-            AC_MSG_ERROR([Xlib-based (Gallium) GLX cannot be built with DRI enabled])
-        fi
-        if test -z "$with_gallium_drivers"; then
-            AC_MSG_ERROR([Xlib-based (Gallium) GLX cannot be built without Gallium enabled])
-        fi
-        ;;
-    esac
-    ;;
-xno)
-    ;;
-*)
-    AC_MSG_ERROR([Illegal value for --enable-glx: $enable_glx])
-    ;;
-esac
-
-AM_CONDITIONAL(HAVE_GLX, test "x$enable_glx" != xno)
-AM_CONDITIONAL(HAVE_DRI_GLX, test "x$enable_glx" = xdri)
-AM_CONDITIONAL(HAVE_XLIB_GLX, test "x$enable_glx" = xxlib)
-AM_CONDITIONAL(HAVE_GALLIUM_XLIB_GLX, test "x$enable_glx" = xgallium-xlib)
-
-DEFAULT_GL_LIB_NAME=GL
-
-dnl
-dnl Libglvnd configuration
-dnl
-AC_ARG_ENABLE([libglvnd],
-    [AS_HELP_STRING([--enable-libglvnd],
-        [Build GLX and EGL for libglvnd @<:@default=disabled@:>@])],
-    [enable_libglvnd="$enableval"],
-    [enable_libglvnd=no])
-AM_CONDITIONAL(USE_LIBGLVND, test "x$enable_libglvnd" = xyes)
-
-if test "x$enable_libglvnd" = xyes ; then
-    case "x$enable_glx" in
-    xxlib | xgallium-xlib )
-        AC_MSG_ERROR([cannot build libgvnd when Xlib-GLX or Gallium-Xlib-GLX is enabled])
-        ;;
-    esac
-
-    PKG_CHECK_MODULES([GLVND], libglvnd >= 0.2.0)
-    LIBGLVND_DATADIR=`$PKG_CONFIG --variable=datadir libglvnd`
-    AC_SUBST([LIBGLVND_DATADIR])
-
-    DEFINES="${DEFINES} -DUSE_LIBGLVND=1"
-    DEFAULT_GL_LIB_NAME=GLX_mesa
-
-    if test "x$enable_glx" = xno -a "x$enable_egl" = xno; then
-        AC_MSG_ERROR([cannot build libglvnd without GLX or EGL])
-    fi
-fi
-
-AC_ARG_WITH([gl-lib-name],
-  [AS_HELP_STRING([--with-gl-lib-name@<:@=NAME@:>@],
-    [specify GL library name @<:@default=GL@:>@])],
-  [AC_MSG_ERROR([--with-gl-lib-name is no longer supported. Rename the library manually if needed.])],
-  [])
-AC_ARG_WITH([osmesa-lib-name],
-  [AS_HELP_STRING([--with-osmesa-lib-name@<:@=NAME@:>@],
-    [specify OSMesa library name @<:@default=OSMesa@:>@])],
-  [AC_MSG_ERROR([--with-osmesa-lib-name is no longer supported. Rename the library manually if needed.])],
-  [])
-GL_LIB="$DEFAULT_GL_LIB_NAME"
-OSMESA_LIB=OSMesa
-
-AC_ARG_WITH([egl-lib-suffix],
-  [AS_HELP_STRING([--with-egl-lib-suffix@<:@=NAME@:>@],
-    [specify EGL library suffix @<:@default=none@:>@])],
-  [EGL_LIB_SUFFIX=$withval],
-  [EGL_LIB_SUFFIX=""])
-AC_ARG_WITH([gles-lib-suffix],
-  [AS_HELP_STRING([--with-gles-lib-suffix@<:@=NAME@:>@],
-    [specify GLES library suffix @<:@default=none@:>@])],
-  [GLES_LIB_SUFFIX=$withval],
-  [GLES_LIB_SUFFIX=""])
-AS_IF([test "x$EGL_LIB_SUFFIX" = xyes], [EGL_LIB_SUFFIX=""])
-AS_IF([test "x$GLES_LIB_SUFFIX" = xyes], [GLES_LIB_SUFFIX=""])
-
-if test "x$enable_libglvnd" = xyes -a "x$EGL_LIB_SUFFIX" != x; then
-    AC_MSG_ERROR([EGL lib suffix can't be used with libglvnd])
-fi
-
-AC_ARG_WITH([platform-sdk-version],
-  [AS_HELP_STRING([--with-platform-sdk-version@<:@=NAME@:>@],
-    [specify Android platform SDK version @<:@default=none@:>@])],
-  [platform_sdk_version=$withval],
-  [platform_sdk_version=""])
-
-dnl
-dnl Mangled Mesa support
-dnl
-AC_ARG_ENABLE([mangling],
-  [AS_HELP_STRING([--enable-mangling],
-    [enable mangled symbols and library name @<:@default=disabled@:>@])],
-  [enable_mangling="${enableval}"],
-  [enable_mangling=no]
-)
-if test "x${enable_mangling}" = "xyes" ; then
-  if test "x$enable_libglvnd" = xyes; then
-    AC_MSG_ERROR([Conflicting options --enable-mangling and --enable-libglvnd.])
-  fi
-  DEFINES="${DEFINES} -DUSE_MGL_NAMESPACE"
-  GL_LIB="Mangled${GL_LIB}"
-  OSMESA_LIB="Mangled${OSMESA_LIB}"
-fi
-AC_SUBST([GL_LIB])
-AC_SUBST([EGL_LIB_SUFFIX])
-AC_SUBST([GLES_LIB_SUFFIX])
-AC_SUBST([OSMESA_LIB])
-
-dnl HACK when building glx + glvnd we ship gl.pc, despite that glvnd should do it
-dnl Thus we need to use GL as a DSO name.
-if test "x$enable_libglvnd" = xyes -a "x$enable_glx" != xno; then
-  GL_PKGCONF_LIB="GL"
-else
-  GL_PKGCONF_LIB="$GL_LIB"
-fi
-AC_SUBST([GL_PKGCONF_LIB])
-
-# Check for libdrm
-PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED],
-                  [have_libdrm=yes], [have_libdrm=no])
-if test "x$have_libdrm" = xyes; then
-    DEFINES="$DEFINES -DHAVE_LIBDRM"
-fi
-
-require_libdrm() {
-    if test "x$have_libdrm" != xyes; then
-       AC_MSG_ERROR([$1 requires libdrm >= $LIBDRM_REQUIRED])
-    fi
-}
-
-
-# Select which platform-dependent DRI code gets built
-case "$host_os" in
-darwin*)
-    dri_platform='apple' ;;
-cygwin*)
-    dri_platform='windows' ;;
-gnu*)
-    dri_platform='none' ;;
-*)
-    dri_platform='drm' ;;
-esac
-
-if test "x$enable_dri" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes; then
-    have_drisw_kms='yes'
-fi
-
-AM_CONDITIONAL(HAVE_DRICOMMON, test "x$enable_dri" = xyes )
-AM_CONDITIONAL(HAVE_DRISW, test "x$enable_dri" = xyes )
-AM_CONDITIONAL(HAVE_DRISW_KMS, test "x$have_drisw_kms" = xyes )
-AM_CONDITIONAL(HAVE_DRI2, test "x$enable_dri" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes )
-AM_CONDITIONAL(HAVE_DRI3, test "x$enable_dri3" = xyes -a "x$dri_platform" = xdrm -a "x$have_libdrm" = xyes )
-AM_CONDITIONAL(HAVE_APPLEDRI, test "x$enable_dri" = xyes -a "x$dri_platform" = xapple )
-AM_CONDITIONAL(HAVE_LMSENSORS, test "x$enable_lmsensors" = xyes )
-AM_CONDITIONAL(HAVE_GALLIUM_EXTRA_HUD, test "x$enable_gallium_extra_hud" = xyes )
-AM_CONDITIONAL(HAVE_WINDOWSDRI, test "x$enable_dri" = xyes -a "x$dri_platform" = xwindows )
-AM_CONDITIONAL(HAVE_XLEASE, test "x$have_xlease" = xyes )
-
-AC_ARG_ENABLE([shared-glapi],
-    [AS_HELP_STRING([--enable-shared-glapi],
-        [Enable shared glapi for OpenGL @<:@default=enabled@:>@])],
-    [enable_shared_glapi="$enableval"],
-    [enable_shared_glapi=yes])
-
-case "x$enable_opengl$enable_gles1$enable_gles2" in
-x*yes*yes*)
-    if test "x$enable_shared_glapi" = xno; then
-        AC_MSG_ERROR([shared GLAPI required when building two or more of
-                      the following APIs - opengl, gles1 gles2])
-    fi
-    ;;
-esac
-
-AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes)
-
-# Build the pipe-drivers as separate libraries/modules.
-# Do not touch this unless you know what you are doing.
-# XXX: Expose via configure option ?
-enable_shared_pipe_drivers=no
-
-dnl
-dnl Driver specific build directories
-dnl
-
-if test "x$enable_gallium_osmesa" = xyes; then
-    if ! echo "$with_gallium_drivers" | grep -q 'swrast'; then
-        AC_MSG_ERROR([gallium_osmesa requires the gallium swrast driver])
-    fi
-    if test "x$enable_osmesa" = xyes; then
-        AC_MSG_ERROR([Cannot enable both classic and Gallium OSMesa implementations])
-    fi
-fi
-
-require_dri_shared_libs_and_glapi() {
-    if test "x$enable_static" = xyes; then
-        AC_MSG_ERROR([$1 cannot be build as static library])
-    fi
-
-    if test "x$enable_dri" != xyes; then
-        # There is only a single backend which won't be build/used otherwise.
-        # XXX: Revisit this as the egl/haiku is a thing.
-        AC_MSG_ERROR([$1 requires --enable-dri])
-    fi
-
-    if test "x$enable_shared_glapi" != xyes; then
-        AC_MSG_ERROR([$1 requires --enable-shared-glapi])
-    fi
-}
-
-if test "x$enable_dri" = xyes; then
-    require_dri_shared_libs_and_glapi "DRI"
-
-    # not a hard requirement as swrast does not depend on it
-    if test "x$have_libdrm" = xyes; then
-        DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
-    fi
-fi
-
-AC_ARG_ENABLE([driglx-direct],
-    [AS_HELP_STRING([--disable-driglx-direct],
-        [disable direct rendering in GLX and EGL for DRI \
-            @<:@default=enabled@:>@])],
-    [driglx_direct="$enableval"],
-    [driglx_direct="yes"])
-
-dnl
-dnl libGL configuration per driver
-dnl
-if test "x$enable_glx" != xno; then
-    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
-fi
-case "x$enable_glx" in
-xxlib | xgallium-xlib)
-    # Xlib-based GLX
-    dri_modules="x11 xext xcb"
-    PKG_CHECK_MODULES([XLIBGL], [$dri_modules])
-    GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"
-    X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS"
-    GL_LIB_DEPS="$XLIBGL_LIBS"
-    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
-    GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm $PTHREAD_LIBS"
-    ;;
-xdri)
-    # DRI-based GLX
-
-    require_dri_shared_libs_and_glapi "GLX"
-
-    # find the DRI deps for libGL
-    dri_modules="x11 xext xdamage >= $XDAMAGE_REQUIRED xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED"
-
-    if test x"$driglx_direct" = xyes; then
-        if test x"$dri_platform" = xdrm ; then
-            DEFINES="$DEFINES -DGLX_USE_DRM"
-            require_libdrm "Direct rendering"
-
-            PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
-            GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED"
-
-            if test x"$enable_dri" = xyes; then
-               dri_modules="$dri_modules xcb-dri2 >= $XCBDRI2_REQUIRED"
-            fi
-
-            dri_modules="$dri_modules xxf86vm"
-        fi
-        if test x"$dri_platform" = xapple ; then
-            DEFINES="$DEFINES -DGLX_USE_APPLEGL"
-        fi
-        if test x"$dri_platform" = xwindows ; then
-            DEFINES="$DEFINES -DGLX_USE_WINDOWSGL"
-        fi
-    fi
-
-    PKG_CHECK_MODULES([DRIGL], [$dri_modules])
-    GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"
-    X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"
-    GL_LIB_DEPS="$DRIGL_LIBS"
-
-    # need DRM libs, $PTHREAD_LIBS, etc.
-    GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
-    GL_PC_LIB_PRIV="-lm $PTHREAD_LIBS $DLOPEN_LIBS"
-    ;;
-esac
-
-GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
-GLESv1_CM_PC_LIB_PRIV="-lm $PTHREAD_LIBS $DLOPEN_LIBS"
-GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
-GLESv2_PC_LIB_PRIV="-lm $PTHREAD_LIBS $DLOPEN_LIBS"
-
-AC_SUBST([X11_INCLUDES])
-AC_SUBST([GL_LIB_DEPS])
-AC_SUBST([GL_PC_REQ_PRIV])
-AC_SUBST([GL_PC_LIB_PRIV])
-AC_SUBST([GL_PC_CFLAGS])
-AC_SUBST([DRI_PC_REQ_PRIV])
-AC_SUBST([GLESv1_CM_LIB_DEPS])
-AC_SUBST([GLESv1_CM_PC_LIB_PRIV])
-AC_SUBST([GLESv2_LIB_DEPS])
-AC_SUBST([GLESv2_PC_LIB_PRIV])
-
-dnl
-dnl More GLX setup
-dnl
-case "x$enable_glx" in
-xxlib | xgallium-xlib)
-    DEFINES="$DEFINES -DUSE_XSHM"
-    ;;
-xdri)
-    DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
-    if test "x$driglx_direct" = xyes; then
-        DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
-    fi
-    ;;
-esac
-
-dnl
-dnl TLS detection
-dnl
-
-AC_ARG_ENABLE([glx-tls],
-    [AS_HELP_STRING([--enable-glx-tls],
-        [enable TLS support in GLX @<:@default=enabled@:>@])],
-    [GLX_USE_TLS="$enableval"],
-    [GLX_USE_TLS=yes])
-AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
-
-if test "x$GLX_USE_TLS" = xyes; then
-    DEFINES="$DEFINES -DGLX_USE_TLS"
-fi
-
-dnl Read-only text section on x86 hardened platforms
-AC_ARG_ENABLE([glx-read-only-text],
-    [AS_HELP_STRING([--enable-glx-read-only-text],
-        [Disable writable .text section on x86 (decreases performance) @<:@default=disabled@:>@])],
-    [enable_glx_read_only_text="$enableval"],
-    [enable_glx_read_only_text=no])
-if test "x$enable_glx_read_only_text" = xyes; then
-    DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
-fi
-
-dnl
-dnl DEPRECATED: EGL Platforms configuration
-dnl
-AC_ARG_WITH([egl-platforms],
-    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
-        [DEPRECATED: use --with-platforms instead@<:@default=auto@:>@])],
-    [with_egl_platforms="$withval"],
-    [with_egl_platforms=auto])
-
-if test "x$with_egl_platforms" = xauto; then
-    with_egl_platforms="x11,surfaceless"
-    if test "x$enable_gbm" = xyes; then
-        with_egl_platforms="$with_egl_platforms,drm"
-    fi
-else
-    AC_MSG_WARN([--with-egl-platforms is deprecated. Use --with-platforms instead.])
-fi
-
-dnl
-dnl Platforms configuration
-dnl
-AC_ARG_WITH([platforms],
-    [AS_HELP_STRING([--with-platforms@<:@=DIRS...@:>@],
-        [comma delimited native platforms libEGL/Vulkan/other supports, e.g.
-        "x11,drm,wayland,surfaceless..." @<:@default=auto@:>@])],
-    [with_platforms="$withval"],
-    [with_platforms=auto])
-
-# Reuse the autodetection rather than duplicating it.
-if test "x$with_platforms" = xauto; then
-    with_platforms=$with_egl_platforms
-fi
-
-# Do per platform setups and checks
-platforms=`IFS=', '; echo $with_platforms`
-for plat in $platforms; do
-    case "$plat" in
-    wayland)
-
-        PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED])
-        PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED])
-        PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
-        if test "x$enable_egl" = xyes; then
-          PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl-backend >= $WAYLAND_EGL_BACKEND_REQUIRED])
-        fi
-        WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
-
-        PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
-                          WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
-                          WAYLAND_SCANNER='')
-        PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
-                          AC_SUBST(SCANNER_ARG, 'private-code'),
-                          AC_SUBST(SCANNER_ARG, 'code'))
-
-        if test "x$WAYLAND_SCANNER" = x; then
-            AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
-        fi
-
-        if test "x$WAYLAND_SCANNER" = "x:"; then
-                AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
-        fi
-        DEFINES="$DEFINES -DHAVE_WAYLAND_PLATFORM -DWL_HIDE_DEPRECATED"
-        ;;
-
-    x11)
-        PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED xcb-xfixes])
-        DEFINES="$DEFINES -DHAVE_X11_PLATFORM"
-        ;;
-
-    drm)
-        test "x$enable_egl" = "xyes" &&
-        test "x$enable_gbm" = "xno" &&
-                AC_MSG_ERROR([EGL platform drm needs gbm])
-        DEFINES="$DEFINES -DHAVE_DRM_PLATFORM"
-        ;;
-
-    surfaceless)
-        DEFINES="$DEFINES -DHAVE_SURFACELESS_PLATFORM"
-        ;;
-
-    android)
-        if test -n "$platform_sdk_version" && test "$platform_sdk_version" -ge 26; then
-            PKG_CHECK_MODULES([ANDROID], [cutils hardware nativewindow sync])
-        else
-            PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
-        fi
-
-        if test -n "$with_gallium_drivers"; then
-            PKG_CHECK_MODULES([BACKTRACE], [backtrace])
-        fi
-        DEFINES="$DEFINES -DHAVE_ANDROID_PLATFORM"
-        ;;
-
-    *)
-        AC_MSG_ERROR([platform '$plat' does not exist])
-        ;;
-    esac
-
-    case "$plat" in
-    wayland|drm|surfaceless)
-        require_libdrm "Platform $plat"
-        ;;
-    esac
-done
-AC_SUBST([WAYLAND_PROTOCOLS_DATADIR])
-
-if test "x$enable_glx" != xno; then
-    if ! echo "$platforms" | grep -q 'x11'; then
-        AC_MSG_ERROR([Building GLX without the x11 platform is not supported])
-    fi
-fi
-
-if test x"$enable_dri3" = xyes; then
-    DEFINES="$DEFINES -DHAVE_DRI3"
-
-    dri3_modules="x11-xcb xcb >= $XCB_REQUIRED xcb-dri3 xcb-xfixes xcb-present xcb-sync xshmfence >= $XSHMFENCE_REQUIRED"
-    PKG_CHECK_MODULES([XCB_DRI3], [$dri3_modules])
-    dri3_modifier_modules="xcb-dri3 >= $XCBDRI3_MODIFIERS_REQUIRED xcb-present >= $XCBPRESENT_MODIFIERS_REQUIRED"
-    PKG_CHECK_MODULES([XCB_DRI3_MODIFIERS], [$dri3_modifier_modules], [have_dri3_modifiers=yes], [have_dri3_modifiers=no])
-
-    if test "x$have_dri3_modifiers" = xyes; then
-        DEFINES="$DEFINES -DHAVE_DRI3_MODIFIERS"
-    fi
-fi
-
-
-if echo "$platforms" | grep -q 'x11' && echo "$platforms" | grep -q 'drm'; then
-    have_xlease=yes
-else
-    have_xlease=no
-fi
-
-if test x"$have_xlease" = xyes; then
-    randr_modules="x11-xcb xcb-randr"
-    PKG_CHECK_MODULES([XCB_RANDR], [$randr_modules])
-    xlib_randr_modules="xrandr"
-    PKG_CHECK_MODULES([XLIB_RANDR], [$xlib_randr_modules])
-fi
-
-AM_CONDITIONAL(HAVE_PLATFORM_X11, echo "$platforms" | grep -q 'x11')
-AM_CONDITIONAL(HAVE_PLATFORM_WAYLAND, echo "$platforms" | grep -q 'wayland')
-AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo "$platforms" | grep -q 'drm')
-AM_CONDITIONAL(HAVE_PLATFORM_SURFACELESS, echo "$platforms" | grep -q 'surfaceless')
-AM_CONDITIONAL(HAVE_PLATFORM_ANDROID, echo "$platforms" | grep -q 'android')
-
-AC_ARG_ENABLE(xlib-lease,
-    [AS_HELP_STRING([--enable-xlib-lease]
-                    [enable VK_acquire_xlib_display using X leases])],
-    [enable_xlib_lease=$enableval], [enable_xlib_lease=auto])
-case "x$enable_xlib_lease" in
-xyes)
-    ;;
-xno)
-    ;;
-*)
-    if echo "$platforms" | grep -q 'x11' && echo "$platforms" | grep -q 'drm'; then
-        enable_xlib_lease=yes
-    else
-        enable_xlib_lease=no
-    fi
-esac
-
-AM_CONDITIONAL(HAVE_XLIB_LEASE, test "x$enable_xlib_lease" = xyes)
-
-dnl
-dnl More DRI setup
-dnl
-dnl Directory for DRI drivers
-AC_ARG_WITH([dri-driverdir],
-    [AS_HELP_STRING([--with-dri-driverdir=DIR],
-        [directory for the DRI drivers @<:@${libdir}/dri@:>@])],
-    [DRI_DRIVER_INSTALL_DIR="$withval"],
-    [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])
-AC_SUBST([DRI_DRIVER_INSTALL_DIR])
-dnl Extra search path for DRI drivers
-AC_ARG_WITH([dri-searchpath],
-    [AS_HELP_STRING([--with-dri-searchpath=DIRS...],
-        [semicolon delimited DRI driver search directories @<:@${libdir}/dri@:>@])],
-    [DRI_DRIVER_SEARCH_DIR="$withval"],
-    [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
-AC_SUBST([DRI_DRIVER_SEARCH_DIR])
-dnl Which drivers to build - default is chosen by platform
-AC_ARG_WITH([dri-drivers],
-    [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],
-        [comma delimited classic DRI drivers list, e.g.
-        "i915,i965,nouveau,radeon,r200,swrast" @<:@default=auto@:>@])],
-    [with_dri_drivers="$withval"],
-    [with_dri_drivers=auto])
-
-if test "x$with_dri_drivers" = xauto; then
-    if test "x$enable_opengl" = xyes -a "x$enable_dri" = xyes; then
-        with_dri_drivers="yes"
-    else
-        with_dri_drivers="no"
-    fi
-fi
-if test "x$with_dri_drivers" = xno; then
-    with_dri_drivers=''
-fi
-
-# Check for expat
-PKG_CHECK_MODULES([EXPAT], [expat],,
-    [PKG_CHECK_MODULES([EXPAT], [expat21])]
-)
-
-dnl If $with_dri_drivers is yes, drivers will be added through
-dnl platform checks. Set DEFINES and LIB_DEPS
-if test "x$enable_dri" = xyes; then
-    # Platform specific settings and drivers to build
-    case "$host_os" in
-    linux*)
-        case "$host_cpu" in
-        powerpc* | sparc*)
-            # Build only the drivers for cards that exist on PowerPC/sparc
-            if test "x$with_dri_drivers" = "xyes"; then
-                with_dri_drivers="r200 radeon swrast"
-            fi
-            ;;
-        esac
-        ;;
-    cygwin*)
-        if test "x$with_dri_drivers" = "xyes"; then
-            with_dri_drivers="swrast"
-        fi
-        ;;
-    darwin*)
-        DEFINES="$DEFINES -DBUILDING_MESA"
-        if test "x$with_dri_drivers" = "xyes"; then
-            with_dri_drivers="swrast"
-        fi
-        ;;
-    esac
-
-    # default drivers
-    if test "x$with_dri_drivers" = "xyes"; then
-        with_dri_drivers="i915 i965 nouveau r200 radeon swrast"
-    fi
-
-    # put all the necessary libs together
-    DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
-fi
-
-AC_SUBST([DRI_LIB_DEPS])
-
-DRI_DIRS=''
-dnl Duplicates in DRI_DIRS are removed by sorting it at the end of this block
-if test -n "$with_dri_drivers"; then
-    if test "x$enable_opengl" != xyes; then
-        AC_MSG_ERROR([--with-dri-drivers requires OpenGL])
-    fi
-
-    dri_drivers=`IFS=', '; echo $with_dri_drivers`
-    for driver in $dri_drivers; do
-        DRI_DIRS="$DRI_DIRS $driver"
-        case "x$driver" in
-        xi915)
-            require_libdrm "i915"
-            HAVE_I915_DRI=yes
-            PKG_CHECK_MODULES([I915], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
-            ;;
-        xi965)
-            require_libdrm "i965"
-            HAVE_I965_DRI=yes
-            ;;
-        xnouveau)
-            require_libdrm "nouveau"
-            HAVE_NOUVEAU_DRI=yes
-            PKG_CHECK_MODULES([NVVIEUX], [libdrm >= $LIBDRM_NVVIEUX_REQUIRED libdrm_nouveau >= $LIBDRM_NVVIEUX_REQUIRED])
-            ;;
-        xradeon)
-            require_libdrm "radeon"
-            HAVE_RADEON_DRI=yes;
-            PKG_CHECK_MODULES([RADEON], [libdrm >= $LIBDRM_RADEON_REQUIRED libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
-            ;;
-        xr200)
-            require_libdrm "r200"
-            HAVE_R200_DRI=yes
-            PKG_CHECK_MODULES([RADEON], [libdrm >= $LIBDRM_RADEON_REQUIRED libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
-            ;;
-        xswrast)
-            HAVE_SWRAST_DRI=yes
-            ;;
-        *)
-            AC_MSG_ERROR([classic DRI driver '$driver' does not exist])
-            ;;
-        esac
-    done
-    DRI_DIRS=`echo $DRI_DIRS|tr " " "\n"|sort -u|tr "\n" " "`
-fi
-
-
-dnl
-dnl Gallium LLVM
-dnl Deprecated: kept for backwards compatibility
-dnl
-AC_ARG_ENABLE([gallium-llvm],
-    [AS_HELP_STRING([--enable-gallium-llvm],
-        [DEPRECATED: use --enable-llvm instead])],
-    [enable_gallium_llvm="$enableval"],
-    [enable_gallium_llvm=auto])
-
-if test "x$enable_gallium_llvm" != xauto; then
-   AC_MSG_WARN([The --enable-gallium-llvm option has been deprecated. Use --enable-llvm instead.])
-   enable_llvm=$enable_gallium_llvm
-fi
-
-dnl
-dnl LLVM
-dnl
-AC_ARG_ENABLE([llvm],
-    [AS_HELP_STRING([--enable-llvm],
-        [build with LLVM support @<:@default=enabled on x86/x86_64@:>@])],
-    [enable_llvm="$enableval"],
-    [enable_llvm=auto])
-
-if test "x$enable_llvm" = xauto -a "x$FOUND_LLVM" = xyes; then
-    if test "x$FOUND_LLVM" = xyes; then
-        case "$host_cpu" in
-        i*86|x86_64|amd64) enable_llvm=yes;;
-        *) enable_llvm=no;;
-        esac
-    else
-        enable_llvm=no
-    fi
-fi
-
-if test "x$enable_llvm" = xyes -a "x$FOUND_LLVM" = xno; then
-    AC_MSG_ERROR([--enable-llvm selected but llvm-config is not found])
-fi
-
-#
-# Vulkan driver configuration
-#
-
-AC_ARG_WITH([vulkan-drivers],
-    [AS_HELP_STRING([--with-vulkan-drivers@<:@=DIRS...@:>@],
-        [comma delimited Vulkan drivers list, e.g.
-        "intel,radeon"
-        @<:@default=no@:>@])],
-    [with_vulkan_drivers="$withval"],
-    [with_vulkan_drivers="no"])
-
-# Doing '--without-vulkan-drivers' will set this variable to 'no'.  Clear it
-# here so that the script doesn't choke on an unknown driver name later.
-case "x$with_vulkan_drivers" in
-    xyes) with_vulkan_drivers="$VULKAN_DRIVERS_DEFAULT" ;;
-    xno) with_vulkan_drivers='' ;;
-esac
-
-AC_ARG_WITH([vulkan-icddir],
-    [AS_HELP_STRING([--with-vulkan-icddir=DIR],
-        [directory for the Vulkan driver icd files @<:@${datarootdir}/vulkan/icd.d@:>@])],
-    [VULKAN_ICD_INSTALL_DIR="$withval"],
-    [VULKAN_ICD_INSTALL_DIR='${datarootdir}/vulkan/icd.d'])
-AC_SUBST([VULKAN_ICD_INSTALL_DIR])
-
-require_x11_dri3() {
-    if echo "$platforms" | grep -q 'x11'; then
-        if test "x$enable_dri3" != xyes; then
-            AC_MSG_ERROR([$1 Vulkan driver requires DRI3 when built with X11])
-        fi
-    fi
-}
-
-if test -n "$with_vulkan_drivers"; then
-    if test "x$ac_cv_func_dl_iterate_phdr" = xno; then
-        AC_MSG_ERROR([Vulkan drivers require the dl_iterate_phdr function])
-    fi
-
-    VULKAN_DRIVERS=`IFS=', '; echo $with_vulkan_drivers`
-    for driver in $VULKAN_DRIVERS; do
-        case "x$driver" in
-        xintel)
-            require_libdrm "ANV"
-            require_x11_dri3 "ANV"
-            HAVE_INTEL_VULKAN=yes
-            ;;
-        xradeon)
-            require_libdrm "radv"
-            PKG_CHECK_MODULES([AMDGPU], [libdrm >= $LIBDRM_AMDGPU_REQUIRED libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED])
-            radeon_llvm_check $LLVM_REQUIRED_RADV "radv"
-            require_x11_dri3 "radv"
-            if test "x$acv_mako_found" = xno; then
-                AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found])
-            fi
-            HAVE_RADEON_VULKAN=yes
-            ;;
-        *)
-            AC_MSG_ERROR([Vulkan driver '$driver' does not exist])
-            ;;
-        esac
-    done
-    VULKAN_DRIVERS=`echo $VULKAN_DRIVERS|tr " " "\n"|sort -u|tr "\n" " "`
-fi
-
-
-DEFINES="$DEFINES -DENABLE_SHADER_CACHE"
-AM_CONDITIONAL(NEED_MEGADRIVER, test -n "$DRI_DIRS")
-AM_CONDITIONAL(NEED_LIBMESA, test "x$enable_glx" = xxlib -o \
-                                  "x$enable_osmesa" = xyes -o \
-                                  -n "$DRI_DIRS")
-
-dnl
-dnl OSMesa configuration
-dnl
-
-dnl Configure the channel bits for OSMesa (libOSMesa, libOSMesa16, ...)
-AC_ARG_WITH([osmesa-bits],
-    [AS_HELP_STRING([--with-osmesa-bits=BITS],
-        [OSMesa channel bits and library name: 8, 16, 32 @<:@default=8@:>@])],
-    [osmesa_bits="$withval"],
-    [osmesa_bits=8])
-if test "x$osmesa_bits" != x8; then
-    if test "x$enable_dri" = xyes -o "x$enable_glx" != xno; then
-        AC_MSG_WARN([Ignoring OSMesa channel bits because of non-OSMesa driver])
-        osmesa_bits=8
-    fi
-fi
-case "x$osmesa_bits" in
-x8)
-    OSMESA_LIB="${OSMESA_LIB}"
-    ;;
-x16|x32)
-    OSMESA_LIB="${OSMESA_LIB}$osmesa_bits"
-    DEFINES="$DEFINES -DCHAN_BITS=$osmesa_bits -DDEFAULT_SOFTWARE_DEPTH_BITS=31"
-    ;;
-*)
-    AC_MSG_ERROR([OSMesa bits '$osmesa_bits' is not a valid option])
-    ;;
-esac
-
-if test "x$enable_osmesa" = xyes -o "x$enable_gallium_osmesa" = xyes; then
-    # only link libraries with osmesa if shared
-    if test "$enable_static" = no; then
-        OSMESA_LIB_DEPS="-lm $PTHREAD_LIBS $SELINUX_LIBS $DLOPEN_LIBS"
-    else
-        OSMESA_LIB_DEPS=""
-    fi
-    OSMESA_PC_LIB_PRIV="-lm $PTHREAD_LIBS $SELINUX_LIBS $DLOPEN_LIBS"
-fi
-
-AC_SUBST([OSMESA_LIB_DEPS])
-AC_SUBST([OSMESA_PC_REQ])
-AC_SUBST([OSMESA_PC_LIB_PRIV])
-
-dnl
-dnl gbm configuration
-dnl
-if test "x$enable_gbm" = xyes; then
-    require_dri_shared_libs_and_glapi "gbm"
-fi
-AM_CONDITIONAL(HAVE_GBM, test "x$enable_gbm" = xyes)
-# FINISHME: GBM has a number of dependencies which we should add below
-GBM_PC_REQ_PRIV=""
-GBM_PC_LIB_PRIV="$DLOPEN_LIBS"
-AC_SUBST([GBM_PC_REQ_PRIV])
-AC_SUBST([GBM_PC_LIB_PRIV])
-
-dnl
-dnl EGL configuration
-dnl
-
-if test "x$enable_egl" = xyes; then
-    EGL_LIB_DEPS="$DLOPEN_LIBS $SELINUX_LIBS $PTHREAD_LIBS"
-
-    AC_CHECK_FUNC(mincore, [DEFINES="$DEFINES -DHAVE_MINCORE"])
-
-    require_dri_shared_libs_and_glapi "egl"
-fi
-AM_CONDITIONAL(HAVE_EGL, test "x$enable_egl" = xyes)
-AC_SUBST([EGL_LIB_DEPS])
-
-gallium_st="mesa"
-
-dnl
-dnl XA configuration
-dnl
-if test "x$enable_xa" = xyes; then
-    if test "x$with_gallium_drivers" = xswrast; then
-       AC_MSG_ERROR([
-          Building xa requires at least one non swrast gallium driver.
-          If you are looking to use libxatracker.so with the VMware driver,
-          make sure to include svga in the gallium drivers list, apart from
-          enabling XA.
-          Example: ./configure --enable-xa --with-gallium-drivers=svga...])
-    fi
-    gallium_st="$gallium_st xa"
-fi
-AM_CONDITIONAL(HAVE_ST_XA, test "x$enable_xa" = xyes)
-
-if echo $platforms | grep -q "x11"; then
-    have_xvmc_platform=yes
-else
-    have_xvmc_platform=no
-fi
-
-if echo $platforms | grep -q "x11"; then
-    have_vdpau_platform=yes
-else
-    have_vdpau_platform=no
-fi
-
-if echo $platforms | egrep -q "x11|drm"; then
-    have_omx_platform=yes
-else
-    have_omx_platform=no
-fi
-
-if echo $platforms | egrep -q "x11|drm|wayland"; then
-    have_va_platform=yes
-else
-    have_va_platform=no
-fi
-
-dnl
-dnl Gallium G3DVL configuration
-dnl
-if test -n "$with_gallium_drivers" -a "x$with_gallium_drivers" != xswrast; then
-    if test "x$enable_xvmc" = xauto -a "x$have_xvmc_platform" = xyes; then
-        PKG_CHECK_EXISTS([xvmc >= $XVMC_REQUIRED], [enable_xvmc=yes], [enable_xvmc=no])
-    fi
-
-    if test "x$enable_vdpau" = xauto -a "x$have_vdpau_platform" = xyes; then
-        PKG_CHECK_EXISTS([vdpau >= $VDPAU_REQUIRED], [enable_vdpau=yes], [enable_vdpau=no])
-    fi
-
-    if test "x$enable_omx_bellagio" = xauto -a "x$have_omx_platform" = xyes; then
-        PKG_CHECK_EXISTS([libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED], [enable_omx_bellagio=yes], [enable_omx_bellagio=no])
-    fi
-
-    if test "x$enable_omx_tizonia" = xauto -a "x$have_omx_platform" = xyes; then
-       PKG_CHECK_EXISTS([libtizonia >= $LIBOMXIL_TIZONIA_REQUIRED], [enable_omx_tizonia=yes], [enable_omx_tizonia=no])
-    fi
-
-    if test "x$enable_va" = xauto -a "x$have_va_platform" = xyes; then
-        PKG_CHECK_EXISTS([libva >= $LIBVA_REQUIRED], [enable_va=yes], [enable_va=no])
-    fi
-fi
-
-if test "x$enable_dri" = xyes -o \
-        "x$enable_xvmc" = xyes -o \
-        "x$enable_vdpau" = xyes -o \
-        "x$enable_omx_bellagio" = xyes -o \
-        "x$enable_omx_tizonia" = xyes -o \
-        "x$enable_va" = xyes; then
-    need_gallium_vl=yes
-fi
-AM_CONDITIONAL(NEED_GALLIUM_VL, test "x$need_gallium_vl" = xyes)
-
-if test "x$enable_xvmc" = xyes -o \
-        "x$enable_vdpau" = xyes -o \
-        "x$enable_omx_bellagio" = xyes -o \
-        "x$enable_omx_tizonia" = xyes -o \
-        "x$enable_va" = xyes; then
-    if echo $platforms | grep -q "x11"; then
-        PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
-    fi
-    need_gallium_vl_winsys=yes
-fi
-AM_CONDITIONAL(NEED_GALLIUM_VL_WINSYS, test "x$need_gallium_vl_winsys" = xyes)
-
-if test "x$enable_xvmc" = xyes; then
-    if test "x$have_xvmc_platform" != xyes; then
-        AC_MSG_ERROR([XVMC requires the x11 platforms])
-    fi
-    PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED])
-    gallium_st="$gallium_st xvmc"
-fi
-AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes)
-
-if test "x$enable_vdpau" = xyes; then
-    if test "x$have_vdpau_platform" != xyes; then
-        AC_MSG_ERROR([VDPAU requires the x11 platforms])
-    fi
-    PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED])
-    gallium_st="$gallium_st vdpau"
-    DEFINES="$DEFINES -DHAVE_ST_VDPAU"
-fi
-AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes)
-
-if test "x$enable_omx_bellagio" = xyes; then
-    if test "x$have_omx_platform" != xyes; then
-        AC_MSG_ERROR([OMX requires at least one of the x11 or drm platforms])
-    fi
-    PKG_CHECK_MODULES([OMX_BELLAGIO], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED])
-    gallium_st="$gallium_st omx_bellagio"
-    AC_DEFINE([ENABLE_ST_OMX_BELLAGIO], 1, [Use Bellagio for OMX IL])
-else
-    AC_DEFINE([ENABLE_ST_OMX_BELLAGIO], 0)
-fi
-AM_CONDITIONAL(HAVE_ST_OMX_BELLAGIO, test "x$enable_omx_bellagio" = xyes)
-
-if test "x$enable_omx_tizonia" = xyes; then
-    if test "x$have_omx_platform" != xyes; then
-        AC_MSG_ERROR([OMX requires at least one of the x11 or drm platforms])
-    fi
-    PKG_CHECK_MODULES([OMX_TIZONIA],
-                      [libtizonia >= $LIBOMXIL_TIZONIA_REQUIRED
-                       tizilheaders >= $LIBOMXIL_TIZONIA_REQUIRED
-                       libtizplatform >= $LIBOMXIL_TIZONIA_REQUIRED])
-    gallium_st="$gallium_st omx_tizonia"
-    AC_DEFINE([ENABLE_ST_OMX_TIZONIA], 1, [Use Tizoina for OMX IL])
-else
-    AC_DEFINE([ENABLE_ST_OMX_TIZONIA], 0)
-fi
-AM_CONDITIONAL(HAVE_ST_OMX_TIZONIA, test "x$enable_omx_tizonia" = xyes)
-
-if test "x$enable_va" = xyes; then
-    if test "x$have_va_platform" != xyes; then
-        AC_MSG_ERROR([VA requires at least one of the x11 drm or wayland platforms])
-    fi
-    PKG_CHECK_MODULES([VA], [libva >= $LIBVA_REQUIRED])
-    gallium_st="$gallium_st va"
-fi
-AM_CONDITIONAL(HAVE_ST_VA, test "x$enable_va" = xyes)
-
-dnl
-dnl Nine Direct3D9 configuration
-dnl
-if test "x$enable_nine" = xyes; then
-    if ! echo "$with_gallium_drivers" | grep -q 'swrast'; then
-        AC_MSG_ERROR([nine requires the gallium swrast driver])
-    fi
-    if test "x$with_gallium_drivers" = xswrast; then
-        AC_MSG_ERROR([nine requires at least one non-swrast gallium driver])
-    fi
-    if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 6; then
-        AC_MSG_ERROR([gcc >= 4.6 is required to build nine])
-    fi
-
-    if test "x$enable_dri3" = xno; then
-        AC_MSG_WARN([using nine together with wine requires DRI3 enabled system])
-    fi
-
-    gallium_st="$gallium_st nine"
-fi
-AM_CONDITIONAL(HAVE_ST_NINE, test "x$enable_nine" = xyes)
-
-dnl
-dnl OpenCL configuration
-dnl
-
-AC_ARG_WITH([clang-libdir],
-   [AS_HELP_STRING([--with-clang-libdir],
-         [Path to Clang libraries @<:@default=llvm-config --libdir@:>@])],
-   [CLANG_LIBDIR="$withval"],
-   [CLANG_LIBDIR=''])
-
-PKG_CHECK_EXISTS([libclc], [have_libclc=yes], [have_libclc=no])
-
-if test "x$enable_opencl" = xyes; then
-    if test -z "$with_gallium_drivers"; then
-        AC_MSG_ERROR([cannot enable OpenCL without Gallium])
-    fi
-
-    if test "x$HAVE_CXX11" != "xyes"; then
-       AC_MSG_ERROR([clover requires c++11 support])
-    fi
-
-    if test "x$have_libclc" = xno; then
-        AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover.
-                    Make sure the directory containing libclc.pc is specified in your
-                    PKG_CONFIG_PATH environment variable.
-                    By default libclc.pc is installed to /usr/local/share/pkgconfig/])
-    else
-        LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc`
-        LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc`
-        AC_SUBST([LIBCLC_INCLUDEDIR])
-        AC_SUBST([LIBCLC_LIBEXECDIR])
-    fi
-
-    gallium_st="$gallium_st clover"
-
-    if test "x$enable_opencl_icd" = xyes; then
-        OPENCL_LIBNAME="MesaOpenCL"
-    else
-        OPENCL_LIBNAME="OpenCL"
-    fi
-
-    if test "x$have_libelf" != xyes; then
-       AC_MSG_ERROR([Clover requires libelf])
-    fi
-
-    if test "x${ac_cv_cxx_compiler_gnu}" = xyes; then
-        altivec_enabled=no
-        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-        #if !defined(__VEC__) || !defined(__ALTIVEC__)
-        #error "AltiVec not enabled"
-        #endif
-        ])], altivec_enabled=yes)
-
-        if test "$altivec_enabled" = yes; then
-            CLOVER_STD_OVERRIDE="-std=gnu++11"
-        fi
-        AC_SUBST([CLOVER_STD_OVERRIDE])
-    fi
-
-    llvm_require_version $LLVM_REQUIRED_OPENCL "opencl"
-
-    llvm_add_default_components "opencl"
-    llvm_add_component "all-targets" "opencl"
-    llvm_add_component "coverage" "opencl"
-    llvm_add_component "linker" "opencl"
-    llvm_add_component "instrumentation" "opencl"
-    llvm_add_component "ipo" "opencl"
-    llvm_add_component "irreader" "opencl"
-    llvm_add_component "lto" "opencl"
-    llvm_add_component "option" "opencl"
-    llvm_add_component "objcarcopts" "opencl"
-    llvm_add_component "profiledata" "opencl"
-    llvm_add_optional_component "coroutines" "opencl"
-
-    dnl Check for Clang internal headers
-    if test -z "$CLANG_LIBDIR"; then
-        CLANG_LIBDIR=${LLVM_LIBDIR}
-    fi
-    CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
-    AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
-        [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
-fi
-AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
-AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
-AC_SUBST([OPENCL_LIBNAME])
-AC_SUBST([CLANG_RESOURCE_DIR])
-
-dnl
-dnl Gallium configuration
-dnl
-AM_CONDITIONAL(HAVE_GALLIUM, test -n "$with_gallium_drivers")
-
-# libEGL wants to default to the first platform specified in
-# ./configure.  parse that here.
-if test "x$platforms" != "x"; then
-    FIRST_PLATFORM_CAPS=`echo $platforms | sed 's| .*||' | tr '[[a-z]]' '[[A-Z]]'`
-    EGL_NATIVE_PLATFORM="_EGL_PLATFORM_$FIRST_PLATFORM_CAPS"
-else
-    EGL_NATIVE_PLATFORM="_EGL_INVALID_PLATFORM"
-fi
-
-AC_SUBST([EGL_NATIVE_PLATFORM])
-AC_SUBST([EGL_CFLAGS])
-
-# If we don't have the X11 platform, set this define so we don't try to include
-# the X11 headers.
-if ! echo "$platforms" | grep -q 'x11'; then
-    DEFINES="$DEFINES -DMESA_EGL_NO_X11_HEADERS"
-    GL_PC_CFLAGS="$GL_PC_CFLAGS -DMESA_EGL_NO_X11_HEADERS"
-fi
-
-dnl Directory for XVMC libs
-AC_ARG_WITH([xvmc-libdir],
-    [AS_HELP_STRING([--with-xvmc-libdir=DIR],
-        [directory for the XVMC libraries @<:@default=${libdir}@:>@])],
-    [XVMC_LIB_INSTALL_DIR="$withval"],
-    [XVMC_LIB_INSTALL_DIR='${libdir}'])
-AC_SUBST([XVMC_LIB_INSTALL_DIR])
-
-dnl
-dnl Gallium Tests
-dnl
-AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes)
-
-dnl Directory for VDPAU libs
-AC_ARG_WITH([vdpau-libdir],
-    [AS_HELP_STRING([--with-vdpau-libdir=DIR],
-        [directory for the VDPAU libraries @<:@default=${libdir}/vdpau@:>@])],
-    [VDPAU_LIB_INSTALL_DIR="$withval"],
-    [VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau'])
-AC_SUBST([VDPAU_LIB_INSTALL_DIR])
-
-dnl Directory for OMX_BELLAGIO libs
-
-AC_ARG_WITH([omx-bellagio-libdir],
-    [AS_HELP_STRING([--with-omx-bellagio-libdir=DIR],
-        [directory for the OMX_BELLAGIO libraries])],
-    [OMX_BELLAGIO_LIB_INSTALL_DIR="$withval"],
-    [OMX_BELLAGIO_LIB_INSTALL_DIR=`$PKG_CONFIG --exists libomxil-bellagio && \
-                                   $PKG_CONFIG --define-variable=libdir=\$libdir --variable=pluginsdir libomxil-bellagio`])
-AC_SUBST([OMX_BELLAGIO_LIB_INSTALL_DIR])
-
-dnl Directory for OMX_TIZONIA libs
-
-AC_ARG_WITH([omx-tizonia-libdir],
-    [AS_HELP_STRING([--with-omx-tizonia-libdir=DIR],
-        [directory for the OMX_TIZONIA libraries])],
-    [OMX_TIZONIA_LIB_INSTALL_DIR="$withval"],
-    [OMX_TIZONIA_LIB_INSTALL_DIR=`$PKG_CONFIG --define-variable=libdir=\$libdir --variable=pluginsdir libtizcore`])
-AC_SUBST([OMX_TIZONIA_LIB_INSTALL_DIR])
-
-dnl Directory for VA libs
-
-AC_ARG_WITH([va-libdir],
-    [AS_HELP_STRING([--with-va-libdir=DIR],
-        [directory for the VA libraries @<:@${libdir}/dri@:>@])],
-    [VA_LIB_INSTALL_DIR="$withval"],
-    [VA_LIB_INSTALL_DIR="${libdir}/dri"])
-AC_SUBST([VA_LIB_INSTALL_DIR])
-
-AC_ARG_WITH([d3d-libdir],
-    [AS_HELP_STRING([--with-d3d-libdir=DIR],
-        [directory for the D3D modules @<:@${libdir}/d3d@:>@])],
-    [D3D_DRIVER_INSTALL_DIR="$withval"],
-    [D3D_DRIVER_INSTALL_DIR="${libdir}/d3d"])
-AC_SUBST([D3D_DRIVER_INSTALL_DIR])
-
-dnl Architectures to build SWR library for
-
-AC_ARG_WITH([swr-archs],
-    [AS_HELP_STRING([--with-swr-archs@<:@=DIRS...@:>@],
-        [comma delimited swr architectures list, e.g.
-        "avx,avx2,knl,skx" @<:@default="avx,avx2"@:>@])],
-    [with_swr_archs="$withval"],
-    [with_swr_archs="avx,avx2"])
-
-dnl
-dnl r300 doesn't strictly require LLVM, but for performance reasons we
-dnl highly recommend LLVM usage. So require it at least on x86 and x86_64
-dnl architectures.
-dnl
-r300_require_llvm() {
-    case "$host" in *gnux32) return;; esac
-    case "$host_cpu" in
-    i*86|x86_64|amd64) require_llvm $1
-        ;;
-    esac
-}
-
-dnl
-dnl DRM is needed by X, Wayland, and offscreen rendering.
-dnl Surfaceless is an alternative for the last one.
-dnl
-require_basic_egl() {
-    case "$with_platforms" in
-        *drm*|*surfaceless*|*android*)
-            ;;
-        *)
-            AC_MSG_ERROR([$1 requires one of these:
-                  1) --with-platforms=drm (X, Wayland, offscreen rendering based on DRM)
-                  2) --with-platforms=surfaceless (offscreen only)
-                  3) --with-platforms=android (Android only)
-                  Recommended options: drm,x11])
-            ;;
-    esac
-}
-
-swr_require_cxx_feature_flags() {
-    feature_name="$1"
-    preprocessor_test="$2"
-    option_list="$3"
-    output_var="$4"
-
-    AC_MSG_CHECKING([whether $CXX supports $feature_name])
-    AC_LANG_PUSH([C++])
-    save_CXXFLAGS="$CXXFLAGS"
-    save_IFS="$IFS"
-    IFS=","
-    found=0
-    for opts in $option_list
-    do
-        unset IFS
-        CXXFLAGS="$opts $save_CXXFLAGS"
-        AC_COMPILE_IFELSE(
-            [AC_LANG_PROGRAM(
-                [   #if !($preprocessor_test)
-                    #error
-                    #endif
-                ])],
-            [found=1; break],
-            [])
-        IFS=","
-    done
-    IFS="$save_IFS"
-    CXXFLAGS="$save_CXXFLAGS"
-    AC_LANG_POP([C++])
-    if test $found -eq 1; then
-        AC_MSG_RESULT([$opts])
-        eval "$output_var=\$opts"
-        return 0
-    fi
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([swr requires $feature_name support])
-    return 1
-}
-
-dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block
-if test -n "$with_gallium_drivers"; then
-    gallium_drivers=`IFS=', '; echo $with_gallium_drivers`
-    for driver in $gallium_drivers; do
-        case "x$driver" in
-        xsvga)
-            HAVE_GALLIUM_SVGA=yes
-            require_libdrm "svga"
-            ;;
-        xi915)
-            HAVE_GALLIUM_I915=yes
-            PKG_CHECK_MODULES([I915], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
-            require_libdrm "Gallium i915"
-            ;;
-        xr300)
-            HAVE_GALLIUM_R300=yes
-            PKG_CHECK_MODULES([RADEON], [libdrm >= $LIBDRM_RADEON_REQUIRED libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
-            require_libdrm "r300"
-            r300_require_llvm "r300"
-            ;;
-        xr600)
-            HAVE_GALLIUM_R600=yes
-            PKG_CHECK_MODULES([RADEON], [libdrm >= $LIBDRM_RADEON_REQUIRED libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
-            require_libdrm "r600"
-            if test "x$enable_llvm" = xyes; then
-                radeon_llvm_check $LLVM_REQUIRED_R600 "r600"
-
-                llvm_add_component "asmparser" "r600"
-                llvm_add_component "bitreader" "r600"
-            fi
-            ;;
-        xradeonsi)
-            HAVE_GALLIUM_RADEONSI=yes
-            PKG_CHECK_MODULES([RADEON], [libdrm >= $LIBDRM_RADEON_REQUIRED libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
-            PKG_CHECK_MODULES([AMDGPU], [libdrm >= $LIBDRM_AMDGPU_REQUIRED libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED])
-            require_libdrm "radeonsi"
-            radeon_llvm_check $LLVM_REQUIRED_RADEONSI "radeonsi"
-            if test "x$enable_egl" = xyes; then
-                require_basic_egl "radeonsi"
-            fi
-            ;;
-        xnouveau)
-            HAVE_GALLIUM_NOUVEAU=yes
-            PKG_CHECK_MODULES([NOUVEAU], [libdrm >= $LIBDRM_NOUVEAU_REQUIRED libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
-            require_libdrm "nouveau"
-            ;;
-        xfreedreno)
-            HAVE_GALLIUM_FREEDRENO=yes
-            require_libdrm "freedreno"
-            ;;
-        xetnaviv)
-            HAVE_GALLIUM_ETNAVIV=yes
-            PKG_CHECK_MODULES([ETNAVIV], [libdrm >= $LIBDRM_ETNAVIV_REQUIRED libdrm_etnaviv >= $LIBDRM_ETNAVIV_REQUIRED])
-            require_libdrm "etnaviv"
-            ;;
-        xtegra)
-            HAVE_GALLIUM_TEGRA=yes
-            require_libdrm "tegra"
-            ;;
-        xswrast)
-            HAVE_GALLIUM_SOFTPIPE=yes
-            if test "x$enable_llvm" = xyes; then
-                HAVE_GALLIUM_LLVMPIPE=yes
-            fi
-            ;;
-        xswr)
-            llvm_require_version $LLVM_REQUIRED_SWR "swr"
-
-            if test "x$HAVE_CXX11" != "xyes"; then
-                AC_MSG_ERROR([swr requires c++11 support])
-            fi
-
-            swr_require_cxx_feature_flags "AVX" "defined(__AVX__)" \
-                ",-target-cpu=sandybridge,-mavx,-march=core-avx,-tp=sandybridge" \
-                SWR_AVX_CXXFLAGS
-            AC_SUBST([SWR_AVX_CXXFLAGS])
-
-            swr_archs=`IFS=', '; echo $with_swr_archs`
-            for arch in $swr_archs; do
-                case "x$arch" in
-                xavx)
-                    HAVE_SWR_AVX=yes
-                    ;;
-                xavx2)
-                    swr_require_cxx_feature_flags "AVX2" "defined(__AVX2__)" \
-                        ",-target-cpu=haswell,-mavx2 -mfma -mbmi2 -mf16c,-march=core-avx2,-tp=haswell" \
-                        SWR_AVX2_CXXFLAGS
-                    AC_SUBST([SWR_AVX2_CXXFLAGS])
-                    HAVE_SWR_AVX2=yes
-                    ;;
-                xknl)
-                    swr_require_cxx_feature_flags "KNL" "defined(__AVX512F__) && defined(__AVX512ER__)" \
-                        ",-target-cpu=mic-knl,-march=knl,-xMIC-AVX512" \
-                        SWR_KNL_CXXFLAGS
-                    AC_SUBST([SWR_KNL_CXXFLAGS])
-                    HAVE_SWR_KNL=yes
-                    ;;
-                xskx)
-                    swr_require_cxx_feature_flags "SKX" "defined(__AVX512F__) && defined(__AVX512BW__)" \
-                        ",-target-cpu=x86-skylake,-march=skylake-avx512,-xCORE-AVX512" \
-                        SWR_SKX_CXXFLAGS
-                    AC_SUBST([SWR_SKX_CXXFLAGS])
-                    HAVE_SWR_SKX=yes
-                    ;;
-                *)
-                    AC_MSG_ERROR([unknown SWR build architecture '$arch'])
-                    ;;
-                esac
-            done
-
-            if test "x$HAVE_SWR_AVX" != xyes -a \
-                    "x$HAVE_SWR_AVX2" != xyes -a \
-                    "x$HAVE_SWR_KNL" != xyes -a \
-                    "x$HAVE_SWR_SKX" != xyes; then
-               AC_MSG_ERROR([swr enabled but no swr architectures selected])
-            fi
-
-            # test if more than one swr arch configured
-            if test `echo $swr_archs | wc -w` -eq 1; then
-                HAVE_SWR_BUILTIN=yes
-            fi
-
-            HAVE_GALLIUM_SWR=yes
-            ;;
-        xvc4)
-            HAVE_GALLIUM_VC4=yes
-            PKG_CHECK_MODULES([VC4], [libdrm >= $LIBDRM_VC4_REQUIRED])
-
-            PKG_CHECK_MODULES([SIMPENROSE], [simpenrose],
-                              [USE_VC4_SIMULATOR=yes;
-                               DEFINES="$DEFINES -DUSE_VC4_SIMULATOR"],
-                              [USE_VC4_SIMULATOR=no])
-            ;;
-        xv3d)
-            HAVE_GALLIUM_V3D=yes
-
-            PKG_CHECK_MODULES([V3D_SIMULATOR], [v3dv3],
-                              [USE_V3D_SIMULATOR=yes;
-                               DEFINES="$DEFINES -DUSE_V3D_SIMULATOR"],
-                              [USE_V3D_SIMULATOR=no])
-            ;;
-        xkmsro)
-            HAVE_GALLIUM_KMSRO=yes
-            ;;
-        xvirgl)
-            HAVE_GALLIUM_VIRGL=yes
-            require_libdrm "virgl"
-            if test "x$enable_egl" = xyes; then
-                require_basic_egl "virgl"
-            fi
-            ;;
-        *)
-            AC_MSG_ERROR([Unknown Gallium driver: $driver])
-            ;;
-        esac
-    done
-fi
-
-# XXX: Keep in sync with LLVM_REQUIRED_SWR
-AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x6.0.0 -a \
-                                              "x$LLVM_VERSION" != x6.0.1)
-
-if test "x$enable_llvm" = "xyes" -a "$with_gallium_drivers"; then
-    llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium"
-    llvm_add_default_components "gallium"
-fi
-
-AM_CONDITIONAL(HAVE_SWR_AVX, test "x$HAVE_SWR_AVX" = xyes)
-AM_CONDITIONAL(HAVE_SWR_AVX2, test "x$HAVE_SWR_AVX2" = xyes)
-AM_CONDITIONAL(HAVE_SWR_KNL, test "x$HAVE_SWR_KNL" = xyes)
-AM_CONDITIONAL(HAVE_SWR_SKX, test "x$HAVE_SWR_SKX" = xyes)
-AM_CONDITIONAL(HAVE_SWR_BUILTIN, test "x$HAVE_SWR_BUILTIN" = xyes)
-
-dnl We need to validate some needed dependencies for renderonly drivers.
-
-if test "x$HAVE_GALLIUM_VC4" != xyes -a "x$HAVE_GALLIUM_KMSRO" = xyes  ; then
-    AC_MSG_ERROR([Building with kmsro requires vc4])
-fi
-
-if test "x$HAVE_GALLIUM_NOUVEAU" != xyes -a "x$HAVE_GALLIUM_TEGRA" = xyes; then
-    AC_MSG_ERROR([Building with tegra requires nouveau])
-fi
-
-detect_old_buggy_llvm() {
-    dnl llvm-config may not give the right answer when llvm is a built as a
-    dnl single shared library, so we must work the library name out for
-    dnl ourselves.
-    dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
-    dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
-    LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
-    AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes])
-
-    if test "x$llvm_have_one_so" = xyes; then
-        dnl LLVM was built using auto*, so there is only one shared object.
-        LLVM_LIBS="-l$LLVM_SO_NAME"
-    else
-        dnl If LLVM was built with CMake, there will be one shared object per
-        dnl component.
-        AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.$IMP_LIB_EXT"],
-               [AC_MSG_ERROR([Could not find llvm shared libraries:
-                Please make sure you have built llvm with the --enable-shared option
-                and that your llvm libraries are installed in $LLVM_LIBDIR
-                If you have installed your llvm libraries to a different directory you
-                can use the --with-llvm-prefix= configure flag to specify this directory.
-                NOTE: Mesa is attempting to use llvm shared libraries by default.
-                If you do not want to build with llvm shared libraries and instead want to
-                use llvm static libraries then add --disable-llvm-shared-libs to your configure
-                invocation and rebuild.])])
-
-        dnl We don't need to update LLVM_LIBS in this case because the LLVM
-        dnl install uses a shared object for each component and we have
-        dnl already added all of these objects to LLVM_LIBS.
-    fi
-}
-
-dnl
-dnl Set defines and buildtime variables only when using LLVM.
-dnl
-if test "x$enable_llvm" = xyes; then
-    DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DMESA_LLVM_VERSION_STRING=\\\"$LLVM_VERSION\\\""
-
-    LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
-    LLVM_CFLAGS=$LLVM_CPPFLAGS   # CPPFLAGS seem to be sufficient
-    LLVM_CXXFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cxxflags"`
-    LLVM_CXXFLAGS="$CXX11_CXXFLAGS $LLVM_CXXFLAGS"
-
-    dnl Set LLVM_LIBS - This is done after the driver configuration so
-    dnl that drivers can add additional components to LLVM_COMPONENTS.
-    dnl Previously, gallium drivers were updating LLVM_LIBS directly
-    dnl by calling llvm-config --libs ${DRIVER_LLVM_COMPONENTS}, but
-    dnl this was causing the same libraries to be appear multiple times
-    dnl in LLVM_LIBS.
-
-    if test $LLVM_VERSION_MAJOR -ge 4 -o $LLVM_VERSION_MAJOR -eq 3 -a $LLVM_VERSION_MINOR -ge 9; then
-        if test "x$enable_llvm_shared_libs" = xyes; then
-            LLVM_LIBS="`$LLVM_CONFIG --link-shared --libs ${LLVM_COMPONENTS}`"
-        else
-            dnl Invoking llvm-config with both -libs and --system-libs produces the
-            dnl two separate lines - each for the set of libraries.
-		dnl Call the program twice, effectively folding them into a single line.
-            LLVM_LIBS="`$LLVM_CONFIG --link-static --libs ${LLVM_COMPONENTS}`"
-            dnl We need to link to llvm system libs when using static libs
-            LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --link-static --system-libs`"
-        fi
-    else
-        LLVM_LIBS="`$LLVM_CONFIG --libs ${LLVM_COMPONENTS}`"
-        if test "x$enable_llvm_shared_libs" = xyes; then
-            detect_old_buggy_llvm
-        else
-            AC_MSG_WARN([Building mesa with statically linked LLVM may cause compilation issues])
-            dnl We need to link to llvm system libs when using static libs
-            dnl However, only llvm 3.5+ provides --system-libs
-            if test $LLVM_VERSION_MAJOR -ge 4 -o $LLVM_VERSION_MAJOR -eq 3 -a $LLVM_VERSION_MINOR -ge 5; then
-                LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --system-libs`"
-            fi
-        fi
-    fi
-
-    dnl The gallium-xlib GLX and gallium OSMesa targets directly embed the
-    dnl swr/llvmpipe driver into the final binary.  Adding LLVM_LIBS results in
-    dnl the LLVM library propagated in the Libs.private of the respective .pc
-    dnl file which ensures complete dependency information when statically
-    dnl linking.
-    if test "x$enable_glx" = xgallium-xlib; then
-        GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $LLVM_LIBS"
-    fi
-    if test "x$enable_gallium_osmesa" = xyes; then
-        OSMESA_PC_LIB_PRIV="$OSMESA_PC_LIB_PRIV $LLVM_LIBS"
-    fi
-fi
-
-AM_CONDITIONAL(HAVE_GALLIUM_SVGA, test "x$HAVE_GALLIUM_SVGA" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_I915, test "x$HAVE_GALLIUM_I915" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_KMSRO, test "x$HAVE_GALLIUM_KMSRO" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_R300, test "x$HAVE_GALLIUM_R300" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_R600, test "x$HAVE_GALLIUM_R600" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_RADEONSI, test "x$HAVE_GALLIUM_RADEONSI" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_NOUVEAU, test "x$HAVE_GALLIUM_NOUVEAU" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_FREEDRENO, test "x$HAVE_GALLIUM_FREEDRENO" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_ETNAVIV, test "x$HAVE_GALLIUM_ETNAVIV" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_TEGRA, test "x$HAVE_GALLIUM_TEGRA" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_SOFTPIPE, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_LLVMPIPE, test "x$HAVE_GALLIUM_LLVMPIPE" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_SWR, test "x$HAVE_GALLIUM_SWR" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_SWRAST, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes -o \
-                                         "x$HAVE_GALLIUM_LLVMPIPE" = xyes -o \
-                                         "x$HAVE_GALLIUM_SWR" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_V3D, test "x$HAVE_GALLIUM_V3D" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_VC4, test "x$HAVE_GALLIUM_VC4" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_VIRGL, test "x$HAVE_GALLIUM_VIRGL" = xyes)
-
-AM_CONDITIONAL(HAVE_GALLIUM_STATIC_TARGETS, test "x$enable_shared_pipe_drivers" = xno)
-
-if test "x$enable_dri" = xyes; then
-    GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_DRI"
-fi
-
-if test "x$have_drisw_kms" = xyes; then
-    GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_KMS"
-fi
-AC_SUBST([GALLIUM_PIPE_LOADER_DEFINES])
-
-AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)
-AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes)
-AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes)
-AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes)
-AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes)
-AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
-
-AM_CONDITIONAL(HAVE_RADEON_VULKAN, test "x$HAVE_RADEON_VULKAN" = xyes)
-AM_CONDITIONAL(HAVE_INTEL_VULKAN, test "x$HAVE_INTEL_VULKAN" = xyes)
-
-AM_CONDITIONAL(HAVE_AMD_DRIVERS, test "x$HAVE_GALLIUM_RADEONSI" = xyes -o \
-                                      "x$HAVE_RADEON_VULKAN" = xyes)
-
-AM_CONDITIONAL(HAVE_BROADCOM_DRIVERS, test "x$HAVE_GALLIUM_VC4" = xyes -o \
-                                      "x$HAVE_GALLIUM_V3D" = xyes)
-
-AM_CONDITIONAL(HAVE_FREEDRENO_DRIVERS, test "x$HAVE_GALLIUM_FREEDRENO" = xyes)
-AM_CONDITIONAL(HAVE_INTEL_DRIVERS, test "x$HAVE_INTEL_VULKAN" = xyes -o \
-                                        "x$HAVE_I965_DRI" = xyes)
-
-AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \
-                                            "x$HAVE_GALLIUM_R600" = xyes -o \
-                                            "x$HAVE_GALLIUM_RADEONSI" = xyes)
-AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$enable_glx" = xgallium-xlib)
-AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_LLVM, test "x$enable_llvm" = xyes)
-AM_CONDITIONAL(USE_V3D_SIMULATOR, test x$USE_V3D_SIMULATOR = xyes)
-AM_CONDITIONAL(USE_VC4_SIMULATOR, test x$USE_VC4_SIMULATOR = xyes)
-
-AM_CONDITIONAL(HAVE_LIBDRM, test "x$have_libdrm" = xyes)
-AM_CONDITIONAL(HAVE_OSMESA, test "x$enable_osmesa" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_OSMESA, test "x$enable_gallium_osmesa" = xyes)
-AM_CONDITIONAL(HAVE_COMMON_OSMESA, test "x$enable_osmesa" = xyes -o \
-                                        "x$enable_gallium_osmesa" = xyes)
-
-AM_CONDITIONAL(HAVE_X86_ASM, test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64)
-AM_CONDITIONAL(HAVE_X86_64_ASM, test "x$asm_arch" = xx86_64)
-AM_CONDITIONAL(HAVE_SPARC_ASM, test "x$asm_arch" = xsparc)
-AM_CONDITIONAL(HAVE_PPC64LE_ASM, test "x$asm_arch" = xppc64le)
-AM_CONDITIONAL(HAVE_AARCH64_ASM, test "x$asm_arch" = xaarch64)
-AM_CONDITIONAL(HAVE_ARM_ASM, test "x$asm_arch" = xarm)
-
-AC_SUBST([NINE_MAJOR], 1)
-AC_SUBST([NINE_MINOR], 0)
-AC_SUBST([NINE_PATCH], 0)
-AC_SUBST([NINE_VERSION], "$NINE_MAJOR.$NINE_MINOR.$NINE_PATCH")
-
-AC_SUBST([VDPAU_MAJOR], 1)
-AC_SUBST([VDPAU_MINOR], 0)
-
-if test "x$enable_va" = xyes; then
-    VA_MAJOR=`$PKG_CONFIG --modversion libva | $SED -n 's/\([[^\.]]*\)\..*$/\1/p'`
-    VA_MINOR=`$PKG_CONFIG --modversion libva | $SED -n 's/.*\.\(.*\)\..*$/\1/p'`
-fi
-AC_SUBST([VA_MAJOR], $VA_MAJOR)
-AC_SUBST([VA_MINOR], $VA_MINOR)
-
-AM_CONDITIONAL(HAVE_VULKAN_COMMON, test "x$VULKAN_DRIVERS" != "x")
-
-AC_SUBST([XVMC_MAJOR], 1)
-AC_SUBST([XVMC_MINOR], 0)
-
-AC_SUBST([XA_MAJOR], 2)
-AC_SUBST([XA_MINOR], 5)
-AC_SUBST([XA_PATCH], 0)
-AC_SUBST([XA_VERSION], "$XA_MAJOR.$XA_MINOR.$XA_PATCH")
-
-AC_ARG_ENABLE(valgrind,
-              [AS_HELP_STRING([--enable-valgrind],
-                             [Build mesa with valgrind support (default: auto)])],
-                             [VALGRIND=$enableval], [VALGRIND=auto])
-if test "x$VALGRIND" != xno; then
-    PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
-fi
-AC_MSG_CHECKING([whether to enable Valgrind support])
-if test "x$VALGRIND" = xauto; then
-    VALGRIND="$have_valgrind"
-fi
-
-if test "x$VALGRIND" = "xyes"; then
-    if ! test "x$have_valgrind" = xyes; then
-        AC_MSG_ERROR([Valgrind support required but not present])
-    fi
-    AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings])
-fi
-
-AC_MSG_RESULT([$VALGRIND])
-
-dnl Restore LDFLAGS and CPPFLAGS
-LDFLAGS="$_SAVE_LDFLAGS"
-CPPFLAGS="$_SAVE_CPPFLAGS"
-
-dnl Suppress clang's warnings about unused CFLAGS and CXXFLAGS
-if test "x$acv_mesa_CLANG" = xyes; then
-    CFLAGS="$CFLAGS -Qunused-arguments"
-    CXXFLAGS="$CXXFLAGS -Qunused-arguments"
-fi
-
-dnl Add user CFLAGS and CXXFLAGS
-CFLAGS="$CFLAGS $USER_CFLAGS"
-CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
-
-dnl Substitute the config
-AC_CONFIG_FILES([Makefile
-                 src/Makefile
-                 src/amd/Makefile
-                 src/amd/vulkan/Makefile
-                 src/broadcom/Makefile
-                 src/compiler/Makefile
-                 src/freedreno/Makefile
-                 src/egl/Makefile
-                 src/egl/main/egl.pc
-                 src/egl/wayland/wayland-drm/Makefile
-                 src/gallium/Makefile
-                 src/gallium/auxiliary/Makefile
-                 src/gallium/auxiliary/pipe-loader/Makefile
-                 src/gallium/drivers/freedreno/Makefile
-                 src/gallium/drivers/i915/Makefile
-                 src/gallium/drivers/llvmpipe/Makefile
-                 src/gallium/drivers/nouveau/Makefile
-                 src/gallium/drivers/kmsro/Makefile
-                 src/gallium/drivers/r300/Makefile
-                 src/gallium/drivers/r600/Makefile
-                 src/gallium/drivers/radeonsi/Makefile
-                 src/gallium/drivers/softpipe/Makefile
-                 src/gallium/drivers/svga/Makefile
-                 src/gallium/drivers/swr/Makefile
-                 src/gallium/drivers/tegra/Makefile
-                 src/gallium/drivers/etnaviv/Makefile
-                 src/gallium/drivers/v3d/Makefile
-                 src/gallium/drivers/vc4/Makefile
-                 src/gallium/drivers/virgl/Makefile
-                 src/gallium/state_trackers/clover/Makefile
-                 src/gallium/state_trackers/dri/Makefile
-                 src/gallium/state_trackers/glx/xlib/Makefile
-                 src/gallium/state_trackers/nine/Makefile
-                 src/gallium/state_trackers/omx/Makefile
-                 src/gallium/state_trackers/omx/bellagio/Makefile
-                 src/gallium/state_trackers/omx/tizonia/Makefile
-                 src/gallium/state_trackers/osmesa/Makefile
-                 src/gallium/state_trackers/va/Makefile
-                 src/gallium/state_trackers/vdpau/Makefile
-                 src/gallium/state_trackers/xa/Makefile
-                 src/gallium/state_trackers/xa/xa_tracker.h
-                 src/gallium/state_trackers/xvmc/Makefile
-                 src/gallium/targets/d3dadapter9/Makefile
-                 src/gallium/targets/d3dadapter9/d3d.pc
-                 src/gallium/targets/dri/Makefile
-                 src/gallium/targets/libgl-xlib/Makefile
-                 src/gallium/targets/omx/Makefile
-                 src/gallium/targets/opencl/Makefile
-                 src/gallium/targets/opencl/mesa.icd
-                 src/gallium/targets/osmesa/Makefile
-                 src/gallium/targets/osmesa/osmesa.pc
-                 src/gallium/targets/pipe-loader/Makefile
-                 src/gallium/targets/va/Makefile
-                 src/gallium/targets/vdpau/Makefile
-                 src/gallium/targets/xa/Makefile
-                 src/gallium/targets/xa/xatracker.pc
-                 src/gallium/targets/xvmc/Makefile
-                 src/gallium/tests/trivial/Makefile
-                 src/gallium/tests/unit/Makefile
-                 src/gallium/winsys/etnaviv/drm/Makefile
-                 src/gallium/winsys/freedreno/drm/Makefile
-                 src/gallium/winsys/i915/drm/Makefile
-                 src/gallium/winsys/nouveau/drm/Makefile
-                 src/gallium/winsys/kmsro/drm/Makefile
-                 src/gallium/winsys/radeon/drm/Makefile
-                 src/gallium/winsys/amdgpu/drm/Makefile
-                 src/gallium/winsys/svga/drm/Makefile
-                 src/gallium/winsys/sw/dri/Makefile
-                 src/gallium/winsys/sw/kms-dri/Makefile
-                 src/gallium/winsys/sw/null/Makefile
-                 src/gallium/winsys/sw/wrapper/Makefile
-                 src/gallium/winsys/sw/xlib/Makefile
-                 src/gallium/winsys/tegra/drm/Makefile
-                 src/gallium/winsys/v3d/drm/Makefile
-                 src/gallium/winsys/vc4/drm/Makefile
-                 src/gallium/winsys/virgl/drm/Makefile
-                 src/gallium/winsys/virgl/vtest/Makefile
-                 src/gbm/Makefile
-                 src/gbm/main/gbm.pc
-                 src/glx/Makefile
-                 src/glx/apple/Makefile
-                 src/glx/tests/Makefile
-                 src/glx/windows/Makefile
-                 src/glx/windows/windowsdriproto.pc
-                 src/gtest/Makefile
-                 src/intel/Makefile
-                 src/loader/Makefile
-                 src/mapi/Makefile
-                 src/mapi/es1api/glesv1_cm.pc
-                 src/mapi/es2api/glesv2.pc
-                 src/mapi/glapi/gen/Makefile
-                 src/mesa/Makefile
-                 src/mesa/gl.pc
-                 src/mesa/drivers/dri/dri.pc
-                 src/mesa/drivers/dri/common/Makefile
-                 src/mesa/drivers/dri/i915/Makefile
-                 src/mesa/drivers/dri/i965/Makefile
-                 src/mesa/drivers/dri/Makefile
-                 src/mesa/drivers/dri/nouveau/Makefile
-                 src/mesa/drivers/dri/r200/Makefile
-                 src/mesa/drivers/dri/radeon/Makefile
-                 src/mesa/drivers/dri/swrast/Makefile
-                 src/mesa/drivers/osmesa/Makefile
-                 src/mesa/drivers/osmesa/osmesa.pc
-                 src/mesa/drivers/x11/Makefile
-                 src/mesa/main/tests/Makefile
-                 src/mesa/state_tracker/tests/Makefile
-                 src/util/Makefile
-                 src/util/tests/fast_idiv_by_const/Makefile
-                 src/util/tests/hash_table/Makefile
-                 src/util/tests/set/Makefile
-                 src/util/tests/string_buffer/Makefile
-                 src/util/tests/vma/Makefile
-                 src/util/xmlpool/Makefile
-                 src/vulkan/Makefile])
-
-AC_OUTPUT
-
-# Fix up dependencies in *.Plo files, where we changed the extension of a
-# source file
-$SED -i -e 's/brw_blorp.cpp/brw_blorp.c/' src/mesa/drivers/dri/i965/.deps/brw_blorp.Plo
-
-rm -f src/compiler/spirv/spirv_info.lo
-echo "# dummy" > src/compiler/spirv/.deps/spirv_info.Plo
-
-rm -f src/compiler/nir/.deps/nir_intrinsics.Plo
-echo "# dummy" > src/compiler/nir/.deps/nir_intrinsics.Plo
-
-dnl
-dnl Output some configuration info for the user
-dnl
-echo ""
-echo "        prefix:          $prefix"
-echo "        exec_prefix:     $exec_prefix"
-echo "        libdir:          $libdir"
-echo "        includedir:      $includedir"
-
-dnl API info
-echo ""
-echo "        OpenGL:          $enable_opengl (ES1: $enable_gles1 ES2: $enable_gles2)"
-
-dnl Driver info
-echo ""
-case "x$enable_osmesa$enable_gallium_osmesa" in
-xnoyes)
-        echo "        OSMesa:          lib$OSMESA_LIB (Gallium)"
-        ;;
-xyesno)
-        echo "        OSMesa:          lib$OSMESA_LIB"
-        ;;
-xnono)
-        echo "        OSMesa:          no"
-        ;;
-esac
-
-echo ""
-if test "x$enable_dri" != xno; then
-        echo "        DRI platform:    $dri_platform"
-        if test -z "$DRI_DIRS"; then
-            echo "        DRI drivers:     no"
-        else
-            echo "        DRI drivers:     $DRI_DIRS"
-        fi
-        echo "        DRI driver dir:  $DRI_DRIVER_INSTALL_DIR"
-fi
-
-case "x$enable_glx" in
-xdri)
-    echo "        GLX:             DRI-based"
-    ;;
-xxlib)
-    echo "        GLX:             Xlib-based"
-    ;;
-xgallium-xlib)
-    echo "        GLX:             Xlib-based (Gallium)"
-    ;;
-*)
-    echo "        GLX:             $enable_glx"
-    ;;
-esac
-
-dnl EGL
-echo ""
-echo "        EGL:             $enable_egl"
-if test "$enable_egl" = yes; then
-
-    egl_drivers=""
-    if test "x$enable_dri" != "xno"; then
-        egl_drivers="$egl_drivers builtin:egl_dri2"
-    fi
-    if test "x$enable_dri3" != "xno"; then
-        egl_drivers="$egl_drivers builtin:egl_dri3"
-    fi
-
-    echo "        EGL drivers:    $egl_drivers"
-fi
-if test "x$enable_gbm" = xyes; then
-    echo "        GBM:             yes"
-else
-    echo "        GBM:             no"
-fi
-
-    echo "        EGL/Vulkan/VL platforms:   $platforms"
-
-# Vulkan
-echo ""
-if test "x$VULKAN_DRIVERS" != x; then
-    echo "        Vulkan drivers:  $VULKAN_DRIVERS"
-    echo "        Vulkan ICD dir:  $VULKAN_ICD_INSTALL_DIR"
-else
-    echo "        Vulkan drivers:  no"
-fi
-
-echo ""
-if test "x$enable_llvm" = xyes; then
-    echo "        llvm:            yes"
-    echo "        llvm-config:     $LLVM_CONFIG"
-    echo "        llvm-version:    $LLVM_VERSION"
-else
-    echo "        llvm:            no"
-fi
-
-echo ""
-if test -n "$with_gallium_drivers"; then
-    echo "        Gallium drivers: $gallium_drivers"
-    echo "        Gallium st:      $gallium_st"
-else
-    echo "        Gallium:         no"
-fi
-
-echo ""
-if test "x$enable_gallium_extra_hud" != xyes; then
-    echo "        HUD extra stats: no"
-else
-    echo "        HUD extra stats: yes"
-fi
-
-if test "x$enable_lmsensors" != xyes; then
-    echo "        HUD lmsensors:   no"
-else
-    echo "        HUD lmsensors:   yes"
-fi
-
-echo ""
-if test "x$HAVE_GALLIUM_SWR" != x; then
-    if test "x$HAVE_SWR_BUILTIN" = xyes; then
-        echo "        SWR archs:       $swr_archs (builtin)"
-    else
-        echo "        SWR archs:       $swr_archs"
-    fi
-fi
-
-dnl Libraries
-echo ""
-echo "        Shared libs:     $enable_shared"
-echo "        Static libs:     $enable_static"
-echo "        Shared-glapi:    $enable_shared_glapi"
-
-dnl Compiler options
-# cleanup the CFLAGS/CXXFLAGS/LDFLAGS/DEFINES vars
-cflags=`echo $CFLAGS | \
-    $SED 's/^ *//;s/  */ /;s/ *$//'`
-cxxflags=`echo $CXXFLAGS | \
-    $SED 's/^ *//;s/  */ /;s/ *$//'`
-ldflags=`echo $LDFLAGS | $SED 's/^ *//;s/  */ /;s/ *$//'`
-defines=`echo $DEFINES | $SED 's/^ *//;s/  */ /;s/ *$//'`
-echo ""
-echo "        CFLAGS:          $cflags"
-echo "        CXXFLAGS:        $cxxflags"
-echo "        CXX11_CXXFLAGS:  $CXX11_CXXFLAGS"
-echo "        LDFLAGS:         $ldflags"
-echo "        Macros:          $defines"
-echo ""
-if test "x$enable_llvm" = xyes; then
-    echo "        LLVM_CFLAGS:     $LLVM_CFLAGS"
-    echo "        LLVM_CXXFLAGS:   $LLVM_CXXFLAGS"
-    echo "        LLVM_CPPFLAGS:   $LLVM_CPPFLAGS"
-    echo "        LLVM_LDFLAGS:    $LLVM_LDFLAGS"
-    echo ""
-fi
-echo "        PYTHON:         $PYTHON"
-
-echo ""
-echo "        Run '${MAKE-make}' to build Mesa"
-echo ""
diff --git a/install-gallium-links.mk b/install-gallium-links.mk
deleted file mode 100644
index fc2f75db5e8..00000000000
--- a/install-gallium-links.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.
-
-if BUILD_SHARED
-if HAVE_COMPAT_SYMLINKS
-all-local : .install-gallium-links
-
-.install-gallium-links : $(dri_LTLIBRARIES) $(egl_LTLIBRARIES) $(lib_LTLIBRARIES)
-	$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);	\
-	link_dir=$(top_builddir)/$(LIB_DIR)/gallium;		\
-	if test x$(egl_LTLIBRARIES) != x; then			\
-		link_dir=$(top_builddir)/$(LIB_DIR)/egl;	\
-	fi;							\
-	$(MKDIR_P) $$link_dir;					\
-	file_list="$(dri_LTLIBRARIES:%.la=.libs/%.so)";		\
-	file_list="$$file_list$(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)";	\
-	file_list="$$file_list$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)";	\
-	for f in $$file_list; do 				\
-		if test -h .libs/$$f; then			\
-			cp -d $$f $$link_dir;			\
-		else						\
-			ln -f $$f $$link_dir;			\
-		fi;						\
-	done && touch $@
-endif
-
-clean-local:
-	for f in $(notdir $(dri_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)) \
-		 $(notdir $(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)) \
-		 $(notdir $(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)); do \
-		echo $$f; \
-		$(RM) $(top_builddir)/$(LIB_DIR)/gallium/$$f;   \
-	done;
-	rmdir $(top_builddir)/$(LIB_DIR)/gallium || true
-	$(RM) .install-gallium-links
-
-endif
diff --git a/install-lib-links.mk b/install-lib-links.mk
deleted file mode 100644
index 5fe9141d3bf..00000000000
--- a/install-lib-links.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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.
-
-if BUILD_SHARED
-if HAVE_COMPAT_SYMLINKS
-all-local : .install-mesa-links
-
-.install-mesa-links : $(lib_LTLIBRARIES)
-	$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);	\
-	for f in $(join $(addsuffix .libs/,$(dir $(lib_LTLIBRARIES))),$(notdir $(lib_LTLIBRARIES:%.la=%.$(LIB_EXT)*))); do \
-		if test -h .libs/$$f; then			\
-			cp -d $$f $(top_builddir)/$(LIB_DIR);	\
-		else						\
-			ln -f $$f $(top_builddir)/$(LIB_DIR);	\
-		fi;						\
-	done && touch $@
-
-clean-local:
-	for f in $(notdir $(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)); do \
-		$(RM) $(top_builddir)/$(LIB_DIR)/$$f;	\
-	done;
-	$(RM) .install-mesa-links
-
-endif
-endif
diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index 38066ddf7ca..00000000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-libtool.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-lt~obsolete.m4
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
deleted file mode 100644
index 0fdca907e8b..00000000000
--- a/m4/ax_check_compile_flag.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <[email protected]>
-#   Copyright (c) 2011 Maarten Bosmans <[email protected]>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-# Emil:
-# Toggle Werror since at some point clang started treating unknown -W
-# flags as warnings, succeeding with the build, yet issuing an annoying
-# warning.
-
-#serial 3
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1 -Werror"
-  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/m4/ax_check_gnu_make.m4 b/m4/ax_check_gnu_make.m4
deleted file mode 100644
index 938aad71f58..00000000000
--- a/m4/ax_check_gnu_make.m4
+++ /dev/null
@@ -1,78 +0,0 @@
-# ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_check_gnu_make.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_GNU_MAKE()
-#
-# DESCRIPTION
-#
-#   This macro searches for a GNU version of make. If a match is found, the
-#   makefile variable `ifGNUmake' is set to the empty string, otherwise it
-#   is set to "#". This is useful for including a special features in a
-#   Makefile, which cannot be handled by other versions of make. The
-#   variable _cv_gnu_make_command is set to the command to invoke GNU make
-#   if it exists, the empty string otherwise.
-#
-#   Here is an example of its use:
-#
-#   Makefile.in might contain:
-#
-#     # A failsafe way of putting a dependency rule into a makefile
-#     $(DEPEND):
-#             $(CC) -MM $(srcdir)/*.c > $(DEPEND)
-#
-#     @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND)))
-#     @ifGNUmake@ include $(DEPEND)
-#     @ifGNUmake@ endif
-#
-#   Then configure.in would normally contain:
-#
-#     AX_CHECK_GNU_MAKE()
-#     AC_OUTPUT(Makefile)
-#
-#   Then perhaps to cause gnu make to override any other make, we could do
-#   something like this (note that GNU make always looks for GNUmakefile
-#   first):
-#
-#     if  ! test x$_cv_gnu_make_command = x ; then
-#             mv Makefile GNUmakefile
-#             echo .DEFAULT: > Makefile ;
-#             echo \  $_cv_gnu_make_command \$@ >> Makefile;
-#     fi
-#
-#   Then, if any (well almost any) other make is called, and GNU make also
-#   exists, then the other make wraps the GNU make.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 John Darrington <[email protected]>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 7
-
-AC_DEFUN([AX_CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
-                _cv_gnu_make_command='' ;
-dnl Search all the common names for GNU make
-                for a in "$MAKE" make gmake gnumake ; do
-                        if test -z "$a" ; then continue ; fi ;
-                        if  ( sh -c "$a --version" 2> /dev/null | grep GNU  2>&1 > /dev/null ) ;  then
-                                _cv_gnu_make_command=$a ;
-                                break;
-                        fi
-                done ;
-        ) ;
-dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
-        if test  "x$_cv_gnu_make_command" != "x"  ; then
-                ifGNUmake='' ;
-        else
-                ifGNUmake='#' ;
-                AC_MSG_RESULT("Not found");
-        fi
-        AC_SUBST(ifGNUmake)
-] )
diff --git a/m4/ax_check_python_mako_module.m4 b/m4/ax_check_python_mako_module.m4
deleted file mode 100644
index d6484e722fd..00000000000
--- a/m4/ax_check_python_mako_module.m4
+++ /dev/null
@@ -1,64 +0,0 @@
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_PYTHON_MAKO_MODULE(MIN_VERSION_NUMBER)
-#
-# DESCRIPTION
-#
-#   Check whether Python mako module is installed and its version higher than
-#   minimum requested.
-#
-#   Example of its use:
-#
-#   For example, the minimum mako version would be 0.7.3. Then configure.ac
-#   would contain:
-#
-#   AX_CHECK_PYTHON_MAKO_MODULE(0.7.3)
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Intel Corporation.
-#
-#   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 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.
-
-dnl macro that checks for mako module in python
-AC_DEFUN([AX_CHECK_PYTHON_MAKO_MODULE],
-[AC_MSG_CHECKING(if module mako in python is installed)
-    echo "
-try:
-    import sys
-    import mako
-    import distutils.version
-except ImportError as err:
-    sys.exit(err)
-else:
-    ver_req = distutils.version.LooseVersion('$1')
-    ver_act = distutils.version.LooseVersion(mako.__version__)
-    sys.exit(int(ver_req > ver_act))
-    " | $PYTHON -
-
-    if test $? -ne 0 ; then
-       AC_MSG_RESULT(no)
-       AC_SUBST(acv_mako_found, 'no')
-    else
-       AC_MSG_RESULT(yes)
-       AC_SUBST(acv_mako_found, 'yes')
-    fi
-])
diff --git a/m4/ax_gcc_builtin.m4 b/m4/ax_gcc_builtin.m4
deleted file mode 100644
index b28a91b14a5..00000000000
--- a/m4/ax_gcc_builtin.m4
+++ /dev/null
@@ -1,168 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_gcc_builtin.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_GCC_BUILTIN(BUILTIN)
-#
-# DESCRIPTION
-#
-#   This macro checks if the compiler supports one of GCC's built-in
-#   functions; many other compilers also provide those same built-ins.
-#
-#   The BUILTIN parameter is the name of the built-in function.
-#
-#   If BUILTIN is supported define HAVE_<BUILTIN>. Keep in mind that since
-#   builtins usually start with two underscores they will be copied over
-#   into the HAVE_<BUILTIN> definition (e.g. HAVE___BUILTIN_EXPECT for
-#   __builtin_expect()).
-#
-#   The macro caches its result in the ax_cv_have_<BUILTIN> variable (e.g.
-#   ax_cv_have___builtin_expect).
-#
-#   The macro currently supports the following built-in functions:
-#
-#    __builtin_assume_aligned
-#    __builtin_bswap32
-#    __builtin_bswap64
-#    __builtin_choose_expr
-#    __builtin___clear_cache
-#    __builtin_clrsb
-#    __builtin_clrsbl
-#    __builtin_clrsbll
-#    __builtin_clz
-#    __builtin_clzl
-#    __builtin_clzll
-#    __builtin_complex
-#    __builtin_constant_p
-#    __builtin_ctz
-#    __builtin_ctzl
-#    __builtin_ctzll
-#    __builtin_expect
-#    __builtin_ffs
-#    __builtin_ffsl
-#    __builtin_ffsll
-#    __builtin_fpclassify
-#    __builtin_huge_val
-#    __builtin_huge_valf
-#    __builtin_huge_vall
-#    __builtin_inf
-#    __builtin_infd128
-#    __builtin_infd32
-#    __builtin_infd64
-#    __builtin_inff
-#    __builtin_infl
-#    __builtin_isinf_sign
-#    __builtin_nan
-#    __builtin_nand128
-#    __builtin_nand32
-#    __builtin_nand64
-#    __builtin_nanf
-#    __builtin_nanl
-#    __builtin_nans
-#    __builtin_nansf
-#    __builtin_nansl
-#    __builtin_object_size
-#    __builtin_parity
-#    __builtin_parityl
-#    __builtin_parityll
-#    __builtin_popcount
-#    __builtin_popcountl
-#    __builtin_popcountll
-#    __builtin_powi
-#    __builtin_powif
-#    __builtin_powil
-#    __builtin_prefetch
-#    __builtin_trap
-#    __builtin_types_compatible_p
-#    __builtin_unreachable
-#
-#   Unsuppored built-ins will be tested with an empty parameter set and the
-#   result of the check might be wrong or meaningless so use with care.
-#
-# LICENSE
-#
-#   Copyright (c) 2013 Gabriele Svelto <[email protected]>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 2
-
-AC_DEFUN([AX_GCC_BUILTIN], [
-    AS_VAR_PUSHDEF([ac_var], [ax_cv_have_$1])
-
-    AC_CACHE_CHECK([for $1], [ac_var], [
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([], [
-            m4_case([$1],
-                [__builtin_assume_aligned], [$1("", 0)],
-                [__builtin_bswap32], [$1(0)],
-                [__builtin_bswap64], [$1(0)],
-                [__builtin_choose_expr], [$1(0, 0, 0)],
-                [__builtin___clear_cache], [$1("", "")],
-                [__builtin_clrsb], [$1(0)],
-                [__builtin_clrsbl], [$1(0)],
-                [__builtin_clrsbll], [$1(0)],
-                [__builtin_clz], [$1(0)],
-                [__builtin_clzl], [$1(0)],
-                [__builtin_clzll], [$1(0)],
-                [__builtin_complex], [$1(0.0, 0.0)],
-                [__builtin_constant_p], [$1(0)],
-                [__builtin_ctz], [$1(0)],
-                [__builtin_ctzl], [$1(0)],
-                [__builtin_ctzll], [$1(0)],
-                [__builtin_expect], [$1(0, 0)],
-                [__builtin_ffs], [$1(0)],
-                [__builtin_ffsl], [$1(0)],
-                [__builtin_ffsll], [$1(0)],
-                [__builtin_fpclassify], [$1(0, 1, 2, 3, 4, 0.0)],
-                [__builtin_huge_val], [$1()],
-                [__builtin_huge_valf], [$1()],
-                [__builtin_huge_vall], [$1()],
-                [__builtin_inf], [$1()],
-                [__builtin_infd128], [$1()],
-                [__builtin_infd32], [$1()],
-                [__builtin_infd64], [$1()],
-                [__builtin_inff], [$1()],
-                [__builtin_infl], [$1()],
-                [__builtin_isinf_sign], [$1(0.0)],
-                [__builtin_nan], [$1("")],
-                [__builtin_nand128], [$1("")],
-                [__builtin_nand32], [$1("")],
-                [__builtin_nand64], [$1("")],
-                [__builtin_nanf], [$1("")],
-                [__builtin_nanl], [$1("")],
-                [__builtin_nans], [$1("")],
-                [__builtin_nansf], [$1("")],
-                [__builtin_nansl], [$1("")],
-                [__builtin_object_size], [$1("", 0)],
-                [__builtin_parity], [$1(0)],
-                [__builtin_parityl], [$1(0)],
-                [__builtin_parityll], [$1(0)],
-                [__builtin_popcount], [$1(0)],
-                [__builtin_popcountl], [$1(0)],
-                [__builtin_popcountll], [$1(0)],
-                [__builtin_powi], [$1(0, 0)],
-                [__builtin_powif], [$1(0, 0)],
-                [__builtin_powil], [$1(0, 0)],
-                [__builtin_prefetch], [$1("")],
-                [__builtin_trap], [$1()],
-                [__builtin_types_compatible_p], [$1(int, int)],
-                [__builtin_unreachable], [$1()],
-                [m4_warn([syntax], [Unsupported built-in $1, the test may fail])
-                 $1()]
-            )
-            ])],
-            [AS_VAR_SET([ac_var], [yes])],
-            [AS_VAR_SET([ac_var], [no])])
-    ])
-
-    AS_IF([test yes = AS_VAR_GET([ac_var])],
-        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$1), 1,
-            [Define to 1 if the system has the `$1' built-in function])], [])
-
-    AS_VAR_POPDEF([ac_var])
-])
diff --git a/m4/ax_gcc_func_attribute.m4 b/m4/ax_gcc_func_attribute.m4
deleted file mode 100644
index 2e67ea2926d..00000000000
--- a/m4/ax_gcc_func_attribute.m4
+++ /dev/null
@@ -1,230 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_gcc_func_attribute.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_GCC_FUNC_ATTRIBUTE(ATTRIBUTE)
-#
-# DESCRIPTION
-#
-#   This macro checks if the compiler supports one of GCC's function
-#   attributes; many other compilers also provide function attributes with
-#   the same syntax. Compiler warnings are used to detect supported
-#   attributes as unsupported ones are ignored by default so quieting
-#   warnings when using this macro will yield false positives.
-#
-#   The ATTRIBUTE parameter holds the name of the attribute to be checked.
-#
-#   If ATTRIBUTE is supported define HAVE_FUNC_ATTRIBUTE_<ATTRIBUTE>.
-#
-#   The macro caches its result in the ax_cv_have_func_attribute_<attribute>
-#   variable.
-#
-#   The macro currently supports the following function attributes:
-#
-#    alias
-#    aligned
-#    alloc_size
-#    always_inline
-#    artificial
-#    cold
-#    const
-#    constructor
-#    deprecated
-#    destructor
-#    dllexport
-#    dllimport
-#    error
-#    externally_visible
-#    flatten
-#    format
-#    format_arg
-#    gnu_inline
-#    hot
-#    ifunc
-#    leaf
-#    malloc
-#    noclone
-#    noinline
-#    nonnull
-#    noreturn
-#    nothrow
-#    optimize
-#    packed
-#    pure
-#    returns_nonnull
-#    unused
-#    used
-#    visibility
-#    warning
-#    warn_unused_result
-#    weak
-#    weakref
-#
-#   Unsuppored function attributes will be tested with a prototype returning
-#   an int and not accepting any arguments and the result of the check might
-#   be wrong or meaningless so use with care.
-#
-# LICENSE
-#
-#   Copyright (c) 2013 Gabriele Svelto <[email protected]>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 2
-
-# mattst88:
-#     Added support for returns_nonnull attribute
-
-AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [
-    AS_VAR_PUSHDEF([ac_var], [ax_cv_have_func_attribute_$1])
-
-    AC_CACHE_CHECK([for __attribute__(($1))], [ac_var], [
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([
-            m4_case([$1],
-                [alias], [
-                    int foo( void ) { return 0; }
-                    int bar( void ) __attribute__(($1("foo")));
-                ],
-                [aligned], [
-                    int foo( void ) __attribute__(($1(32)));
-                ],
-                [alloc_size], [
-                    void *foo(int a) __attribute__(($1(1)));
-                ],
-                [always_inline], [
-                    inline __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [artificial], [
-                    inline __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [cold], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [const], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [constructor], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [deprecated], [
-                    int foo( void ) __attribute__(($1("")));
-                ],
-                [destructor], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [dllexport], [
-                    __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [dllimport], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [error], [
-                    int foo( void ) __attribute__(($1("")));
-                ],
-                [externally_visible], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [flatten], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [format], [
-                    int foo(const char *p, ...) __attribute__(($1(printf, 1, 2)));
-                ],
-                [format_arg], [
-                    char *foo(const char *p) __attribute__(($1(1)));
-                ],
-                [gnu_inline], [
-                    inline __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [hot], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [ifunc], [
-                    int my_foo( void ) { return 0; }
-                    static int (*resolve_foo(void))(void) { return my_foo; }
-                    int foo( void ) __attribute__(($1("resolve_foo")));
-                ],
-                [leaf], [
-                    __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [malloc], [
-                    void *foo( void ) __attribute__(($1));
-                ],
-                [noclone], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [noinline], [
-                    __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [nonnull], [
-                    int foo(char *p) __attribute__(($1(1)));
-                ],
-                [noreturn], [
-                    void foo( void ) __attribute__(($1));
-                ],
-                [nothrow], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [optimize], [
-                    __attribute__(($1(3))) int foo( void ) { return 0; }
-                ],
-                [packed], [
-                    struct __attribute__(($1)) foo { int bar; };
-                ],
-                [pure], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [returns_nonnull], [
-                    int *foo( void ) __attribute__(($1));
-                ],
-                [unused], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [used], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [visibility], [
-                    int foo_def( void ) __attribute__(($1("default")));
-                    int foo_hid( void ) __attribute__(($1("hidden")));
-                    int foo_int( void ) __attribute__(($1("internal")));
-                    int foo_pro( void ) __attribute__(($1("protected")));
-                ],
-                [warning], [
-                    int foo( void ) __attribute__(($1("")));
-                ],
-                [warn_unused_result], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [weak], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [weakref], [
-                    static int foo( void ) { return 0; }
-                    static int bar( void ) __attribute__(($1("foo")));
-                ],
-                [
-                 m4_warn([syntax], [Unsupported attribute $1, the test may fail])
-                 int foo( void ) __attribute__(($1));
-                ]
-            )], [])
-            ],
-            dnl GCC doesn't exit with an error if an unknown attribute is
-            dnl provided but only outputs a warning, so accept the attribute
-            dnl only if no warning were issued.
-            [AS_IF([test -s conftest.err],
-                [AS_VAR_SET([ac_var], [no])],
-                [AS_VAR_SET([ac_var], [yes])])],
-            [AS_VAR_SET([ac_var], [no])])
-    ])
-
-    AS_IF([test yes = AS_VAR_GET([ac_var])],
-        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FUNC_ATTRIBUTE_$1), 1,
-            [Define to 1 if the system has the `$1' function attribute])], [])
-
-    AS_VAR_POPDEF([ac_var])
-])
diff --git a/m4/ax_prog_bison.m4 b/m4/ax_prog_bison.m4
deleted file mode 100644
index dae4470ea45..00000000000
--- a/m4/ax_prog_bison.m4
+++ /dev/null
@@ -1,71 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_prog_bison.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_BISON(ACTION-IF-TRUE,ACTION-IF-FALSE)
-#
-# DESCRIPTION
-#
-#   Check whether bison is the parser generator. Run ACTION-IF-TRUE if
-#   successful, ACTION-IF-FALSE otherwise
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Francesco Salvestrini <[email protected]>
-#   Copyright (c) 2010 Diego Elio Petteno` <[email protected]>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 9
-
-# mattst88:
-#     Modified YACC assignment to remove -o y.tab.c since we're writing
-#     our own .y/.yy rules.
-#
-#     Replaced m4_ifnblank(...) with m4_ifval(m4_normalize(...), ...)
-#     since m4_ifnblank requires autoconf-2.64.
-
-AC_DEFUN([AX_PROG_BISON], [
-  AC_REQUIRE([AC_PROG_YACC])
-  AC_REQUIRE([AC_PROG_EGREP])
-
-  AC_CACHE_CHECK([if bison is the parser generator],[ax_cv_prog_bison],[
-    AS_IF([$YACC --version 2>/dev/null | $EGREP -q '^bison '],
-      [ax_cv_prog_bison=yes], [ax_cv_prog_bison=no])
-  ])
-  AS_IF([test "$ax_cv_prog_bison" = "yes"], [
-      dnl replace the yacc-compatible compiler with the real bison, as
-      dnl otherwise autoconf limits us to the POSIX yacc.
-      dnl We also change the generated filename to the old one, so that
-      dnl automake's ylwrap can deal with it.
-      YACC="${YACC% -y}"
-    ] m4_ifval(m4_normalize([$1]), [[$1]]),
-    m4_ifval(m4_normalize([$2]), [[$2]])
-  )
-])
diff --git a/m4/ax_prog_flex.m4 b/m4/ax_prog_flex.m4
deleted file mode 100644
index 1f1f5977613..00000000000
--- a/m4/ax_prog_flex.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_prog_flex.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_FLEX(ACTION-IF-TRUE,ACTION-IF-FALSE)
-#
-# DESCRIPTION
-#
-#   Check whether flex is the scanner generator. Run ACTION-IF-TRUE if
-#   successful, ACTION-IF-FALSE otherwise
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Francesco Salvestrini <[email protected]>
-#   Copyright (c) 2010 Diego Elio Petteno` <[email protected]>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 12
-
-# mattst88:
-#     Replaced m4_ifnblank(...) with m4_ifval(m4_normalize(...), ...)
-#     since m4_ifnblank requires autoconf-2.64.
-
-AC_DEFUN([AX_PROG_FLEX], [
-  AC_REQUIRE([AM_PROG_LEX])
-  AC_REQUIRE([AC_PROG_EGREP])
-
-  AC_CACHE_CHECK([if flex is the lexer generator],[ax_cv_prog_flex],[
-    AS_IF([$LEX --version 2>/dev/null | $EGREP -qw '^g?flex'],
-      [ax_cv_prog_flex=yes], [ax_cv_prog_flex=no])
-  ])
-  AS_IF([test "$ax_cv_prog_flex" = "yes"],
-    m4_ifval(m4_normalize([$1]), [[$1]]),
-    m4_ifval(m4_normalize([$2]), [[$2]])
-  )
-])
diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
deleted file mode 100644
index d90de34d14b..00000000000
--- a/m4/ax_pthread.m4
+++ /dev/null
@@ -1,309 +0,0 @@
-# ===========================================================================
-#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro figures out how to build C programs using POSIX threads. It
-#   sets the PTHREAD_LIBS output variable to the threads library and linker
-#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-#   flags that are needed. (The user can also force certain compiler
-#   flags/libs to be tested by setting these environment variables.)
-#
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise). (This
-#   is necessary on AIX to use the special cc_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also link it with them as well. e.g. you should link with
-#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-#   If you are only building threads programs, you may wish to use these
-#   variables in your default LIBS, CFLAGS, and CC:
-#
-#     LIBS="$PTHREAD_LIBS $LIBS"
-#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#     CC="$PTHREAD_CC"
-#
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-#   PTHREAD_CFLAGS.
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-#   is not found. If ACTION-IF-FOUND is not specified, the default action
-#   will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or if
-#   you have any other suggestions or comments. This macro was based on work
-#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-#   grateful for the helpful feedback of numerous users.
-#
-#   Updated for Autoconf 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <[email protected]>
-#   Copyright (c) 2011 Daniel Richard G. <[email protected]>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 18
-
-AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-AC_DEFUN([AX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_PUSH([C])
-ax_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-        AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
-        AC_MSG_RESULT($ax_pthread_ok)
-        if test x"$ax_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case ${host_os} in
-        solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
-
-        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-        ;;
-
-        darwin*)
-        ax_pthread_flags="-pthread $ax_pthread_flags"
-        ;;
-esac
-
-if test x"$ax_pthread_ok" = xno; then
-for flag in $ax_pthread_flags; do
-
-        case $flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $flag])
-                PTHREAD_CFLAGS="$flag"
-                ;;
-
-                pthread-config)
-                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
-                if test x"$ax_pthread_config" = xno; then continue; fi
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$flag])
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CFLAGS="$CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-                        static void routine(void *a) { a = 0; }
-                        static void *start_routine(void *a) { return a; }],
-                       [pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */])],
-                [ax_pthread_ok=yes],
-                [])
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        AC_MSG_RESULT($ax_pthread_ok)
-        if test "x$ax_pthread_ok" = xyes; then
-                break;
-        fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$ax_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_MSG_CHECKING([for joinable pthread attribute])
-        attr_name=unknown
-        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-                           [int attr = $attr; return attr /* ; */])],
-                [attr_name=$attr; break],
-                [])
-        done
-        AC_MSG_RESULT($attr_name)
-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
-                               [Define to necessary symbol if this constant
-                                uses a non-standard name on your system.])
-        fi
-
-        AC_MSG_CHECKING([if more special flags are required for pthreads])
-        flag=no
-        case ${host_os} in
-            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
-            osf* | hpux*) flag="-D_REENTRANT";;
-            solaris*)
-            if test "$GCC" = "yes"; then
-                flag="-D_REENTRANT"
-            else
-                flag="-mt -D_REENTRANT"
-            fi
-            ;;
-        esac
-        AC_MSG_RESULT(${flag})
-        if test "x$flag" != xno; then
-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-        fi
-
-        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-            ax_cv_PTHREAD_PRIO_INHERIT, [
-                AC_LINK_IFELSE([
-                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
-                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
-            AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        # More AIX lossage: must compile with xlc_r or cc_r
-        if test x"$GCC" != xyes; then
-          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
-        else
-          PTHREAD_CC=$CC
-        fi
-else
-        PTHREAD_CC="$CC"
-fi
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_CC)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$ax_pthread_ok" = xyes; then
-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
-        :
-else
-        ax_pthread_ok=no
-        $2
-fi
-AC_LANG_POP
-])dnl AX_PTHREAD
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 1eda3e581ae..00000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright © 2013 Intel Corporation
-#
-# 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.
-
-.PHONY: git_sha1.h
-git_sha1.h:
-	@echo "updating $@"
-	@$(PYTHON) $(top_srcdir)/bin/git_sha1_gen.py --output $@
-
-BUILT_SOURCES = git_sha1.h
-CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = meson.build
-
-SUBDIRS = . gtest util mapi/glapi/gen mapi
-
-if HAVE_OPENGL
-gldir = $(includedir)/GL
-gl_HEADERS = \
-  $(top_srcdir)/include/GL/gl.h \
-  $(top_srcdir)/include/GL/glext.h \
-  $(top_srcdir)/include/GL/glcorearb.h \
-  $(top_srcdir)/include/GL/gl_mangle.h
-endif
-
-# TODO: When building with glvnd, glvnd itself should be providing gl.pc and the headers
-if HAVE_GLX
-glxdir = $(includedir)/GL
-glx_HEADERS = \
-  $(top_srcdir)/include/GL/glx.h \
-  $(top_srcdir)/include/GL/glxext.h \
-  $(top_srcdir)/include/GL/glx_mangle.h
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = mesa/gl.pc
-endif
-
-if HAVE_COMMON_OSMESA
-osmesadir = $(includedir)/GL
-osmesa_HEADERS = $(top_srcdir)/include/GL/osmesa.h
-endif
-
-# include only conditionally ?
-SUBDIRS += compiler
-
-## Optionally required by EGL
-if HAVE_PLATFORM_WAYLAND
-SUBDIRS += egl/wayland/wayland-drm
-endif
-
-if HAVE_VULKAN_COMMON
-SUBDIRS += vulkan
-endif
-
-EXTRA_DIST += vulkan/registry/vk.xml
-
-if HAVE_AMD_DRIVERS
-SUBDIRS += amd
-endif
-
-if HAVE_INTEL_DRIVERS
-SUBDIRS += intel
-endif
-
-if HAVE_BROADCOM_DRIVERS
-SUBDIRS += broadcom
-endif
-
-if HAVE_FREEDRENO_DRIVERS
-SUBDIRS += freedreno
-endif
-
-if NEED_OPENGL_COMMON
-SUBDIRS += mesa
-endif
-
-SUBDIRS += loader
-
-if HAVE_DRI_GLX
-SUBDIRS += glx
-endif
-
-## Optionally required by EGL (aka PLATFORM_GBM)
-if HAVE_GBM
-SUBDIRS += gbm
-endif
-
-if HAVE_EGL
-SUBDIRS += egl
-endif
-
-# Requires wayland-drm
-if HAVE_RADEON_VULKAN
-SUBDIRS += amd/vulkan
-endif
-
-if HAVE_GALLIUM
-SUBDIRS += gallium
-endif
-
-EXTRA_DIST += \
-	getopt hgl SConscript \
-	$(top_srcdir)/include/GL/mesa_glinterop.h
-
-AM_CFLAGS = $(VISIBILITY_CFLAGS)
-AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include/ \
-	-I$(top_srcdir)/src/mapi/ \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	$(DEFINES)
-
-noinst_LTLIBRARIES = libglsl_util.la
-
-libglsl_util_la_SOURCES = \
-	mesa/main/extensions_table.c \
-	mesa/main/imports.c \
-	mesa/program/prog_parameter.c \
-	mesa/program/symbol_table.c \
-	mesa/program/dummy_errors.c
-
-EXTRA_DIST += \
-	tools/imgui/imconfig.h \
-	tools/imgui/imgui.cpp \
-	tools/imgui/imgui.h \
-	tools/imgui/imgui_draw.cpp \
-	tools/imgui/imgui_demo.cpp \
-	tools/imgui/imgui_internal.h \
-	tools/imgui/imgui_memory_editor.h \
-	tools/imgui/stb_rect_pack.h \
-	tools/imgui/stb_textedit.h \
-	tools/imgui/stb_truetype.h \
-	tools/imgui/README \
-	tools/imgui/LICENSE.txt \
-	tools/imgui/meson.build
diff --git a/src/amd/Makefile.addrlib.am b/src/amd/Makefile.addrlib.am
deleted file mode 100644
index 6de0e487f69..00000000000
--- a/src/amd/Makefile.addrlib.am
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2016 Red Hat Inc.
-#
-# 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.
-
-ADDRLIB_LIBS = addrlib/libamdgpu_addrlib.la
-
-addrlib_libamdgpu_addrlib_la_CPPFLAGS = \
-	$(DEFINES) \
-	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/include \
-	-I$(srcdir)/common \
-	-I$(srcdir)/addrlib/inc \
-	-I$(srcdir)/addrlib/src \
-	-I$(srcdir)/addrlib/src/core \
-	-I$(srcdir)/addrlib/src/chip/gfx9 \
-	-I$(srcdir)/addrlib/src/chip/r800
-
-addrlib_libamdgpu_addrlib_la_CXXFLAGS = \
-	$(VISIBILITY_CXXFLAGS) $(CXX11_CXXFLAGS)
-
-noinst_LTLIBRARIES += $(ADDRLIB_LIBS)
-
-addrlib_libamdgpu_addrlib_la_SOURCES = $(ADDRLIB_FILES)
diff --git a/src/amd/Makefile.am b/src/amd/Makefile.am
deleted file mode 100644
index 39cf0741ad9..00000000000
--- a/src/amd/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2016 Red Hat.
-#
-# 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
-
-noinst_LTLIBRARIES =
-
-include Makefile.addrlib.am
-include Makefile.common.am
-
-EXTRA_DIST = \
-     $(COMMON_HEADER_FILES) \
-     common/sid_tables.py \
-     meson.build \
-     addrlib/meson.build \
-     common/meson.build \
-     vulkan/meson.build
diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
deleted file mode 100644
index 453d23c3ac9..00000000000
--- a/src/amd/Makefile.common.am
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright © 2016 Bas Nieuwenhuizen
-#
-# 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.
-
-if HAVE_GALLIUM_LLVM
-
-COMMON_LIBS = common/libamd_common.la
-
-# TODO cleanup these
-common_libamd_common_la_CPPFLAGS = \
-	$(AMDGPU_CFLAGS) \
-	$(VALGRIND_CFLAGS) \
-	$(DEFINES) \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src/amd/common \
-	-I$(top_srcdir)/src/amd/common \
-	-I$(top_builddir)/src/compiler \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/include
-
-common_libamd_common_la_CFLAGS = \
-	$(VISIBILITY_CFLAGS) \
-	$(PTHREAD_CFLAGS) \
-	$(LLVM_CFLAGS) \
-	$(LIBELF_CFLAGS)
-
-common_libamd_common_la_CXXFLAGS = \
-	$(VISIBILITY_CXXFLAGS) \
-	$(LLVM_CXXFLAGS)
-
-noinst_LTLIBRARIES += $(COMMON_LIBS)
-
-common_libamd_common_la_SOURCES = \
-	$(AMD_COMMON_FILES) \
-	$(AMD_COMPILER_FILES) \
-	$(AMD_DEBUG_FILES) \
-	$(AMD_GENERATED_FILES) \
-	$(AMD_NIR_FILES)
-endif
-
-common_libamd_common_la_LIBADD = $(LIBELF_LIBS)
-
-common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h
-	$(AM_V_at)$(MKDIR_P) $(@D)
-	$(AM_V_GEN) $(PYTHON) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@
-
-BUILT_SOURCES = $(AMD_GENERATED_FILES)
diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
deleted file mode 100644
index 2522171dacf..00000000000
--- a/src/amd/vulkan/Makefile.am
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright © 2016 Red Hat
-#
-# 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
-
-noinst_HEADERS = \
-	$(top_srcdir)/include/vulkan/vk_platform.h \
-	$(top_srcdir)/include/vulkan/vulkan_core.h \
-	$(top_srcdir)/include/vulkan/vulkan_wayland.h \
-	$(top_srcdir)/include/vulkan/vulkan_xcb.h \
-	$(top_srcdir)/include/vulkan/vulkan_xlib.h \
-	$(top_srcdir)/include/vulkan/vulkan.h
-
-lib_LTLIBRARIES = libvulkan_radeon.la
-
-# The gallium includes are for the util/u_math.h include from main/macros.h
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/vulkan/wsi \
-	-I$(top_builddir)/src/vulkan/util \
-	-I$(top_srcdir)/src/vulkan/util \
-	-I$(top_srcdir)/src/amd \
-	-I$(top_srcdir)/src/amd/common \
-	-I$(top_builddir)/src/compiler \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/include \
-	$(AMDGPU_CFLAGS) \
-	$(VALGRIND_CFLAGS) \
-	$(DEFINES)
-
-AM_CFLAGS = \
-	$(VISIBILITY_CFLAGS) \
-	$(PTHREAD_CFLAGS) \
-	$(LLVM_CFLAGS)
-
-AM_CXXFLAGS = \
-	$(VISIBILITY_CXXFLAGS) \
-	$(LLVM_CXXFLAGS)
-
-VULKAN_SOURCES = \
-	$(VULKAN_GENERATED_FILES) \
-	$(VULKAN_FILES)
-
-VULKAN_LIB_DEPS = \
-	libvulkan_common.la \
-	$(top_builddir)/src/vulkan/libvulkan_util.la \
-	$(top_builddir)/src/vulkan/libvulkan_wsi.la \
-	$(top_builddir)/src/amd/common/libamd_common.la \
-	$(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la \
-	$(top_builddir)/src/compiler/nir/libnir.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(LLVM_LIBS) \
-	$(LIBELF_LIBS) \
-	$(PTHREAD_LIBS) \
-	$(AMDGPU_LIBS) \
-	$(LIBDRM_LIBS) \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS) \
-	-lm
-
-if HAVE_PLATFORM_DRM
-AM_CPPFLAGS += \
-	-DVK_USE_PLATFORM_DISPLAY_KHR
-
-VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES)
-endif
-
-if HAVE_XLIB_LEASE
-AM_CPPFLAGS += \
-	-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
-	$(XCB_RANDR_CFLAGS) \
-	$(XLIB_RANDR_CFLAGS)
-
-VULKAN_LIB_DEPS += $(XCB_RANDR_LIBS)
-endif
-
-if HAVE_PLATFORM_X11
-AM_CPPFLAGS += \
-	$(XCB_DRI3_CFLAGS) \
-	-DVK_USE_PLATFORM_XCB_KHR \
-	-DVK_USE_PLATFORM_XLIB_KHR
-
-VULKAN_SOURCES += $(VULKAN_WSI_X11_FILES)
-
-VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS)
-endif
-
-
-if HAVE_PLATFORM_WAYLAND
-AM_CPPFLAGS += \
-	$(WAYLAND_CLIENT_CFLAGS) \
-	-DVK_USE_PLATFORM_WAYLAND_KHR
-
-VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)
-
-VULKAN_LIB_DEPS += \
-	$(WAYLAND_CLIENT_LIBS)
-endif
-
-if HAVE_PLATFORM_ANDROID
-AM_CPPFLAGS += $(ANDROID_CPPFLAGS) -DVK_USE_PLATFORM_ANDROID_KHR
-AM_CFLAGS += $(ANDROID_CFLAGS)
-VULKAN_LIB_DEPS += $(ANDROID_LIBS)
-VULKAN_SOURCES += $(VULKAN_ANDROID_FILES)
-endif
-
-noinst_LTLIBRARIES = libvulkan_common.la
-libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
-
-nodist_EXTRA_libvulkan_radeon_la_SOURCES = dummy.cpp
-libvulkan_radeon_la_SOURCES = $(VULKAN_GEM_FILES)
-
-vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
-
-radv_entrypoints.c: radv_entrypoints_gen.py radv_extensions.py $(vulkan_api_xml)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/radv_entrypoints_gen.py \
-		--xml $(vulkan_api_xml) \
-		--outdir $(builddir)
-radv_entrypoints.h: radv_entrypoints.c
-
-radv_extensions.c: radv_extensions.py \
-		 $(vulkan_api_xml)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/radv_extensions.py \
-		--xml $(vulkan_api_xml) \
-		--out-c radv_extensions.c \
-		--out-h radv_extensions.h
-radv_extensions.h: radv_extensions.c
-
-vk_format_table.c: vk_format_table.py \
-		   vk_format_parse.py \
-                   vk_format_layout.csv
-	$(PYTHON) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@
-
-BUILT_SOURCES = $(VULKAN_GENERATED_FILES)
-CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd.@[email protected]
-EXTRA_DIST = \
-	$(top_srcdir)/include/vulkan/vk_icd.h \
-	radv_entrypoints_gen.py \
-	radv_extensions.py \
-	radv_icd.py \
-	vk_format_layout.csv \
-	vk_format_parse.py \
-	vk_format_table.py \
-	meson.build
-
-libvulkan_radeon_la_LIBADD = $(VULKAN_LIB_DEPS)
-
-libvulkan_radeon_la_LDFLAGS = \
-	-shared \
-	-module \
-	-no-undefined \
-	-avoid-version \
-	$(BSYMBOLIC) \
-	$(LLVM_LDFLAGS) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-
-icdconfdir = @VULKAN_ICD_INSTALL_DIR@
-icdconf_DATA = radeon_icd.@[email protected]
-# The following is used for development purposes, by setting VK_ICD_FILENAMES.
-noinst_DATA = dev_icd.json
-
-dev_icd.json : radv_extensions.py radv_icd.py
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \
-		--lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
-
-radeon_icd.@[email protected] : radv_extensions.py radv_icd.py
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \
-		--lib-path="${libdir}" --out $@
-
-include $(top_srcdir)/install-lib-links.mk
diff --git a/src/broadcom/Makefile.am b/src/broadcom/Makefile.am
deleted file mode 100644
index 061afe67bfe..00000000000
--- a/src/broadcom/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright © 2016 Broadcom
-# Copyright © 2016 Intel Corporation
-#
-# 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.
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler/nir \
-	-I$(top_srcdir)/src/broadcom/ \
-	-I$(top_srcdir)/src/broadcom/cle \
-	-I$(top_srcdir)/src/broadcom/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/include \
-	$(VALGRIND_CFLAGS) \
-	$(DEFINES)
-
-AM_CFLAGS = \
-	$(EXPAT_CFLAGS)
-
-include Makefile.sources
-
-lib_LTLIBRARIES =
-check_LTLIBRARIES =
-noinst_DATA =
-noinst_HEADERS =
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-check_PROGRAMS =
-TESTS =
-BUILT_SOURCES =
-CLEANFILES =
-EXTRA_DIST = \
-	$(BROADCOM_FILES) \
-	meson.build \
-	cle/meson.build \
-	compiler/meson.build \
-	qpu/meson.build
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-include Makefile.genxml.am
-include Makefile.cle.am
-include Makefile.v3d.am
-
-CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/broadcom/Makefile.cle.am b/src/broadcom/Makefile.cle.am
deleted file mode 100644
index 1c262d03966..00000000000
--- a/src/broadcom/Makefile.cle.am
+++ /dev/null
@@ -1,6 +0,0 @@
-noinst_LTLIBRARIES += cle/libbroadcom_cle.la
-
-cle_libbroadcom_cle_la_CFLAGS = \
-	-I$(top_builddir)/src/broadcom/cle	\
-	$(AM_CFLAGS)
-cle_libbroadcom_cle_la_SOURCES = $(BROADCOM_DECODER_FILES)
diff --git a/src/broadcom/Makefile.genxml.am b/src/broadcom/Makefile.genxml.am
deleted file mode 100644
index 8828207d2aa..00000000000
--- a/src/broadcom/Makefile.genxml.am
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright © 2016 Intel Corporation
-#
-# 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.
-
-BUILT_SOURCES += $(BROADCOM_GENXML_GENERATED_FILES)
-
-EXTRA_DIST += $(BROADCOM_GENXML_XML_FILES)
-EXTRA_DIST += $(BROADCOM_GENXML_GENERATED_FILES)
-
-SUFFIXES = _pack.h .xml
-
-$(BROADCOM_GENXML_GENERATED_FILES): cle/gen_pack_header.py
-
-cle/v3d_packet_v21_pack.h: $(srcdir)/cle/v3d_packet_v21.xml $(srcdir)/cle/gen_pack_header.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 21 > $@ || ($(RM) $@; false)
-
-cle/v3d_packet_v33_pack.h: $(srcdir)/cle/v3d_packet_v33.xml $(srcdir)/cle/gen_pack_header.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 33 > $@ || ($(RM) $@; false)
-
-cle/v3d_packet_v41_pack.h: $(srcdir)/cle/v3d_packet_v33.xml $(srcdir)/cle/gen_pack_header.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 41 > $@ || ($(RM) $@; false)
-
-cle/v3d_packet_v42_pack.h: $(srcdir)/cle/v3d_packet_v33.xml $(srcdir)/cle/gen_pack_header.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 42 > $@ || ($(RM) $@; false)
-
-GEN_ZIPPED = $(srcdir)/../intel/genxml/gen_zipped_file.py
-cle/v3d_xml.h: $(GEN_ZIPPED) $(BROADCOM_GENXML_XML_FILES)
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(GEN_ZIPPED) $(BROADCOM_GENXML_XML_FILES:%=$(srcdir)/%) > $@ || ($(RM) $@; false)
-
-EXTRA_DIST += \
-	cle/gen_pack_header.py \
-	$()
diff --git a/src/broadcom/Makefile.v3d.am b/src/broadcom/Makefile.v3d.am
deleted file mode 100644
index 97ef2d7455e..00000000000
--- a/src/broadcom/Makefile.v3d.am
+++ /dev/null
@@ -1,32 +0,0 @@
-noinst_LTLIBRARIES += libbroadcom.la
-noinst_LTLIBRARIES += libbroadcom_v33.la
-noinst_LTLIBRARIES += libbroadcom_v41.la
-noinst_LTLIBRARIES += libbroadcom_v42.la
-
-if USE_V3D_SIMULATOR
-AM_CFLAGS += $(V3D_SIMULATOR_CFLAGS)
-libbroadcom_la_LDFLAGS = $(V3D_SIMULATOR_LIBS)
-endif
-
-libbroadcom_v33_la_SOURCES = $(BROADCOM_PER_VERSION_SOURCES)
-libbroadcom_v33_la_CFLAGS = -DV3D_VERSION=33
-
-libbroadcom_v41_la_SOURCES = $(BROADCOM_PER_VERSION_SOURCES)
-libbroadcom_v41_la_CFLAGS = -DV3D_VERSION=41
-
-libbroadcom_v42_la_SOURCES = $(BROADCOM_PER_VERSION_SOURCES)
-libbroadcom_v42_la_CFLAGS = -DV3D_VERSION=42
-
-libbroadcom_la_SOURCES = $(BROADCOM_FILES)
-
-check_PROGRAMS += \
-	qpu/tests/qpu_disasm \
-	$(NULL)
-
-LDADD = \
-	libbroadcom.la \
-	$(top_builddir)/src/compiler/nir/libnir.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(NULL)
-
-TESTS += $(check_PROGRAMS)
diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
deleted file mode 100644
index 05cdb1446c0..00000000000
--- a/src/compiler/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright © 2012 Jon TURNEY
-# Copyright (C) 2015 Intel Corporation
-#
-# 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
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_builddir)/src/compiler/glsl\
-	-I$(top_srcdir)/src/compiler/glsl\
-	-I$(top_srcdir)/src/compiler/glsl/glcpp\
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler/spirv \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gtest/include \
-	$(VALGRIND_CFLAGS) \
-	$(DEFINES)
-
-AM_CFLAGS = \
-	$(VISIBILITY_CFLAGS) \
-	$(WNO_OVERRIDE_INIT) \
-	$(MSVC2013_COMPAT_CFLAGS)
-
-AM_CXXFLAGS = \
-	$(VISIBILITY_CXXFLAGS) \
-	$(MSVC2013_COMPAT_CXXFLAGS)
-
-noinst_LTLIBRARIES = libcompiler.la
-
-libcompiler_la_SOURCES = $(LIBCOMPILER_FILES)
-
-noinst_PROGRAMS =
-check_PROGRAMS =
-TESTS =
-BUILT_SOURCES =
-CLEANFILES =
-EXTRA_DIST = \
-	SConscript \
-	glsl/glcpp/meson.build \
-	glsl/tests/meson.build \
-	glsl/meson.build \
-	nir/meson.build \
-	spirv/meson.build \
-	meson.build
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-include Makefile.spirv.am
-
-include Makefile.glsl.am
-
-include Makefile.nir.am
diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
deleted file mode 100644
index 007af4769af..00000000000
--- a/src/compiler/Makefile.glsl.am
+++ /dev/null
@@ -1,272 +0,0 @@
-#
-# Copyright © 2012 Jon TURNEY
-# Copyright (C) 2015 Intel Corporation
-#
-# 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.
-
-EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README	\
-	glsl/TODO glsl/glcpp/README			\
-	glsl/glsl_lexer.ll				\
-	glsl/glsl_parser.yy				\
-	glsl/ir_expression_operation.py			\
-	glsl/glcpp/glcpp-lex.l				\
-	glsl/glcpp/glcpp-parse.y			\
-	glsl/xxd.py					\
-	glsl/float64.glsl                               \
-	SConscript.glsl
-
-TESTS += glsl/glcpp/tests/glcpp-test.sh			\
-	glsl/tests/blob-test				\
-	glsl/tests/cache-test				\
-	glsl/tests/general-ir-test			\
-	glsl/tests/optimization-test.sh			\
-	glsl/tests/sampler-types-test			\
-	glsl/tests/uniform-initializer-test             \
-	glsl/tests/warnings-test.sh
-
-TESTS_ENVIRONMENT= \
-	export abs_builddir=$(abs_builddir); \
-	export PYTHON=$(PYTHON); \
-	export PYTHON_FLAGS=$(PYTHON_FLAGS);
-
-check_PROGRAMS +=					\
-	glsl/glcpp/glcpp				\
-	glsl/glsl_test					\
-	glsl/tests/blob-test				\
-	glsl/tests/cache-test				\
-	glsl/tests/general-ir-test			\
-	glsl/tests/sampler-types-test			\
-	glsl/tests/uniform-initializer-test
-
-noinst_PROGRAMS += glsl_compiler
-
-glsl_tests_blob_test_SOURCES =				\
-	glsl/tests/blob_test.c
-glsl_tests_blob_test_LDADD =				\
-	glsl/libglsl.la
-
-glsl_tests_cache_test_SOURCES =				\
-	glsl/tests/cache_test.c
-glsl_tests_cache_test_CFLAGS =				\
-	$(PTHREAD_CFLAGS)
-glsl_tests_cache_test_LDADD =				\
-	glsl/libglsl.la					\
-	$(PTHREAD_LIBS)					\
-	$(CLOCK_LIB)
-
-glsl_tests_general_ir_test_SOURCES =			\
-	glsl/tests/array_refcount_test.cpp 		\
-	glsl/tests/builtin_variable_test.cpp		\
-	glsl/tests/invalidate_locations_test.cpp	\
-	glsl/tests/general_ir_test.cpp			\
-	glsl/tests/lower_int64_test.cpp			\
-	glsl/tests/opt_add_neg_to_sub_test.cpp		\
-	glsl/tests/varyings_test.cpp
-glsl_tests_general_ir_test_CFLAGS =			\
-	$(PTHREAD_CFLAGS)
-glsl_tests_general_ir_test_LDADD =			\
-	$(top_builddir)/src/gtest/libgtest.la		\
-	glsl/libglsl.la		\
-	glsl/libstandalone.la				\
-	$(top_builddir)/src/libglsl_util.la		\
-	$(PTHREAD_LIBS)					\
-	$(CLOCK_LIB)
-
-glsl_tests_uniform_initializer_test_SOURCES =		\
-	glsl/tests/copy_constant_to_storage_tests.cpp	\
-	glsl/tests/set_uniform_initializer_tests.cpp	\
-	glsl/tests/uniform_initializer_utils.cpp	\
-	glsl/tests/uniform_initializer_utils.h
-glsl_tests_uniform_initializer_test_CFLAGS =		\
-	$(PTHREAD_CFLAGS)
-glsl_tests_uniform_initializer_test_LDADD =		\
-	$(top_builddir)/src/gtest/libgtest.la		\
-	glsl/libglsl.la		\
-	$(top_builddir)/src/libglsl_util.la		\
-	$(PTHREAD_LIBS)
-
-glsl_tests_sampler_types_test_SOURCES =			\
-	glsl/tests/sampler_types_test.cpp
-glsl_tests_sampler_types_test_CFLAGS =			\
-	$(PTHREAD_CFLAGS)
-glsl_tests_sampler_types_test_LDADD =			\
-	$(top_builddir)/src/gtest/libgtest.la		\
-	glsl/libglsl.la					\
-	$(top_builddir)/src/libglsl_util.la		\
-	$(PTHREAD_LIBS)
-
-noinst_LTLIBRARIES += glsl/libglsl.la glsl/libglcpp.la glsl/libstandalone.la
-
-glsl_libglcpp_la_LIBADD =				\
-	$(top_builddir)/src/util/libmesautil.la
-glsl_libglcpp_la_SOURCES =				\
-	glsl/glcpp/glcpp-lex.c				\
-	glsl/glcpp/glcpp-parse.c			\
-	glsl/glcpp/glcpp-parse.h			\
-	$(LIBGLCPP_FILES)
-
-glsl_glcpp_glcpp_SOURCES =				\
-	glsl/glcpp/glcpp.c
-glsl_glcpp_glcpp_LDADD =				\
-	glsl/libglcpp.la	\
-	$(top_builddir)/src/libglsl_util.la		\
-	-lm
-
-glsl_libglsl_la_LIBADD = \
-	nir/libnir.la \
-	glsl/libglcpp.la
-
-glsl_libglsl_la_SOURCES =				\
-	$(LIBGLSL_GENERATED_FILES)			\
-	$(LIBGLSL_FILES)				\
-	$(LIBGLSL_SHADER_CACHE_FILES)
-
-glsl_libstandalone_la_SOURCES = \
-	$(GLSL_COMPILER_CXX_FILES)
-
-glsl_libstandalone_la_LIBADD =				\
-	glsl/libglsl.la					\
-	$(top_builddir)/src/libglsl_util.la		\
-	$(top_builddir)/src/util/libmesautil.la		\
-	$(PTHREAD_LIBS)
-
-glsl_compiler_SOURCES = \
-	glsl/main.cpp
-
-glsl_compiler_LDADD = \
-	glsl/libstandalone.la \
-	$(CLOCK_LIB)
-
-glsl_glsl_test_SOURCES = \
-	glsl/test.cpp \
-	glsl/test_optpass.cpp \
-	glsl/test_optpass.h
-
-glsl_glsl_test_LDADD =					\
-	glsl/libglsl.la					\
-	glsl/libstandalone.la				\
-	$(top_builddir)/src/libglsl_util.la		\
-	$(PTHREAD_LIBS)					\
-	$(CLOCK_LIB)
-
-# We write our own rules for yacc and lex below. We'd rather use automake,
-# but automake makes it especially difficult for a number of reasons:
-#
-#  * < automake-1.12 generates .h files from .yy and .ypp files, but
-#    >=automake-1.12 generates .hh and .hpp files respectively. There's no
-#    good way of making a project that uses C++ yacc files compatible with
-#    both versions of automake. Strong work automake developers.
-#
-#  * Since we're generating code from .l/.y files in a subdirectory (glcpp/)
-#    we'd like the resulting generated code to also go in glcpp/ for purposes
-#    of distribution. Automake gives no way to do this.
-#
-#  * Since we're building multiple yacc parsers into one library (and via one
-#    Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes
-#    automake to name the resulting generated code as <library-name>_filename.c.
-#    Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file.
-
-# In order to make build output print "LEX" and "YACC", we reproduce the
-# automake variables below.
-
-AM_V_LEX = $(am__v_LEX_$(V))
-am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY))
-am__v_LEX_0 = @echo "  LEX     " $@;
-am__v_LEX_1 =
-
-AM_V_YACC = $(am__v_YACC_$(V))
-am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
-am__v_YACC_0 = @echo "  YACC    " $@;
-am__v_YACC_1 =
-
-YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
-LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
-
-glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy
-	$(MKDIR_GEN)
-	$(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl/glsl_parser.h $(srcdir)/glsl/glsl_parser.yy
-
-glsl/glsl_lexer.cpp: glsl/glsl_lexer.ll
-	$(MKDIR_GEN)
-	$(LEX_GEN) -o $@ $(srcdir)/glsl/glsl_lexer.ll
-
-glsl/glcpp/glcpp-parse.c glsl/glcpp/glcpp-parse.h: glsl/glcpp/glcpp-parse.y
-	$(MKDIR_GEN)
-	$(YACC_GEN) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glsl/glcpp/glcpp-parse.h $(srcdir)/glsl/glcpp/glcpp-parse.y
-
-glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l
-	$(MKDIR_GEN)
-	$(LEX_GEN) -o $@ $(srcdir)/glsl/glcpp/glcpp-lex.l
-
-glsl/ir_expression_operation.h: glsl/ir_expression_operation.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py enum > $@ || ($(RM) $@; false)
-
-glsl/ir_expression_operation_constant.h: glsl/ir_expression_operation.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py constant > $@ || ($(RM) $@; false)
-
-glsl/ir_expression_operation_strings.h: glsl/ir_expression_operation.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py strings > $@ || ($(RM) $@; false)
-
-glsl/float64_glsl.h: glsl/xxd.py glsl/float64.glsl
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/glsl/xxd.py $(srcdir)/glsl/float64.glsl $@ -n float64_source || ($(RM) $@; false)
-
-# Only the parsers (specifically the header files generated at the same time)
-# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is
-# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files
-# YACC is only executed once for each parser. The rest of the generated code
-# will be created at the appropriate times according to standard automake
-# dependency rules.
-BUILT_SOURCES +=					\
-	glsl/float64_glsl.h				\
-	glsl/glsl_parser.cpp				\
-	glsl/glsl_lexer.cpp				\
-	glsl/ir_expression_operation.h			\
-	glsl/ir_expression_operation_constant.h		\
-	glsl/ir_expression_operation_strings.h		\
-	glsl/glcpp/glcpp-parse.c			\
-	glsl/glcpp/glcpp-lex.c
-CLEANFILES +=						\
-	glsl/float64_glsl.h				\
-	glsl/glcpp/glcpp-parse.h			\
-	glsl/glsl_parser.h				\
-	glsl/glsl_parser.cpp				\
-	glsl/glsl_lexer.cpp				\
-	glsl/ir_expression_operation.h			\
-	glsl/ir_expression_operation_constant.h		\
-	glsl/ir_expression_operation_strings.h		\
-	glsl/glcpp/glcpp-parse.c			\
-	glsl/glcpp/glcpp-lex.c
-
-clean-local:
-	$(RM) glsl/tests/lower_jumps/*.opt_test
-	$(RM) glsl/tests/lower_jumps/*.expected
-	$(RM) glsl/tests/lower_jumps/*.out
-	$(RM) glsl/tests/warnings/*.out
-	$(RM) glsl/glcpp/tests/*.out
-	$(RM) -r glsl/glcpp/tests/subtest*/
-	$(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr
-
-dist-hook:
-	$(RM) glsl/glcpp/tests/*.out
-	$(RM) glsl/glcpp/tests/subtest*/*.out
diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am
deleted file mode 100644
index aa0a92856f1..00000000000
--- a/src/compiler/Makefile.nir.am
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Copyright © 2012 Jon TURNEY
-# Copyright (C) 2015 Intel Corporation
-#
-# 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.
-
-noinst_LTLIBRARIES += nir/libnir.la
-
-nir_libnir_la_LIBADD = \
-	libcompiler.la
-
-nir_libnir_la_SOURCES =					\
-	$(NIR_FILES)					\
-	$(SPIRV_FILES)					\
-	$(SPIRV_GENERATED_FILES) 			\
-	$(NIR_GENERATED_FILES)
-
-nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py nir/nir_intrinsics.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false)
-
-nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/nir/nir_constant_expressions.py > $@ || ($(RM) $@; false)
-
-nir/nir_intrinsics.h: nir/nir_intrinsics.py nir/nir_intrinsics_h.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/nir/nir_intrinsics_h.py --outdir nir || ($(RM) $@; false)
-
-nir/nir_intrinsics.c: nir/nir_intrinsics.py nir/nir_intrinsics_c.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/nir/nir_intrinsics_c.py --outdir nir || ($(RM) $@; false)
-
-nir/nir_opcodes.h: nir/nir_opcodes.py nir/nir_opcodes_h.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_h.py > $@ || ($(RM) $@; false)
-
-nir/nir_opcodes.c: nir/nir_opcodes.py nir/nir_opcodes_c.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_c.py > $@ || ($(RM) $@; false)
-
-nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false)
-
-check_PROGRAMS += \
-	nir/tests/control_flow_tests \
-	nir/tests/vars_tests
-
-NIR_TESTS_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler/nir
-NIR_TESTS_CFLAGS = \
-	$(PTHREAD_CFLAGS)
-NIR_TESTS_LDADD = \
-	$(top_builddir)/src/gtest/libgtest.la \
-	nir/libnir.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(PTHREAD_LIBS)
-
-
-nir_tests_control_flow_tests_CPPFLAGS = $(NIR_TESTS_CPPFLAGS)
-nir_tests_control_flow_tests_SOURCES = nir/tests/control_flow_tests.cpp
-nir_tests_control_flow_tests_CFLAGS = $(NIR_TESTS_CFLAGS)
-nir_tests_control_flow_tests_LDADD = $(NIR_TESTS_LDADD)
-
-nir_tests_vars_tests_CPPFLAGS = $(NIR_TESTS_CPPFLAGS)
-nir_tests_vars_tests_SOURCES = nir/tests/vars_tests.cpp
-nir_tests_vars_tests_CFLAGS = $(NIR_TESTS_CFLAGS)
-nir_tests_vars_tests_LDADD = $(NIR_TESTS_LDADD)
-
-check_SCRIPTS = nir/tests/algebraic_parser_test.sh
-
-TESTS += \
-        nir/tests/control_flow_tests \
-        nir/tests/vars_tests \
-	nir/tests/algebraic_parser_test.sh
-
-
-BUILT_SOURCES += \
-	$(NIR_GENERATED_FILES)
-
-CLEANFILES += \
-	$(NIR_GENERATED_FILES)
-
-EXTRA_DIST += \
-	nir/nir_algebraic.py				\
-	nir/nir_builder_opcodes_h.py			\
-	nir/nir_constant_expressions.py			\
-	nir/nir_intrinsics.py				\
-	nir/nir_intrinsics_c.py				\
-	nir/nir_intrinsics_h.py				\
-	nir/nir_opcodes.py				\
-	nir/nir_opcodes_c.py				\
-	nir/nir_opcodes_h.py				\
-	nir/nir_opt_algebraic.py			\
-	nir/tests \
-	nir/README \
-	SConscript.nir \
-	SConscript.spirv
diff --git a/src/compiler/Makefile.spirv.am b/src/compiler/Makefile.spirv.am
deleted file mode 100644
index 2ac97f30acf..00000000000
--- a/src/compiler/Makefile.spirv.am
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2017 Intel Corporation
-#
-# 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.
-
-spirv/spirv_info.c: spirv/spirv_info_c.py spirv/spirv.core.grammar.json
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/spirv/spirv_info_c.py $(srcdir)/spirv/spirv.core.grammar.json $@ || ($(RM) $@; false)
-
-spirv/vtn_gather_types.c: spirv/vtn_gather_types_c.py spirv/spirv.core.grammar.json
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/spirv/vtn_gather_types_c.py $(srcdir)/spirv/spirv.core.grammar.json $@ || ($(RM) $@; false)
-
-noinst_PROGRAMS += spirv2nir
-
-spirv2nir_SOURCES = \
-	spirv/spirv2nir.c
-
-spirv2nir_CPPFLAGS =					\
-	$(AM_CPPFLAGS)					\
-	-I$(top_builddir)/src/compiler/nir		\
-	-I$(top_srcdir)/src/compiler/nir		\
-	-I$(top_srcdir)/src/compiler/spirv
-
-spirv2nir_LDADD =					\
-	nir/libnir.la					\
-	$(top_builddir)/src/util/libmesautil.la		\
-	-lm						\
-	$(PTHREAD_LIBS)
-
-nodist_EXTRA_spirv2nir_SOURCES = dummy.cpp
-
-BUILT_SOURCES += \
-	$(SPIRV_GENERATED_FILES)
-
-CLEANFILES += \
-	$(SPIRV_GENERATED_FILES)
-
-EXTRA_DIST += \
-	spirv/spirv_info_c.py				\
-	spirv/spirv.core.grammar.json			\
-	spirv/vtn_gather_types_c.py
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
deleted file mode 100644
index 349779feb4e..00000000000
--- a/src/egl/Makefile.am
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-
-BUILT_SOURCES =
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/egl/main \
-	-I$(top_srcdir)/src/gbm/main \
-	-I$(top_srcdir)/src \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS) \
-	$(LIBDRM_CFLAGS) \
-	$(EGL_CFLAGS) \
-	-D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM)
-
-# Depending on whether libglvnd is enabled, we'll build the EGL library as
-# either libEGL.so.1 or libEGL_mesa.so.0. Using an automake substitution
-# in the variable names breaks "make dist" target, so use a conenience library
-# instead.
-noinst_LTLIBRARIES = libEGL_common.la
-libEGL_common_la_SOURCES = \
-	$(LIBEGL_C_FILES)
-
-libEGL_common_la_LIBADD = \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(EGL_LIB_DEPS)
-
-dri2_backend_FILES =
-dri2_backend_GENERATED_FILES =
-dri3_backend_FILES =
-
-if HAVE_PLATFORM_X11
-AM_CFLAGS += $(XCB_DRI2_CFLAGS)
-libEGL_common_la_LIBADD += $(XCB_DRI2_LIBS)
-dri2_backend_FILES += drivers/dri2/platform_x11.c
-
-if HAVE_DRI3
-dri3_backend_FILES += \
-	drivers/dri2/platform_x11_dri3.c \
-	drivers/dri2/platform_x11_dri3.h
-
-libEGL_common_la_LIBADD += $(top_builddir)/src/loader/libloader_dri3_helper.la
-endif
-endif
-
-WL_DMABUF_XML = $(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
-
-drivers/dri2/linux-dmabuf-unstable-v1-protocol.c: $(WL_DMABUF_XML)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(WAYLAND_SCANNER) $(SCANNER_ARG) $< $@
-
-drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: $(WL_DMABUF_XML)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
-
-if HAVE_PLATFORM_WAYLAND
-drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
-drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
-drivers/dri2/platform_wayland.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
-
-AM_CFLAGS += $(WAYLAND_CLIENT_CFLAGS)
-libEGL_common_la_LIBADD += $(WAYLAND_CLIENT_LIBS)
-libEGL_common_la_LIBADD += $(LIBDRM_LIBS)
-AM_CFLAGS += $(WAYLAND_EGL_CFLAGS)
-libEGL_common_la_LIBADD += $(WAYLAND_EGL_LIBS)
-AM_CFLAGS += $(WAYLAND_SERVER_CFLAGS)
-libEGL_common_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la
-libEGL_common_la_LIBADD += $(WAYLAND_SERVER_LIBS)
-dri2_backend_FILES += \
-	drivers/dri2/platform_wayland.c
-dri2_backend_GENERATED_FILES += \
-	drivers/dri2/linux-dmabuf-unstable-v1-protocol.c \
-	drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
-endif
-
-if HAVE_PLATFORM_DRM
-libEGL_common_la_LIBADD += $(top_builddir)/src/gbm/libgbm.la
-dri2_backend_FILES += drivers/dri2/platform_drm.c
-endif
-
-if HAVE_PLATFORM_SURFACELESS
-dri2_backend_FILES += drivers/dri2/platform_surfaceless.c
-endif
-
-if HAVE_PLATFORM_ANDROID
-AM_CFLAGS += $(ANDROID_CFLAGS)
-libEGL_common_la_LIBADD += $(ANDROID_LIBS)
-dri2_backend_FILES += drivers/dri2/platform_android.c
-endif
-
-AM_CFLAGS += \
-	-I$(top_srcdir)/src/loader \
-	-I$(top_builddir)/src/egl/drivers/dri2 \
-	-I$(top_srcdir)/src/egl/drivers/dri2 \
-	-I$(top_srcdir)/src/gbm/backends/dri \
-	-I$(top_builddir)/src/egl/wayland/wayland-drm \
-	-I$(top_srcdir)/src/egl/wayland/wayland-drm
-
-nodist_libEGL_common_la_SOURCES = \
-	$(dri2_backend_GENERATED_FILES)
-
-libEGL_common_la_SOURCES += \
-	$(dri2_backend_core_FILES) \
-	$(dri2_backend_FILES) \
-	$(dri3_backend_FILES)
-
-libEGL_common_la_LIBADD += \
-	$(top_builddir)/src/loader/libloader.la \
-	$(top_builddir)/src/util/libxmlconfig.la \
-	$(DLOPEN_LIBS) \
-	$(LIBDRM_LIBS) \
-	$(CLOCK_LIB)
-
-# dummy rule to keep dist happy
-$(top_scrdir)/src/mapi/new/genCommon.py:
-
-GLVND_GEN_EGL_DEPS = \
-	generate/gen_egl_dispatch.py \
-	generate/eglFunctionList.py \
-	generate/egl.xml \
-	generate/egl_other.xml
-
-GLVND_GEN_DEPS = $(top_scrdir)/src/mapi/new/genCommon.py \
-	$(GLVND_GEN_EGL_DEPS)
-
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-g_egldispatchstubs.c: $(GLVND_GEN_DEPS)
-	$(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py source \
-		$(top_srcdir)/src/egl/generate/egl.xml \
-		$(top_srcdir)/src/egl/generate/egl_other.xml > $@
-
-g_egldispatchstubs.h: $(GLVND_GEN_DEPS)
-	$(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py header \
-		$(top_srcdir)/src/egl/generate/egl.xml \
-		$(top_srcdir)/src/egl/generate/egl_other.xml > $@
-
-BUILT_SOURCES += g_egldispatchstubs.c g_egldispatchstubs.h
-
-CLEANFILES = \
-	$(BUILT_SOURCES) \
-	$(dri2_backend_GENERATED_FILES)
-
-if USE_LIBGLVND
-AM_CFLAGS += \
-	$(GLVND_CFLAGS)
-
-vendorjsondir = @LIBGLVND_DATADIR@/glvnd/egl_vendor.d
-vendorjson_DATA = main/50_mesa.json
-
-lib_LTLIBRARIES = libEGL_mesa.la
-libEGL_mesa_la_SOURCES = \
-	main/eglglvnd.c \
-	main/egldispatchstubs.h \
-	main/egldispatchstubs.c \
-	g_egldispatchstubs.c \
-	g_egldispatchstubs.h
-libEGL_mesa_la_LIBADD = \
-	libEGL_common.la \
-	$(top_builddir)/src/mapi/shared-glapi/libglapi.la
-libEGL_mesa_la_LDFLAGS = \
-	-no-undefined \
-	-version-number 0 \
-	$(BSYMBOLIC) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-else # USE_LIBGLVND
-
-lib_LTLIBRARIES = libEGL@[email protected]
-libEGL@EGL_LIB_SUFFIX@_la_SOURCES =
-libEGL@EGL_LIB_SUFFIX@_la_LIBADD = \
-	libEGL_common.la \
-	$(top_builddir)/src/mapi/shared-glapi/libglapi.la
-libEGL@EGL_LIB_SUFFIX@_la_LDFLAGS = \
-	-no-undefined \
-	-version-number 1:0 \
-	$(BSYMBOLIC) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-endif # USE_LIBGLVND
-
-include $(top_srcdir)/install-lib-links.mk
-
-# TODO: When building with glvnd, glvnd itself should be providing egl.pc and the headers
-pkgconfigdir = $(libdir)/pkgconfig
-
-pkgconfig_DATA = main/egl.pc
-
-egldir = $(includedir)/EGL
-egl_HEADERS = \
-	$(top_srcdir)/include/EGL/eglext.h \
-	$(top_srcdir)/include/EGL/egl.h \
-	$(top_srcdir)/include/EGL/eglextchromium.h \
-	$(top_srcdir)/include/EGL/eglmesaext.h \
-	$(top_srcdir)/include/EGL/eglplatform.h
-
-TESTS = egl-entrypoint-check
-
-if USE_LIBGLVND
-#TODO: glvnd symbol check
-else
-TESTS += egl-symbols-check
-endif
-
-EXTRA_DIST = \
-	$(TESTS) \
-	SConscript \
-	drivers/haiku \
-	main/egl.def \
-	main/README.txt \
-	$(GLVND_GEN_EGL_DEPS) \
-	main/50_mesa.json \
-	meson.build
diff --git a/src/egl/wayland/wayland-drm/Makefile.am b/src/egl/wayland/wayland-drm/Makefile.am
deleted file mode 100644
index 40174c6acdd..00000000000
--- a/src/egl/wayland/wayland-drm/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-AM_CFLAGS = -I$(top_srcdir)/include \
-	    $(DEFINES) \
-	    $(VISIBILITY_CFLAGS) \
-	    $(WAYLAND_SERVER_CFLAGS)
-
-if HAVE_PLATFORM_WAYLAND
-wayland-drm.lo: wayland-drm-client-protocol.h wayland-drm-server-protocol.h
-endif
-
-noinst_LTLIBRARIES = libwayland-drm.la
-
-nodist_libwayland_drm_la_SOURCES = \
-	wayland-drm-protocol.c \
-	wayland-drm-client-protocol.h \
-	wayland-drm-server-protocol.h
-
-libwayland_drm_la_SOURCES = \
-	wayland-drm.c \
-	wayland-drm.h
-
-noinst_HEADERS = wayland-drm.h
-
-EXTRA_DIST = wayland-drm.xml meson.build
-
-CLEANFILES = \
-	wayland-drm-protocol.c \
-	wayland-drm-client-protocol.h \
-	wayland-drm-server-protocol.h
-
-%-protocol.c : %.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) $(SCANNER_ARG) $< $@
-
-%-server-protocol.h : %.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header $< $@
-
-%-client-protocol.h : %.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
diff --git a/src/freedreno/Makefile.am b/src/freedreno/Makefile.am
deleted file mode 100644
index 342f03d644c..00000000000
--- a/src/freedreno/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright © 2016 Broadcom
-# Copyright © 2016 Intel Corporation
-#
-# 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.
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/freedreno/ \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/include \
-	$(DEFINES)
-
-AM_CFLAGS = \
-	$(EXPAT_CFLAGS)
-
-include Makefile.sources
-
-lib_LTLIBRARIES =
-check_LTLIBRARIES =
-noinst_DATA =
-noinst_HEADERS = $(registers_FILES)
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-check_PROGRAMS =
-TESTS =
-BUILT_SOURCES =
-CLEANFILES =
-EXTRA_DIST = \
-	meson.build \
-	drm/meson.build \
-	ir3/ir3_nir_trig.py \
-	ir3/meson.build
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-CLEANFILES += $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES += libfreedreno_drm.la
-
-libfreedreno_drm_la_SOURCES = $(drm_SOURCES)
-libfreedreno_drm_la_CFLAGS = $(VALGRIND_CFLAGS) $(LIBDRM_CFLAGS)
-
-noinst_LTLIBRARIES += libfreedreno_ir3.la
-
-libfreedreno_ir3_la_SOURCES = $(ir3_SOURCES) $(ir3_GENERATED_FILES)
-libfreedreno_ir3_la_CFLAGS = \
-	-I$(top_srcdir)/src/freedreno/ir3 \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler/nir
-
-ir3/ir3_nir_trig.c: ir3/ir3_nir_trig.py $(top_srcdir)/src/compiler/nir/nir_algebraic.py
-	$(MKDIR_GEN)
-	$(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/ir3/ir3_nir_trig.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false)
-
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
deleted file mode 100644
index 329c8839e17..00000000000
--- a/src/gallium/Automake.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-GALLIUM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	$(DEFINES)
-
-# src/gallium/auxiliary must appear before src/gallium/drivers
-# because there are stupidly two rbug_context.h files in
-# different directories, and which one is included by the
-# preprocessor is determined by the ordering of the -I flags.
-GALLIUM_DRIVER_CFLAGS = \
-	-I$(srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS)
-
-GALLIUM_DRIVER_CXXFLAGS = \
-	-I$(srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	$(DEFINES) \
-	$(VISIBILITY_CXXFLAGS)
-
-GALLIUM_TARGET_CFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/loader \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-I$(top_builddir)/src/util/ \
-	-I$(top_builddir)/src/gallium/drivers/ \
-	$(DEFINES) \
-	$(PTHREAD_CFLAGS) \
-	$(LIBDRM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-GALLIUM_COMMON_LIB_DEPS = \
-	-lm \
-	$(LIBUNWIND_LIBS) \
-	$(LIBSENSORS_LIBS) \
-	$(CLOCK_LIB) \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS)
-
-if HAVE_LIBDRM
-GALLIUM_COMMON_LIB_DEPS += \
-	$(LIBDRM_LIBS)
-endif
-
-if HAVE_PLATFORM_ANDROID
-GALLIUM_COMMON_LIB_DEPS += \
-	$(ANDROID_LIBS) \
-	$(BACKTRACE_LIBS)
-endif
-
-GALLIUM_WINSYS_CFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS)
-
-
-GALLIUM_PIPE_LOADER_WINSYS_LIBS = \
-	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
-	$(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la
-
-if HAVE_DRISW
-GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
-	$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
-endif
-
-if HAVE_DRISW_KMS
-GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
-	$(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la \
-	$(LIBDRM_LIBS)
-endif
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
deleted file mode 100644
index ff69796180f..00000000000
--- a/src/gallium/Makefile.am
+++ /dev/null
@@ -1,207 +0,0 @@
-SUBDIRS =
-
-##
-## Gallium auxiliary module
-##
-
-SUBDIRS += auxiliary
-SUBDIRS += auxiliary/pipe-loader
-
-##
-## Gallium pipe drivers and their respective winsys'
-##
-
-## freedreno/msm/kgsl
-if HAVE_GALLIUM_FREEDRENO
-SUBDIRS += drivers/freedreno winsys/freedreno/drm
-endif
-
-## i915g/i915
-if HAVE_GALLIUM_I915
-SUBDIRS += drivers/i915 winsys/i915/drm
-endif
-
-## nouveau
-if HAVE_GALLIUM_NOUVEAU
-SUBDIRS += drivers/nouveau winsys/nouveau/drm
-endif
-
-## vmwgfx/svga
-if HAVE_GALLIUM_SVGA
-SUBDIRS += drivers/svga winsys/svga/drm
-endif
-
-## r300
-if HAVE_GALLIUM_R300
-SUBDIRS += drivers/r300
-endif
-
-## r600
-if HAVE_GALLIUM_R600
-SUBDIRS += drivers/r600
-endif
-
-## radeonsi
-if HAVE_GALLIUM_RADEONSI
-SUBDIRS += drivers/radeonsi
-SUBDIRS += winsys/amdgpu/drm
-endif
-
-## the radeon winsys - linked in by r300, r600 and radeonsi
-if NEED_RADEON_DRM_WINSYS
-SUBDIRS += winsys/radeon/drm
-endif
-
-if HAVE_GALLIUM_ETNAVIV
-SUBDIRS += drivers/etnaviv winsys/etnaviv/drm
-endif
-
-if HAVE_GALLIUM_KMSRO
-SUBDIRS += drivers/kmsro winsys/kmsro/drm
-endif
-
-## swrast/softpipe
-if HAVE_GALLIUM_SOFTPIPE
-SUBDIRS += drivers/softpipe
-
-## swrast/llvmpipe
-if HAVE_GALLIUM_LLVMPIPE
-SUBDIRS += drivers/llvmpipe
-endif
-endif
-
-if HAVE_GALLIUM_SWR
-SUBDIRS += drivers/swr
-endif
-
-## tegra
-if HAVE_GALLIUM_TEGRA
-SUBDIRS += drivers/tegra winsys/tegra/drm
-endif
-
-## vc4/rpi
-if HAVE_GALLIUM_VC4
-SUBDIRS += drivers/vc4 winsys/vc4/drm
-endif
-
-## v3d
-if HAVE_GALLIUM_V3D
-SUBDIRS += drivers/v3d winsys/v3d/drm
-endif
-
-## virgl
-if HAVE_GALLIUM_VIRGL
-SUBDIRS += drivers/virgl winsys/virgl/drm winsys/virgl/vtest
-endif
-
-## the sw winsys'
-SUBDIRS += winsys/sw/null
-
-if NEED_WINSYS_XLIB
-SUBDIRS += winsys/sw/xlib
-endif
-
-if HAVE_DRISW
-SUBDIRS += winsys/sw/dri
-endif
-
-if HAVE_DRISW_KMS
-SUBDIRS += winsys/sw/kms-dri
-endif
-
-SUBDIRS += winsys/sw/wrapper
-
-##
-## Don't forget to bundle the remaining (non autotools) winsys'
-##
-
-EXTRA_DIST = \
-	docs \
-	README.portability \
-	SConscript \
-	winsys/sw/gdi \
-	winsys/sw/hgl
-
-
-##
-## Gallium state trackers and their users (targets)
-##
-
-## XXX: Rename the conditional once we have a config switch for static/dynamic pipe-drivers
-if HAVE_CLOVER
-SUBDIRS += targets/pipe-loader
-endif
-
-if HAVE_CLOVER
-SUBDIRS += state_trackers/clover targets/opencl
-endif
-
-if HAVE_DRICOMMON
-SUBDIRS += state_trackers/dri targets/dri
-endif
-
-if HAVE_GALLIUM_XLIB_GLX
-SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
-endif
-
-if HAVE_ST_OMX_BELLAGIO
-SUBDIRS += state_trackers/omx targets/omx
-endif
-
-if HAVE_ST_OMX_TIZONIA
-SUBDIRS += state_trackers/omx targets/omx
-endif
-
-if HAVE_GALLIUM_OSMESA
-SUBDIRS += state_trackers/osmesa targets/osmesa
-endif
-
-if HAVE_ST_VA
-SUBDIRS += state_trackers/va targets/va
-endif
-
-if HAVE_ST_VDPAU
-SUBDIRS += state_trackers/vdpau targets/vdpau
-endif
-
-if HAVE_ST_XA
-SUBDIRS += state_trackers/xa targets/xa
-endif
-
-if HAVE_ST_XVMC
-SUBDIRS += state_trackers/xvmc targets/xvmc
-endif
-
-if HAVE_ST_NINE
-SUBDIRS += state_trackers/nine targets/d3dadapter9
-endif
-
-##
-## Don't forget to bundle the remaining (non autotools) state-trackers/targets
-##
-
-EXTRA_DIST += \
-	include \
-	state_trackers/README \
-	state_trackers/wgl targets/libgl-gdi \
-	targets/graw-gdi targets/graw-null  targets/graw-xlib \
-	state_trackers/hgl targets/haiku-softpipe \
-	tools
-
-
-##
-## Gallium tests
-##
-
-if HAVE_GALLIUM_TESTS
-SUBDIRS += \
-	tests/trivial \
-	tests/unit
-endif
-
-EXTRA_DIST += \
-	tests/graw \
-	tests/python \
-	meson.build \
-	tests/meson.build \
-	tests/graw/meson.build
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
deleted file mode 100644
index d7d803a961c..00000000000
--- a/src/gallium/auxiliary/Makefile.am
+++ /dev/null
@@ -1,134 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-noinst_LTLIBRARIES = libgallium.la
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/loader \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/gallium/auxiliary/util \
-	$(GALLIUM_CFLAGS) \
-	$(LIBUNWIND_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(MSVC2013_COMPAT_CFLAGS)
-
-AM_CXXFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CXXFLAGS) \
-	$(MSVC2013_COMPAT_CXXFLAGS)
-
-libgallium_la_SOURCES = \
-	$(C_SOURCES) \
-	$(NIR_SOURCES) \
-	$(GENERATED_SOURCES)
-
-if HAVE_PLATFORM_ANDROID
-# Android's libbacktrace headers required C++11, but the Android toolchain (at
-# least in the Chrome OS SDK) does not enable C++11 by default.
-AM_CXXFLAGS += $(CXX11_CXXFLAGS)
-
-libgallium_la_SOURCES += util/u_debug_stack_android.cpp
-endif
-
-if HAVE_LIBDRM
-
-AM_CFLAGS += \
-	$(LIBDRM_CFLAGS)
-
-libgallium_la_SOURCES += \
-	$(RENDERONLY_SOURCES)
-
-endif
-
-if HAVE_GALLIUM_LLVM
-
-AM_CFLAGS += \
-	$(LLVM_CFLAGS)
-
-AM_CXXFLAGS += \
-	$(LLVM_CXXFLAGS)
-
-libgallium_la_SOURCES += \
-	$(GALLIVM_SOURCES)
-
-endif
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN =  $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-indices/u_indices_gen.c: indices/u_indices_gen.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/indices/u_indices_gen.py > $@
-
-indices/u_unfilled_gen.c: indices/u_unfilled_gen.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/indices/u_unfilled_gen.py > $@
-
-util/u_format_table.c: util/u_format_table.py \
-                       util/u_format_pack.py \
-                       util/u_format_parse.py \
-                       util/u_format.csv
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
-
-noinst_LTLIBRARIES += libgalliumvl_stub.la
-libgalliumvl_stub_la_SOURCES = \
-	$(VL_STUB_SOURCES)
-
-if NEED_GALLIUM_VL
-
-COMMON_VL_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(VL_CFLAGS) \
-	$(XCB_DRI3_CFLAGS) \
-	$(DRI2PROTO_CFLAGS) \
-	$(LIBDRM_CFLAGS)
-
-noinst_LTLIBRARIES += libgalliumvl.la
-
-libgalliumvl_la_CFLAGS = \
-	$(COMMON_VL_CFLAGS)
-
-libgalliumvl_la_SOURCES = \
-	$(VL_SOURCES)
-
-if NEED_GALLIUM_VL_WINSYS
-
-noinst_LTLIBRARIES += libgalliumvlwinsys.la
-
-libgalliumvlwinsys_la_CFLAGS = $(COMMON_VL_CFLAGS)
-libgalliumvlwinsys_la_SOURCES = $(VL_WINSYS_SOURCES)
-
-if HAVE_PLATFORM_X11
-libgalliumvlwinsys_la_SOURCES += $(VL_WINSYS_DRI2_SOURCES)
-
-if HAVE_DRI3
-libgalliumvlwinsys_la_SOURCES += $(VL_WINSYS_DRI3_SOURCES)
-endif
-endif
-
-if HAVE_PLATFORM_DRM
-libgalliumvlwinsys_la_SOURCES += $(VL_WINSYS_DRM_SOURCES)
-endif
-
-endif # NEED_GALLIUM_VL_WINSYS
-endif # NEED_GALLIUM_VL
-
-EXTRA_DIST = \
-	SConscript \
-	driver_rbug/README \
-	driver_trace/README \
-	driver_trace/trace.xsl \
-	indices/u_indices.c \
-	indices/u_unfilled_indices.c \
-	indices/u_indices_gen.py \
-	indices/u_unfilled_gen.py \
-	postprocess/ADDING \
-	rbug/README \
-	target-helpers \
-	util/u_debug_stack_android.cpp \
-	util/u_format.csv \
-	util/u_format_pack.py \
-	util/u_format_parse.py \
-	util/u_format_table.py \
-	meson.build
diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am
deleted file mode 100644
index 718e5afad63..00000000000
--- a/src/gallium/auxiliary/pipe-loader/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-# XXX: check if we need the gallium/winsys include
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/loader \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-I$(top_builddir)/src/util \
-	$(GALLIUM_PIPE_LOADER_DEFINES) \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-noinst_LTLIBRARIES = \
-	libpipe_loader_static.la \
-	libpipe_loader_dynamic.la
-
-libpipe_loader_static_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-DGALLIUM_STATIC_TARGETS=1
-
-libpipe_loader_dynamic_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
-
-libpipe_loader_static_la_SOURCES = \
-	$(COMMON_SOURCES)
-
-libpipe_loader_dynamic_la_SOURCES = \
-	$(COMMON_SOURCES)
-
-if HAVE_LIBDRM
-AM_CFLAGS += \
-	$(LIBDRM_CFLAGS)
-
-libpipe_loader_static_la_SOURCES += \
-	$(DRM_SOURCES)
-
-libpipe_loader_dynamic_la_SOURCES += \
-	$(DRM_SOURCES)
-
-endif
-
-libpipe_loader_static_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la \
-	$(top_builddir)/src/util/libxmlconfig.la
-
-libpipe_loader_dynamic_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la \
-	$(top_builddir)/src/util/libxmlconfig.la
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/drivers/etnaviv/Automake.inc b/src/gallium/drivers/etnaviv/Automake.inc
deleted file mode 100644
index f9b39567e36..00000000000
--- a/src/gallium/drivers/etnaviv/Automake.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-if HAVE_GALLIUM_ETNAVIV
-
-TARGET_DRIVERS += etnaviv
-TARGET_CPPFLAGS += -DGALLIUM_ETNAVIV
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/winsys/etnaviv/drm/libetnavivdrm.la \
-	$(top_builddir)/src/gallium/drivers/etnaviv/libetnaviv.la \
-	$(ETNAVIV_LIBS) \
-	$(LIBDRM_LIBS)
-
-endif
diff --git a/src/gallium/drivers/etnaviv/Makefile.am b/src/gallium/drivers/etnaviv/Makefile.am
deleted file mode 100644
index 81ef3c9f370..00000000000
--- a/src/gallium/drivers/etnaviv/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright © 2013 W.J. van der Laan
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-noinst_LTLIBRARIES = libetnaviv.la
-
-AM_CPPFLAGS = \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(ETNAVIV_CFLAGS)
-
-libetnaviv_la_SOURCES = $(C_SOURCES)
-
-noinst_PROGRAMS = etnaviv_compiler
-
-etnaviv_compiler_SOURCES = \
-	etnaviv_compiler_cmdline.c
-
-etnaviv_compiler_LDADD = \
-	libetnaviv.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(GALLIUM_COMMON_LIB_DEPS) \
-	$(ETNAVIV_LIBS)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/drivers/freedreno/Automake.inc b/src/gallium/drivers/freedreno/Automake.inc
deleted file mode 100644
index 936c286f4c9..00000000000
--- a/src/gallium/drivers/freedreno/Automake.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-if HAVE_GALLIUM_FREEDRENO
-
-TARGET_DRIVERS += msm kgsl
-TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \
-	$(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \
-	$(top_builddir)/src/freedreno/libfreedreno_drm.la \
-	$(top_builddir)/src/freedreno/libfreedreno_ir3.la \
-	$(FREEDRENO_LIBS) \
-	$(LIBDRM_LIBS)
-
-endif
diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
deleted file mode 100644
index c002378dfb1..00000000000
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-Wno-packed-bitfield-compat \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/gallium/drivers/freedreno/ir3 \
-	-I$(top_srcdir)/src/freedreno \
-	-I$(top_srcdir)/src/freedreno/registers \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler/nir \
-	$(LIBDRM_CFLAGS) \
-	$(GALLIUM_DRIVER_CFLAGS)
-
-noinst_LTLIBRARIES = libfreedreno.la
-
-libfreedreno_la_SOURCES = \
-	$(C_SOURCES) \
-	$(a2xx_SOURCES) \
-	$(a3xx_SOURCES) \
-	$(a4xx_SOURCES) \
-	$(a5xx_SOURCES) \
-	$(a6xx_SOURCES) \
-	$(ir3_SOURCES)
-
-EXTRA_DIST = \
-	ir3/ir3_cmdline.c \
-	meson.build
diff --git a/src/gallium/drivers/i915/Automake.inc b/src/gallium/drivers/i915/Automake.inc
deleted file mode 100644
index 73ef8101d1c..00000000000
--- a/src/gallium/drivers/i915/Automake.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-if HAVE_GALLIUM_I915
-
-TARGET_DRIVERS += i915
-TARGET_CPPFLAGS += -DGALLIUM_I915
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
-	$(top_builddir)/src/gallium/drivers/i915/libi915.la \
-	$(I915_LIBS) \
-	$(LIBDRM_LIBS)
-
-endif
diff --git a/src/gallium/drivers/i915/Makefile.am b/src/gallium/drivers/i915/Makefile.am
deleted file mode 100644
index 261f292fd21..00000000000
--- a/src/gallium/drivers/i915/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_DRIVER_CFLAGS)
-
-noinst_LTLIBRARIES = libi915.la
-
-libi915_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = TODO meson.build
diff --git a/src/gallium/drivers/kmsro/Automake.inc b/src/gallium/drivers/kmsro/Automake.inc
deleted file mode 100644
index 61989f425ac..00000000000
--- a/src/gallium/drivers/kmsro/Automake.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-if HAVE_GALLIUM_KMSRO
-
-TARGET_DRIVERS += hx8357d
-TARGET_DRIVERS += ili9225
-TARGET_DRIVERS += ili9341
-TARGET_DRIVERS += mi0283qt
-TARGET_DRIVERS += pl111
-TARGET_DRIVERS += repaper
-TARGET_DRIVERS += st7586
-TARGET_DRIVERS += st7735r
-TARGET_CPPFLAGS += -DGALLIUM_KMSRO
-TARGET_LIB_DEPS += \
-    $(top_builddir)/src/gallium/winsys/kmsro/drm/libkmsrodrm.la \
-    $(LIBDRM_LIBS)
-
-endif
diff --git a/src/gallium/drivers/kmsro/Makefile.am b/src/gallium/drivers/kmsro/Makefile.am
deleted file mode 100644
index 5bfaccaa1e5..00000000000
--- a/src/gallium/drivers/kmsro/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CPPFLAGS = \
-	$(GALLIUM_CFLAGS)
-
-noinst_LTLIBRARIES = libkmsro.la
-
-libkmsro_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/drivers/llvmpipe/Automake.inc b/src/gallium/drivers/llvmpipe/Automake.inc
deleted file mode 100644
index 0a0aa34e74a..00000000000
--- a/src/gallium/drivers/llvmpipe/Automake.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-if HAVE_GALLIUM_LLVMPIPE
-
-TARGET_CPPFLAGS += -DGALLIUM_LLVMPIPE
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
-
-endif
diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am
deleted file mode 100644
index d649fa44b95..00000000000
--- a/src/gallium/drivers/llvmpipe/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(LLVM_CFLAGS) \
-	$(MSVC2013_COMPAT_CFLAGS)
-AM_CXXFLAGS= \
-	$(GALLIUM_DRIVER_CXXFLAGS) \
-	$(LLVM_CXXFLAGS) \
-	$(MSVC2013_COMPAT_CXXFLAGS)
-
-noinst_LTLIBRARIES = libllvmpipe.la
-
-libllvmpipe_la_SOURCES = $(C_SOURCES)
-
-libllvmpipe_la_LDFLAGS = $(LLVM_LDFLAGS)
-
-noinst_HEADERS = lp_test.h
-
-check_PROGRAMS = \
-	lp_test_format	\
-	lp_test_arit	\
-	lp_test_blend	\
-	lp_test_conv	\
-	lp_test_printf
-TESTS = $(check_PROGRAMS)
-
-TEST_LIBS = \
-	libllvmpipe.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(LLVM_LIBS) \
-	$(DLOPEN_LIBS) \
-	$(PTHREAD_LIBS) \
-	$(CLOCK_LIB)
-
-lp_test_format_SOURCES = lp_test_format.c lp_test_main.c
-lp_test_format_LDADD = $(TEST_LIBS)
-nodist_EXTRA_lp_test_format_SOURCES = dummy.cpp
-
-lp_test_arit_SOURCES = lp_test_arit.c lp_test_main.c
-lp_test_arit_LDADD = $(TEST_LIBS)
-nodist_EXTRA_lp_test_arit_SOURCES = dummy.cpp
-
-lp_test_blend_SOURCES = lp_test_blend.c lp_test_main.c
-lp_test_blend_LDADD = $(TEST_LIBS)
-nodist_EXTRA_lp_test_blend_SOURCES = dummy.cpp
-
-lp_test_conv_SOURCES = lp_test_conv.c lp_test_main.c
-lp_test_conv_LDADD = $(TEST_LIBS)
-nodist_EXTRA_lp_test_conv_SOURCES = dummy.cpp
-
-lp_test_printf_SOURCES = lp_test_printf.c lp_test_main.c
-lp_test_printf_LDADD = $(TEST_LIBS)
-nodist_EXTRA_lp_test_printf_SOURCES = dummy.cpp
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/drivers/nouveau/Automake.inc b/src/gallium/drivers/nouveau/Automake.inc
deleted file mode 100644
index 657790494dc..00000000000
--- a/src/gallium/drivers/nouveau/Automake.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-if HAVE_GALLIUM_NOUVEAU
-
-TARGET_DRIVERS += nouveau
-TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
-	$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
-	$(NOUVEAU_LIBS) \
-	$(LIBDRM_LIBS)
-
-TARGET_COMPILER_LIB_DEPS = \
-	$(top_builddir)/src/compiler/nir/libnir.la
-
-endif
diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am
deleted file mode 100644
index ee7191675cc..00000000000
--- a/src/gallium/drivers/nouveau/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler/nir \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(LIBDRM_CFLAGS) \
-	$(NOUVEAU_CFLAGS)
-
-noinst_LTLIBRARIES = libnouveau.la
-
-libnouveau_la_SOURCES = \
-	$(C_SOURCES) \
-	$(NV30_C_SOURCES) \
-	$(NV50_CODEGEN_SOURCES) \
-	$(NV50_C_SOURCES) \
-	$(NVC0_CODEGEN_SOURCES) \
-	$(NVC0_C_SOURCES)
-
-noinst_PROGRAMS = nouveau_compiler
-
-nodist_EXTRA_nouveau_compiler_SOURCES = dummy.cpp
-nouveau_compiler_SOURCES = \
-	nouveau_compiler.c
-
-nouveau_compiler_LDADD = \
-	libnouveau.la \
-	$(top_builddir)/src/compiler/nir/libnir.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-EXTRA_DIST = codegen/lib nvc0/mme meson.build
diff --git a/src/gallium/drivers/r300/Automake.inc b/src/gallium/drivers/r300/Automake.inc
deleted file mode 100644
index d4ddc401bb3..00000000000
--- a/src/gallium/drivers/r300/Automake.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-if HAVE_GALLIUM_R300
-
-TARGET_DRIVERS += r300
-TARGET_CPPFLAGS += -DGALLIUM_R300
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/drivers/r300/libr300.la \
-	$(RADEON_LIBS) \
-	$(LIBDRM_LIBS)
-
-TARGET_RADEON_WINSYS = \
-	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
-
-endif
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
deleted file mode 100644
index 26c75be3271..00000000000
--- a/src/gallium/drivers/r300/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/mesa/program \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src/glsl \
-	-I$(top_srcdir)/src/mapi \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(LLVM_CFLAGS) \
-	$(RADEON_CFLAGS)
-
-noinst_LTLIBRARIES = libr300.la
-check_PROGRAMS = r300_compiler_tests
-TESTS = r300_compiler_tests
-
-r300_compiler_tests_LDADD = libr300.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(GALLIUM_COMMON_LIB_DEPS)
-r300_compiler_tests_CPPFLAGS = \
-	-DTEST_PATH=\"$(top_srcdir)/src/gallium/drivers/r300/compiler/tests\" \
-	-I$(top_srcdir)/src/gallium/drivers/r300/compiler
-r300_compiler_tests_SOURCES = $(COMPILER_TESTS_SOURCES)
-
-libr300_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = \
-	compiler/tests/omod_two_writers.test \
-	compiler/tests/regalloc_tex_1d_swizzle.test \
-	meson.build
diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc
deleted file mode 100644
index 727b1174d3f..00000000000
--- a/src/gallium/drivers/r600/Automake.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-if HAVE_GALLIUM_R600
-
-TARGET_DRIVERS += r600
-TARGET_CPPFLAGS += -DGALLIUM_R600
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
-	$(RADEON_LIBS) \
-	$(LIBDRM_LIBS) \
-	$(LIBELF_LIBS)
-
-TARGET_RADEON_WINSYS = \
-	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
-
-endif
diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
deleted file mode 100644
index c5b41cce26e..00000000000
--- a/src/gallium/drivers/r600/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-egd_tables.h: $(srcdir)/egd_tables.py $(srcdir)/evergreend.h
-	$(AM_V_at)$(MKDIR_P) $(@D)
-	$(AM_V_GEN) $(PYTHON) $(srcdir)/egd_tables.py $(srcdir)/evergreend.h > $@
-
-BUILT_SOURCES = $(R600_GENERATED_FILES)
-AM_CFLAGS = \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(RADEON_CFLAGS) \
-	$(LIBELF_CFLAGS) \
-	-I$(top_srcdir)/src/amd/common -Wstrict-overflow=0
-
-AM_CXXFLAGS = \
-	$(GALLIUM_DRIVER_CXXFLAGS) \
-	$(RADEON_CFLAGS) \
-	$(LIBELF_CFLAGS) \
-	-I$(top_srcdir)/src/amd/common
-
-noinst_LTLIBRARIES = libr600.la
-
-libr600_la_SOURCES = \
-	$(C_SOURCES) \
-	$(CXX_SOURCES)
-
-if HAVE_GALLIUM_LLVM
-
-AM_CFLAGS += \
-	$(LLVM_CFLAGS)
-
-endif
-
-if HAVE_GALLIUM_COMPUTE
-AM_CFLAGS += \
-	-DHAVE_OPENCL
-endif
-
-CLEANFILES = \
-	egd_tables.h
-
-EXTRA_DIST = \
-	egd_tables.py \
-	sb/notes.markdown \
-	sb/sb_bc_fmt_def.inc \
-	meson.build
diff --git a/src/gallium/drivers/radeonsi/Automake.inc b/src/gallium/drivers/radeonsi/Automake.inc
deleted file mode 100644
index 740648d798b..00000000000
--- a/src/gallium/drivers/radeonsi/Automake.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-if HAVE_GALLIUM_RADEONSI
-
-TARGET_DRIVERS += radeonsi
-TARGET_CPPFLAGS += -DGALLIUM_RADEONSI
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
-	$(RADEON_LIBS) \
-	$(LIBDRM_LIBS) \
-	$(AMDGPU_LIBS)
-
-TARGET_COMPILER_LIB_DEPS = \
-	$(top_builddir)/src/compiler/nir/libnir.la
-
-TARGET_RADEON_WINSYS = \
-	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
-	$(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la
-
-TARGET_RADEON_COMMON = \
-	$(top_builddir)/src/amd/common/libamd_common.la
-
-endif
diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
deleted file mode 100644
index 317ae7ea19f..00000000000
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	-I$(top_builddir)/src/amd/common \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/amd/common \
-	$(RADEON_CFLAGS) \
-	$(LLVM_CFLAGS) \
-	-Wstrict-overflow=0
-# ^^ disable warnings about overflows (os_time_timeout)
-
-noinst_LTLIBRARIES = libradeonsi.la
-
-libradeonsi_la_SOURCES = $(C_SOURCES)
-
-libradeonsi_la_LIBADD = \
-	$(CLOCK_LIB) \
-	$(LLVM_LIBS)
-
-libradeonsi_la_LDFLAGS = \
-	$(LLVM_LDFLAGS)
-
-GEN_DRIINFO_INPUTS = \
-	$(top_srcdir)/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h \
-	$(srcdir)/driinfo_radeonsi.h
-
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-MERGE_DRIINFO = $(top_srcdir)/src/util/merge_driinfo.py
-
-si_driinfo.h: $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS)
-	$(PYTHON_GEN) $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS) > $@ || ($(RM) $@; false)
-
-BUILT_SOURCES = $(GENERATED_SOURCES)
-CLEANFILES = $(GENERATED_SOURCES)
-EXTRA_DIST = meson.build
diff --git a/src/gallium/drivers/softpipe/Automake.inc b/src/gallium/drivers/softpipe/Automake.inc
deleted file mode 100644
index bd3c2eead16..00000000000
--- a/src/gallium/drivers/softpipe/Automake.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-if HAVE_GALLIUM_SOFTPIPE
-
-TARGET_DRIVERS += swrast
-TARGET_CPPFLAGS += -DGALLIUM_SOFTPIPE
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
-
-if HAVE_DRISW_KMS
-TARGET_DRIVERS += kms_swrast
-
-endif
-endif
diff --git a/src/gallium/drivers/softpipe/Makefile.am b/src/gallium/drivers/softpipe/Makefile.am
deleted file mode 100644
index c8c2615a970..00000000000
--- a/src/gallium/drivers/softpipe/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(MSVC2013_COMPAT_CFLAGS)
-
-noinst_LTLIBRARIES = libsoftpipe.la
-
-libsoftpipe_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/drivers/svga/Automake.inc b/src/gallium/drivers/svga/Automake.inc
deleted file mode 100644
index d2d1d8f1842..00000000000
--- a/src/gallium/drivers/svga/Automake.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-if HAVE_GALLIUM_SVGA
-
-TARGET_DRIVERS += vmwgfx
-TARGET_CPPFLAGS += -DGALLIUM_VMWGFX
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
-	$(top_builddir)/src/gallium/drivers/svga/libsvga.la \
-	$(LIBDRM_LIBS)
-
-endif
diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am
deleted file mode 100644
index a457df03c8c..00000000000
--- a/src/gallium/drivers/svga/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CPPFLAGS = \
-	-I$(top_builddir)/src
-
-AM_CFLAGS = \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(MSVC2013_COMPAT_CFLAGS)
-
-noinst_HEADERS = $(SVGA_H_FILES)
-noinst_LTLIBRARIES = libsvga.la
-
-libsvga_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = SConscript \
-	include/README \
-	svgadump/svga_dump.py \
-	meson.build
diff --git a/src/gallium/drivers/swr/Automake.inc b/src/gallium/drivers/swr/Automake.inc
deleted file mode 100644
index a51921455a9..00000000000
--- a/src/gallium/drivers/swr/Automake.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-if HAVE_GALLIUM_SWR
-
-TARGET_DRIVERS += swrast
-TARGET_CPPFLAGS += -DGALLIUM_SWR
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/drivers/swr/libmesaswr.la
-
-endif
diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
deleted file mode 100644
index 3390ef6b096..00000000000
--- a/src/gallium/drivers/swr/Makefile.am
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright (C) 2015 Intel Corporation.   All Rights Reserved.
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(CXX11_CXXFLAGS)
-
-noinst_LTLIBRARIES = libmesaswr.la
-
-libmesaswr_la_SOURCES = \
-	$(CXX_SOURCES) \
-	$(JITTER_CXX_SOURCES) \
-	$(LOADER_SOURCES)
-
-COMMON_CXXFLAGS = \
-	-fno-strict-aliasing \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(LLVM_CXXFLAGS) \
-	$(CXX11_CXXFLAGS) \
-	-I$(builddir)/rasterizer/codegen \
-	-I$(builddir)/rasterizer/core \
-	-I$(builddir)/rasterizer/jitter \
-	-I$(builddir)/rasterizer/archrast \
-	-I$(srcdir)/rasterizer \
-	-I$(srcdir)/rasterizer/core \
-	-I$(srcdir)/rasterizer/codegen \
-	-I$(srcdir)/rasterizer/jitter \
-	-I$(srcdir)/rasterizer/archrast
-
-# SWR_AVX_CXXFLAGS needed for intrinsic usage in swr api headers
-libmesaswr_la_CXXFLAGS = \
-	$(SWR_AVX_CXXFLAGS) \
-	$(COMMON_CXXFLAGS)
-
-if HAVE_SWR_AVX
-libmesaswr_la_CXXFLAGS += -DHAVE_SWR_AVX
-endif
-
-if HAVE_SWR_AVX2
-libmesaswr_la_CXXFLAGS += -DHAVE_SWR_AVX2
-endif
-
-if HAVE_SWR_KNL
-libmesaswr_la_CXXFLAGS += -DHAVE_SWR_KNL
-endif
-
-if HAVE_SWR_SKX
-libmesaswr_la_CXXFLAGS += -DHAVE_SWR_SKX
-endif
-
-COMMON_SOURCES = \
-	$(ARCHRAST_CXX_SOURCES) \
-	$(COMMON_CXX_SOURCES) \
-	$(CORE_CXX_SOURCES) \
-	$(MEMORY_CXX_SOURCES) \
-	$(BUILT_SOURCES)
-
-BUILT_SOURCES = \
-	gen_swr_context_llvm.h \
-	rasterizer/codegen/gen_knobs.cpp \
-	rasterizer/codegen/gen_knobs.h \
-	rasterizer/jitter/gen_state_llvm.h \
-	rasterizer/jitter/gen_builder.hpp \
-	rasterizer/jitter/gen_builder_meta.hpp \
-	rasterizer/jitter/gen_builder_intrin.hpp \
-	rasterizer/archrast/gen_ar_event.hpp \
-	rasterizer/archrast/gen_ar_event.cpp \
-	rasterizer/archrast/gen_ar_eventhandler.hpp \
-	rasterizer/archrast/gen_ar_eventhandlerfile.hpp \
-	rasterizer/core/backends/gen_BackendPixelRate0.cpp \
-	rasterizer/core/backends/gen_BackendPixelRate1.cpp \
-	rasterizer/core/backends/gen_BackendPixelRate2.cpp \
-	rasterizer/core/backends/gen_BackendPixelRate3.cpp \
-	rasterizer/core/backends/gen_BackendPixelRate.hpp \
-	rasterizer/core/backends/gen_rasterizer0.cpp \
-	rasterizer/core/backends/gen_rasterizer1.cpp \
-	rasterizer/core/backends/gen_rasterizer2.cpp \
-	rasterizer/core/backends/gen_rasterizer3.cpp \
-	rasterizer/core/backends/gen_rasterizer.hpp
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-gen_swr_context_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/codegen/templates/gen_llvm.hpp swr_context.h
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_llvm_types.py \
-		--input $(srcdir)/swr_context.h \
-		--output ./gen_swr_context_llvm.h
-	$(AM_V_GEN)touch $@
-
-rasterizer/codegen/gen_knobs.cpp: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/gen_knobs.cpp rasterizer/codegen/gen_common.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_knobs.py \
-		--output rasterizer/codegen/gen_knobs.cpp \
-		--gen_cpp
-	$(AM_V_GEN)touch $@
-
-rasterizer/codegen/gen_knobs.h: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/gen_knobs.h rasterizer/codegen/gen_common.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_knobs.py \
-		--output rasterizer/codegen/gen_knobs.h \
-		--gen_h
-	$(AM_V_GEN)touch $@
-
-rasterizer/jitter/gen_state_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/codegen/templates/gen_llvm.hpp rasterizer/core/state.h rasterizer/codegen/gen_common.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_llvm_types.py \
-		--input $(srcdir)/rasterizer/core/state.h \
-		--output rasterizer/jitter/gen_state_llvm.h
-	$(AM_V_GEN)touch $@
-
-rasterizer/jitter/gen_builder.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rasterizer/codegen/templates/gen_builder.hpp rasterizer/codegen/gen_common.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \
-		--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
-		--output rasterizer/jitter \
-		--gen_h
-	$(AM_V_GEN)touch $@
-
-rasterizer/jitter/gen_builder_meta.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rasterizer/codegen/templates/gen_builder.hpp rasterizer/codegen/gen_common.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \
-		--output rasterizer/jitter \
-		--gen_meta_h
-	$(AM_V_GEN)touch $@
-
-rasterizer/jitter/gen_builder_intrin.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rasterizer/codegen/templates/gen_builder.hpp rasterizer/codegen/gen_common.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \
-		--output rasterizer/jitter \
-		--gen_intrin_h
-	$(AM_V_GEN)touch $@
-
-rasterizer/archrast/gen_ar_event.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_archrast.py \
-		--proto $(srcdir)/rasterizer/archrast/events.proto \
-		--proto_private $(srcdir)/rasterizer/archrast/events_private.proto \
-		--output rasterizer/archrast/gen_ar_event.hpp \
-		--gen_event_hpp
-	$(AM_V_GEN)touch $@
-
-rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.cpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_archrast.py \
-		--proto $(srcdir)/rasterizer/archrast/events.proto \
-		--proto_private $(srcdir)/rasterizer/archrast/events_private.proto \
-		--output rasterizer/archrast/gen_ar_event.cpp \
-		--gen_event_cpp
-	$(AM_V_GEN)touch $@
-
-rasterizer/archrast/gen_ar_eventhandler.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandler.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_archrast.py \
-		--proto $(srcdir)/rasterizer/archrast/events.proto \
-		--proto_private $(srcdir)/rasterizer/archrast/events_private.proto \
-		--output rasterizer/archrast/gen_ar_eventhandler.hpp \
-		--gen_eventhandler_hpp
-	$(AM_V_GEN)touch $@
-
-rasterizer/archrast/gen_ar_eventhandlerfile.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_archrast.py \
-		--proto $(srcdir)/rasterizer/archrast/events.proto \
-		--proto_private $(srcdir)/rasterizer/archrast/events_private.proto \
-		--output rasterizer/archrast/gen_ar_eventhandlerfile.hpp \
-		--gen_eventhandlerfile_hpp
-	$(AM_V_GEN)touch $@
-
-rasterizer/core/backends/gen_BackendPixelRate0.cpp \
-rasterizer/core/backends/gen_BackendPixelRate1.cpp \
-rasterizer/core/backends/gen_BackendPixelRate2.cpp \
-rasterizer/core/backends/gen_BackendPixelRate3.cpp \
-rasterizer/core/backends/gen_BackendPixelRate.hpp: \
-backend.intermediate
-
-# 5 SWR_MULTISAMPLE_TYPE_COUNT
-# 2 SWR_MSAA_SAMPLE_PATTERN_COUNT
-# 3 SWR_INPUT_COVERAGE_COUNT
-# 2 centroid
-# 2 forcedSampleCount
-# 2 canEarlyZ
-
-# use intermediate rule to tell make that all files can be
-# generated in one invocation of gen_backends.py (prevents
-# parallel make race condition)
-.INTERMEDIATE: backend.intermediate
-backend.intermediate: rasterizer/codegen/gen_backends.py rasterizer/codegen/templates/gen_backend.cpp rasterizer/codegen/templates/gen_header_init.hpp
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_backends.py \
-		--outdir rasterizer/core/backends \
-		--dim 5 2 3 2 2 2 \
-		--numfiles 4 \
-		--cpp \
-		--hpp
-
-rasterizer/core/backends/gen_rasterizer0.cpp \
-rasterizer/core/backends/gen_rasterizer1.cpp \
-rasterizer/core/backends/gen_rasterizer2.cpp \
-rasterizer/core/backends/gen_rasterizer3.cpp \
-rasterizer/core/backends/gen_rasterizer.hpp: \
-rasterizer.intermediate
-
-# 5 SWR_MULTISAMPLE_TYPE_COUNT
-# 2 CenterPattern
-# 2 Conservative
-# 3 SWR_INPUT_COVERAGE_COUNT
-# 5 STATE_VALID_TRI_EDGE_COUNT
-# 2 RasterScissorEdges
-
-# use intermediate rule to tell make that all files can be
-# generated in one invocation of gen_backends.py (prevents
-# parallel make race condition)
-.INTERMEDIATE: rasterizer.intermediate
-rasterizer.intermediate: rasterizer/codegen/gen_backends.py rasterizer/codegen/templates/gen_rasterizer.cpp rasterizer/codegen/templates/gen_header_init.hpp
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/codegen/gen_backends.py \
-		--outdir rasterizer/core/backends \
-		--rast \
-		--dim 5 2 2 3 5 2 \
-		--numfiles 4 \
-		--cpp \
-		--hpp
-
-COMMON_LDFLAGS = \
-	-shared \
-	-module \
-	-no-undefined \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-lib_LTLIBRARIES =
-
-if HAVE_SWR_AVX
-libswrAVX_la_CXXFLAGS = \
-	$(PTHREAD_CFLAGS) \
-	$(SWR_AVX_CXXFLAGS) \
-	-DKNOB_ARCH=KNOB_ARCH_AVX \
-	$(COMMON_CXXFLAGS)
-
-libswrAVX_la_SOURCES = \
-	$(COMMON_SOURCES)
-
-libswrAVX_la_LIBADD = \
-	$(PTHREAD_LIBS)
-
-libswrAVX_la_LDFLAGS = \
-	$(COMMON_LDFLAGS)
-endif
-
-if HAVE_SWR_AVX2
-libswrAVX2_la_CXXFLAGS = \
-	$(PTHREAD_CFLAGS) \
-	$(SWR_AVX2_CXXFLAGS) \
-	-DKNOB_ARCH=KNOB_ARCH_AVX2 \
-	$(COMMON_CXXFLAGS)
-
-libswrAVX2_la_SOURCES = \
-	$(COMMON_SOURCES)
-
-libswrAVX2_la_LIBADD = \
-	$(PTHREAD_LIBS)
-
-libswrAVX2_la_LDFLAGS = \
-	$(COMMON_LDFLAGS)
-endif
-
-if HAVE_SWR_KNL
-libswrKNL_la_CXXFLAGS = \
-	$(PTHREAD_CFLAGS) \
-	$(SWR_KNL_CXXFLAGS) \
-	-DKNOB_ARCH=KNOB_ARCH_AVX512 -DSIMD_ARCH_KNIGHTS \
-	$(COMMON_CXXFLAGS)
-
-libswrKNL_la_SOURCES = \
-	$(COMMON_SOURCES)
-
-libswrKNL_la_LIBADD = \
-	$(PTHREAD_LIBS)
-
-libswrKNL_la_LDFLAGS = \
-	$(COMMON_LDFLAGS)
-endif
-
-if HAVE_SWR_SKX
-libswrSKX_la_CXXFLAGS = \
-	$(PTHREAD_CFLAGS) \
-	$(SWR_SKX_CXXFLAGS) \
-	-DKNOB_ARCH=KNOB_ARCH_AVX512 \
-	$(COMMON_CXXFLAGS)
-
-libswrSKX_la_SOURCES = \
-	$(COMMON_SOURCES)
-
-libswrSKX_la_LIBADD = \
-	$(PTHREAD_LIBS)
-
-libswrSKX_la_LDFLAGS = \
-	$(COMMON_LDFLAGS)
-endif
-
-if HAVE_SWR_BUILTIN
-libmesaswr_la_CXXFLAGS += -DHAVE_SWR_BUILTIN
-libmesaswr_la_LIBADD =
-if HAVE_SWR_AVX
-noinst_LTLIBRARIES += libswrAVX.la
-libmesaswr_la_LIBADD += libswrAVX.la
-endif
-if HAVE_SWR_AVX2
-noinst_LTLIBRARIES += libswrAVX2.la
-libmesaswr_la_LIBADD += libswrAVX2.la
-endif
-if HAVE_SWR_KNL
-noinst_LTLIBRARIES += libswrKNL.la
-libmesaswr_la_LIBADD += libswrKNL.la
-endif
-if HAVE_SWR_SKX
-noinst_LTLIBRARIES += libswrSKX.la
-libmesaswr_la_LIBADD += libswrSKX.la
-endif
-else # !HAVE_SWR_BUILTIN
-# gen_knobs.* included here to provide driver access to swr configuration
-libmesaswr_la_SOURCES += \
-       $(COMMON_CXX_SOURCES) \
-       rasterizer/codegen/gen_knobs.cpp \
-       rasterizer/codegen/gen_knobs.h
-if HAVE_SWR_AVX
-lib_LTLIBRARIES += libswrAVX.la
-endif
-if HAVE_SWR_AVX2
-lib_LTLIBRARIES += libswrAVX2.la
-endif
-if HAVE_SWR_KNL
-lib_LTLIBRARIES += libswrKNL.la
-endif
-if HAVE_SWR_SKX
-lib_LTLIBRARIES += libswrSKX.la
-endif
-endif
-
-include $(top_srcdir)/install-gallium-links.mk
-
-# Generated gen_builder.hpp is not backwards compatible. So ship only one
-# created with the oldest supported version of LLVM.
-dist-hook:
-if SWR_INVALID_LLVM_VERSION
-	@echo "*****************************************"
-	@echo "LLVM 6.0.x required to create the tarball"
-	@echo "*****************************************"
-	@test
-endif
-
-EXTRA_DIST = \
-	SConscript \
-	meson.build \
-	rasterizer/jitter/meson.build \
-	rasterizer/codegen/meson.build \
-	rasterizer/core/backends/meson.build \
-	rasterizer/archrast/events.proto \
-	rasterizer/archrast/events_private.proto \
-	rasterizer/codegen/gen_llvm_ir_macros.py \
-	rasterizer/codegen/gen_llvm_types.py \
-	rasterizer/codegen/gen_archrast.py \
-	rasterizer/codegen/gen_backends.py \
-	rasterizer/codegen/gen_common.py \
-	rasterizer/codegen/gen_knobs.py \
-	rasterizer/codegen/knob_defs.py \
-	rasterizer/codegen/templates/gen_ar_event.cpp \
-	rasterizer/codegen/templates/gen_ar_event.hpp \
-	rasterizer/codegen/templates/gen_ar_eventhandler.hpp \
-	rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp \
-	rasterizer/codegen/templates/gen_backend.cpp \
-	rasterizer/codegen/templates/gen_builder.hpp \
-	rasterizer/codegen/templates/gen_header_init.hpp \
-	rasterizer/codegen/templates/gen_knobs.cpp \
-	rasterizer/codegen/templates/gen_knobs.h \
-	rasterizer/codegen/templates/gen_llvm.hpp \
-	rasterizer/codegen/templates/gen_rasterizer.cpp
diff --git a/src/gallium/drivers/tegra/Automake.inc b/src/gallium/drivers/tegra/Automake.inc
deleted file mode 100644
index f6528191624..00000000000
--- a/src/gallium/drivers/tegra/Automake.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-if HAVE_GALLIUM_TEGRA
-
-TARGET_DRIVERS += tegra
-TARGET_CPPFLAGS += -DGALLIUM_TEGRA
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/winsys/tegra/drm/libtegradrm.la \
-	$(top_builddir)/src/gallium/drivers/tegra/libtegra.la \
-	$(LIBDRM_LIBS) \
-	$(TEGRA_LIBS)
-
-endif
diff --git a/src/gallium/drivers/tegra/Makefile.am b/src/gallium/drivers/tegra/Makefile.am
deleted file mode 100644
index bcb039b227f..00000000000
--- a/src/gallium/drivers/tegra/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	$(LIBDRM_CFLAGS) \
-	$(GALLIUM_DRIVER_CFLAGS)
-
-noinst_LTLIBRARIES = libtegra.la
-
-libtegra_la_SOURCES = \
-	$(C_SOURCES)
-
-EXTRA_DIST = \
-	meson.build
diff --git a/src/gallium/drivers/v3d/Automake.inc b/src/gallium/drivers/v3d/Automake.inc
deleted file mode 100644
index 91ae826b301..00000000000
--- a/src/gallium/drivers/v3d/Automake.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-if HAVE_GALLIUM_V3D
-
-TARGET_DRIVERS += v3d
-TARGET_CPPFLAGS += -DGALLIUM_V3D
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/winsys/v3d/drm/libv3ddrm.la \
-	$(top_builddir)/src/gallium/drivers/v3d/libv3d.la \
-	$(top_builddir)/src/broadcom/libbroadcom.la \
-	$(top_builddir)/src/broadcom/libbroadcom_v33.la \
-	$(top_builddir)/src/broadcom/libbroadcom_v41.la
-
-if !HAVE_GALLIUM_VC4
-TARGET_LIB_DEPS += $(top_builddir)/src/broadcom/cle/libbroadcom_cle.la
-endif
-
-endif
diff --git a/src/gallium/drivers/v3d/Makefile.am b/src/gallium/drivers/v3d/Makefile.am
deleted file mode 100644
index 5fb536275fd..00000000000
--- a/src/gallium/drivers/v3d/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright © 2014 Broadcom
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/broadcom \
-	-I$(top_builddir)/src/broadcom \
-	-I$(top_builddir)/src \
-	$(LIBDRM_CFLAGS) \
-	$(V3D_SIMULATOR_CFLAGS) \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(VALGRIND_CFLAGS) \
-	$()
-
-noinst_LTLIBRARIES = \
-	libv3d.la \
-	libv3d_v33.la \
-	libv3d_v41.la \
-	$()
-
-libv3d_v33_la_SOURCES = $(V3D_PER_VERSION_SOURCES)
-libv3d_v33_la_CFLAGS = $(AM_CFLAGS) -DV3D_VERSION=33
-
-libv3d_v41_la_SOURCES = $(V3D_PER_VERSION_SOURCES)
-libv3d_v41_la_CFLAGS = $(AM_CFLAGS) -DV3D_VERSION=41
-
-libv3d_la_SOURCES = $(C_SOURCES)
-
-libv3d_la_LDFLAGS = \
-	$(V3D_SIMULATOR_LIBS) \
-	$(NULL)
-libv3d_la_LIBADD = \
-	libv3d_v33.la \
-	libv3d_v41.la \
-	$()
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/drivers/vc4/Automake.inc b/src/gallium/drivers/vc4/Automake.inc
deleted file mode 100644
index 650466e495a..00000000000
--- a/src/gallium/drivers/vc4/Automake.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-if HAVE_GALLIUM_VC4
-
-TARGET_DRIVERS += vc4
-TARGET_CPPFLAGS += -DGALLIUM_VC4
-
-if !HAVE_GALLIUM_V3D
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/broadcom/libbroadcom.la \
-	$(top_builddir)/src/broadcom/libbroadcom_v33.la \
-	$(top_builddir)/src/broadcom/libbroadcom_v41.la
-endif
-
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/winsys/vc4/drm/libvc4drm.la \
-	$(top_builddir)/src/gallium/drivers/vc4/libvc4.la \
-	$(top_builddir)/src/broadcom/cle/libbroadcom_cle.la
-
-
-endif
diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am
deleted file mode 100644
index 585ff20e6cf..00000000000
--- a/src/gallium/drivers/vc4/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright © 2014 Broadcom
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-if USE_VC4_SIMULATOR
-SIM_LDFLAGS = -lsimpenrose
-endif
-
-AM_CFLAGS = \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/src/broadcom \
-	-I$(top_builddir)/src/broadcom \
-	$(LIBDRM_CFLAGS) \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(SIM_CFLAGS) \
-	$(VALGRIND_CFLAGS) \
-	$()
-
-noinst_LTLIBRARIES = libvc4.la
-
-libvc4_la_SOURCES = $(C_SOURCES)
-
-libvc4_la_LIBADD = \
-	$(SIM_LIB) \
-	$()
-
-if HAVE_ARM_ASM
-noinst_LTLIBRARIES += libvc4_neon.la
-libvc4_la_LIBADD += libvc4_neon.la
-libvc4_neon_la_SOURCES = $(NEON_C_SOURCES)
-libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -mfpu=neon
-endif
-
-libvc4_la_LDFLAGS = $(SIM_LDFLAGS)
-
-EXTRA_DIST = kernel/README meson.build
diff --git a/src/gallium/drivers/virgl/Automake.inc b/src/gallium/drivers/virgl/Automake.inc
deleted file mode 100644
index b05d3e314c8..00000000000
--- a/src/gallium/drivers/virgl/Automake.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-if HAVE_GALLIUM_VIRGL
-
-TARGET_DRIVERS += virtio_gpu
-TARGET_CPPFLAGS += -DGALLIUM_VIRGL
-TARGET_LIB_DEPS += \
-	$(top_builddir)/src/gallium/drivers/virgl/libvirgl.la \
-	$(top_builddir)/src/gallium/winsys/virgl/drm/libvirgldrm.la \
-	$(top_builddir)/src/gallium/winsys/virgl/vtest/libvirglvtest.la \
-	$(LIBDRM_LIBS)
-
-endif
diff --git a/src/gallium/drivers/virgl/Makefile.am b/src/gallium/drivers/virgl/Makefile.am
deleted file mode 100644
index e5e1d9ef6d9..00000000000
--- a/src/gallium/drivers/virgl/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright © 2014, 2015 Red Hat.
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CPPFLAGS = \
-	$(GALLIUM_DRIVER_CFLAGS) \
-	$(LIBDRM_CFLAGS)
-
-noinst_LTLIBRARIES = libvirgl.la
-
-libvirgl_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am
deleted file mode 100644
index 32ed04f6a2c..00000000000
--- a/src/gallium/state_trackers/clover/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-include Makefile.sources
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/winsys
-
-if HAVE_CLOVER_ICD
-AM_CPPFLAGS += -DHAVE_CLOVER_ICD
-else
-# Only install the headers if we are building a stand-alone implementation
-cldir = $(includedir)/CL
-cl_HEADERS = \
-	$(top_srcdir)/include/CL/cl.h \
-	$(top_srcdir)/include/CL/cl.hpp \
-	$(top_srcdir)/include/CL/cl2.hpp \
-	$(top_srcdir)/include/CL/cl_d3d10.h \
-	$(top_srcdir)/include/CL/cl_d3d11.h \
-	$(top_srcdir)/include/CL/cl_dx9_media_sharing.h \
-	$(top_srcdir)/include/CL/cl_dx9_media_sharing_intel.h \
-	$(top_srcdir)/include/CL/cl_egl.h \
-	$(top_srcdir)/include/CL/cl_ext.h \
-	$(top_srcdir)/include/CL/cl_ext_intel.h \
-	$(top_srcdir)/include/CL/cl_gl.h \
-	$(top_srcdir)/include/CL/cl_gl_ext.h \
-	$(top_srcdir)/include/CL/cl_platform.h \
-	$(top_srcdir)/include/CL/cl_va_api_media_sharing_intel.h \
-	$(top_srcdir)/include/CL/cl_version.h \
-	$(top_srcdir)/include/CL/opencl.h
-endif
-
-noinst_LTLIBRARIES = libclover.la libclllvm.la
-
-libclllvm_la_CXXFLAGS = \
-	$(CXX11_CXXFLAGS) \
-	$(VISIBILITY_CXXFLAGS) \
-	$(LLVM_CXXFLAGS) \
-	$(CLOVER_STD_OVERRIDE) \
-	$(DEFINES) \
-	$(LIBELF_CFLAGS) \
-	-DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \
-	-DLIBCLC_LIBEXECDIR=\"$(LIBCLC_LIBEXECDIR)/\" \
-	-DCLANG_RESOURCE_DIR=\"$(CLANG_RESOURCE_DIR)\"
-
-libclllvm_la_SOURCES = $(LLVM_SOURCES)
-
-libclover_la_CXXFLAGS = \
-	$(CXX11_CXXFLAGS) \
-	$(CLOVER_STD_OVERRIDE) \
-	$(VISIBILITY_CXXFLAGS)
-
-libclover_la_LIBADD = \
-	libclllvm.la
-
-libclover_la_SOURCES = $(CPP_SOURCES)
-
-EXTRA_DIST = Doxyfile meson.build
diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am
deleted file mode 100644
index d66e585b195..00000000000
--- a/src/gallium/state_trackers/dri/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright © 2012 Intel Corporation
-# Copyright © 2014 Emil Velikov
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_builddir)/src/util \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	$(GALLIUM_CFLAGS) \
-	$(LIBDRM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-if HAVE_GALLIUM_SOFTPIPE
-AM_CPPFLAGS += \
-	-DGALLIUM_SOFTPIPE
-endif # HAVE_GALLIUM_SOFTPIPE
-
-noinst_LTLIBRARIES = libdri.la
-libdri_la_SOURCES = $(common_SOURCES)
-
-if HAVE_DRISW
-libdri_la_SOURCES += $(drisw_SOURCES)
-endif
-
-
-if HAVE_DRI2
-libdri_la_SOURCES += $(dri2_SOURCES)
-endif
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/state_trackers/glx/xlib/Makefile.am b/src/gallium/state_trackers/glx/xlib/Makefile.am
deleted file mode 100644
index 914d4a5b885..00000000000
--- a/src/gallium/state_trackers/glx/xlib/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(GLPROTO_CFLAGS) \
-	$(X11_INCLUDES)
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa
-
-noinst_LTLIBRARIES = libxlib.la
-
-libxlib_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/state_trackers/nine/Makefile.am b/src/gallium/state_trackers/nine/Makefile.am
deleted file mode 100644
index 2a66df8b9e6..00000000000
--- a/src/gallium/state_trackers/nine/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include/D3D9 \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-noinst_LTLIBRARIES = libninetracker.la
-
-libninetracker_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = README meson.build
diff --git a/src/gallium/state_trackers/omx/Makefile.am b/src/gallium/state_trackers/omx/Makefile.am
deleted file mode 100644
index 734ca0908e4..00000000000
--- a/src/gallium/state_trackers/omx/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-if HAVE_ST_OMX_BELLAGIO
-SUBDIRS = bellagio
-
-AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(VL_CFLAGS) \
-	$(XCB_DRI3_CFLAGS) \
-	$(OMX_BELLAGIO_CFLAGS)
-else
-SUBDIRS = tizonia
-
-AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(LIBDRM_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(VL_CFLAGS) \
-	$(XCB_DRI3_CFLAGS) \
-	$(OMX_TIZONIA_CFLAGS) \
-	$(OMX_TIZILHEADERS_CFLAGS) \
-	$(OMX_TIZPLATFORM_CFLAGS)
-endif
-
-noinst_LTLIBRARIES = libomxtracker_common.la
-
-libomxtracker_common_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/state_trackers/omx/bellagio/Makefile.am b/src/gallium/state_trackers/omx/bellagio/Makefile.am
deleted file mode 100644
index 3e542ab0f26..00000000000
--- a/src/gallium/state_trackers/omx/bellagio/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/state_trackers/omx \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(VL_CFLAGS) \
-	$(XCB_DRI3_CFLAGS) \
-	$(OMX_BELLAGIO_CFLAGS)
-
-noinst_LTLIBRARIES = libomxtracker.la
-
-libomxtracker_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/state_trackers/omx/tizonia/Makefile.am b/src/gallium/state_trackers/omx/tizonia/Makefile.am
deleted file mode 100644
index ac72affa326..00000000000
--- a/src/gallium/state_trackers/omx/tizonia/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_builddir)/src/mesa/drivers/dri/common \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	-I$(top_srcdir)/src/egl \
-	-I$(top_srcdir)/src/egl/drivers/dri2 \
-	-I$(top_srcdir)/src/egl/main \
-	-I$(top_srcdir)/src/gbm/main \
-	-I$(top_srcdir)/src/loader \
-	-I$(top_srcdir)/src/gbm/backends/dri \
-	-I$(top_srcdir)/src/gallium/state_trackers/dri \
-	-I$(top_srcdir)/src/gallium/state_trackers/omx \
-	$(GALLIUM_CFLAGS) \
-	$(LIBDRM_CFLAGS) \
-	$(WAYLAND_EGL_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(VL_CFLAGS) \
-	$(XCB_DRI3_CFLAGS) \
-	$(OMX_TIZONIA_CFLAGS) \
-	$(OMX_TIZILHEADERS_CFLAGS) \
-	$(OMX_TIZPLATFORM_CFLAGS)
-
-noinst_LTLIBRARIES = libomxtiztracker.la
-
-libomxtiztracker_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/state_trackers/osmesa/Makefile.am b/src/gallium/state_trackers/osmesa/Makefile.am
deleted file mode 100644
index 05e3ca0d739..00000000000
--- a/src/gallium/state_trackers/osmesa/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = $(GALLIUM_CFLAGS)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-I$(top_srcdir)/src/gallium/state_trackers/glx/xlib \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-DGALLIUM_SOFTPIPE
-
-noinst_LTLIBRARIES = libosmesa.la
-
-libosmesa_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/state_trackers/va/Makefile.am b/src/gallium/state_trackers/va/Makefile.am
deleted file mode 100644
index cd548e70b35..00000000000
--- a/src/gallium/state_trackers/va/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2014 Advanced Micro Devices, Inc.
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(VL_CFLAGS) \
-	$(XCB_DRI3_CFLAGS) \
-	$(VA_CFLAGS) \
-	-DVA_DRIVER_INIT_FUNC="__vaDriverInit_$(VA_MAJOR)_$(VA_MINOR)"
-
-noinst_LTLIBRARIES = libvatracker.la
-
-libvatracker_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/state_trackers/vdpau/Makefile.am b/src/gallium/state_trackers/vdpau/Makefile.am
deleted file mode 100644
index 8bf8945b238..00000000000
--- a/src/gallium/state_trackers/vdpau/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-VDPAU_MAJOR = 1
-VDPAU_MINOR = 0
-
-AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(VL_CFLAGS) \
-	$(XCB_DRI3_CFLAGS) \
-	$(VDPAU_CFLAGS)
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-DVER_MAJOR=$(VDPAU_MAJOR) \
-	-DVER_MINOR=$(VDPAU_MINOR)
-
-noinst_LTLIBRARIES = libvdpautracker.la
-
-libvdpautracker_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/state_trackers/xa/Makefile.am b/src/gallium/state_trackers/xa/Makefile.am
deleted file mode 100644
index 56ead63d3a4..00000000000
--- a/src/gallium/state_trackers/xa/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-pedantic \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-xa_includedir = $(includedir)
-xa_include_HEADERS = \
-	xa_composite.h \
-	xa_context.h \
-	xa_tracker.h
-
-noinst_LTLIBRARIES = libxatracker.la
-
-libxatracker_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = README xa-indent.sh meson.build
diff --git a/src/gallium/state_trackers/xvmc/Makefile.am b/src/gallium/state_trackers/xvmc/Makefile.am
deleted file mode 100644
index dc278099030..00000000000
--- a/src/gallium/state_trackers/xvmc/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(VL_CFLAGS) \
-	$(X11_INCLUDES) \
-	$(XCB_DRI3_CFLAGS) \
-	$(XVMC_CFLAGS)
-
-noinst_LTLIBRARIES = libxvmctracker.la
-
-libxvmctracker_la_SOURCES = $(C_SOURCES)
-
-## The tests require the XvMC library to be installed and the wrapper to
-## point to the correct library (via /etc/X11/XvMCConfig).
-noinst_PROGRAMS = \
-	tests/xvmc_bench \
-	tests/test_context \
-	tests/test_surface \
-	tests/test_subpicture \
-	tests/test_blocks \
-	tests/test_rendering
-
-noinst_HEADERS = tests/testlib.h
-
-TEST_LIBS = $(XVMC_LIBS) -lXvMCW $(VL_LIBS) $(XCB_DRI3_LIBS)
-tests_test_context_SOURCES = tests/test_context.c tests/testlib.c
-tests_test_context_LDADD = $(TEST_LIBS)
-tests_test_surface_SOURCES = tests/test_surface.c tests/testlib.c
-tests_test_surface_LDADD = $(TEST_LIBS)
-tests_test_subpicture_SOURCES = tests/test_subpicture.c tests/testlib.c
-tests_test_subpicture_LDADD = $(TEST_LIBS)
-tests_test_blocks_SOURCES = tests/test_blocks.c tests/testlib.c
-tests_test_blocks_LDADD = $(TEST_LIBS)
-tests_test_rendering_SOURCES = tests/test_rendering.c tests/testlib.c
-tests_test_rendering_LDADD = $(TEST_LIBS)
-tests_xvmc_bench_SOURCES = tests/xvmc_bench.c tests/testlib.c
-tests_xvmc_bench_LDADD = $(TEST_LIBS)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am
deleted file mode 100644
index 69cebbcd16f..00000000000
--- a/src/gallium/targets/d3dadapter9/Makefile.am
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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 $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include/D3D9 \
-	-I$(top_srcdir)/src/loader \
-	-I$(top_srcdir)/src/mapi/ \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_builddir)/src/util \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-I$(top_srcdir)/src/gallium/state_trackers/nine \
-	$(GALLIUM_TARGET_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-AM_CPPFLAGS = \
-	$(DEFINES)
-
-ninedir = $(D3D_DRIVER_INSTALL_DIR)
-nine_LTLIBRARIES = d3dadapter9.la
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = d3d.pc
-
-d3dadapter9_la_SOURCES = \
-	description.c \
-	getproc.c \
-	drm.c
-
-d3dadapter9_la_LDFLAGS = \
-	-shared \
-	-shrext .so \
-	-module \
-	-no-undefined \
-	-version-number $(NINE_MAJOR):$(NINE_MINOR):$(NINE_PATCH) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-if HAVE_LD_VERSION_SCRIPT
-d3dadapter9_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/d3dadapter9/d3dadapter9.sym
-endif # HAVE_LD_VERSION_SCRIPT
-
-d3dadapter9_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/gallium/state_trackers/nine/libninetracker.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(EXPAT_LIBS) \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-EXTRA_d3dadapter9_la_DEPENDENCIES = d3dadapter9.sym
-EXTRA_DIST = d3dadapter9.sym meson.build
-
-TARGET_DRIVERS =
-TARGET_CPPFLAGS =
-TARGET_LIB_DEPS =
-
-include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
-
-if HAVE_GALLIUM_STATIC_TARGETS
-
-d3dadapter9_la_CPPFLAGS = $(AM_CPPFLAGS) $(TARGET_CPPFLAGS)
-d3dadapter9_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
-	$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
-	$(TARGET_LIB_DEPS) \
-	$(TARGET_COMPILER_LIB_DEPS) \
-	$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
-
-else # HAVE_GALLIUM_STATIC_TARGETS
-
-d3dadapter9_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la
-
-endif # HAVE_GALLIUM_STATIC_TARGETS
-
-if HAVE_GALLIUM_LLVM
-nodist_EXTRA_d3dadapter9_la_SOURCES = dummy.cpp
-d3dadapter9_la_LDFLAGS += $(LLVM_LDFLAGS)
-d3dadapter9_la_LIBADD += $(LLVM_LIBS)
-endif
-
-d3dadapterdir = $(includedir)/d3dadapter
-d3dadapter_HEADERS = \
-	$(top_srcdir)/include/d3dadapter/d3dadapter9.h \
-	$(top_srcdir)/include/d3dadapter/drm.h \
-	$(top_srcdir)/include/d3dadapter/present.h
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
deleted file mode 100644
index f53be532bb2..00000000000
--- a/src/gallium/targets/dri/Makefile.am
+++ /dev/null
@@ -1,143 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	-I$(top_srcdir)/src/gallium/state_trackers/dri \
-	$(GALLIUM_TARGET_CFLAGS)
-
-AM_CPPFLAGS = \
-	$(DEFINES)
-
-dridir = $(DRI_DRIVER_INSTALL_DIR)
-dri_LTLIBRARIES = gallium_dri.la
-
-nodist_EXTRA_gallium_dri_la_SOURCES = dummy.cpp
-gallium_dri_la_SOURCES =
-
-gallium_dri_la_LDFLAGS = \
-	-shared \
-	-shrext .so \
-	-module \
-	-no-undefined \
-	-avoid-version \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-if HAVE_LD_VERSION_SCRIPT
-gallium_dri_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri/dri.sym
-endif # HAVE_LD_VERSION_SCRIPT
-
-if HAVE_LD_DYNAMIC_LIST
-gallium_dri_la_LDFLAGS += \
-	-Wl,--dynamic-list=$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
-endif # HAVE_LD_DYNAMIC_LIST
-
-gallium_dri_la_LIBADD = \
-	$(top_builddir)/src/mesa/libmesagallium.la \
-	$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-	$(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \
-	$(top_builddir)/src/gallium/state_trackers/dri/libdri.la \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
-	$(LIBDRM_LIBS) \
-	$(SELINUX_LIBS) \
-	$(EXPAT_LIBS) \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-EXTRA_gallium_dri_la_DEPENDENCIES = \
-	dri.sym \
-	$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
-EXTRA_DIST = \
-	SConscript \
-	meson.build \
-	dri.sym \
-	$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
-
-TARGET_DRIVERS =
-TARGET_CPPFLAGS =
-TARGET_LIB_DEPS =
-
-include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/tegra/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/v3d/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/kmsro/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/etnaviv/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/swr/Automake.inc
-
-if HAVE_GALLIUM_STATIC_TARGETS
-
-gallium_dri_la_SOURCES += target.c
-gallium_dri_la_CPPFLAGS = $(AM_CPPFLAGS) $(TARGET_CPPFLAGS)
-gallium_dri_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
-	$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
-	$(TARGET_LIB_DEPS) \
-	$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
-
-else # HAVE_GALLIUM_STATIC_TARGETS
-
-gallium_dri_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la
-
-endif # HAVE_GALLIUM_STATIC_TARGETS
-
-if HAVE_GALLIUM_LLVM
-gallium_dri_la_LIBADD += $(LLVM_LIBS)
-gallium_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
-endif
-
-if HAVE_COMPAT_SYMLINKS
-# Add a link to allow setting LIBGL_DRIVERS_PATH to /lib/gallium of the build tree.
-all-local: $(dri_LTLIBRARIES)
-	$(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium;         \
-	$(MKDIR_P) $${link_dir};                                        \
-	for i in $(TARGET_DRIVERS); do                                  \
-		ln -f .libs/gallium_dri.so                              \
-			$${link_dir}/$${i}_dri.so;                      \
-	done
-
-clean-local:
-	$(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium;         \
-	$(AM_V_GEN)for i in $(TARGET_DRIVERS); do                       \
-		$(RM) $${link_dir}/$${i}_dri.so;                        \
-	done;
-endif
-
-# hardlink each megadriver instance, but don't actually have
-# gallium_dri.so in the set of final installed files.
-install-data-hook:
-	for i in $(TARGET_DRIVERS); do                                  \
-		ln -f $(DESTDIR)$(dridir)/gallium_dri.so                \
-		      $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
-	done;                                                           \
-	$(RM) $(DESTDIR)$(dridir)/gallium_dri.*;                        \
-	$(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true
-
-uninstall-hook:
-	for i in $(TARGET_DRIVERS); do                                  \
-		$(RM) $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
-	done;
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
deleted file mode 100644
index 56d548e7c15..00000000000
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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.
-
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src/mesa/main \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/state_trackers/glx/xlib \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-DGALLIUM_SOFTPIPE
-
-AM_CFLAGS = $(X11_INCLUDES)
-
-lib_LTLIBRARIES = lib@[email protected]
-
-nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
-lib@GL_LIB@_la_SOURCES = xlib.c
-lib@GL_LIB@_la_LDFLAGS = \
-	-no-undefined \
-	-version-number 1:5:0 \
-	$(BSYMBOLIC) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-if HAVE_LD_VERSION_SCRIPT
-lib@GL_LIB@_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/libgl-xlib/libgl-xlib.sym
-endif
-
-lib@GL_LIB@_la_LIBADD = \
-	$(top_builddir)/src/gallium/state_trackers/glx/xlib/libxlib.la \
-	$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
-	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
-	$(top_builddir)/src/mapi/glapi/libglapi.la \
-	$(top_builddir)/src/mesa/libmesagallium.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(SHARED_GLAPI_LIB) \
-	$(GL_LIB_DEPS) \
-	$(CLOCK_LIB) \
-	$(LIBUNWIND_LIBS)
-
-if HAVE_GALLIUM_LLVM
-lib@GL_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
-AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
-lib@GL_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
-endif
-
-if HAVE_GALLIUM_SWR
-lib@GL_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/swr/libmesaswr.la $(LLVM_LIBS)
-AM_CPPFLAGS += -DGALLIUM_SWR
-endif
-
-EXTRA_lib@GL_LIB@_la_DEPENDENCIES = libgl-xlib.sym
-EXTRA_DIST = SConscript libgl-xlib.sym meson.build
-
-include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am
deleted file mode 100644
index 32d61a189b4..00000000000
--- a/src/gallium/targets/omx/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_TARGET_CFLAGS)
-
-if HAVE_ST_OMX_BELLAGIO
-omxdir = $(OMX_BELLAGIO_LIB_INSTALL_DIR)
-else
-omxdir = $(OMX_TIZONIA_LIB_INSTALL_DIR)
-endif
-
-omx_LTLIBRARIES = libomx_mesa.la
-
-nodist_EXTRA_libomx_mesa_la_SOURCES = dummy.cpp
-libomx_mesa_la_SOURCES =
-
-libomx_mesa_la_LDFLAGS = \
-	-shared \
-	-module \
-	-no-undefined \
-	-avoid-version \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-if HAVE_LD_VERSION_SCRIPT
-libomx_mesa_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx/omx.sym
-endif # HAVE_LD_VERSION_SCRIPT
-
-libomx_mesa_la_LIBADD = \
-	$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker_common.la \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(LIBDRM_LIBS) \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-if HAVE_ST_OMX_BELLAGIO
-libomx_mesa_la_LIBADD += \
-	$(top_builddir)/src/gallium/state_trackers/omx/bellagio/libomxtracker.la \
-	$(OMX_BELLAGIO_LIBS)
-else
-libomx_mesa_la_LIBADD += \
-	$(top_builddir)/src/gallium/state_trackers/omx/tizonia/libomxtiztracker.la \
-	$(OMX_TIZONIA_LIBS) \
-	$(OMX_TIZILHEADERS_LIBS) \
-	$(OMX_TIZPLATFORM_LIBS)
-endif
-
-if HAVE_PLATFORM_X11
-libomx_mesa_la_LIBADD += \
-	$(VL_LIBS) \
-	$(XCB_DRI3_LIBS)
-endif
-
-EXTRA_libomx_mesa_la_DEPENDENCIES = omx.sym
-EXTRA_DIST = omx.sym meson.build
-
-if HAVE_GALLIUM_STATIC_TARGETS
-
-TARGET_DRIVERS =
-TARGET_CPPFLAGS =
-TARGET_LIB_DEPS =
-
-
-include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
-
-libomx_mesa_la_SOURCES += target.c
-libomx_mesa_la_CPPFLAGS = $(TARGET_CPPFLAGS)
-libomx_mesa_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
-	$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
-	$(TARGET_LIB_DEPS) \
-	$(TARGET_COMPILER_LIB_DEPS) \
-	$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
-
-else # HAVE_GALLIUM_STATIC_TARGETS
-
-libomx_mesa_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la
-
-endif # HAVE_GALLIUM_STATIC_TARGETS
-
-if HAVE_GALLIUM_LLVM
-libomx_mesa_la_LIBADD += $(LLVM_LIBS)
-libomx_mesa_la_LDFLAGS += $(LLVM_LDFLAGS)
-endif
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
deleted file mode 100644
index f0e1de7797c..00000000000
--- a/src/gallium/targets/opencl/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-lib_LTLIBRARIES = lib@[email protected]
-
-lib@OPENCL_LIBNAME@_la_LDFLAGS = \
-	$(LLVM_LDFLAGS) \
-	-no-undefined \
-	-version-number @OPENCL_VERSION@:0 \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-if HAVE_LD_VERSION_SCRIPT
-lib@OPENCL_LIBNAME@_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/opencl/opencl.sym
-endif
-
-lib@OPENCL_LIBNAME@_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la \
-	$(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(EXPAT_LIBS) \
-	$(LIBELF_LIBS) \
-	$(DLOPEN_LIBS) \
-	-lclangCodeGen \
-	-lclangFrontend \
-	-lclangFrontendTool \
-	-lclangDriver \
-	-lclangSerialization \
-	-lclangParse \
-	-lclangSema \
-	-lclangAnalysis \
-	-lclangAST \
-	-lclangEdit \
-	-lclangLex \
-	-lclangBasic \
-	$(LLVM_LIBS) \
-	$(PTHREAD_LIBS)
-
-nodist_EXTRA_lib@OPENCL_LIBNAME@_la_SOURCES = dummy.cpp
-lib@OPENCL_LIBNAME@_la_SOURCES =
-
-EXTRA_lib@OPENCL_LIBNAME@_la_DEPENDENCIES = opencl.sym
-EXTRA_DIST = mesa.icd opencl.sym meson.build
-
-if HAVE_CLOVER_ICD
-icddir = $(sysconfdir)/OpenCL/vendors/
-icd_DATA = mesa.icd
-endif
-
-include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
deleted file mode 100644
index dc4d49e1072..00000000000
--- a/src/gallium/targets/osmesa/Makefile.am
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# 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 $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-DGALLIUM_SOFTPIPE
-
-lib_LTLIBRARIES = lib@[email protected]
-
-nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
-lib@OSMESA_LIB@_la_SOURCES = target.c
-
-lib@OSMESA_LIB@_la_LDFLAGS = \
-	-no-undefined \
-	-version-number @OSMESA_VERSION@ \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-if HAVE_LD_VERSION_SCRIPT
-lib@OSMESA_LIB@_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/osmesa/osmesa.sym
-endif
-
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
-
-lib@OSMESA_LIB@_la_LIBADD = \
-	$(top_builddir)/src/mesa/libmesagallium.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
-	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
-	$(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \
-	$(top_builddir)/src/mapi/glapi/libglapi.la \
-	$(SHARED_GLAPI_LIB) \
-	$(OSMESA_LIB_DEPS) \
-	$(CLOCK_LIB) \
-	$(LIBUNWIND_LIBS)
-
-if HAVE_GALLIUM_LLVM
-AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
-lib@OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
-lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
-endif
-
-if HAVE_GALLIUM_SWR
-AM_CPPFLAGS += -DGALLIUM_SWR
-lib@OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
-lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/swr/libmesaswr.la $(LLVM_LIBS)
-endif
-
-EXTRA_lib@OSMESA_LIB@_la_DEPENDENCIES = osmesa.sym
-EXTRA_DIST = \
-	osmesa.sym \
-	osmesa.def \
-	osmesa.mingw.def \
-	SConscript \
-	meson.build
-
-include $(top_srcdir)/install-gallium-links.mk
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = osmesa.pc
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
deleted file mode 100644
index 864ee8d50d3..00000000000
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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 $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CPPFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-I$(top_builddir)/src/util \
-	$(GALLIUM_PIPE_LOADER_DEFINES) \
-	$(LIBDRM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-pipedir = $(libdir)/gallium-pipe
-pipe_LTLIBRARIES =
-
-PIPE_LIBS =
-
-if NEED_GALLIUM_VL
-PIPE_LIBS += \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la
-else
-PIPE_LIBS += \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la
-endif
-
-if NEED_GALLIUM_VL_WINSYS
-PIPE_LIBS+= \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la
-endif
-
-PIPE_LIBS += \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/compiler/nir/libnir.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-AM_LDFLAGS = \
-	-module \
-	-no-undefined \
-	-avoid-version \
-	$(GC_SECTIONS)
-
-if HAVE_LD_VERSION_SCRIPT
-AM_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.sym
-endif
-
-if HAVE_GALLIUM_LLVM
-PIPE_LIBS += $(LLVM_LIBS)
-AM_LDFLAGS += $(LLVM_LDFLAGS)
-endif
-
-if HAVE_GALLIUM_I915
-pipe_LTLIBRARIES += pipe_i915.la
-
-pipe_i915_la_SOURCES = pipe_i915.c
-nodist_EXTRA_pipe_i915_la_SOURCES = dummy.cpp
-pipe_i915_la_LIBADD = \
-	$(PIPE_LIBS) \
-	$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
-	$(top_builddir)/src/gallium/drivers/i915/libi915.la \
-	$(LIBDRM_LIBS) \
-	$(I915_LIBS)
-
-endif
-
-if HAVE_GALLIUM_NOUVEAU
-pipe_LTLIBRARIES += pipe_nouveau.la
-
-pipe_nouveau_la_SOURCES = pipe_nouveau.c
-nodist_EXTRA_pipe_nouveau_la_SOURCES = dummy.cpp
-pipe_nouveau_la_LIBADD = \
-	$(PIPE_LIBS) \
-	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
-	$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
-	$(LIBDRM_LIBS) \
-	$(NOUVEAU_LIBS)
-
-endif
-
-if HAVE_GALLIUM_R300
-pipe_LTLIBRARIES += pipe_r300.la
-
-pipe_r300_la_SOURCES = pipe_r300.c
-nodist_EXTRA_pipe_r300_la_SOURCES = dummy.cpp
-pipe_r300_la_LIBADD = \
-	$(PIPE_LIBS) \
-	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
-	$(top_builddir)/src/gallium/drivers/r300/libr300.la \
-	$(LIBDRM_LIBS) \
-	$(RADEON_LIBS)
-
-endif
-
-if HAVE_GALLIUM_R600
-pipe_LTLIBRARIES += pipe_r600.la
-
-pipe_r600_la_SOURCES = pipe_r600.c
-nodist_EXTRA_pipe_r600_la_SOURCES = dummy.cpp
-pipe_r600_la_LIBADD = \
-	$(PIPE_LIBS) \
-	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
-	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
-	$(LIBDRM_LIBS) \
-	$(RADEON_LIBS) \
-	$(LIBELF_LIBS)
-endif
-
-if HAVE_GALLIUM_RADEONSI
-pipe_LTLIBRARIES += pipe_radeonsi.la
-
-pipe_radeonsi_la_SOURCES = pipe_radeonsi.c
-nodist_EXTRA_pipe_radeonsi_la_SOURCES = dummy.cpp
-pipe_radeonsi_la_LIBADD = \
-	$(PIPE_LIBS) \
-	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
-	$(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la \
-	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
-	$(top_builddir)/src/amd/common/libamd_common.la \
-	$(top_builddir)/src/util/libxmlconfig.la \
-	$(LIBDRM_LIBS) \
-	$(RADEON_LIBS) \
-	$(AMDGPU_LIBS)
-
-endif
-
-if HAVE_GALLIUM_FREEDRENO
-pipe_LTLIBRARIES += pipe_msm.la
-
-pipe_msm_la_SOURCES = pipe_msm.c
-nodist_EXTRA_pipe_msm_la_SOURCES = dummy.cpp
-pipe_msm_la_LIBADD = \
-	$(PIPE_LIBS) \
-	$(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \
-	$(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \
-	$(top_builddir)/src/freedreno/libfreedreno_drm.la \
-	$(top_builddir)/src/freedreno/libfreedreno_ir3.la \
-	$(LIBDRM_LIBS) \
-	$(FREEDRENO_LIBS)
-
-endif
-
-if HAVE_GALLIUM_SVGA
-pipe_LTLIBRARIES += pipe_vmwgfx.la
-
-pipe_vmwgfx_la_SOURCES = pipe_vmwgfx.c
-nodist_EXTRA_pipe_vmwgfx_la_SOURCES = dummy.cpp
-
-pipe_vmwgfx_la_LIBADD = \
-	$(PIPE_LIBS) \
-	$(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
-	$(top_builddir)/src/gallium/drivers/svga/libsvga.la \
-	$(LIBDRM_LIBS)
-
-endif
-
-if HAVE_GALLIUM_SWRAST
-pipe_LTLIBRARIES += pipe_swrast.la
-pipe_swrast_la_SOURCES = pipe_swrast.c
-nodist_EXTRA_pipe_swrast_la_SOURCES = dummy.cpp
-pipe_swrast_la_LIBADD = $(PIPE_LIBS)
-
-if HAVE_GALLIUM_SOFTPIPE
-AM_CPPFLAGS += -DGALLIUM_SOFTPIPE
-
-pipe_swrast_la_LIBADD += \
-	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
-endif
-
-if HAVE_GALLIUM_LLVMPIPE
-AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
-
-pipe_swrast_la_LIBADD += \
-	$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
-endif
-
-if HAVE_GALLIUM_SWR
-AM_CPPFLAGS += -DGALLIUM_SWR
-
-pipe_swrast_la_LIBADD += \
-	$(top_builddir)/src/gallium/drivers/swr/libmesaswr.la
-endif
-
-pipe_swrast_la_LIBADD += \
-	$(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
-
-endif
-
-EXTRA_DIST = pipe.sym meson.build
diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am
deleted file mode 100644
index 0f2fe14594b..00000000000
--- a/src/gallium/targets/va/Makefile.am
+++ /dev/null
@@ -1,88 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_TARGET_CFLAGS)
-
-vadir = $(VA_LIB_INSTALL_DIR)
-va_LTLIBRARIES = gallium_drv_video.la
-
-nodist_EXTRA_gallium_drv_video_la_SOURCES = dummy.cpp
-gallium_drv_video_la_SOURCES =
-
-gallium_drv_video_la_LDFLAGS = \
-	-shared \
-	-module \
-	-no-undefined \
-	-avoid-version \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-if HAVE_LD_VERSION_SCRIPT
-gallium_drv_video_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/va/va.sym
-endif # HAVE_LD_VERSION_SCRIPT
-
-# NOTE: gallium_drv_video does not use(link against) libva
-gallium_drv_video_la_LIBADD = \
-	$(top_builddir)/src/gallium/state_trackers/va/libvatracker.la \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(LIBDRM_LIBS) \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-if HAVE_PLATFORM_X11
-gallium_drv_video_la_LIBADD += \
-	$(VL_LIBS) \
-	$(XCB_DRI3_LIBS)
-endif
-
-EXTRA_gallium_drv_video_la_DEPENDENCIES = va.sym
-EXTRA_DIST = va.sym meson.build
-
-if HAVE_GALLIUM_STATIC_TARGETS
-
-TARGET_DRIVERS =
-TARGET_CPPFLAGS =
-TARGET_LIB_DEPS =
-
-include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
-
-gallium_drv_video_la_SOURCES += target.c
-gallium_drv_video_la_CPPFLAGS = $(TARGET_CPPFLAGS)
-gallium_drv_video_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
-	$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
-	$(TARGET_LIB_DEPS) \
-	$(TARGET_COMPILER_LIB_DEPS) \
-	$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
-
-else # HAVE_GALLIUM_STATIC_TARGETS
-
-gallium_drv_video_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la
-
-endif # HAVE_GALLIUM_STATIC_TARGETS
-
-if HAVE_GALLIUM_LLVM
-gallium_drv_video_la_LIBADD += $(LLVM_LIBS)
-gallium_drv_video_la_LDFLAGS += $(LLVM_LDFLAGS)
-endif
-
-# hardlink each megadriver instance, but don't actually have
-# gallium_drv_video.so in the set of final installed files.
-install-data-hook:
-	for i in $(TARGET_DRIVERS); do                                  \
-		ln -f $(DESTDIR)$(vadir)/gallium_drv_video.so                \
-		      $(DESTDIR)$(vadir)/$${i}_drv_video.so;                 \
-	done;                                                           \
-	$(RM) $(DESTDIR)$(vadir)/gallium_drv_video.*
-
-uninstall-hook:
-	for i in $(TARGET_DRIVERS); do                                  \
-		$(RM) $(DESTDIR)$(vadir)/$${i}_drv_video.so;                 \
-	done;
diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
deleted file mode 100644
index 2742c7acd44..00000000000
--- a/src/gallium/targets/vdpau/Makefile.am
+++ /dev/null
@@ -1,132 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_TARGET_CFLAGS)
-
-vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
-vdpau_LTLIBRARIES = libvdpau_gallium.la
-
-nodist_EXTRA_libvdpau_gallium_la_SOURCES = dummy.cpp
-libvdpau_gallium_la_SOURCES =
-
-libvdpau_gallium_la_LDFLAGS = \
-	-shared \
-	-module \
-	-no-undefined \
-	-version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-if HAVE_LD_VERSION_SCRIPT
-libvdpau_gallium_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau/vdpau.sym
-endif # HAVE_LD_VERSION_SCRIPT
-
-if HAVE_LD_DYNAMIC_LIST
-libvdpau_gallium_la_LDFLAGS += \
-	-Wl,--dynamic-list=$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
-endif # HAVE_LD_DYNAMIC_LIST
-
-# NOTE: libvdpau_gallium does not use(link against) libvdpau
-libvdpau_gallium_la_LIBADD = \
-	$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(VL_LIBS) \
-	$(XCB_DRI3_LIBS) \
-	$(LIBDRM_LIBS) \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-EXTRA_libvdpau_gallium_la_DEPENDENCIES = \
-	vdpau.sym \
-	$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
-EXTRA_DIST = \
-	vdpau.sym \
-	$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn \
-	meson.build
-
-TARGET_DRIVERS =
-TARGET_CPPFLAGS =
-TARGET_LIB_DEPS =
-
-include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
-
-if HAVE_GALLIUM_STATIC_TARGETS
-
-libvdpau_gallium_la_SOURCES += target.c
-libvdpau_gallium_la_CPPFLAGS = $(TARGET_CPPFLAGS)
-libvdpau_gallium_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
-	$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
-	$(TARGET_LIB_DEPS) \
-	$(TARGET_COMPILER_LIB_DEPS) \
-	$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
-
-else # HAVE_GALLIUM_STATIC_TARGETS
-
-libvdpau_gallium_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la
-
-endif # HAVE_GALLIUM_STATIC_TARGETS
-
-if HAVE_GALLIUM_LLVM
-libvdpau_gallium_la_LIBADD += $(LLVM_LIBS)
-libvdpau_gallium_la_LDFLAGS += $(LLVM_LDFLAGS)
-endif
-
-if HAVE_COMPAT_SYMLINKS
-# Add a link to allow setting VDPAU_DRIVER_PATH to /lib/gallium of the build tree.
-all-local: $(vdpau_LTLIBRARIES)
-	$(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium;		\
-	$(MKDIR_P) $${link_dir};					\
-	for i in $(TARGET_DRIVERS); do					\
-		j=libvdpau_gallium.$(LIB_EXT);				\
-		k=libvdpau_$${i}.$(LIB_EXT);				\
-		l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;		\
-		ln -f .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0	\
-		      $${link_dir}/$${l};				\
-		ln -sf $${l}						\
-		       $${link_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
-		ln -sf $${l}						\
-		       $${link_dir}/$${k}.$(VDPAU_MAJOR);		\
-		ln -sf $${l}						\
-		       $${link_dir}/$${k};				\
-	done
-
-clean-local:
-	$(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium;		\
-	$(AM_V_GEN)for i in $(TARGET_DRIVERS); do			\
-		$(RM) $${link_dir}/libvdpau_$${i}.so{,.$(VDPAU_MAJOR){,.$(VDPAU_MINOR){,.0}}}; \
-	done;
-endif
-
-# hardlink each megadriver instance, but don't actually have
-# libvdpau_gallium.so in the set of final installed files.
-install-data-hook:
-	$(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir);			\
-	for i in $(TARGET_DRIVERS); do					\
-		j=libvdpau_gallium.$(LIB_EXT);				\
-		k=libvdpau_$${i}.$(LIB_EXT);				\
-		l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;		\
-		ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
-		      $${dest_dir}/$${l};				\
-		ln -sf $${l}						\
-		       $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
-		ln -sf $${l}						\
-		       $${dest_dir}/$${k}.$(VDPAU_MAJOR);		\
-		ln -sf $${l}						\
-		       $${dest_dir}/$${k};				\
-	done;								\
-	$(RM) $${dest_dir}/libvdpau_gallium.*;				\
-	$(RM) -d $${dest_dir} &>/dev/null || true
-
-uninstall-hook:
-	for i in $(TARGET_DRIVERS); do					\
-		$(RM) $(DESTDIR)$(vdpaudir)/libvdpau_$${i}.so{,.$(VDPAU_MAJOR){,.$(VDPAU_MINOR){,.0}}}; \
-	done;
diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am
deleted file mode 100644
index 2238a7ea81f..00000000000
--- a/src/gallium/targets/xa/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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 $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_TARGET_CFLAGS)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xatracker.pc
-
-lib_LTLIBRARIES = libxatracker.la
-
-nodist_EXTRA_libxatracker_la_SOURCES = dummy.cpp
-libxatracker_la_SOURCES =
-
-libxatracker_la_LIBADD = \
-	$(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/compiler/glsl/libglsl.la \
-	$(LIBDRM_LIBS) \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-libxatracker_la_LDFLAGS = \
-	-no-undefined \
-	-version-number $(XA_MAJOR):$(XA_MINOR):$(XA_PATCH) \
-	$(GC_SECTIONS)
-
-if HAVE_LD_VERSION_SCRIPT
-libxatracker_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/xa/xa.sym
-endif
-
-EXTRA_libxatracker_la_DEPENDENCIES = xa.sym
-EXTRA_DIST = xa.sym meson.build
-
-if HAVE_GALLIUM_STATIC_TARGETS
-
-TARGET_DRIVERS =
-TARGET_CPPFLAGS =
-TARGET_LIB_DEPS =
-
-include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
-
-libxatracker_la_SOURCES += target.c
-libxatracker_la_CPPFLAGS = $(TARGET_CPPFLAGS)
-libxatracker_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
-	$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
-	$(TARGET_LIB_DEPS)
-
-else # HAVE_GALLIUM_STATIC_TARGETS
-
-libxatracker_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la
-
-endif # HAVE_GALLIUM_STATIC_TARGETS
-
-if HAVE_GALLIUM_LLVM
-libxatracker_la_LIBADD += $(LLVM_LIBS)
-libxatracker_la_LDFLAGS += $(LLVM_LDFLAGS)
-endif
-
-include $(top_srcdir)/install-lib-links.mk
diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
deleted file mode 100644
index 45b1d860692..00000000000
--- a/src/gallium/targets/xvmc/Makefile.am
+++ /dev/null
@@ -1,93 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_TARGET_CFLAGS)
-
-xvmcdir = $(XVMC_LIB_INSTALL_DIR)
-xvmc_LTLIBRARIES = libXvMCgallium.la
-
-nodist_EXTRA_libXvMCgallium_la_SOURCES = dummy.cpp
-libXvMCgallium_la_SOURCES =
-
-libXvMCgallium_la_LDFLAGS = \
-	-shared \
-	-module \
-	-no-undefined \
-	-version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-if HAVE_LD_VERSION_SCRIPT
-libXvMCgallium_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc/xvmc.sym
-endif # HAVE_LD_VERSION_SCRIPT
-
-libXvMCgallium_la_LIBADD = \
-	$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \
-	$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(XVMC_LIBS) \
-	$(VL_LIBS) \
-	$(XCB_DRI3_LIBS) \
-	$(LIBDRM_LIBS) \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-EXTRA_libXvMCgallium_la_DEPENDENCIES = xvmc.sym
-EXTRA_DIST = xvmc.sym meson.build
-
-TARGET_DRIVERS =
-TARGET_CPPFLAGS =
-TARGET_LIB_DEPS =
-
-include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
-
-include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
-
-if HAVE_GALLIUM_STATIC_TARGETS
-
-libXvMCgallium_la_SOURCES += target.c
-libXvMCgallium_la_CPPFLAGS = $(TARGET_CPPFLAGS)
-libXvMCgallium_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
-	$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
-	$(TARGET_LIB_DEPS) \
-	$(TARGET_COMPILER_LIB_DEPS) \
-	$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
-
-else # HAVE_GALLIUM_STATIC_TARGETS
-libXvMCgallium_la_LIBADD += \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la
-
-endif # HAVE_GALLIUM_STATIC_TARGETS
-
-if HAVE_GALLIUM_LLVM
-libXvMCgallium_la_LIBADD += $(LLVM_LIBS)
-libXvMCgallium_la_LDFLAGS += $(LLVM_LDFLAGS)
-endif
-
-# hardlink each megadriver instance, but don't actually have
-# libXvMCgallium.so in the set of final installed files.
-install-data-hook:
-	$(AM_V_GEN)dest_dir=$(DESTDIR)/$(xvmcdir);			\
-	for i in $(TARGET_DRIVERS); do					\
-		j=libXvMCgallium.$(LIB_EXT);				\
-		k=libXvMC$${i}.$(LIB_EXT);				\
-		l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0;			\
-		ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0	\
-		      $${dest_dir}/$${l};				\
-		ln -sf $${l}						\
-		       $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR);	\
-		ln -sf $${l}						\
-		       $${dest_dir}/$${k}.$(XVMC_MAJOR);		\
-		ln -sf $${l}						\
-		       $${dest_dir}/$${k};				\
-	done;								\
-	$(RM) $${dest_dir}/libXvMCgallium.*;				\
-	$(RM) -d $${dest_dir} &>/dev/null || true
-
-uninstall-hook:
-	for i in $(TARGET_DRIVERS); do					\
-		$(RM) $(DESTDIR)$(xvmcdir)/libXvMC$${i}.so{,.$(XVMC_MAJOR){,.$(XVMC_MINOR){,.0}}}; \
-	done;
diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
deleted file mode 100644
index db9a54ff0ad..00000000000
--- a/src/gallium/tests/trivial/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-PIPE_SRC_DIR = $(top_builddir)/src/gallium/targets/pipe-loader
-
-AM_CFLAGS = \
-	$(GALLIUM_CFLAGS)
-
-LDADD = \
-	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-noinst_PROGRAMS = compute tri quad-tex
-
-compute_SOURCES = compute.c
-
-tri_SOURCES = tri.c
-
-quad_tex_SOURCES = quad-tex.c
-
-EXTRA_DIST = meson.build
-
-clean-local:
-	-rm -f result.bmp
diff --git a/src/gallium/tests/unit/Makefile.am b/src/gallium/tests/unit/Makefile.am
deleted file mode 100644
index 74d125fe449..00000000000
--- a/src/gallium/tests/unit/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# TODO: wire up some useful tests to make check
-
-include $(top_srcdir)/src/gallium/Automake.inc
-
-EXTRA_DIST = SConscript meson.build
-
-AM_CFLAGS = \
-	$(GALLIUM_CFLAGS)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys
-
-LDADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
-	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
-	$(GALLIUM_COMMON_LIB_DEPS)
-
-noinst_PROGRAMS = pipe_barrier_test u_cache_test u_half_test \
-	u_format_test u_format_compatible_test translate_test
-
-pipe_barrier_test_SOURCES = pipe_barrier_test.c
-
-u_cache_test_SOURCES = u_cache_test.c
-
-u_half_test_SOURCES = u_half_test.c
-
-u_format_test_SOURCES = u_format_test.c
-
-u_format_compatible_test_SOURCES = u_format_compatible_test.c
-
-translate_test_SOURCES = translate_test.c
diff --git a/src/gallium/winsys/amdgpu/drm/Makefile.am b/src/gallium/winsys/amdgpu/drm/Makefile.am
deleted file mode 100644
index 1c2ec010fc6..00000000000
--- a/src/gallium/winsys/amdgpu/drm/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_WINSYS_CFLAGS) \
-	$(AMDGPU_CFLAGS) \
-	$(LLVM_CFLAGS) \
-	-I$(top_srcdir)/src/amd/
-
-AM_CXXFLAGS = $(AM_CFLAGS)
-
-noinst_LTLIBRARIES = libamdgpuwinsys.la
-
-libamdgpuwinsys_la_LIBADD = \
-   $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
-
-libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/etnaviv/drm/Makefile.am b/src/gallium/winsys/etnaviv/drm/Makefile.am
deleted file mode 100644
index 3cc54c8ad13..00000000000
--- a/src/gallium/winsys/etnaviv/drm/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	$(GALLIUM_CFLAGS) \
-	$(ETNAVIV_CFLAGS)
-
-noinst_LTLIBRARIES = libetnavivdrm.la
-
-libetnavivdrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/freedreno/drm/Makefile.am b/src/gallium/winsys/freedreno/drm/Makefile.am
deleted file mode 100644
index 16184dfd935..00000000000
--- a/src/gallium/winsys/freedreno/drm/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/freedreno \
-	-I$(top_srcdir)/src/freedreno/registers \
-	$(GALLIUM_WINSYS_CFLAGS) \
-	$(FREEDRENO_CFLAGS)
-
-noinst_LTLIBRARIES = libfreedrenodrm.la
-
-libfreedrenodrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/i915/drm/Makefile.am b/src/gallium/winsys/i915/drm/Makefile.am
deleted file mode 100644
index 0b06f9df876..00000000000
--- a/src/gallium/winsys/i915/drm/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	$(GALLIUM_WINSYS_CFLAGS) \
-	$(I915_CFLAGS)
-
-noinst_LTLIBRARIES = libi915drm.la
-
-libi915drm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/kmsro/drm/Makefile.am b/src/gallium/winsys/kmsro/drm/Makefile.am
deleted file mode 100644
index 8c51839b064..00000000000
--- a/src/gallium/winsys/kmsro/drm/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	$(GALLIUM_WINSYS_CFLAGS) \
-	$(LIBDRM_CFLAGS)
-
-if HAVE_GALLIUM_ETNAVIV
-AM_CFLAGS += -DGALLIUM_ETNAVIV
-endif
-
-if HAVE_GALLIUM_VC4
-AM_CFLAGS += -DGALLIUM_VC4
-endif
-
-if HAVE_GALLIUM_FREEDRENO
-AM_CFLAGS += -DGALLIUM_FREEDRENO
-endif
-
-noinst_LTLIBRARIES = libkmsrodrm.la
-
-libkmsrodrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am b/src/gallium/winsys/nouveau/drm/Makefile.am
deleted file mode 100644
index 992fa25cc11..00000000000
--- a/src/gallium/winsys/nouveau/drm/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	$(GALLIUM_WINSYS_CFLAGS) \
-	$(NOUVEAU_CFLAGS)
-
-noinst_LTLIBRARIES = libnouveaudrm.la
-
-libnouveaudrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/panfrost/drm/Makefile.am b/src/gallium/winsys/panfrost/drm/Makefile.am
deleted file mode 100644
index 7a836288b02..00000000000
--- a/src/gallium/winsys/panfrost/drm/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2014 Broadco
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	$(GALLIUM_WINSYS_CFLAGS)
-
-noinst_LTLIBRARIES = libpanfrostdrm.la
-
-libpanfrostdrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/radeon/drm/Makefile.am b/src/gallium/winsys/radeon/drm/Makefile.am
deleted file mode 100644
index c94c9b3a9c4..00000000000
--- a/src/gallium/winsys/radeon/drm/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_WINSYS_CFLAGS) \
-	$(RADEON_CFLAGS)
-
-noinst_LTLIBRARIES = libradeonwinsys.la
-
-libradeonwinsys_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am
deleted file mode 100644
index 46bf5d85f9d..00000000000
--- a/src/gallium/winsys/svga/drm/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers/svga \
-	-I$(top_srcdir)/src/gallium/drivers/svga/include \
-	$(GALLIUM_WINSYS_CFLAGS) \
-	$(LIBDRM_CFLAGS)
-
-noinst_LTLIBRARIES = libsvgadrm.la
-
-libsvgadrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/winsys/sw/dri/Makefile.am b/src/gallium/winsys/sw/dri/Makefile.am
deleted file mode 100644
index ecf63d17da9..00000000000
--- a/src/gallium/winsys/sw/dri/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_WINSYS_CFLAGS)
-
-noinst_LTLIBRARIES = libswdri.la
-
-libswdri_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/winsys/sw/kms-dri/Makefile.am b/src/gallium/winsys/sw/kms-dri/Makefile.am
deleted file mode 100644
index 022f3c508da..00000000000
--- a/src/gallium/winsys/sw/kms-dri/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#             2013 Red Hat, Inc.
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_WINSYS_CFLAGS) \
-	$(LIBDRM_CFLAGS)
-
-noinst_LTLIBRARIES = libswkmsdri.la
-
-libswkmsdri_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/sw/null/Makefile.am b/src/gallium/winsys/sw/null/Makefile.am
deleted file mode 100644
index c2051891931..00000000000
--- a/src/gallium/winsys/sw/null/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_WINSYS_CFLAGS)
-
-noinst_LTLIBRARIES = libws_null.la
-
-libws_null_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/winsys/sw/wrapper/Makefile.am b/src/gallium/winsys/sw/wrapper/Makefile.am
deleted file mode 100644
index 7cd03a4c2b9..00000000000
--- a/src/gallium/winsys/sw/wrapper/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_WINSYS_CFLAGS)
-
-noinst_LTLIBRARIES = libwsw.la
-
-libwsw_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/winsys/sw/xlib/Makefile.am b/src/gallium/winsys/sw/xlib/Makefile.am
deleted file mode 100644
index e518dda82f4..00000000000
--- a/src/gallium/winsys/sw/xlib/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_WINSYS_CFLAGS) \
-	$(X11_INCLUDES)
-
-noinst_LTLIBRARIES = libws_xlib.la
-
-libws_xlib_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = SConscript meson.build
diff --git a/src/gallium/winsys/tegra/drm/Makefile.am b/src/gallium/winsys/tegra/drm/Makefile.am
deleted file mode 100644
index 9a8169889cf..00000000000
--- a/src/gallium/winsys/tegra/drm/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	$(GALLIUM_WINSYS_CFLAGS)
-
-noinst_LTLIBRARIES = libtegradrm.la
-
-libtegradrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = \
-	meson.build
diff --git a/src/gallium/winsys/v3d/drm/Makefile.am b/src/gallium/winsys/v3d/drm/Makefile.am
deleted file mode 100644
index ac2ef23bb64..00000000000
--- a/src/gallium/winsys/v3d/drm/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2014 Broadcom
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	$(GALLIUM_WINSYS_CFLAGS)
-
-noinst_LTLIBRARIES = libv3ddrm.la
-
-libv3ddrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/vc4/drm/Makefile.am b/src/gallium/winsys/vc4/drm/Makefile.am
deleted file mode 100644
index a32709bffaf..00000000000
--- a/src/gallium/winsys/vc4/drm/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2014 Broadcom
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	$(GALLIUM_WINSYS_CFLAGS)
-
-noinst_LTLIBRARIES = libvc4drm.la
-
-libvc4drm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/virgl/drm/Makefile.am b/src/gallium/winsys/virgl/drm/Makefile.am
deleted file mode 100644
index e543227e39e..00000000000
--- a/src/gallium/winsys/virgl/drm/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2015 Red Hat Inc.
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	$(GALLIUM_WINSYS_CFLAGS) \
-	$(LIBDRM_CFLAGS)
-
-noinst_LTLIBRARIES = libvirgldrm.la
-
-libvirgldrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/virgl/vtest/Makefile.am b/src/gallium/winsys/virgl/vtest/Makefile.am
deleted file mode 100644
index 0a31477a1f2..00000000000
--- a/src/gallium/winsys/virgl/vtest/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright © 2015 Red Hat
-#
-# 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
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	$(GALLIUM_WINSYS_CFLAGS)
-
-noinst_LTLIBRARIES = libvirglvtest.la
-
-libvirglvtest_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
deleted file mode 100644
index bb246ecebf5..00000000000
--- a/src/gbm/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-include Makefile.sources
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = main/gbm.pc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/loader \
-	-I$(top_srcdir)/src/gbm/main \
-	$(DLOPEN_CFLAGS) \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS)
-
-lib_LTLIBRARIES = libgbm.la
-include_HEADERS = main/gbm.h
-
-libgbm_la_SOURCES = \
-	$(gbm_core_FILES)
-
-libgbm_la_LDFLAGS = \
-	-no-undefined \
-	-version-info 1:0 \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-libgbm_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(top_builddir)/src/util/libxmlconfig.la \
-	$(DLOPEN_LIBS)
-
-if HAVE_PLATFORM_WAYLAND
-AM_CFLAGS += \
-	$(WAYLAND_SERVER_CFLAGS) \
-	-I$(top_srcdir)/src/egl/wayland/wayland-drm/
-libgbm_la_LIBADD += $(WAYLAND_SERVER_LIBS)
-endif
-
-if HAVE_DRI2
-libgbm_la_SOURCES += \
-	$(gbm_dri_FILES)
-
-AM_CFLAGS += \
-	$(LIBDRM_CFLAGS) \
-	$(PTHREADSTUBS_CFLAGS)
-
-libgbm_la_LIBADD += \
-	$(LIBDRM_LIBS) \
-	$(PTHREADSTUBS_LIBS)
-endif
-
-TESTS = gbm-symbols-check
-EXTRA_DIST = gbm-symbols-check meson.build
-
-include $(top_srcdir)/install-lib-links.mk
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
deleted file mode 100644
index a66957d609b..00000000000
--- a/src/glx/Makefile.am
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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.
-
-
-SUBDIRS =
-
-EXTRA_DIST = SConscript meson.build
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/include/GL/internal \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/loader \
-	-I$(top_builddir)/src/mapi \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_builddir)/src/mapi/glapi \
-	-I$(top_srcdir)/src/mapi/glapi \
-	$(VISIBILITY_CFLAGS) \
-	-D_REENTRANT \
-	$(DEFINES) \
-	$(LIBDRM_CFLAGS) \
-	$(DRI2PROTO_CFLAGS) \
-	$(GLPROTO_CFLAGS) \
-	$(X11_INCLUDES)
-
-lib_LTLIBRARIES = lib@[email protected]
-
-noinst_LTLIBRARIES = libglx.la
-
-libglx_la_SOURCES = \
-	clientattrib.c \
-	clientinfo.c \
-	compsize.c \
-	create_context.c \
-	eval.c \
-	glxclient.h \
-	glxcmds.c \
-	glxconfig.c \
-	glxconfig.h \
-	glxcurrent.c \
-	glx_error.c \
-	glx_error.h \
-	glxext.c \
-	glxextensions.c \
-	glxextensions.h \
-	glxhash.c \
-	glxhash.h \
-	glx_pbuffer.c \
-	glx_query.c \
-	indirect.c \
-	indirect_glx.c \
-	indirect_init.c \
-	indirect_init.h \
-	indirect_size.c \
-	indirect_texture_compression.c \
-	indirect_transpose_matrix.c \
-	indirect_vertex_array.c \
-	indirect_vertex_array.h \
-	indirect_vertex_array_priv.h \
-	indirect_vertex_program.c \
-	indirect_window_pos.c \
-	packrender.h \
-	packsingle.h \
-	pixel.c \
-	pixelstore.c \
-	query_renderer.c \
-	render2.c \
-	renderpix.c \
-	single2.c \
-	singlepix.c \
-	vertarr.c
-
-libglx_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(top_builddir)/src/util/libxmlconfig.la
-
-if HAVE_DRISW
-libglx_la_SOURCES += \
-	drisw_glx.c \
-	drisw_priv.h
-endif
-
-if HAVE_DRICOMMON
-libglx_la_SOURCES += \
-	dri_common.c \
-	dri_common.h \
-	dri_common_query_renderer.c \
-	dri_common_interop.c \
-	xfont.c
-endif
-
-if HAVE_DRI2
-libglx_la_SOURCES += \
-	dri2.c \
-	dri2_glx.c \
-	dri2.h \
-	dri2_priv.h \
-	dri_glx.c \
-	dri_sarea.h \
-	XF86dri.c \
-	xf86dri.h \
-	xf86dristr.h
-endif
-
-if HAVE_DRI3
-libglx_la_SOURCES += \
-	dri3_glx.c \
-	dri3_priv.h
-
-libglx_la_LIBADD += $(top_builddir)/src/loader/libloader_dri3_helper.la
-endif
-
-if HAVE_APPLEDRI
-libglx_la_SOURCES += \
-	applegl_glx.c
-
-SUBDIRS += apple
-libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
-endif
-
-if HAVE_WINDOWSDRI
-libglx_la_SOURCES += \
-	  driwindows_glx.c
-
-SUBDIRS += windows
-libglx_la_LIBADD += \
-	  $(builddir)/windows/libwindowsdri.la \
-	  $(builddir)/windows/libwindowsglx.la
-endif
-
-if USE_LIBGLVND
-AM_CFLAGS += \
-	-DGL_LIB_NAME=\"lib@[email protected]\" \
-	$(GLVND_CFLAGS)
-
-libglx_la_SOURCES += \
-	g_glxglvnddispatchfuncs.c \
-	g_glxglvnddispatchindices.h \
-	glxglvnd.c \
-	glxglvnd.h \
-	glxglvnddispatchfuncs.h
-
-GL_LIB_VERSION=0
-else
-AM_CFLAGS += \
-	-DGL_LIB_NAME=\"lib@[email protected]\"
-GL_LIB_VERSION=1:2
-endif
-
-# Push the libdrm furhter up, as due to libtool bug we might end up relinking
-# against the system one.
-GL_LIBS = \
-	$(LIBDRM_LIBS) \
-	libglx.la \
-	$(top_builddir)/src/mapi/glapi/libglapi.la \
-	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
-	$(GL_LIB_DEPS)
-
-GL_LDFLAGS = \
-	-no-undefined \
-	-version-number $(GL_LIB_VERSION) \
-	$(BSYMBOLIC) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-lib@GL_LIB@_la_SOURCES =
-lib@GL_LIB@_la_LIBADD = $(GL_LIBS)
-lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
-
-if HAVE_WINDOWSDRI
-lib@GL_LIB@_la_LDFLAGS += -lgdi32 -lopengl32 -Wl,--disable-stdcall-fixup
-endif
-
-SUBDIRS += . tests
-
-include $(top_srcdir)/install-lib-links.mk
diff --git a/src/glx/apple/Makefile.am b/src/glx/apple/Makefile.am
deleted file mode 100644
index 8f932686359..00000000000
--- a/src/glx/apple/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-EXTRA_DIST = \
-	RELEASE_NOTES \
-	meson.build
-
-noinst_LTLIBRARIES = libappleglx.la
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/glx \
-	-I$(top_builddir)/src/mesa \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_builddir)/src/mapi/glapi \
-	-I$(top_srcdir)/src/mapi/glapi \
-	$(VISIBILITY_CFLAGS) \
-	$(DEFINES) \
-	$(X11_INCLUDES)
-
-libappleglx_la_SOURCES = \
-	apple_cgl.c \
-	apple_cgl.h \
-	appledri.c \
-	appledri.h \
-	appledristr.h \
-	apple_glapi.c \
-	apple_glx.c \
-	apple_glx_context.c \
-	apple_glx_context.h \
-	apple_glx_drawable.c \
-	apple_glx_drawable.h \
-	apple_glx.h \
-	apple_glx_log.c \
-	apple_glx_log.h \
-	apple_glx_pbuffer.c \
-	apple_glx_pixmap.c \
-	apple_glx_surface.c \
-	apple_visual.c \
-	apple_visual.h \
-	apple_xgl_api.h \
-	apple_xgl_api_read.c \
-	apple_xgl_api_stereo.c \
-	apple_xgl_api_viewport.c \
-	glx_empty.c
-
-libappleglx_la_LDFLAGS = -lXplugin -framework ApplicationServices -framework CoreFoundation
diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am
deleted file mode 100644
index 07173164f23..00000000000
--- a/src/glx/tests/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-if HAVE_SHARED_GLAPI
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gtest/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_builddir)/src/glx \
-	-I$(top_srcdir)/src/glx \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/include/GL/internal \
-	$(DEFINES) \
-	$(LIBDRM_CFLAGS) \
-	$(X11_INCLUDES)
-
-TESTS = glx-test dispatch-index-check
-check_PROGRAMS = glx-test
-EXTRA_DIST = dispatch-index-check meson.build
-
-glx_test_SOURCES =			\
-	clientinfo_unittest.cpp		\
-	create_context_unittest.cpp	\
-	enum_sizes.cpp			\
-	fake_glx_screen.cpp		\
-	fake_glx_screen.h		\
-	indirect_api.cpp		\
-	mock_xdisplay.h			\
-	query_renderer_unittest.cpp
-
-if HAVE_DRI2
-glx_test_SOURCES += \
-	query_renderer_implementation_unittest.cpp
-endif
-
-glx_test_LDADD = \
-	$(top_builddir)/src/glx/libglx.la \
-	$(top_builddir)/src/gtest/libgtest.la \
-	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
-	$(PTHREAD_LIBS)
-endif
diff --git a/src/glx/windows/Makefile.am b/src/glx/windows/Makefile.am
deleted file mode 100644
index 828a930e53f..00000000000
--- a/src/glx/windows/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-noinst_LTLIBRARIES = libwindowsdri.la libwindowsglx.la
-
-# protocol defines for the Windows-DRI server extension
-windowsdriincludedir = $(includedir)/X11/extensions
-windowsdriinclude_HEADERS = windowsdriconst.h windowsdristr.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = windowsdriproto.pc
-
-# library for using the Windows-DRI server extension
-libwindowsdri_la_SOURCES = xwindowsdri.c xwindowsdri.h
-
-libwindowsdri_la_CFLAGS = \
-        $(X11_INCLUDES)
-
-# native rendering GL for windows
-libwindowsglx_la_SOURCES = \
-	windowsgl.c \
-	windowsgl.h \
-	windowsgl_internal.h \
-	windows_drawable.c \
-	wgl.c \
-	wgl.h
-
-libwindowsglx_la_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/glx \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_builddir)/src/mapi/glapi \
-	-I$(top_srcdir)/src/mapi/glapi \
-	$(VISIBILITY_CFLAGS) \
-	$(DEFINES) \
-	$(X11_INCLUDES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gtest/Makefile.am b/src/gtest/Makefile.am
deleted file mode 100644
index 23b75536109..00000000000
--- a/src/gtest/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
- # Copyright © 2012 Intel Corporation
-#
-# 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.
-
-AM_CFLAGS = $(DEFINES) -I$(top_srcdir)/src/gtest/include
-AM_CXXFLAGS = $(DEFINES) -I$(top_srcdir)/src/gtest/include
-
-check_LTLIBRARIES = libgtest.la
-
-libgtest_la_SOURCES = \
-	src/gtest-all.cc \
-	src/gtest_main.cc
-
-EXTRA_DIST = \
-	include \
-	src/gtest.cc \
-	src/gtest-death-test.cc \
-	src/gtest-filepath.cc \
-	src/gtest-internal-inl.h \
-	src/gtest-port.cc \
-	src/gtest-printers.cc \
-	src/gtest-test-part.cc \
-	src/gtest-typed-test.cc \
-	meson.build
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
deleted file mode 100644
index b4d6a978a85..00000000000
--- a/src/intel/Makefile.am
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright © 2016 Intel Corporation
-#
-# 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
-
-# The gallium includes are for the util/u_math.h include from main/macros.h
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/src \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src/compiler/glsl \
-	-I$(top_srcdir)/src/compiler/glsl \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler/nir \
-	-I$(top_srcdir)/src/gtest/include \
-	-I$(top_builddir)/src/intel \
-	-I$(top_srcdir)/src/intel \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/include \
-	$(VALGRIND_CFLAGS) \
-	$(LIBDRM_CFLAGS) \
-	$(DEFINES)
-
-AM_CFLAGS = \
-	$(VISIBILITY_CFLAGS) \
-	$(WNO_OVERRIDE_INIT)
-
-AM_CXXFLAGS = \
-	$(VISIBILITY_CXXFLAGS)
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-lib_LTLIBRARIES =
-check_LTLIBRARIES =
-noinst_DATA =
-noinst_HEADERS =
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-check_PROGRAMS =
-TESTS =
-BUILT_SOURCES =
-CLEANFILES =
-EXTRA_DIST = \
-	blorp/meson.build \
-	common/meson.build \
-	compiler/meson.build \
-	dev/meson.build \
-	genxml/meson.build \
-	isl/meson.build \
-	tools/aubinator_viewer.cpp \
-	tools/aubinator_viewer.h \
-	tools/aubinator_viewer_decoder.cpp \
-	tools/aubinator_viewer_urb.h \
-	tools/imgui/imgui_impl_gtk3.cpp \
-	tools/imgui/imgui_impl_gtk3.h \
-	tools/imgui/imgui_impl_opengl3.cpp \
-	tools/imgui/imgui_impl_opengl3.h \
-	tools/imgui/meson.build \
-	tools/intel_sanitize_gpu.c \
-	tools/intel_sanitize_gpu.in \
-	tools/intel_dump_gpu.c \
-	tools/intel_dump_gpu.in \
-	tools/meson.build \
-	vulkan/meson.build \
-	meson.build
-
-include Makefile.blorp.am
-include Makefile.common.am
-include Makefile.compiler.am
-include Makefile.dev.am
-include Makefile.genxml.am
-include Makefile.isl.am
-include Makefile.tools.am
-
-include Makefile.vulkan.am
-
-CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/intel/Makefile.blorp.am b/src/intel/Makefile.blorp.am
deleted file mode 100644
index 971c1bad06f..00000000000
--- a/src/intel/Makefile.blorp.am
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2015-2016 Intel Corporation
-#
-# 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.
-
-noinst_LTLIBRARIES += blorp/libblorp.la
-
-blorp_libblorp_la_SOURCES = $(BLORP_FILES)
-
-EXTRA_DIST += blorp/TODO
diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
deleted file mode 100644
index 443cefc522a..00000000000
--- a/src/intel/Makefile.common.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright © 2016 Intel Corporation
-#
-# 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.
-
-noinst_LTLIBRARIES += common/libintel_common.la
-
-common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(EXPAT_CFLAGS)
-common_libintel_common_la_SOURCES = $(COMMON_FILES)
-common_libintel_common_la_LIBADD = $(EXPAT_LIBS)
-
-if HAVE_PLATFORM_ANDROID
-common_libintel_common_la_CFLAGS += $(ANDROID_CFLAGS)
-common_libintel_common_la_LIBADD += $(ANDROID_LIBS)
-endif
diff --git a/src/intel/Makefile.compiler.am b/src/intel/Makefile.compiler.am
deleted file mode 100644
index 7c33e35816b..00000000000
--- a/src/intel/Makefile.compiler.am
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2015-2016 Intel Corporation
-#
-# 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.
-
-noinst_LTLIBRARIES += compiler/libintel_compiler.la
-
-compiler_libintel_compiler_la_CPPFLAGS = \
-	-I$(top_builddir)/src/intel/compiler \
-	-I$(top_srcdir)/src/intel/compiler \
-	$(AM_CPPFLAGS)
-
-compiler_libintel_compiler_la_SOURCES = \
-	$(COMPILER_FILES) \
-	$(COMPILER_GENERATED_FILES)
-
-BUILT_SOURCES += $(COMPILER_GENERATED_FILES)
-
-compiler/brw_nir_trig_workarounds.c: compiler/brw_nir_trig_workarounds.py \
-                                     $(top_srcdir)/src/compiler/nir/nir_algebraic.py
-	$(MKDIR_GEN)
-	$(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false)
-
-EXTRA_DIST += \
-	compiler/brw_nir_trig_workarounds.py
-
-# ----------------------------------------------------------------------------
-#  Tests
-# ----------------------------------------------------------------------------
-
-TEST_LIBS = \
-	$(top_builddir)/src/gtest/libgtest.la \
-	compiler/libintel_compiler.la \
-	common/libintel_common.la \
-	dev/libintel_dev.la \
-	$(top_builddir)/src/compiler/nir/libnir.la \
-	$(top_builddir)/src/intel/isl/libisl.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS)
-
-COMPILER_TESTS = \
-	compiler/test_fs_cmod_propagation \
-	compiler/test_fs_copy_propagation \
-	compiler/test_fs_saturate_propagation \
-	compiler/test_eu_compact \
-	compiler/test_eu_validate \
-	compiler/test_vf_float_conversions \
-	compiler/test_vec4_cmod_propagation \
-	compiler/test_vec4_copy_propagation \
-	compiler/test_vec4_dead_code_eliminate \
-	compiler/test_vec4_register_coalesce
-
-TESTS += $(COMPILER_TESTS)
-check_PROGRAMS += $(COMPILER_TESTS)
-
-compiler_test_fs_cmod_propagation_SOURCES = \
-	compiler/test_fs_cmod_propagation.cpp
-compiler_test_fs_cmod_propagation_LDADD = $(TEST_LIBS)
-
-compiler_test_fs_copy_propagation_SOURCES = \
-	compiler/test_fs_copy_propagation.cpp
-compiler_test_fs_copy_propagation_LDADD = $(TEST_LIBS)
-
-compiler_test_fs_saturate_propagation_SOURCES = \
-	compiler/test_fs_saturate_propagation.cpp
-compiler_test_fs_saturate_propagation_LDADD = $(TEST_LIBS)
-
-compiler_test_vf_float_conversions_SOURCES = \
-	compiler/test_vf_float_conversions.cpp
-compiler_test_vf_float_conversions_LDADD = $(TEST_LIBS)
-
-compiler_test_vec4_register_coalesce_SOURCES = \
-	compiler/test_vec4_register_coalesce.cpp
-compiler_test_vec4_register_coalesce_LDADD = $(TEST_LIBS)
-
-compiler_test_vec4_copy_propagation_SOURCES = \
-	compiler/test_vec4_copy_propagation.cpp
-compiler_test_vec4_copy_propagation_LDADD = $(TEST_LIBS)
-
-compiler_test_vec4_cmod_propagation_SOURCES = \
-	compiler/test_vec4_cmod_propagation.cpp
-compiler_test_vec4_cmod_propagation_LDADD = $(TEST_LIBS)
-
-compiler_test_vec4_dead_code_eliminate_SOURCES = \
-	compiler/test_vec4_dead_code_eliminate.cpp
-compiler_test_vec4_dead_code_eliminate_LDADD = $(TEST_LIBS)
-
-# Strictly speaking this is neither a C++ test nor using gtest - we can address
-# address that at a later point. Until then, this allows us a to simplify things.
-compiler_test_eu_compact_SOURCES = \
-	compiler/test_eu_compact.cpp
-compiler_test_eu_compact_LDADD = $(TEST_LIBS)
-
-compiler_test_eu_validate_SOURCES = \
-	compiler/test_eu_validate.cpp
-compiler_test_eu_validate_LDADD = $(TEST_LIBS)
diff --git a/src/intel/Makefile.dev.am b/src/intel/Makefile.dev.am
deleted file mode 100644
index 2bf5b4e232a..00000000000
--- a/src/intel/Makefile.dev.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright © 2016 Intel Corporation
-#
-# 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.
-
-noinst_LTLIBRARIES += dev/libintel_dev.la
-
-dev_libintel_dev_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(EXPAT_CFLAGS)
-dev_libintel_dev_la_SOURCES = $(DEV_FILES)
-dev_libintel_dev_la_LIBADD = $(EXPAT_LIBS)
-
-if HAVE_PLATFORM_ANDROID
-dev_libintel_dev_la_CFLAGS += $(ANDROID_CFLAGS)
-dev_libintel_dev_la_LIBADD += $(ANDROID_LIBS)
-endif
diff --git a/src/intel/Makefile.genxml.am b/src/intel/Makefile.genxml.am
deleted file mode 100644
index f034f25e2ef..00000000000
--- a/src/intel/Makefile.genxml.am
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright © 2016 Intel Corporation
-#
-# 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.
-
-BUILT_SOURCES += \
-	$(GENXML_GENERATED_FILES)
-
-EXTRA_DIST += \
-	$(GENXML_XML_FILES) \
-	$(GENXML_GENERATED_FILES)
-
-SUFFIXES = _pack.h _xml.h .xml
-
-$(GENXML_GENERATED_PACK_FILES): genxml/gen_pack_header.py
-
-.xml_pack.h:
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/genxml/gen_pack_header.py $< > $@ || ($(RM) $@; false)
-
-genxml/genX_xml.h: genxml/gen_zipped_file.py $(GENXML_XML_FILES)
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/genxml/gen_zipped_file.py $(GENXML_XML_FILES:%=$(srcdir)/%) > $@ || ($(RM) $@; false)
-
-genxml/genX_bits.h: genxml/gen_bits_header.py $(GENXML_XML_FILES)
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/genxml/gen_bits_header.py -o $@ $(GENXML_XML_FILES:%=$(srcdir)/%)
-
-EXTRA_DIST += \
-	genxml/genX_pack.h \
-	genxml/gen_macros.h \
-	genxml/gen_pack_header.py \
-	genxml/gen_zipped_file.py \
-	genxml/gen_bits_header.py \
-	genxml/README
diff --git a/src/intel/Makefile.isl.am b/src/intel/Makefile.isl.am
deleted file mode 100644
index dcb9d3ad6fc..00000000000
--- a/src/intel/Makefile.isl.am
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2015-2016 Intel Corporation
-#
-# 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.
-
-ISL_GEN_LIBS =                                           \
-	isl/libisl-gen4.la                               \
-	isl/libisl-gen5.la                               \
-	isl/libisl-gen6.la                               \
-	isl/libisl-gen7.la                               \
-	isl/libisl-gen75.la                              \
-	isl/libisl-gen8.la                               \
-	isl/libisl-gen9.la                               \
-	isl/libisl-gen10.la                              \
-	isl/libisl-gen11.la                              \
-	$(NULL)
-
-noinst_LTLIBRARIES += $(ISL_GEN_LIBS) \
-                      isl/libisl.la \
-                      libisl_tiled_memcpy.la
-
-isl_libisl_la_LIBADD = $(ISL_GEN_LIBS) \
-                       libisl_tiled_memcpy.la
-
-if SSE41_SUPPORTED
-isl_libisl_la_LIBADD += libisl_tiled_memcpy_sse41.la
-noinst_LTLIBRARIES += libisl_tiled_memcpy_sse41.la
-endif
-
-isl_libisl_la_SOURCES = $(ISL_FILES) $(ISL_GENERATED_FILES)
-
-libisl_tiled_memcpy_la_SOURCES = $(ISL_TILED_MEMCPY_FILES)
-libisl_tiled_memcpy_la_CFLAGS = $(AM_CFLAGS)
-
-libisl_tiled_memcpy_sse41_la_SOURCES = $(ISL_TILED_MEMCPY_SSE41_FILES)
-libisl_tiled_memcpy_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS)
-
-isl_tiled_memcpy_normal.c: $(ISL_TILED_MEMCPY_DEP_FILES)
-isl_tiled_memcpy_sse41.c: $(ISL_TILED_MEMCPY_DEP_FILES)
-
-isl_libisl_gen4_la_SOURCES = $(ISL_GEN4_FILES)
-isl_libisl_gen4_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=40
-
-isl_libisl_gen5_la_SOURCES = $(ISL_GEN5_FILES)
-isl_libisl_gen5_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=50
-
-isl_libisl_gen6_la_SOURCES = $(ISL_GEN6_FILES)
-isl_libisl_gen6_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=60
-
-isl_libisl_gen7_la_SOURCES = $(ISL_GEN7_FILES)
-isl_libisl_gen7_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=70
-
-isl_libisl_gen75_la_SOURCES = $(ISL_GEN75_FILES)
-isl_libisl_gen75_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=75
-
-isl_libisl_gen8_la_SOURCES = $(ISL_GEN8_FILES)
-isl_libisl_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80
-
-isl_libisl_gen9_la_SOURCES = $(ISL_GEN9_FILES)
-isl_libisl_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
-
-isl_libisl_gen10_la_SOURCES = $(ISL_GEN10_FILES)
-isl_libisl_gen10_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=100
-
-isl_libisl_gen11_la_SOURCES = $(ISL_GEN11_FILES)
-isl_libisl_gen11_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=110
-
-BUILT_SOURCES += $(ISL_GENERATED_FILES)
-
-isl/isl_format_layout.c: isl/gen_format_layout.py \
-                         isl/isl_format_layout.csv
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/isl/gen_format_layout.py \
-	    --csv $(srcdir)/isl/isl_format_layout.csv --out $@
-
-# ----------------------------------------------------------------------------
-#  Tests
-# ----------------------------------------------------------------------------
-
-check_PROGRAMS += isl/tests/isl_surf_get_image_offset_test
-
-TESTS += $(check_PROGRAMS)
-
-isl_tests_isl_surf_get_image_offset_test_LDADD = \
-	dev/libintel_dev.la \
-	isl/libisl.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	-lm
-
-# ----------------------------------------------------------------------------
-
-EXTRA_DIST += \
-	isl/gen_format_layout.py \
-	isl/isl_format_layout.csv \
-	isl/README \
-	$(ISL_TILED_MEMCPY_DEP_FILES)
diff --git a/src/intel/Makefile.tools.am b/src/intel/Makefile.tools.am
deleted file mode 100644
index 4809962b188..00000000000
--- a/src/intel/Makefile.tools.am
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2015-2017 Intel Corporation
-#
-# 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.
-
-noinst_PROGRAMS += \
-	tools/aubinator \
-	tools/aubinator_error_decode \
-	tools/i965_disasm \
-	tools/error2aub
-
-
-tools_aubinator_SOURCES = \
-	tools/aub_mem.c \
-	tools/aub_mem.h \
-	tools/aub_read.c \
-	tools/aub_read.h \
-	tools/aubinator.c \
-	tools/intel_aub.h
-
-tools_aubinator_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(ZLIB_CFLAGS)
-
-tools_aubinator_LDADD = \
-	common/libintel_common.la \
-	compiler/libintel_compiler.la \
-	dev/libintel_dev.la \
-	isl/libisl.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(PER_GEN_LIBS) \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS) \
-	$(ZLIB_LIBS) \
-	-lm
-
-
-tools_aubinator_error_decode_SOURCES = \
-	tools/aubinator_error_decode.c
-
-tools_aubinator_error_decode_LDADD = \
-	common/libintel_common.la \
-	compiler/libintel_compiler.la \
-	dev/libintel_dev.la \
-	isl/libisl.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(PTHREAD_LIBS) \
-	$(ZLIB_LIBS)
-
-tools_aubinator_error_decode_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(ZLIB_CFLAGS)
-
-tools_i965_disasm_SOURCES = \
-	tools/i965_disasm.c
-
-tools_i965_disasm_LDADD = \
-	common/libintel_common.la \
-	compiler/libintel_compiler.la \
-	dev/libintel_dev.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(PTHREAD_LIBS)
-
-tools_i965_disasm_CFLAGS = \
-	$(AM_CFLAGS)
-
-
-tools_error2aub_SOURCES = \
-	tools/gen_context.h \
-	tools/gen8_context.h \
-	tools/gen10_context.h \
-	tools/aub_write.h \
-	tools/aub_write.c \
-	tools/error2aub.c
-
-tools_error2aub_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(ZLIB_CFLAGS)
-
-tools_error2aub_LDADD = \
-	dev/libintel_dev.la \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS) \
-	$(ZLIB_LIBS) \
-	-lm
diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
deleted file mode 100644
index 7d9a74c9301..00000000000
--- a/src/intel/Makefile.vulkan.am
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright © 2015 Intel Corporation
-#
-# 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.
-
-# Due to a what seems like a autoconf bug, we must ensure that the genaration
-# rules must be outside of any AM_CONDITIONALs. Otherwise they will be commented
-# out and we'll fail at `make dist'
-vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
-
-vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py \
-			  vulkan/anv_extensions.py \
-			  $(vulkan_api_xml)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_entrypoints_gen.py \
-		--xml $(vulkan_api_xml) \
-		--outdir $(builddir)/vulkan
-vulkan/anv_entrypoints.h: vulkan/anv_entrypoints.c
-
-vulkan/anv_extensions.c: vulkan/anv_extensions_gen.py \
-			 vulkan/anv_extensions.py \
-			 $(vulkan_api_xml)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_extensions_gen.py \
-		--xml $(vulkan_api_xml) \
-		--out-c $@
-
-vulkan/anv_extensions.h: vulkan/anv_extensions_gen.py \
-			 vulkan/anv_extensions.py \
-			 $(vulkan_api_xml)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_extensions_gen.py \
-		--xml $(vulkan_api_xml) \
-		--out-h $@
-
-BUILT_SOURCES += $(VULKAN_GENERATED_FILES)
-CLEANFILES += \
-	$(VULKAN_GENERATED_FILES) \
-	vulkan/dev_icd.json \
-	vulkan/intel_icd.@[email protected]
-
-EXTRA_DIST += \
-	$(top_srcdir)/include/vulkan/vk_icd.h \
-	vulkan/anv_entrypoints_gen.py \
-	vulkan/anv_extensions_gen.py \
-	vulkan/anv_extensions.py \
-	vulkan/anv_icd.py \
-	vulkan/TODO
-
-vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_icd.py \
-		--lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
-
-vulkan/intel_icd.@[email protected] : vulkan/anv_extensions.py vulkan/anv_icd.py
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_icd.py \
-		--lib-path="${libdir}" --out $@
-
-if HAVE_INTEL_VULKAN
-
-vulkan_includedir = $(includedir)/vulkan
-
-noinst_HEADERS += \
-	$(top_srcdir)/include/vulkan/vk_platform.h \
-	$(top_srcdir)/include/vulkan/vulkan_core.h \
-	$(top_srcdir)/include/vulkan/vulkan_wayland.h \
-	$(top_srcdir)/include/vulkan/vulkan_xcb.h \
-	$(top_srcdir)/include/vulkan/vulkan_xlib.h \
-	$(top_srcdir)/include/vulkan/vulkan.h
-
-vulkan_include_HEADERS = \
-	$(top_srcdir)/include/vulkan/vulkan_intel.h
-
-lib_LTLIBRARIES += vulkan/libvulkan_intel.la
-
-check_LTLIBRARIES += vulkan/libvulkan-test.la
-
-VULKAN_PER_GEN_LIBS = \
-	vulkan/libanv-gen7.la \
-	vulkan/libanv-gen75.la \
-	vulkan/libanv-gen8.la \
-	vulkan/libanv-gen9.la \
-	vulkan/libanv-gen10.la \
-	vulkan/libanv-gen11.la
-
-noinst_LTLIBRARIES += $(VULKAN_PER_GEN_LIBS)
-
-VULKAN_CFLAGS = \
-	$(AM_CFLAGS) \
-	-msse2 -mstackrealign
-
-VULKAN_CPPFLAGS = \
-	-I$(top_srcdir)/src/compiler \
-	-I$(top_srcdir)/src/intel/compiler \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/src/intel/vulkan \
-	-I$(top_srcdir)/src/intel/vulkan \
-	-I$(top_srcdir)/src/vulkan/wsi \
-	-I$(top_builddir)/src/vulkan/util \
-	-I$(top_srcdir)/src/vulkan/util \
-	$(AM_CPPFLAGS) \
-	$(LIBDRM_CFLAGS)
-
-vulkan_libanv_gen7_la_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_libanv_gen7_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=70
-vulkan_libanv_gen7_la_SOURCES = $(VULKAN_GEN7_FILES)
-
-vulkan_libanv_gen75_la_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_libanv_gen75_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=75
-vulkan_libanv_gen75_la_SOURCES = $(VULKAN_GEN75_FILES)
-
-vulkan_libanv_gen8_la_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_libanv_gen8_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=80
-vulkan_libanv_gen8_la_SOURCES = $(VULKAN_GEN8_FILES)
-
-vulkan_libanv_gen9_la_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_libanv_gen9_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=90
-vulkan_libanv_gen9_la_SOURCES = $(VULKAN_GEN9_FILES)
-
-vulkan_libanv_gen10_la_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_libanv_gen10_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=100
-vulkan_libanv_gen10_la_SOURCES = $(VULKAN_GEN10_FILES)
-
-vulkan_libanv_gen11_la_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_libanv_gen11_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=110
-vulkan_libanv_gen11_la_SOURCES = $(VULKAN_GEN11_FILES)
-
-VULKAN_SOURCES = \
-	$(VULKAN_GENERATED_FILES) \
-	$(VULKAN_FILES)
-
-VULKAN_LIB_DEPS = \
-	vulkan/libvulkan_common.la \
-	$(VULKAN_PER_GEN_LIBS) \
-	compiler/libintel_compiler.la \
-	common/libintel_common.la \
-	dev/libintel_dev.la \
-	isl/libisl.la \
-	blorp/libblorp.la \
-	$(top_builddir)/src/vulkan/libvulkan_util.la \
-	$(top_builddir)/src/vulkan/libvulkan_wsi.la \
-	$(top_builddir)/src/compiler/nir/libnir.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(LIBDRM_LIBS) \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS) \
-	-lm
-
-if HAVE_PLATFORM_ANDROID
-VULKAN_CPPFLAGS += \
-    $(ANDROID_CPPFLAGS) \
-    -DVK_USE_PLATFORM_ANDROID_KHR
-
-VULKAN_CFLAGS += $(ANDROID_CFLAGS)
-VULKAN_LIB_DEPS += $(ANDROID_LIBS)
-VULKAN_SOURCES += $(VULKAN_ANDROID_FILES)
-else
-VULKAN_SOURCES += $(VULKAN_NON_ANDROID_FILES)
-endif
-
-if HAVE_PLATFORM_X11
-VULKAN_CPPFLAGS += \
-	$(XCB_DRI3_CFLAGS) \
-	-DVK_USE_PLATFORM_XCB_KHR \
-	-DVK_USE_PLATFORM_XLIB_KHR
-
-VULKAN_SOURCES += $(VULKAN_WSI_X11_FILES)
-
-VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS)
-endif
-
-
-if HAVE_PLATFORM_WAYLAND
-VULKAN_CPPFLAGS += \
-	$(WAYLAND_CLIENT_CFLAGS) \
-	-DVK_USE_PLATFORM_WAYLAND_KHR
-
-VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)
-
-VULKAN_LIB_DEPS += $(WAYLAND_CLIENT_LIBS)
-endif
-
-if HAVE_PLATFORM_DRM
-VULKAN_CPPFLAGS += \
-	-DVK_USE_PLATFORM_DISPLAY_KHR
-
-VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES)
-endif
-
-if HAVE_XLIB_LEASE
-VULKAN_CPPFLAGS += \
-	-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
-	$(XCB_RANDR_CFLAGS) \
-	$(XLIB_RANDR_CFLAGS)
-VULKAN_LIB_DEPS += $(XCB_RANDR_LIBS)
-endif
-
-noinst_LTLIBRARIES += vulkan/libvulkan_common.la
-vulkan_libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
-vulkan_libvulkan_common_la_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_libvulkan_common_la_CPPFLAGS = $(VULKAN_CPPFLAGS)
-
-nodist_EXTRA_vulkan_libvulkan_intel_la_SOURCES = dummy.cpp
-vulkan_libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES)
-vulkan_libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS)
-vulkan_libvulkan_intel_la_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_libvulkan_intel_la_CPPFLAGS = $(VULKAN_CPPFLAGS)
-
-vulkan_libvulkan_intel_la_LDFLAGS = \
-	-shared \
-	-module \
-	-no-undefined \
-	-avoid-version \
-	-Wl,--build-id=sha1 \
-	$(BSYMBOLIC) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-icdconfdir = @VULKAN_ICD_INSTALL_DIR@
-icdconf_DATA = vulkan/intel_icd.@[email protected]
-# The following is used for development purposes, by setting VK_ICD_FILENAMES.
-noinst_DATA += vulkan/dev_icd.json
-
-# Libvulkan with dummy gem. Used for unit tests.
-vulkan_libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES)
-vulkan_libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS)
-vulkan_libvulkan_test_la_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_libvulkan_test_la_CPPFLAGS = $(VULKAN_CPPFLAGS)
-
-include $(top_srcdir)/install-lib-links.mk
-
-noinst_HEADERS += \
-	vulkan/tests/state_pool_test_helper.h
-
-VULKAN_TESTS = \
-	vulkan/tests/block_pool_no_free \
-	vulkan/tests/state_pool_no_free \
-	vulkan/tests/state_pool_free_list_only \
-	vulkan/tests/state_pool_padding \
-	vulkan/tests/state_pool
-
-VULKAN_TEST_LDADD = \
-	vulkan/libvulkan-test.la \
-	$(PTHREAD_LIBS) -lm -lstdc++
-
-check_PROGRAMS += $(VULKAN_TESTS)
-TESTS += $(VULKAN_TESTS)
-
-vulkan_tests_block_pool_no_free_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_tests_block_pool_no_free_CPPFLAGS = $(VULKAN_CPPFLAGS)
-vulkan_tests_block_pool_no_free_LDADD = $(VULKAN_TEST_LDADD)
-
-vulkan_tests_state_pool_no_free_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_tests_state_pool_no_free_CPPFLAGS = $(VULKAN_CPPFLAGS)
-vulkan_tests_state_pool_no_free_LDADD = $(VULKAN_TEST_LDADD)
-
-vulkan_tests_state_pool_free_list_only_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_tests_state_pool_free_list_only_CPPFLAGS = $(VULKAN_CPPFLAGS)
-vulkan_tests_state_pool_free_list_only_LDADD = $(VULKAN_TEST_LDADD)
-
-vulkan_tests_state_pool_padding_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_tests_state_pool_padding_CPPFLAGS = $(VULKAN_CPPFLAGS)
-vulkan_tests_state_pool_padding_LDADD = $(VULKAN_TEST_LDADD)
-
-vulkan_tests_state_pool_CFLAGS = $(VULKAN_CFLAGS)
-vulkan_tests_state_pool_CPPFLAGS = $(VULKAN_CPPFLAGS)
-vulkan_tests_state_pool_LDADD = $(VULKAN_TEST_LDADD)
-
-endif
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
deleted file mode 100644
index fbefdaee5da..00000000000
--- a/src/loader/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-
-EXTRA_DIST = SConscript meson.build
-
-noinst_LTLIBRARIES = libloader.la
-
-AM_CPPFLAGS = \
-	-I$(top_builddir)/src/util/ \
-	-DUSE_DRICONF \
-	-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
-	$(DEFINES) \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	$(VISIBILITY_CFLAGS) \
-	$(XCB_DRI3_CFLAGS) \
-	$(LIBDRM_CFLAGS)
-
-libloader_la_CPPFLAGS = $(AM_CPPFLAGS)
-libloader_la_SOURCES = $(LOADER_C_FILES)
-libloader_la_LIBADD =
-
-if HAVE_LIBDRM
-libloader_la_LIBADD += \
-	$(LIBDRM_LIBS)
-endif
-
-if HAVE_PLATFORM_X11
-if HAVE_DRI3
-noinst_LTLIBRARIES += libloader_dri3_helper.la
-
-libloader_dri3_helper_la_SOURCES = \
-	loader_dri3_helper.c \
-	loader_dri3_helper.h
-libloader_dri3_helper_la_LIBADD = $(XCB_DRI3_LIBS)
-endif
-endif
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
deleted file mode 100644
index 23735ded1a5..00000000000
--- a/src/mapi/Makefile.am
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright © 2013, 2014 Intel Corporation
-#
-# 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.
-
-SUBDIRS =
-TESTS =
-
-BUILT_SOURCES =
-CLEANFILES = $(BUILT_SOURCES)
-
-lib_LTLIBRARIES =
-check_PROGRAMS =
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =
-
-EXTRA_DIST = \
-	new/genCommon.py \
-	new/gen_gldispatch_mapi.py \
-	es1api/ABI-check \
-	es2api/ABI-check \
-	mapi_abi.py \
-	glapi/SConscript \
-	glapi/registry/gl.xml \
-	shared-glapi/SConscript \
-	es1api/meson.build \
-	es2api/meson.build \
-	glapi/meson.build \
-	shared-glapi/meson.build \
-	meson.build
-
-AM_CFLAGS = \
-	$(PTHREAD_CFLAGS) \
-	$(MSVC2013_COMPAT_CFLAGS)
-AM_CPPFLAGS =							\
-	$(DEFINES)						\
-	$(SELINUX_CFLAGS)					\
-	-I$(top_srcdir)/include					\
-	-I$(top_srcdir)/src					\
-	-I$(top_builddir)/src/mapi				\
-	-I$(top_srcdir)/src/mapi				\
-	-I$(top_builddir)/src/mapi/glapi			\
-	-I$(top_srcdir)/src/mapi/glapi
-
-include Makefile.sources
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-shared_glapi_gen_mapi_deps := \
-	mapi_abi.py \
-	$(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \
-	$(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py)
-
-glapi_gen_gl_xml := \
-	$(srcdir)/glapi/registry/gl.xml
-glapi_gen_mapi_script = $(srcdir)/new/gen_gldispatch_mapi.py
-glapi_gen_mapi_deps = \
-	$(glapi_gen_mapi_script) \
-	$(srcdir)/new/genCommon.py \
-	$(glapi_gen_gl_xml)
-glapi_gen_mapi = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) $(glapi_gen_mapi_script)
-
-if HAVE_SHARED_GLAPI
-BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
-
-lib_LTLIBRARIES += shared-glapi/libglapi.la
-shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) shared-glapi/glapi_mapi_tmp.h
-shared_glapi_libglapi_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-shared_glapi_libglapi_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DMAPI_MODE_GLAPI \
-	-DMAPI_ABI_HEADER=\"shared-glapi/glapi_mapi_tmp.h\"
-shared_glapi_libglapi_la_LIBADD = \
-	$(PTHREAD_LIBS) \
-	$(SELINUX_LIBS)
-shared_glapi_libglapi_la_LDFLAGS = \
-	-no-undefined \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-TESTS += shared-glapi-test
-check_PROGRAMS += shared-glapi-test
-
-shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp
-shared_glapi_test_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-I$(top_srcdir)/src/gtest/include \
-	-I$(top_srcdir)/src/mesa
-shared_glapi_test_LDADD = \
-	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
-	$(top_builddir)/src/gtest/libgtest.la
-endif
-
-shared-glapi/glapi_mapi_tmp.h : glapi/gen/gl_and_es_API.xml $(shared_glapi_gen_mapi_deps)
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/mapi_abi.py --printer shared-glapi \
-		$(srcdir)/glapi/gen/gl_and_es_API.xml > $@
-
-if HAVE_OPENGL
-noinst_LTLIBRARIES = glapi/libglapi.la
-
-if HAVE_X86_ASM
-if HAVE_X86_64_ASM
-GLAPI_ASM_SOURCES = glapi/glapi_x86-64.S
-else
-GLAPI_ASM_SOURCES = glapi/glapi_x86.S
-endif
-endif
-if HAVE_SPARC_ASM
-GLAPI_ASM_SOURCES = glapi/glapi_sparc.S
-endif
-
-glapi_libglapi_la_SOURCES =
-glapi_libglapi_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-I$(top_srcdir)/src/mesa
-
-if HAVE_APPLEDRI
-glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c
-endif
-if HAVE_WINDOWSDRI
-glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c
-endif
-
-if HAVE_SHARED_GLAPI
-glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES) glapi/glapi_mapi_tmp.h
-glapi_libglapi_la_CPPFLAGS += \
-	-DMAPI_MODE_BRIDGE \
-	-DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\"
-else
-glapi_libglapi_la_CPPFLAGS += \
-	-DMAPI_MODE_UTIL
-glapi_libglapi_la_SOURCES += \
-	glapi/glapi_dispatch.c \
-	glapi/glapi_entrypoint.c \
-	glapi/glapi_getproc.c \
-	glapi/glapi_nop.c \
-	glapi/glapi.c \
-	glapi/glapi.h \
-	glapi/glapi_priv.h \
-	$(GLAPI_ASM_SOURCES) \
-	$(MAPI_UTIL_FILES)
-
-TESTS += glapi-test
-check_PROGRAMS += glapi-test
-
-glapi_test_SOURCES = glapi/tests/check_table.cpp
-glapi_test_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-I$(top_srcdir)/src/gtest/include \
-	-I$(top_srcdir)/src/mesa
-
-glapi_test_LDADD = \
-	$(top_builddir)/src/mapi/glapi/libglapi.la \
-	$(top_builddir)/src/gtest/libgtest.la
-endif
-endif
-
-if USE_LIBGLVND
-else
-if HAVE_OPENGL_ES1
-TESTS += es1api/ABI-check
-
-BUILT_SOURCES += es1api/glapi_mapi_tmp.h
-
-pkgconfig_DATA += es1api/glesv1_cm.pc
-
-GLES_includedir = $(includedir)/GLES
-GLES_include_HEADERS = \
-	$(top_srcdir)/include/GLES/egl.h \
-	$(top_srcdir)/include/GLES/gl.h \
-	$(top_srcdir)/include/GLES/glext.h \
-	$(top_srcdir)/include/GLES/glplatform.h
-
-lib_LTLIBRARIES += es1api/libGLESv1_CM@[email protected]
-
-es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_SOURCES = entry.c es1api/glapi_mapi_tmp.h
-es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DMAPI_MODE_BRIDGE \
-	-DMAPI_ABI_HEADER=\"es1api/glapi_mapi_tmp.h\"
-es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_LIBADD = $(GLESv1_CM_LIB_DEPS)
-es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_LDFLAGS = \
-	-no-undefined \
-	-version-number 1:1 \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_LIBADD += shared-glapi/libglapi.la
-endif # HAVE_OPENGL_ES1
-endif # USE_LIBGLVND
-
-es1api/glapi_mapi_tmp.h: $(glapi_gen_mapi_deps)
-	$(MKDIR_GEN)
-	$(glapi_gen_mapi) glesv1 $(glapi_gen_gl_xml) > $@
-
-if USE_LIBGLVND
-else
-if HAVE_OPENGL_ES2
-TESTS += es2api/ABI-check
-
-BUILT_SOURCES += es2api/glapi_mapi_tmp.h
-
-pkgconfig_DATA += es2api/glesv2.pc
-
-GLES2_includedir = $(includedir)/GLES2
-GLES2_include_HEADERS = \
-	$(top_srcdir)/include/GLES2/gl2.h \
-	$(top_srcdir)/include/GLES2/gl2ext.h \
-	$(top_srcdir)/include/GLES2/gl2platform.h
-GLES3_includedir = $(includedir)/GLES3
-GLES3_include_HEADERS = \
-	$(top_srcdir)/include/GLES3/gl3.h \
-	$(top_srcdir)/include/GLES3/gl31.h \
-	$(top_srcdir)/include/GLES3/gl32.h \
-	$(top_srcdir)/include/GLES3/gl3ext.h \
-	$(top_srcdir)/include/GLES3/gl3platform.h
-
-lib_LTLIBRARIES += es2api/libGLESv2@[email protected]
-
-es2api_libGLESv2@GLES_LIB_SUFFIX@_la_SOURCES = entry.c es2api/glapi_mapi_tmp.h
-es2api_libGLESv2@GLES_LIB_SUFFIX@_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-es2api_libGLESv2@GLES_LIB_SUFFIX@_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DMAPI_MODE_BRIDGE \
-	-DMAPI_ABI_HEADER=\"es2api/glapi_mapi_tmp.h\"
-es2api_libGLESv2@GLES_LIB_SUFFIX@_la_LIBADD = $(GLESv2_LIB_DEPS)
-es2api_libGLESv2@GLES_LIB_SUFFIX@_la_LDFLAGS = \
-	-no-undefined \
-	-version-number 2 \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-es2api_libGLESv2@GLES_LIB_SUFFIX@_la_LIBADD += shared-glapi/libglapi.la
-endif # HAVE_OPENGL_ES2
-endif # USE_LIBGLVND
-
-es2api/glapi_mapi_tmp.h: $(glapi_gen_mapi_deps)
-	$(MKDIR_GEN)
-	$(glapi_gen_mapi) glesv2 $(glapi_gen_gl_xml) > $@
-
-include $(top_srcdir)/install-lib-links.mk
-
-if NEED_KHRPLATFORM
-khrdir = $(includedir)/KHR
-khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
-endif
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
deleted file mode 100644
index 40538b0ff2e..00000000000
--- a/src/mapi/glapi/gen/Makefile.am
+++ /dev/null
@@ -1,373 +0,0 @@
-# These are the "official" xserver indent flags from utils/modular/x-indent.sh
-XORG_INDENT_FLAGS = -linux -bad -bap -blf -bli0 -cbi0 -cdw -nce -cs -i4 -lc80 -psl -nbbo \
-    -nbc -psl -nbfda -nut -nss -T pointer -T ScreenPtr -T ScrnInfoPtr -T pointer \
-    -T DeviceIntPtr -T DevicePtr -T ClientPtr -T CallbackListPtr \
-    -T CallbackProcPtr -T OsTimerPtr -T CARD32 -T CARD16 -T CARD8 \
-    -T INT32 -T INT16 -T INT8 -T Atom -T Time -T WindowPtr -T DrawablePtr \
-    -T PixmapPtr -T ColormapPtr -T CursorPtr -T Font -T XID -T Mask \
-    -T BlockHandlerProcPtr -T WakeupHandlerProcPtr -T RegionPtr \
-    -T InternalEvent -T GrabPtr -T Timestamp -T Bool -T TimeStamp \
-    -T xEvent -T DeviceEvent -T RawDeviceEvent -T GrabMask -T Window \
-    -T Drawable -T FontPtr -T CallbackPtr -T XIPropertyValuePtr \
-    -T GrabParameters -T deviceKeyButtonPointer -T TouchOwnershipEvent \
-    -T xGenericEvent -T DeviceChangedEvent -T GCPtr -T BITS32 \
-    -T xRectangle -T BoxPtr -T RegionRec -T ValuatorMask -T KeyCode \
-    -T KeySymsPtr -T XkbDescPtr -T InputOption -T XI2Mask -T DevUnion \
-    -T DevPrivateKey -T DevScreenPrivateKey -T PropertyPtr -T RESTYPE \
-    -T XkbAction -T XkbChangesPtr -T XkbControlsPtr -T PrivatePtr -T pmWait \
-    -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT
-
-
-MESA_DIR = $(top_builddir)/src/mesa
-MESA_GLAPI_DIR = $(top_builddir)/src/mapi/glapi
-MESA_MAPI_DIR = $(top_srcdir)/src/mapi
-MESA_GLX_DIR = $(top_builddir)/src/glx
-
-MESA_GLAPI_OUTPUTS = \
-	$(MESA_GLAPI_DIR)/glapi_mapi_tmp.h \
-	$(MESA_GLAPI_DIR)/glprocs.h \
-	$(MESA_GLAPI_DIR)/glapitemp.h \
-	$(MESA_GLAPI_DIR)/glapitable.h
-
-if HAVE_APPLEDRI
-MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c
-endif
-if HAVE_WINDOWSDRI
-MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c
-endif
-
-MESA_GLAPI_ASM_OUTPUTS =
-if HAVE_X86_ASM
-if HAVE_X86_64_ASM
-MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86-64.S
-else
-MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86.S
-endif
-endif
-
-if HAVE_SPARC_ASM
-MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_sparc.S
-endif
-
-BUILT_SOURCES = \
-	$(MESA_GLAPI_OUTPUTS) \
-	$(MESA_GLAPI_ASM_OUTPUTS) \
-	$(MESA_DIR)/main/enums.c \
-	$(MESA_DIR)/main/api_exec.c \
-	$(MESA_DIR)/main/marshal_generated.c \
-	$(MESA_DIR)/main/marshal_generated.h \
-	$(MESA_DIR)/main/dispatch.h \
-	$(MESA_DIR)/main/remap_helper.h \
-	$(MESA_GLX_DIR)/indirect.c \
-	$(MESA_GLX_DIR)/indirect.h \
-	$(MESA_GLX_DIR)/indirect_init.c \
-	$(MESA_GLX_DIR)/indirect_size.h \
-	$(MESA_GLX_DIR)/indirect_size.c
-EXTRA_DIST= \
-	$(BUILT_SOURCES) \
-	$(MESA_GLAPI_DIR)/glapi_gentable.c \
-	$(MESA_GLAPI_DIR)/glapi_x86.S \
-	$(MESA_GLAPI_DIR)/glapi_x86-64.S \
-	$(MESA_GLAPI_DIR)/glapi_sparc.S \
-	$(COMMON_GLX) \
-	apiexec.py \
-	gl_apitemp.py \
-	gl_enums.py \
-	gl_genexec.py \
-	gl_gentable.py \
-	gl_marshal.py \
-	gl_marshal_h.py \
-	gl_procs.py \
-	gl_SPARC_asm.py \
-	gl_table.py \
-	gl_x86-64_asm.py \
-	gl_x86_asm.py \
-	glX_proto_recv.py \
-	glX_proto_send.py \
-	glX_proto_size.py \
-	glX_server_table.py \
-	marshal_XML.py \
-	remap_helper.py \
-	static_data.py \
-	SConscript \
-	gl_API.dtd \
-	meson.build
-
-######################################################################
-
-XORG_GLX_DIR = $(XORG_BASE)/glx
-XORG_GLAPI_DIR = $(XORG_BASE)/glx
-
-XORG_OUTPUTS = \
-	$(XORG_GLX_DIR)/indirect_dispatch.c \
-	$(XORG_GLX_DIR)/indirect_dispatch_swap.c \
-	$(XORG_GLX_DIR)/indirect_dispatch.h \
-	$(XORG_GLX_DIR)/indirect_reqsize.c \
-	$(XORG_GLX_DIR)/indirect_reqsize.h \
-	$(XORG_GLX_DIR)/indirect_size.h \
-	$(XORG_GLX_DIR)/indirect_size_get.c \
-	$(XORG_GLX_DIR)/indirect_size_get.h \
-	$(XORG_GLX_DIR)/indirect_table.c
-
-.PHONY: $(XORG_OUTPUTS)
-
-######################################################################
-
-API_XML = \
-	gl_API.xml \
-	es_EXT.xml \
-	gl_and_es_API.xml \
-	gl_and_glX_API.xml \
-	ARB_base_instance.xml \
-	ARB_blend_func_extended.xml \
-	ARB_bindless_texture.xml \
-	ARB_clear_buffer_object.xml \
-	ARB_clear_texture.xml \
-	ARB_clip_control.xml \
-	ARB_color_buffer_float.xml \
-	ARB_compressed_texture_pixel_storage.xml \
-	ARB_compute_shader.xml \
-	ARB_compute_variable_group_size.xml \
-	ARB_copy_buffer.xml \
-	ARB_copy_image.xml \
-	ARB_debug_output.xml \
-	ARB_depth_buffer_float.xml \
-	ARB_depth_clamp.xml \
-	ARB_direct_state_access.xml \
-	ARB_draw_buffers.xml \
-	ARB_draw_buffers_blend.xml \
-	ARB_draw_elements_base_vertex.xml \
-	ARB_draw_indirect.xml \
-	ARB_draw_instanced.xml \
-	ARB_ES2_compatibility.xml \
-	ARB_ES3_compatibility.xml \
-	ARB_framebuffer_no_attachments.xml \
-	ARB_framebuffer_object.xml \
-	ARB_get_program_binary.xml \
-	ARB_get_texture_sub_image.xml \
-	ARB_gl_spirv.xml \
-	ARB_gpu_shader_fp64.xml \
-	ARB_gpu_shader_int64.xml \
-	ARB_gpu_shader5.xml \
-	ARB_indirect_parameters.xml \
-	ARB_instanced_arrays.xml \
-	ARB_internalformat_query.xml \
-	ARB_internalformat_query2.xml \
-	ARB_invalidate_subdata.xml \
-	ARB_map_buffer_range.xml \
-	ARB_multi_bind.xml \
-	ARB_pipeline_statistics_query.xml \
-	ARB_program_interface_query.xml \
-	ARB_robustness.xml \
-	ARB_sample_shading.xml \
-	ARB_sampler_objects.xml \
-	ARB_seamless_cube_map.xml \
-	ARB_separate_shader_objects.xml \
-	ARB_shader_atomic_counters.xml \
-	ARB_shader_image_load_store.xml \
-	ARB_shader_subroutine.xml \
-	ARB_shader_storage_buffer_object.xml \
-	ARB_sparse_buffer.xml \
-	ARB_sync.xml \
-	ARB_tessellation_shader.xml \
-	ARB_texture_barrier.xml \
-	ARB_texture_buffer_object.xml \
-	ARB_texture_buffer_range.xml \
-	ARB_texture_compression_rgtc.xml \
-	ARB_texture_cube_map_array.xml \
-	ARB_texture_float.xml \
-	ARB_texture_gather.xml \
-	ARB_texture_multisample.xml \
-	ARB_texture_rgb10_a2ui.xml \
-	ARB_texture_rg.xml \
-	ARB_texture_storage_multisample.xml \
-	ARB_texture_storage.xml \
-	ARB_texture_view.xml \
-	ARB_uniform_buffer_object.xml \
-	ARB_vertex_array_object.xml \
-	ARB_vertex_attrib_64bit.xml \
-	ARB_vertex_attrib_binding.xml \
-	ARB_viewport_array.xml \
-	AMD_depth_clamp_separate.xml \
-	AMD_draw_buffers_blend.xml \
-	AMD_gpu_shader_int64.xml \
-	AMD_performance_monitor.xml \
-	ARB_vertex_type_2_10_10_10_rev.xml \
-	APPLE_object_purgeable.xml \
-	APPLE_vertex_array_object.xml \
-	EXT_draw_buffers2.xml \
-	EXT_external_objects.xml \
-	EXT_external_objects_fd.xml \
-	EXT_framebuffer_object.xml \
-	EXT_gpu_shader4.xml \
-	EXT_multisampled_render_to_texture.xml \
-	EXT_packed_depth_stencil.xml \
-	EXT_provoking_vertex.xml \
-	EXT_separate_shader_objects.xml \
-	EXT_texture_array.xml \
-	EXT_texture_integer.xml \
-	EXT_transform_feedback.xml \
-	EXT_vertex_attrib_64bit.xml \
-	EXT_window_rectangles.xml \
-	GREMEDY_string_marker.xml \
-	INTEL_performance_query.xml \
-	KHR_debug.xml \
-	KHR_context_flush_control.xml \
-	KHR_robustness.xml \
-	KHR_robustness_es.xml \
-	KHR_texture_compression_astc.xml \
-	MESA_tile_raster_order.xml \
-	NV_conditional_render.xml \
-	NV_primitive_restart.xml \
-	NV_texture_barrier.xml \
-	NV_vdpau_interop.xml \
-	OES_EGL_image.xml \
-	OES_fixed_point.xml \
-	OES_single_precision.xml \
-	OES_texture_compression_astc.xml \
-	GL3x.xml \
-	GL4x.xml
-
-COMMON = $(API_XML) \
-	gl_XML.py \
-	glX_XML.py \
-	license.py \
-	static_data.py \
-	typeexpr.py
-
-COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
-
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-######################################################################
-
-xorg: check-xorg-source $(XORG_OUTPUTS)
-
-check-xorg-source:
-	@if ! test -d $(XORG_GLX_DIR); then \
-		echo "ERROR: Must specify path to xserver/ checkout. Set XORG_BASE env var."; \
-		if test x$(XORG_BASE) != x; then \
-			echo "'$(XORG_GLX_DIR)' does not exist."; \
-		fi; \
-		exit 1; \
-	fi
-
-clean-local:
-	-rm -f *~ *.pyo
-
-######################################################################
-
-$(XORG_GLAPI_DIR)/%.c: $(MESA_GLAPI_DIR)/%.c
-	$(INDENT) $(XORG_INDENT_FLAGS) < $< > $@
-
-$(XORG_GLAPI_DIR)/dispatch.h: $(MESA_DIR)/main/dispatch.h
-	$(INDENT) $(XORG_INDENT_FLAGS) < $< > $@
-
-$(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h
-	$(INDENT) $(XORG_INDENT_FLAGS) < $< > $@
-
-######################################################################
-
-$(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON)
-	$(PYTHON_GEN) $(MESA_MAPI_DIR)/mapi_abi.py \
-		--printer glapi $(srcdir)/gl_and_es_API.xml > $@
-
-$(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_procs.py -c -f $(srcdir)/gl_and_es_API.xml > $@
-
-$(MESA_GLAPI_DIR)/glapitemp.h: gl_apitemp.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_apitemp.py -f $(srcdir)/gl_and_es_API.xml > $@
-
-$(MESA_GLAPI_DIR)/glapitable.h: gl_table.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_table.py -f $(srcdir)/gl_and_es_API.xml > $@
-
-$(MESA_GLAPI_DIR)/glapi_gentable.c: gl_gentable.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_gentable.py -f $(srcdir)/gl_and_es_API.xml > $@
-
-######################################################################
-
-$(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_x86_asm.py -f $(srcdir)/gl_and_es_API.xml > $@
-
-$(MESA_GLAPI_DIR)/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_x86-64_asm.py -f $(srcdir)/gl_and_es_API.xml > $@
-
-$(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_SPARC_asm.py -f $(srcdir)/gl_and_es_API.xml > $@
-
-######################################################################
-
-$(MESA_DIR)/main/enums.c: gl_enums.py $(srcdir)/../registry/gl.xml
-	$(PYTHON_GEN) $(srcdir)/gl_enums.py -f $(srcdir)/../registry/gl.xml > $@
-
-$(MESA_DIR)/main/api_exec.c: gl_genexec.py apiexec.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_genexec.py -f $(srcdir)/gl_and_es_API.xml > $@
-
-$(MESA_DIR)/main/marshal_generated.c: gl_marshal.py marshal_XML.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_marshal.py -f $(srcdir)/gl_and_es_API.xml > $@
-
-$(MESA_DIR)/main/marshal_generated.h: gl_marshal_h.py marshal_XML.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_marshal_h.py -f $(srcdir)/gl_and_es_API.xml > $@
-
-$(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/gl_table.py -f $(srcdir)/gl_and_es_API.xml -m remap_table > $@
-
-$(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON)
-	$(PYTHON_GEN) $(srcdir)/remap_helper.py -f $(srcdir)/gl_and_es_API.xml > $@
-
-######################################################################
-
-$(MESA_GLX_DIR)/indirect.c: glX_proto_send.py $(COMMON_GLX)
-	$(PYTHON_GEN) $(srcdir)/glX_proto_send.py -f $(srcdir)/gl_API.xml -m proto \
-	  | $(INDENT) $(INDENT_FLAGS) > $@
-
-$(MESA_GLX_DIR)/indirect.h: glX_proto_send.py $(COMMON_GLX)
-	$(PYTHON_GEN) $(srcdir)/glX_proto_send.py -f $(srcdir)/gl_API.xml -m init_h > $@
-
-$(MESA_GLX_DIR)/indirect_init.c: glX_proto_send.py $(COMMON_GLX)
-	$(PYTHON_GEN) $(srcdir)/glX_proto_send.py -f $(srcdir)/gl_API.xml -m init_c > $@
-
-$(MESA_GLX_DIR)/indirect_size.h $(XORG_GLX_DIR)/indirect_size.h: glX_proto_size.py $(COMMON_GLX)
-	$(PYTHON_GEN) $(srcdir)/glX_proto_size.py -f $(srcdir)/gl_API.xml -m size_h --only-set \
-	    --header-tag _INDIRECT_SIZE_H_ \
-	  | $(INDENT) $(INDENT_FLAGS) > $@
-
-$(MESA_GLX_DIR)/indirect_size.c: glX_proto_size.py $(COMMON_GLX)
-	$(PYTHON_GEN) $(srcdir)/glX_proto_size.py -f $(srcdir)/gl_API.xml -m size_c --only-set \
-	  | $(INDENT) $(INDENT_FLAGS) > $@
-
-######################################################################
-
-$(XORG_GLX_DIR)/indirect_dispatch.c: glX_proto_recv.py $(COMMON_GLX)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m dispatch_c \
-	| $(INDENT) $(XORG_INDENT_FLAGS) > $@
-
-$(XORG_GLX_DIR)/indirect_dispatch_swap.c: glX_proto_recv.py $(COMMON_GLX)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m dispatch_c -s \
-	| $(INDENT) $(XORG_INDENT_FLAGS) > $@
-
-$(XORG_GLX_DIR)/indirect_dispatch.h: glX_proto_recv.py gl_and_glX_API.xml $(COMMON_GLX)
-	$(PYTHON_GEN) $< -m dispatch_h -f $(srcdir)/gl_and_glX_API.xml -s \
-	| $(INDENT) $(XORG_INDENT_FLAGS) > $@
-
-$(XORG_GLX_DIR)/indirect_size_get.h: glX_proto_size.py $(COMMON_GLX)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_h \
-           --only-get --header-tag '_INDIRECT_SIZE_GET_H_' \
-	  | $(INDENT) $(XORG_INDENT_FLAGS) > $@
-
-$(XORG_GLX_DIR)/indirect_size_get.c: glX_proto_size.py $(COMMON_GLX)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_c \
-	  | $(INDENT) $(INDENT_FLAGS) > $@
-
-$(XORG_GLX_DIR)/indirect_reqsize.h: glX_proto_size.py $(COMMON_GLX)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m reqsize_h \
-           --only-get --header-tag '_INDIRECT_SIZE_GET_H_' \
-	  | $(INDENT) $(XORG_INDENT_FLAGS) > $@
-
-$(XORG_GLX_DIR)/indirect_reqsize.c: glX_proto_size.py $(COMMON_GLX)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m reqsize_c \
-          | $(INDENT) $(XORG_INDENT_FLAGS) > $@
-
-$(XORG_GLX_DIR)/indirect_table.c: glX_server_table.py gl_and_glX_API.xml $(COMMON_GLX)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_glX_API.xml \
-	| $(INDENT) $(XORG_INDENT_FLAGS) > $@
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
deleted file mode 100644
index d7daa995c5c..00000000000
--- a/src/mesa/Makefile.am
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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.
-
-SUBDIRS = . main/tests
-
-# state tracker tests depend on libmesagallium.la
-if HAVE_GALLIUM
-SUBDIRS += state_tracker/tests
-endif
-
-if HAVE_XLIB_GLX
-SUBDIRS += drivers/x11
-endif
-
-if HAVE_DRICOMMON
-SUBDIRS += drivers/dri
-endif
-
-if HAVE_OSMESA
-SUBDIRS += drivers/osmesa
-endif
-
-include Makefile.sources
-
-EXTRA_DIST = \
-	drivers/SConscript \
-	main/meson.build \
-	program/meson.build \
-	meson.build \
-	main/format_fallback.py \
-	main/format_info.py \
-	main/format_pack.py \
-	main/format_parser.py \
-	main/format_unpack.py \
-	main/formats.csv \
-	main/get_hash_generator.py \
-	main/get_hash_params.py \
-	program/program_lexer.l \
-	program/program_parse.y \
-	SConscript \
-	swrast/NOTES \
-	swrast_setup/NOTES \
-	tnl/NOTES \
-	tnl_dd
-
-BUILT_SOURCES = \
-	main/get_hash.h \
-	main/format_fallback.c \
-	main/format_info.h \
-	main/format_pack.c \
-	main/format_unpack.c \
-	program/program_parse.tab.c \
-	program/lex.yy.c
-CLEANFILES = \
-	$(BUILT_SOURCES) \
-	program/program_parse.tab.h
-
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py \
-                 main/get_hash_generator.py
-	$(PYTHON_GEN) $(srcdir)/main/get_hash_generator.py \
-		-f $(srcdir)/../mapi/glapi/gen/gl_and_es_API.xml > $@
-
-main/format_fallback.c: main/format_fallback.py \
-                        main/format_parser.py \
-	                main/formats.csv
-	$(PYTHON_GEN) $(srcdir)/main/format_fallback.py $(srcdir)/main/formats.csv $@
-
-main/format_info.h: main/formats.csv \
-                    main/format_parser.py main/format_info.py
-	$(PYTHON_GEN) $(srcdir)/main/format_info.py $(srcdir)/main/formats.csv > $@
-
-main/format_pack.c: main/format_pack.py main/formats.csv \
-                    main/format_parser.py
-	$(PYTHON_GEN) $(srcdir)/main/format_pack.py $(srcdir)/main/formats.csv > $@
-
-main/format_unpack.c: main/format_unpack.py main/formats.csv	\
-                      main/format_parser.py
-	$(PYTHON_GEN) $(srcdir)/main/format_unpack.py $(srcdir)/main/formats.csv > $@
-
-main/formats.c: main/format_info.h
-
-noinst_LTLIBRARIES = $(ARCH_LIBS)
-if NEED_LIBMESA
-noinst_LTLIBRARIES += libmesa.la
-else
-check_LTLIBRARIES = libmesa.la
-endif
-if HAVE_GALLIUM
-noinst_LTLIBRARIES += libmesagallium.la
-endif
-
-AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
-AM_CFLAGS = \
-	$(VDPAU_CFLAGS) \
-	$(LLVM_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(MSVC2013_COMPAT_CFLAGS)
-AM_CXXFLAGS = \
-	$(LLVM_CFLAGS) \
-	$(VISIBILITY_CXXFLAGS) \
-	$(MSVC2013_COMPAT_CXXFLAGS)
-
-ARCH_LIBS =
-
-if SSE41_SUPPORTED
-ARCH_LIBS += libmesa_sse41.la
-endif
-
-MESA_ASM_FILES_FOR_ARCH =
-
-if HAVE_X86_ASM
-noinst_PROGRAMS = gen_matypes
-
-gen_matypes_SOURCES = x86/gen_matypes.c
-BUILT_SOURCES += matypes.h
-
-if HAVE_X86_64_ASM
-MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES)
-AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64
-else
-MESA_ASM_FILES_FOR_ARCH += $(X86_FILES)
-AM_CPPFLAGS += -I$(builddir)/x86 -I$(srcdir)/x86
-endif
-endif
-if HAVE_SPARC_ASM
-MESA_ASM_FILES_FOR_ARCH += $(SPARC_FILES)
-AM_CPPFLAGS += -I$(builddir)/sparc -I$(srcdir)/sparc
-endif
-
-libmesa_la_SOURCES = \
-	$(MESA_FILES) \
-	$(PROGRAM_FILES) \
-	$(PROGRAM_NIR_FILES) \
-	$(MESA_ASM_FILES_FOR_ARCH)
-
-libmesa_la_LIBADD = \
-	$(top_builddir)/src/compiler/glsl/libglsl.la \
-	$(ARCH_LIBS)
-
-libmesagallium_la_SOURCES = \
-	$(MESA_GALLIUM_FILES) \
-	$(PROGRAM_FILES) \
-	$(PROGRAM_NIR_FILES) \
-	$(MESA_ASM_FILES_FOR_ARCH)
-
-libmesagallium_la_LIBADD = \
-	$(top_builddir)/src/compiler/glsl/libglsl.la \
-	$(ARCH_LIBS)
-
-libmesa_sse41_la_SOURCES = \
-	$(X86_SSE41_FILES)
-
-libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS)
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS)
-LEX_GEN = $(AM_V_GEN)$(LEX) $(LFLAGS)
-
-program/lex.yy.c: program/program_lexer.l
-	$(MKDIR_GEN)
-	$(LEX_GEN) -o $@ $(srcdir)/program/program_lexer.l
-
-program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
-	$(MKDIR_GEN)
-	$(YACC_GEN) -o $@ -p "_mesa_program_" --defines=$(builddir)/program/program_parse.tab.h $(srcdir)/program/program_parse.y
-
-if GEN_ASM_OFFSETS
-matypes.h: $(gen_matypes_SOURCES)
-	$(AM_V_GEN)$(COMPILE) $< -DASM_OFFSETS -S -o - | \
-		sed -n '/^->/{s:^->::;/[$$]/{s:^:#define :;s:[$$]::};p}' > $@
-else
-matypes.h: gen_matypes
-	$(AM_V_GEN)./gen_matypes > $@
-endif
-
-# Emacs tags
-tags:
-	etags `find . -name \*.[ch]` $(top_srcdir)/include/GL/*.h
diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
deleted file mode 100644
index 3876d7c4192..00000000000
--- a/src/mesa/drivers/dri/Makefile.am
+++ /dev/null
@@ -1,112 +0,0 @@
-dridir = $(DRI_DRIVER_INSTALL_DIR)
-
-SUBDIRS =
-MEGADRIVERS =
-MEGADRIVERS_DEPS =
-
-SUBDIRS+=common
-
-if HAVE_I915_DRI
-SUBDIRS += i915
-MEGADRIVERS_DEPS += i915/libi915_dri.la
-MEGADRIVERS += i915_dri.so
-endif
-
-if HAVE_I965_DRI
-SUBDIRS += i965
-MEGADRIVERS_DEPS += i965/libi965_dri.la
-MEGADRIVERS += i965_dri.so
-endif
-
-if HAVE_NOUVEAU_DRI
-SUBDIRS += nouveau
-MEGADRIVERS_DEPS += nouveau/libnouveau_dri.la
-MEGADRIVERS += nouveau_vieux_dri.so
-endif
-
-if HAVE_R200_DRI
-SUBDIRS += r200
-MEGADRIVERS_DEPS += r200/libr200_dri.la
-MEGADRIVERS += r200_dri.so
-endif
-
-if HAVE_RADEON_DRI
-SUBDIRS += radeon
-MEGADRIVERS_DEPS += radeon/libradeon_dri.la
-MEGADRIVERS += radeon_dri.so
-endif
-
-if HAVE_SWRAST_DRI
-SUBDIRS += swrast
-MEGADRIVERS_DEPS += swrast/libswrast_dri.la
-MEGADRIVERS += swrast_dri.so
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dri.pc
-
-driincludedir = $(includedir)/GL/internal
-driinclude_HEADERS = \
-	$(top_srcdir)/include/GL/internal/dri_interface.h
-
-nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp
-mesa_dri_drivers_la_SOURCES =
-mesa_dri_drivers_la_LDFLAGS = \
-	-shared \
-	-shrext .so \
-	-module \
-	-no-undefined \
-	-avoid-version \
-	$(LD_BUILD_ID) \
-	$(BSYMBOLIC) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-mesa_dri_drivers_la_LIBADD = \
-        ../../libmesa.la \
-        common/libmegadriver_stub.la \
-        common/libdricommon.la \
-        $(top_builddir)/src/util/libxmlconfig.la \
-        $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
-        $(MEGADRIVERS_DEPS) \
-        $(DRI_LIB_DEPS) \
-        $()
-
-EXTRA_DIST = meson.build
-
-if NEED_MEGADRIVER
-dri_LTLIBRARIES = mesa_dri_drivers.la
-
-if HAVE_COMPAT_SYMLINKS
-# Add a link to allow setting LD_LIBRARY_PATH/LIBGL_DRIVERS_PATH to /lib of the build tree.
-all-local: mesa_dri_drivers.la
-	$(AM_V_at)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-	$(AM_V_GEN)ln -f .libs/mesa_dri_drivers.so \
-			 $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so;
-	$(AM_V_GEN)for i in $(MEGADRIVERS); do \
-		ln -f $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so \
-		      $(top_builddir)/$(LIB_DIR)/$$i; \
-	done;
-
-clean-local:
-	$(AM_V_GEN)$(RM) $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so;
-	$(AM_V_GEN)for i in $(MEGADRIVERS); do \
-		$(RM) $(top_builddir)/$(LIB_DIR)/$$i; \
-	done;
-endif
-
-# hardlink each megadriver instance, but don't actually have
-# mesa_dri_drivers.so in the set of final installed files.
-install-data-hook:
-	for i in $(MEGADRIVERS); do \
-		ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
-		      $(DESTDIR)$(dridir)/$$i; \
-	done;
-	$(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.*
-
-uninstall-hook:
-	for i in $(MEGADRIVERS); do \
-		$(RM) $(DESTDIR)$(dridir)/$$i; \
-	done;
-
-endif
diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
deleted file mode 100644
index 192b3642b21..00000000000
--- a/src/mesa/drivers/dri/common/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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
-
-EXTRA_DIST = SConscript meson.build
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_builddir)/src/util/ \
-	$(LIBDRM_CFLAGS) \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS)
-
-noinst_LTLIBRARIES = \
-	libdricommon.la \
-	libmegadriver_stub.la
-
-libdricommon_la_SOURCES = $(DRI_COMMON_FILES)
-
-libmegadriver_stub_la_SOURCES = $(megadriver_stub_FILES)
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
deleted file mode 100644
index b66617ba82f..00000000000
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-# 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
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_builddir)/src/util \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS) \
-	$(I915_CFLAGS)
-
-noinst_LTLIBRARIES = libi915_dri.la
-libi915_dri_la_SOURCES = $(i915_FILES)
-libi915_dri_la_LIBADD = $(I915_LIBS)
-
-EXTRA_DIST = meson.build
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
deleted file mode 100644
index d7d7db208da..00000000000
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-# Copyright © 2011 Intel Corporation
-#
-# 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
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/ \
-	-I$(top_builddir)/src/ \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_builddir)/src/util \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	-I$(top_srcdir)/src/gtest/include \
-	-I$(top_builddir)/src/compiler \
-	-I$(top_srcdir)/src/compiler \
-	-I$(top_builddir)/src/compiler/glsl \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/compiler/nir \
-	-I$(top_builddir)/src/intel \
-	-I$(top_srcdir)/src/intel \
-	-I$(top_srcdir)/include \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS) \
-	$(WNO_OVERRIDE_INIT) \
-	$(LIBDRM_CFLAGS) \
-	$(VALGRIND_CFLAGS) \
-	-msse2 -mstackrealign
-
-AM_CXXFLAGS = $(AM_CFLAGS)
-
-I965_PERGEN_LIBS = \
-	libi965_gen4.la \
-	libi965_gen45.la \
-	libi965_gen5.la \
-	libi965_gen6.la \
-	libi965_gen7.la \
-	libi965_gen75.la \
-	libi965_gen8.la \
-	libi965_gen9.la \
-	libi965_gen10.la \
-	libi965_gen11.la
-
-libi965_gen4_la_SOURCES = $(i965_gen4_FILES)
-libi965_gen4_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=40
-
-libi965_gen45_la_SOURCES = $(i965_gen45_FILES)
-libi965_gen45_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=45
-
-libi965_gen5_la_SOURCES = $(i965_gen5_FILES)
-libi965_gen5_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=50
-
-libi965_gen6_la_SOURCES = $(i965_gen6_FILES)
-libi965_gen6_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=60
-
-libi965_gen7_la_SOURCES = $(i965_gen7_FILES)
-libi965_gen7_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=70
-
-libi965_gen75_la_SOURCES = $(i965_gen75_FILES)
-libi965_gen75_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=75
-
-libi965_gen8_la_SOURCES = $(i965_gen8_FILES)
-libi965_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80
-
-libi965_gen9_la_SOURCES = $(i965_gen9_FILES)
-libi965_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
-
-libi965_gen10_la_SOURCES = $(i965_gen10_FILES)
-libi965_gen10_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=100
-
-libi965_gen11_la_SOURCES = $(i965_gen11_FILES)
-libi965_gen11_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=110
-
-noinst_LTLIBRARIES = \
-	libi965_dri.la \
-	$(I965_PERGEN_LIBS)
-
-libi965_dri_la_SOURCES = \
-	$(i965_FILES) \
-	$(i965_oa_GENERATED_FILES)
-libi965_dri_la_LIBADD = \
-	$(top_builddir)/src/intel/common/libintel_common.la \
-	$(top_builddir)/src/intel/dev/libintel_dev.la \
-	$(top_builddir)/src/intel/isl/libisl.la \
-	$(top_builddir)/src/intel/compiler/libintel_compiler.la \
-	$(top_builddir)/src/intel/blorp/libblorp.la \
-	$(I965_PERGEN_LIBS) \
-	$(LIBDRM_LIBS)
-
-BUILT_SOURCES = $(i965_oa_GENERATED_FILES)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	brw_oa.py \
-	$(i965_oa_xml_FILES) \
-	meson.build
-
-brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
-	$(PYTHON) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \
-	--code=$(builddir)/brw_oa_metrics.c \
-	--header=$(builddir)/brw_oa_metrics.h \
-	$(i965_oa_xml_FILES:%=$(srcdir)/%)
-
-brw_oa_metrics.h: brw_oa_metrics.c
diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
deleted file mode 100644
index 59fd7fce7c9..00000000000
--- a/src/mesa/drivers/dri/nouveau/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-# 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
-
-EXTRA_DIST = \
-	nouveau_render_t.c \
-	nouveau_swtnl_t.c \
-	nouveau_vbo_t.c \
-	meson.build
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS) \
-	$(NVVIEUX_CFLAGS)
-
-noinst_LTLIBRARIES = libnouveau_dri.la
-libnouveau_dri_la_SOURCES = $(NOUVEAU_C_FILES)
-libnouveau_dri_la_LIBADD = $(NVVIEUX_LIBS)
diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
deleted file mode 100644
index 3d15c019909..00000000000
--- a/src/mesa/drivers/dri/r200/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-# 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
-
-EXTRA_DIST = \
-	r200_maos_arrays.c \
-	meson.build
-
-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/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_builddir)/src/util \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	-I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS) \
-	$(RADEON_CFLAGS)
-
-noinst_LTLIBRARIES = libr200_dri.la
-libr200_dri_la_SOURCES = $(R200_C_FILES)
-libr200_dri_la_LIBADD = $(RADEON_LIBS)
diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
deleted file mode 100644
index 9d43d2627fa..00000000000
--- a/src/mesa/drivers/dri/radeon/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-# 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
-
-EXTRA_DIST = \
-	radeon_maos_verts.c \
-	radeon_maos_arrays.c \
-	meson.build
-
-AM_CFLAGS = \
-	-DRADEON_R100 \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_builddir)/src/util \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	-I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS) \
-	$(RADEON_CFLAGS)
-
-noinst_LTLIBRARIES = libradeon_dri.la
-libradeon_dri_la_SOURCES = $(RADEON_C_FILES)
-libradeon_dri_la_LIBADD = $(RADEON_LIBS)
diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
deleted file mode 100644
index 110c056054b..00000000000
--- a/src/mesa/drivers/dri/swrast/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-# 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
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_builddir)/src/util \
-	-I$(top_srcdir)/src/mesa/drivers/dri/common \
-	$(LIBDRM_CFLAGS) \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS)
-
-noinst_LTLIBRARIES = libswrast_dri.la
-libswrast_dri_la_SOURCES = $(SWRAST_C_FILES)
-
-EXTRA_DIST = meson.build
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
deleted file mode 100644
index f7816995933..00000000000
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-# Copyright © 2012 Laurent Carlier <[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.
-
-EXTRA_DIST = osmesa.def SConscript meson.build
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_builddir)/src/mapi \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_builddir)/src/mapi/glapi \
-	-I$(top_srcdir)/src/mapi/glapi \
-	-I$(top_srcdir)/src/mesa/ \
-	$(DEFINES)
-AM_CFLAGS = $(PTHREAD_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-lib_LTLIBRARIES = lib@[email protected]
-
-nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
-lib@OSMESA_LIB@_la_SOURCES = osmesa.c
-
-lib@OSMESA_LIB@_la_LDFLAGS = \
-	-no-undefined \
-	-version-number @OSMESA_VERSION@ \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
-
-lib@OSMESA_LIB@_la_LIBADD = \
-	$(top_builddir)/src/mesa/libmesa.la \
-	$(top_builddir)/src/mapi/glapi/libglapi.la \
-	$(SHARED_GLAPI_LIB) \
-	$(OSMESA_LIB_DEPS)
-
-include $(top_srcdir)/install-lib-links.mk
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = osmesa.pc
diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
deleted file mode 100644
index 3024c549e61..00000000000
--- a/src/mesa/drivers/x11/Makefile.am
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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.
-
-# This builds "stand-alone" Mesa, a version of libGL that does not need the
-# GLX extension.  All rendering is converted to Xlib calls.  No hardware
-# acceleration.
-
-EXTRA_DIST = SConscript meson.build
-
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/mesa/main \
-	$(X11_INCLUDES) \
-	$(DEFINES)
-
-lib_LTLIBRARIES = lib@[email protected]
-
-lib@GL_LIB@_la_SOURCES = \
-	glxapi.h \
-	glxheader.h \
-	xfonts.h \
-	xmesaP.h \
-	fakeglx.c \
-	glxapi.c \
-	xfonts.c \
-	xm_api.c \
-	xm_buffer.c \
-	xm_dd.c \
-	xmesa.h \
-	xmesa_x.h \
-	xm_line.c \
-	xm_tri.c
-
-# Force usage of a C++ linker
-nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
-
-GL_MAJOR = 1
-GL_MINOR = 6
-GL_PATCH = 0
-
-lib@GL_LIB@_la_LIBADD = \
-	$(top_builddir)/src/mesa/libmesa.la \
-	$(top_builddir)/src/mapi/glapi/libglapi.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(SHARED_GLAPI_LIB) \
-	$(GL_LIB_DEPS)
-
-lib@GL_LIB@_la_LDFLAGS = \
-	-no-undefined \
-	-version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \
-	$(BSYMBOLIC) \
-	$(GC_SECTIONS) \
-	$(LD_NO_UNDEFINED)
-
-include $(top_srcdir)/install-lib-links.mk
diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am
deleted file mode 100644
index 94266a1d4ab..00000000000
--- a/src/mesa/main/tests/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-AM_CFLAGS = \
-	$(PTHREAD_CFLAGS)
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gtest/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_builddir)/src/mapi/glapi \
-	-I$(top_srcdir)/src/mapi/glapi \
-	-I$(top_builddir)/src/mesa \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/include \
-	$(DEFINES) $(INCLUDE_DIRS)
-
-TESTS = main-test
-check_PROGRAMS = main-test
-
-main_test_SOURCES =			\
-	enum_strings.cpp
-
-main_test_LDADD = \
-	$(top_builddir)/src/mesa/libmesa.la \
-	$(top_builddir)/src/gtest/libgtest.la \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS) \
-	$(CLOCK_LIB)
-
-if HAVE_SHARED_GLAPI
-main_test_SOURCES +=			\
-	dispatch_sanity.cpp		\
-	mesa_formats.cpp			\
-	mesa_extensions.cpp			\
-	program_state_string.cpp
-
-main_test_LDADD += \
-	$(top_builddir)/src/mapi/shared-glapi/libglapi.la
-else
-main_test_SOURCES +=			\
-	stubs.cpp
-endif
-
-EXTRA_DIST = meson.build
diff --git a/src/mesa/state_tracker/tests/Makefile.am b/src/mesa/state_tracker/tests/Makefile.am
deleted file mode 100644
index 0665a880844..00000000000
--- a/src/mesa/state_tracker/tests/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(PTHREAD_CFLAGS)
-
-AM_CXXFLAGS = \
-	$(GALLIUM_DRIVER_CXXFLAGS) \
-	$(CXX11_CXXFLAGS)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gtest/include \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_builddir)/src/mesa \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_builddir)/src/compiler/glsl \
-	$(DEFINES)
-
-if HAVE_STD_CXX11
-if HAVE_SHARED_GLAPI
-TESTS = st-renumerate-test \
-	st-array-merge-test
-check_PROGRAMS = st-renumerate-test \
-	st-array-merge-test
-
-check_LIBRARIES = libmesa-st-tests-common.a
-endif
-endif
-
-libmesa_st_tests_common_a_SOURCES = \
-	st_tests_common.cpp \
-	st_tests_common.h
-
-st_renumerate_test_SOURCES =			\
-	test_glsl_to_tgsi_lifetime.cpp
-
-st_renumerate_test_LDFLAGS = \
-	$(LLVM_LDFLAGS)
-
-st_array_merge_test_SOURCES = \
-	test_glsl_to_tgsi_array_merge.cpp
-
-st_array_merge_test_LDFLAGS = \
-	$(LLVM_LDFLAGS)
-
-st_common_LDADD = \
-	libmesa-st-tests-common.a \
-	$(top_builddir)/src/mesa/libmesagallium.la \
-	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(top_builddir)/src/gtest/libgtest.la \
-	$(GALLIUM_COMMON_LIB_DEPS) \
-	$(LLVM_LIBS)
-
-st_renumerate_test_LDADD = \
-	$(st_common_LDADD)
-
-st_array_merge_test_LDADD = \
-	$(st_common_LDADD)
-
-EXTRA_DIST = meson.build
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
deleted file mode 100644
index 4bda54c551d..00000000000
--- a/src/util/Makefile.am
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright © 2014 Intel Corporation
-#
-# 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.
-
-SUBDIRS = . \
-	xmlpool \
-	tests/fast_idiv_by_const \
-	tests/hash_table \
-	tests/string_buffer \
-	tests/set
-
-if HAVE_STD_CXX11
-SUBDIRS += tests/vma
-endif
-
-include Makefile.sources
-
-noinst_LTLIBRARIES = \
-	libmesautil.la \
-	libxmlconfig.la
-
-AM_CPPFLAGS = \
-	$(PTHREAD_CFLAGS) \
-	-I$(top_srcdir)/include
-
-libmesautil_la_CPPFLAGS = \
-	$(DEFINES) \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	$(VISIBILITY_CFLAGS) \
-	$(MSVC2013_COMPAT_CFLAGS) \
-	$(ZLIB_CFLAGS)
-
-libmesautil_la_SOURCES = \
-	$(MESA_UTIL_FILES) \
-	$(MESA_UTIL_GENERATED_FILES)
-
-libmesautil_la_LIBADD = \
-	$(PTHREAD_LIBS) \
-	$(CLOCK_LIB) \
-	$(ZLIB_LIBS) \
-	$(LIBATOMIC_LIBS) \
-	-lm
-
-libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
-libxmlconfig_la_CFLAGS = \
-	$(DEFINES) \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	$(VISIBILITY_CFLAGS) \
-	$(EXPAT_CFLAGS)
-libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
-
-drircdir = $(datadir)/drirc.d
-drirc_DATA = 00-mesa-defaults.conf
-
-u_atomic_test_LDADD = libmesautil.la
-roundeven_test_LDADD = -lm
-mesa_sha1_test_LDADD = libmesautil.la
-
-check_PROGRAMS = u_atomic_test roundeven_test mesa-sha1_test
-TESTS = $(check_PROGRAMS)
-
-BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
-CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = \
-	00-mesa-defaults.conf \
-	format_srgb.py \
-	merge_driinfo.py \
-	SConscript \
-	xmlpool.h \
-	sha1/README \
-	meson.build
-
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-format_srgb.c: format_srgb.py
-	$(PYTHON_GEN) $(srcdir)/format_srgb.py > $@
diff --git a/src/util/tests/fast_idiv_by_const/Makefile.am b/src/util/tests/fast_idiv_by_const/Makefile.am
deleted file mode 100644
index 1ebee09f59b..00000000000
--- a/src/util/tests/fast_idiv_by_const/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright © 2018 Intel
-#
-#  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.
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gtest/include \
-	$(PTHREAD_CFLAGS) \
-	$(DEFINES)
-
-TESTS = fast_idiv_by_const_test
-
-check_PROGRAMS = $(TESTS)
-
-fast_idiv_by_const_test_SOURCES = \
-	fast_idiv_by_const_test.cpp
-
-fast_idiv_by_const_test_LDADD = \
-	$(top_builddir)/src/gtest/libgtest.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS)
-
-EXTRA_DIST = meson.build
diff --git a/src/util/tests/hash_table/Makefile.am b/src/util/tests/hash_table/Makefile.am
deleted file mode 100644
index 526454cb1ed..00000000000
--- a/src/util/tests/hash_table/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright © 2009 Intel Corporation
-#
-#  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
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
-#  ADAM JACKSON 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.
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/util \
-	$(DEFINES)
-
-LDADD = \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS)
-
-TESTS = \
-	clear \
-	collision \
-	delete_and_lookup \
-	delete_management \
-	destroy_callback \
-	insert_and_lookup \
-	insert_many \
-	null_destroy \
-	random_entry \
-	remove_key \
-	remove_null \
-	replacement \
-	$()
-
-check_PROGRAMS = $(TESTS)
-
-EXTRA_DIST = meson.build
diff --git a/src/util/tests/set/Makefile.am b/src/util/tests/set/Makefile.am
deleted file mode 100644
index 5529f4c144a..00000000000
--- a/src/util/tests/set/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright © 2018 Intel
-#
-#  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.
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/gtest/include \
-	$(PTHREAD_CFLAGS) \
-	$(DEFINES)
-
-TESTS = set_test
-
-check_PROGRAMS = $(TESTS)
-
-set_test_SOURCES = \
-	set_test.cpp
-
-set_test_LDADD = \
-	$(top_builddir)/src/gtest/libgtest.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS)
-
-EXTRA_DIST = meson.build
diff --git a/src/util/tests/string_buffer/Makefile.am b/src/util/tests/string_buffer/Makefile.am
deleted file mode 100644
index 8bc8a9c9b6c..00000000000
--- a/src/util/tests/string_buffer/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright © 2017 Thomas Helland
-#
-#  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.
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/gtest/include \
-	$(PTHREAD_CFLAGS) \
-	$(DEFINES)
-
-TESTS = string_buffer_test
-
-check_PROGRAMS = $(TESTS)
-
-string_buffer_test_SOURCES = \
-	string_buffer_test.cpp
-
-string_buffer_test_LDADD = \
-	$(top_builddir)/src/gtest/libgtest.la \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS)
-
-EXTRA_DIST = meson.build
diff --git a/src/util/tests/vma/Makefile.am b/src/util/tests/vma/Makefile.am
deleted file mode 100644
index b9ca8f5977a..00000000000
--- a/src/util/tests/vma/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2018 Intel Corporation
-#
-#  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.
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/util \
-	$(DEFINES)
-
-TESTS = vma_random_test
-
-check_PROGRAMS = $(TESTS)
-
-vma_random_test_SOURCES = \
-	vma_random_test.cpp
-
-vma_random_test_LDADD = \
-	$(top_builddir)/src/util/libmesautil.la
-
-vma_random_test_CXXFLAGS = $(CXX11_CXXFLAGS)
-
-EXTRA_DIST = meson.build
diff --git a/src/util/xmlpool/Makefile.am b/src/util/xmlpool/Makefile.am
deleted file mode 100644
index 2b01391401b..00000000000
--- a/src/util/xmlpool/Makefile.am
+++ /dev/null
@@ -1,110 +0,0 @@
-# Convenient makefile for managing translations.
-
-# Prerequisites:
-# - GNU gettext
-# - Python
-
-# Adding new translations
-# -----------------------
-
-# To start working on a new translation edit the POS=... line
-# below. If you want to add for example a french translation, add
-# fr.po.
-
-# Then run "make po" to generate a fresh .po file from translatable
-# strings in t_options.h. Now you can edit the new .po file (fr.po in
-# the example above) to translate the strings. Please make sure that
-# your editor encodes the file in UTF-8.
-
-# Updating existing translations
-# ------------------------------
-
-# Run "make po" to update .po files with new translatable strings from
-# t_options.h. Now you can edit the .po files you're interested
-# in. Please make sure that your editor encodes the file in UTF-8.
-
-# Updating options.h
-# ------------------
-
-# Finally run "make" to generate options.h from t_options.h with all
-# translations. Now you can rebuild the drivers. Any common options
-# used by the drivers will have option descriptions with the latest
-# translations.
-
-# Publishing translations
-# -----------------------
-
-# To get your translation(s) into Mesa CVS, please send me your
-# <lang>.po file.
-
-# More information:
-# - info gettext
-
-# The set of supported languages. Add languages as needed.
-POS=ca.po de.po es.po nl.po fr.po sv.po
-
-#
-# Don't change anything below, unless you know what you're doing.
-#
-LANGS=$(POS:%.po=%)
-MOS=$(POS:%.po=%.gmo)
-POT=xmlpool.pot
-
-.PHONY: all clean clean-local pot po mo
-
-EXTRA_DIST = \
-	gen_xmlpool.py \
-	options.h \
-	t_options.h \
-	$(POS) \
-	$(MOS) \
-	SConscript \
-	meson.build \
-	LINGUAS \
-	POTFILES
-
-BUILT_SOURCES = options.h
-CLEANFILES = \
-	options.h
-	$(POS) \
-	$(MOS)
-
-clean-local:
-	rm -f $(MOS)
-
-# Default target options.h
-LOCALEDIR := .
-options.h: t_options.h $(MOS)
-	$(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py \
-	--template $(srcdir)/t_options.h \
-	--output options.h \
-	--localedir $(LOCALEDIR) \
-	--languages $(LANGS)
-
-# Update .mo files from the corresponding .po files.
-%.gmo: %.po
-	@mo="$@"; \
-	lang=$${mo%%/*}; \
-	echo "Updating ($$lang) $@ from $?."; \
-	msgfmt -o $@ $?
-
-# Use this target to create or update .po files with new messages in
-# driconf.py.
-po: $(POT)
-	@for po in $(POS); do \
-		if [ -f $$po ]; then \
-			echo "Merging new strings from $(POT) into $@."; \
-			mv $$po $$po~; \
-			msgmerge -o $$po $$po~ $(POT); \
-		else \
-			echo "Initializing $$po from $(POT)."; \
-			msginit -i $(POT) -o $$po~ --locale=$*; \
-			sed -e 's/charset=.*\\n/charset=UTF-8\\n/' $$po~ > $$po; \
-		fi \
-	done
-
-pot: $(POT)
-
-# Extract message catalog from driconf.py.
-$(POT): t_options.h
-	xgettext -L C --from-code utf-8 -o $(POT) t_options.h
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
deleted file mode 100644
index 9d5416fc855..00000000000
--- a/src/vulkan/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-include Makefile.sources
-
-noinst_LTLIBRARIES = libvulkan_wsi.la libvulkan_util.la
-
-vulkan_includedir = $(includedir)/vulkan
-vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-EXTRA_DIST = \
-	overlay-layer/README \
-	overlay-layer/meson.build \
-	overlay-layer/overlay.cpp \
-	overlay-layer/overlay_params.c \
-	overlay-layer/overlay_params.h \
-	overlay-layer/overlay.frag \
-	overlay-layer/overlay.vert \
-	overlay-layer/VkLayer_MESA_overlay.json.in \
-	overlay-layer/vk_layer_table.cpp \
-	overlay-layer/vk_layer_table.h \
-	util/gen_enum_to_str.py \
-	util/meson.build \
-	wsi/meson.build \
-	meson.build
-
-AM_CPPFLAGS = \
-	$(DEFINES) \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/vulkan/util \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/gallium/include
-
-AM_CFLAGS = \
-	$(LIBDRM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-VULKAN_WSI_GENERATED_SOURCES =
-
-VULKAN_WSI_SOURCES = \
-	$(VULKAN_WSI_FILES)
-
-if HAVE_PLATFORM_X11
-AM_CPPFLAGS += \
-	$(XCB_DRI3_CFLAGS) \
-	-DVK_USE_PLATFORM_XCB_KHR \
-	-DVK_USE_PLATFORM_XLIB_KHR
-
-VULKAN_WSI_SOURCES += $(VULKAN_WSI_X11_FILES)
-endif
-
-if HAVE_PLATFORM_DRM
-AM_CPPFLAGS += \
-	-DVK_USE_PLATFORM_DISPLAY_KHR
-
-VULKAN_WSI_SOURCES += $(VULKAN_WSI_DISPLAY_FILES)
-endif
-
-if HAVE_XLIB_LEASE
-AM_CPPFLAGS += \
-	$(XCB_RANDR_CFLAGS) \
-	$(XLIB_RANDR_CFLAGS) \
-	-DVK_USE_PLATFORM_XLIB_XRANDR_EXT
-endif
-
-CLEANFILES = \
-	$(VULKAN_UTIL_GENERATED_FILES) \
-	$(VULKAN_WSI_WAYLAND_GENERATED_FILES)
-
-WL_DRM_XML = $(top_srcdir)/src/egl/wayland/wayland-drm/wayland-drm.xml
-
-wsi/wayland-drm-protocol.c : $(WL_DRM_XML)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(WAYLAND_SCANNER) $(SCANNER_ARG) $< $@
-
-wsi/wayland-drm-client-protocol.h : $(WL_DRM_XML)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
-
-WL_DMABUF_XML = $(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
-
-wsi/linux-dmabuf-unstable-v1-protocol.c : $(WL_DMABUF_XML)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(WAYLAND_SCANNER) $(SCANNER_ARG) $< $@
-
-wsi/linux-dmabuf-unstable-v1-client-protocol.h : $(WL_DMABUF_XML)
-	$(MKDIR_GEN)
-	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
-
-if HAVE_PLATFORM_WAYLAND
-wsi/linux-dmabuf-unstable-v1-protocol.lo: wsi/linux-dmabuf-unstable-v1-client-protocol.h
-wsi/wayland-drm-protocol.lo: wsi/wayland-drm-client-protocol.h
-wsi/wsi_common_wayland.lo: wsi/linux-dmabuf-unstable-v1-client-protocol.h wsi/wayland-drm-client-protocol.h
-
-AM_CPPFLAGS += \
-	-I$(top_builddir)/src/vulkan/wsi \
-	$(WAYLAND_CLIENT_CFLAGS) \
-	-DVK_USE_PLATFORM_WAYLAND_KHR
-
-VULKAN_WSI_SOURCES += \
-	$(VULKAN_WSI_WAYLAND_FILES)
-
-VULKAN_WSI_GENERATED_SOURCES += \
-	$(VULKAN_WSI_WAYLAND_GENERATED_FILES)
-
-endif
-
-VULKAN_UTIL_SOURCES = \
-	$(VULKAN_UTIL_FILES) \
-	$(VULKAN_UTIL_GENERATED_FILES)
-
-util/vk_enum_to_str.c util/vk_enum_to_str.h: util/gen_enum_to_str.py \
-		$(vulkan_api_xml)
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/util/gen_enum_to_str.py \
-	    --xml $(vulkan_api_xml) \
-	    --outdir $(top_builddir)/src/vulkan/util
-
-libvulkan_util_la_SOURCES = $(VULKAN_UTIL_SOURCES)
-
-nodist_libvulkan_wsi_la_SOURCES = $(VULKAN_WSI_GENERATED_SOURCES)
-
-libvulkan_wsi_la_SOURCES = $(VULKAN_WSI_SOURCES)