13 files changed, 0 insertions, 955 deletions
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