Drop autotools build system

22 files changed, 0 insertions, 2051 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3afbb3e8..f01e759e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,30 +34,6 @@ fedora-x86_64-meson:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
       - public
 
-fedora-x86_64-autotools:
-  stage: build
-  variables:
-    CCACHE_BASEDIR: "${CI_PROJECT_DIR}"
-    CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache"
-    CFLAGS: "-Werror"
-  script:
-    - sed -i 's|\[glib-2\.0 >= [0-9.]*\]|[glib-2.0 >= 1.0]|' configure.ac
-    - mkdir _build
-    - cd _build
-    - ../autogen.sh --with-python=python3 --enable-gtk-doc --enable-doctool
-    - make -j4
-    - make check
-    - python3 -m pip install --user flake8
-    - make check.quality
-  artifacts:
-    when: on_failure
-    name: "gi-_${CI_COMMIT_REF_NAME}"
-    paths:
-      - "_build/*.log"
-      - "_build/*/*.log"
-      - "_build/*/*/*.log"
-      - "_build/*/*/*/*.log"
-
 msys2-mingw32-meson:
   stage: build
   tags:
@@ -74,22 +50,6 @@ msys2-mingw32-meson:
     paths:
       - _build/meson-logs
 
-msys2-mingw32-autotools:
-  stage: build
-  tags:
-    - win32
-  variables:
-    MSYSTEM: "MINGW32"
-    CHERE_INVOKING: "yes"
-  script:
-    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
-    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-autotools.sh"
-  artifacts:
-    when: on_failure
-    name: "gi-_%CI_COMMIT_REF_NAME%"
-    paths:
-      - _build/meson-logs
-
 vs2017-x64-meson:
   stage: build
   tags:
diff --git a/.gitlab-ci/test-msys2-autotools.sh b/.gitlab-ci/test-msys2-autotools.sh
deleted file mode 100644
index 1029864b..00000000
--- a/.gitlab-ci/test-msys2-autotools.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export PATH="/c/msys64/$MSYSTEM/bin:$PATH"
-if [[ "$MSYSTEM" == "MINGW32" ]]; then
-    export MSYS2_ARCH="i686"
-else
-    export MSYS2_ARCH="x86_64"
-fi
-
-pacman --noconfirm -Suy
-
-pacman --noconfirm -S --needed \
-    base-devel \
-    autoconf-archive \
-    mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-python3 \
-    mingw-w64-$MSYS2_ARCH-libffi \
-    mingw-w64-$MSYS2_ARCH-cairo \
-    mingw-w64-$MSYS2_ARCH-glib2 \
-    mingw-w64-$MSYS2_ARCH-gtk-doc
-
-./autogen.sh
-
-make -j6
-make -j6 check
diff --git a/Makefile-cmph.am b/Makefile-cmph.am
deleted file mode 100644
index a0bf2291..00000000
--- a/Makefile-cmph.am
+++ /dev/null
@@ -1,80 +0,0 @@
-EXTRA_LTLIBRARIES += libcmph.la
-
-libcmph_la_CPPFLAGS = -Icmph $(GLIB_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS)
-libcmph_la_LIBADD = -lm $(GLIB_LIBS)
-
-EXTRA_DIST += \
-	girepository/cmph/meson.build
-
-libcmph_la_SOURCES = \
-	girepository/cmph/bdz.c \
-	girepository/cmph/bdz.h \
-	girepository/cmph/bdz_ph.c \
-	girepository/cmph/bdz_ph.h \
-	girepository/cmph/bdz_structs.h \
-	girepository/cmph/bdz_structs_ph.h \
-	girepository/cmph/bitbool.h \
-	girepository/cmph/bmz8.c \
-	girepository/cmph/bmz8.h \
-	girepository/cmph/bmz8_structs.h \
-	girepository/cmph/bmz.c \
-	girepository/cmph/bmz.h \
-	girepository/cmph/bmz_structs.h \
-	girepository/cmph/brz.c \
-	girepository/cmph/brz.h \
-	girepository/cmph/brz_structs.h \
-	girepository/cmph/buffer_entry.c \
-	girepository/cmph/buffer_entry.h \
-	girepository/cmph/buffer_manager.c \
-	girepository/cmph/buffer_manager.h \
-	girepository/cmph/chd.c \
-	girepository/cmph/chd.h \
-	girepository/cmph/chd_ph.c \
-	girepository/cmph/chd_ph.h \
-	girepository/cmph/chd_structs.h \
-	girepository/cmph/chd_structs_ph.h \
-	girepository/cmph/chm.c \
-	girepository/cmph/chm.h \
-	girepository/cmph/chm_structs.h \
-	girepository/cmph/cmph.c \
-	girepository/cmph/cmph.h \
-	girepository/cmph/cmph_structs.c \
-	girepository/cmph/cmph_structs.h \
-	girepository/cmph/cmph_time.h \
-	girepository/cmph/cmph_types.h \
-	girepository/cmph/compressed_rank.c \
-	girepository/cmph/compressed_rank.h \
-	girepository/cmph/compressed_seq.c \
-	girepository/cmph/compressed_seq.h \
-	girepository/cmph/debug.h \
-	girepository/cmph/fch_buckets.c \
-	girepository/cmph/fch_buckets.h \
-	girepository/cmph/fch.c \
-	girepository/cmph/fch.h \
-	girepository/cmph/fch_structs.h \
-	girepository/cmph/graph.c \
-	girepository/cmph/graph.h \
-	girepository/cmph/hash.c \
-	girepository/cmph/hash.h \
-	girepository/cmph/hash_state.h \
-	girepository/cmph/jenkins_hash.c \
-	girepository/cmph/jenkins_hash.h \
-	girepository/cmph/miller_rabin.c \
-	girepository/cmph/miller_rabin.h \
-	girepository/cmph/select.c \
-	girepository/cmph/select.h \
-	girepository/cmph/select_lookup_tables.h \
-	girepository/cmph/vqueue.c \
-	girepository/cmph/vqueue.h \
-	girepository/cmph/vstack.c \
-	girepository/cmph/vstack.h
-
-
-TESTS += cmph-bdz-test
-EXTRA_PROGRAMS += cmph-bdz-test
-
-cmph_bdz_test_SOURCES = girepository/cmph-bdz-test.c
-cmph_bdz_test_CFLAGS = -I$(top_srcdir)/girepository/cmph $(GOBJECT_CFLAGS)
-cmph_bdz_test_LDADD = libcmph.la $(GOBJECT_LIBS)
-
-CLEANFILES += cmph-bdz-test libcmph.la
diff --git a/Makefile-examples.am b/Makefile-examples.am
deleted file mode 100644
index 9404e2bb..00000000
--- a/Makefile-examples.am
+++ /dev/null
@@ -1,9 +0,0 @@
-noinst_PROGRAMS += glib-print
-
-glib_print_SOURCES = examples/glib-print.c
-glib_print_CFLAGS = $(GOBJECT_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)/girepository -I$(top_builddir)/girepository
-glib_print_LDFLAGS = $(WARN_LDFLAGS)
-glib_print_LDADD = libgirepository-1.0.la $(GOBJECT_LIBS)
-
-EXTRA_DIST += \
-	examples/meson.build
diff --git a/Makefile-gir.am b/Makefile-gir.am
deleted file mode 100644
index b59b0a6b..00000000
--- a/Makefile-gir.am
+++ /dev/null
@@ -1,237 +0,0 @@
-BUILT_GIRSOURCES =
-SUBSTITUTED_GIRSOURCES =
-
-STATIC_GIRSOURCES =                 \
-        gir/DBus-1.0.gir            \
-        gir/DBusGLib-1.0.gir        \
-        gir/fontconfig-2.0.gir      \
-        gir/freetype2-2.0.gir       \
-        gir/GL-1.0.gir              \
-        gir/libxml2-2.0.gir         \
-        gir/xft-2.0.gir             \
-        gir/xlib-2.0.gir            \
-        gir/xfixes-4.0.gir          \
-        gir/xrandr-1.3.gir          \
-        gir/win32-1.0.gir
-EXTRA_DIST += $(STATIC_GIRSOURCES)
-
-EXTRA_DIST += \
-	gir/meson.build
-
-gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile
-	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
-	sed \
-	-e s,\@CAIRO_SHARED_LIBRARY\@,$(CAIRO_SHARED_LIBRARY), \
-	-e s,\@CAIRO_GIR_PACKAGE\@,$(CAIRO_GIR_PACKAGE), \
-	< $< > $@.tmp && mv $@.tmp $@
-BUILT_SOURCES += gir/cairo-1.0.gir
-SUBSTITUTED_GIRSOURCES += gir/cairo-1.0.gir
-CLEANFILES += gir/cairo-1.0.gir
-EXTRA_DIST += gir/cairo-1.0.gir.in
-
-# Doesn't seem to work to do gir/%.typelib =(
-gir/cairo-1.0.typelib: g-ir-compiler$(EXEEXT)
-gir/DBus-1.0.typelib: g-ir-compiler$(EXEEXT)
-gir/DBusGLib-1.0.typelib: g-ir-compiler$(EXEEXT)
-gir/fontconfig-2.0.typelib: g-ir-compiler$(EXEEXT)
-gir/freetype2-2.0.typelib: g-ir-compiler$(EXEEXT)
-gir/GL-1.0.typelib: g-ir-compiler$(EXEEXT)
-gir/libxml2-2.0.typelib: g-ir-compiler$(EXEEXT)
-gir/xft-2.0.typelib: g-ir-compiler$(EXEEXT)
-gir/xlib-2.0.typelib: g-ir-compiler$(EXEEXT)
-gir/xfixes-4.0.typelib: g-ir-compiler$(EXEEXT)
-gir/xrandr-1.3.typelib: g-ir-compiler$(EXEEXT)
-gir/win32-1.0.typelib: g-ir-compiler$(EXEEXT)
-
-# glib with source (to enable documentation)
-if WITH_GLIBSRC
-     GLib_2_0_gir_DOCSRC = $(GLIBSRC)/glib/*.c
-     GObject_2_0_gir_DOCSRC = $(GLIBSRC)/gobject/*.c
-     GModule_2_0_gir_DOCSRC = $(GLIBSRC)/gmodule/*.c
-     Gio_2_0_gir_DOCSRC = $(GLIBSRC)/gio/*.c
-else
-    GLib_2_0_gir_DOCSRC =
-    GObject_2_0_gir_DOCSRC =
-    GModule_2_0_gir_DOCSRC =
-    Gio_2_0_gir_DOCSRC =
-
-endif
-
-# glib
-GLIB_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
-GLIB_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
-
-GLIB_LIBRARY=glib-2.0
-
-GLib_2_0_gir_LIBS = $(GLIB_LIBRARY) $(GOBJECT_LIBRARY)
-GLib_2_0_gir_SCANNERFLAGS = \
-            --external-library \
-            --reparse-validate \
-            --identifier-prefix=G \
-            --symbol-prefix=g \
-            --symbol-prefix=glib \
-            --c-include="glib.h" \
-            $(GLib_2_0_gir_DOCSRC)
-GLib_2_0_gir_PACKAGES = glib-2.0
-GLib_2_0_gir_CFLAGS = \
-            -I$(GLIB_INCLUDEDIR) \
-            -I$(GLIB_LIBDIR)/glib-2.0/include \
-            -DGETTEXT_PACKAGE=Dummy \
-            -DGLIB_COMPILATION \
-            -D__G_I18N_LIB_H__
-GLib_2_0_gir_FILES =  \
-                $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
-		$(filter-out $(GLIB_INCLUDEDIR)/glib/glib-autocleanups.h,$(wildcard $(GLIB_INCLUDEDIR)/glib/*.h)) \
-		$(GLIB_INCLUDEDIR)/gobject/glib-types.h \
-                gir/glib-2.0.c
-if HAVE_GIO_UNIX
-GLib_2_0_gir_FILES += $(GLIB_INCLUDEDIR)/glib-unix.h
-endif
-
-BUILT_GIRSOURCES += GLib-2.0.gir
-
-GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT)
-
-gir/DBusGLib-1.0.typelib: GObject-2.0.gir
-
-# gobject
-GOBJECT_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
-GOBJECT_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
-
-GOBJECT_LIBRARY=gobject-2.0
-
-GObject-2.0.gir: GLib-2.0.gir
-GObject_2_0_gir_LIBS = $(GOBJECT_LIBRARY)
-GObject_2_0_gir_SCANNERFLAGS = \
-            --external-library \
-            --reparse-validate \
-            --identifier-prefix=G \
-            --c-include="glib-object.h" \
-            --add-include-path=. \
-            $(GObject_2_0_gir_DOCSRC)
-
-GObject_2_0_gir_PACKAGES = gobject-2.0
-GObject_2_0_gir_INCLUDES = GLib-2.0
-GObject_2_0_gir_CFLAGS = \
-            -DGOBJECT_COMPILATION \
-            -I$(GOBJECT_INCLUDEDIR) \
-            -I$(GOBJECT_LIBDIR)/glib-2.0/include
-GObject_2_0_gir_FILES = \
-	$(filter-out $(GOBJECT_INCLUDEDIR)/gobject/glib-types.h $(GOBJECT_INCLUDEDIR)/gobject/gvaluecollector.h (GOBJECT_INCLUDEDIR)/gobject/glib-enumtypes.h, \
-               $(wildcard $(GOBJECT_INCLUDEDIR)/gobject/*.h)) \
-	gir/gobject-2.0.c
-
-BUILT_GIRSOURCES += GObject-2.0.gir
-
-# gmodule
-GMODULE_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
-GMODULE_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
-
-GMODULE_LIBRARY=gmodule-2.0
-
-GModule-2.0.gir: GLib-2.0.gir
-
-GModule_2_0_gir_LIBS = $(GMODULE_LIBRARY)
-GModule_2_0_gir_SCANNERFLAGS = \
-            --external-library \
-            --identifier-prefix=G \
-            --c-include="gmodule.h" \
-            --add-include-path=. \
-            $(GModule_2_0_gir_DOCSRC)
-
-GModule_2_0_gir_PACKAGES = gmodule-2.0
-GModule_2_0_gir_INCLUDES = GLib-2.0
-GModule_2_0_gir_CFLAGS = \
-            -I$(GMODULE_INCLUDEDIR) \
-            -I$(GMODULE_LIBDIR)/glib-2.0/include
-GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
-            gir/gmodule-2.0.c
-
-BUILT_GIRSOURCES += GModule-2.0.gir
-
-# gio
-GIO_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
-GIO_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
-
-GIO_LIBRARY=gio-2.0
-
-if HAVE_GIO_UNIX
-GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
-GIO_UNIX_HDRS = $(wildcard $(GIO_UNIX_INCLUDEDIR)/gio/*.h)
-GIO_UNIX_PACKAGES = gio-unix-2.0
-else
-GIO_UNIX_INCLUDEDIR =
-GIO_UNIX_HDRS=
-GIO_UNIX_PACKAGES =
-endif
-GIO_CINCLUDES=$(patsubst $(GIO_UNIX_INCLUDEDIR)/%,--c-include='%',$(wildcard $(GIO_UNIX_HDRS)))
-
-Gio-2.0.gir: GObject-2.0.gir
-
-Gio_2_0_gir_LIBS = $(GIO_LIBRARY)
-Gio_2_0_gir_SCANNERFLAGS = \
-            --external-library \
-            --reparse-validate \
-            --warn-all \
-            --identifier-prefix=G \
-            --c-include="gio/gio.h" \
-            $(GIO_CINCLUDES) \
-            --add-include-path=. \
-            $(Gio_2_0_gir_DOCSRC)
-
-Gio_2_0_gir_PACKAGES = gio-2.0 $(GIO_UNIX_PACKAGES)
-Gio_2_0_gir_INCLUDES = GObject-2.0
-Gio_2_0_gir_CFLAGS = \
-            -DGIO_COMPILATION \
-            -DG_SETTINGS_ENABLE_BACKEND \
-            -I$(GIO_LIBDIR)/glib-2.0/include
-Gio_2_0_gir_FILES = \
-            $(GIO_UNIX_HDRS) \
-            $(shell echo $(GIO_INCLUDEDIR)/gio/*.h) \
-            gir/gio-2.0.c
-
-BUILT_GIRSOURCES += Gio-2.0.gir
-EXTRA_DIST += gir/glib-2.0.c gir/gmodule-2.0.c gir/gobject-2.0.c gir/gio-2.0.c
-
-# girepository
-GIRepository-2.0.gir: GObject-2.0.gir libgirepository-1.0.la
-
-GIRepository_2_0_gir_LIBS = libgirepository-1.0.la
-GIRepository_2_0_gir_SCANNERFLAGS = \
-        $(WARN_SCANNERFLAGS) \
-        --identifier-prefix=GI \
-        --symbol-prefix=g \
-        --symbol-prefix=gi \
-        --c-include="girepository.h" \
-        --add-include-path=.
-GIRepository_2_0_gir_PACKAGES = gobject-2.0
-GIRepository_2_0_gir_INCLUDES = GObject-2.0
-GIRepository_2_0_gir_EXPORT_PACKAGES = gobject-introspection-1.0
-GIRepository_2_0_gir_CFLAGS = \
-    -I$(top_srcdir)/girepository \
-    -I$(top_srcdir) \
-    -I$(top_builddir)/girepository \
-    -DGI_COMPILATION
-GIRepository_2_0_gir_FILES = \
-        $(top_srcdir)/girepository/girepository.h \
-        $(top_srcdir)/girepository/girepository.c \
-        $(wildcard $(top_srcdir)/girepository/gi*info.c) \
-        $(wildcard $(top_srcdir)/girepository/gi*info.h) \
-        $(top_srcdir)/girepository/giversion.c \
-        $(top_builddir)/girepository/giversion.h \
-        $(top_srcdir)/girepository/gitypelib.h \
-        $(top_srcdir)/girepository/gitypes.h
-
-BUILT_GIRSOURCES += GIRepository-2.0.gir
-
-CLEANFILES += $(BUILT_GIRSOURCES)
-
-INTROSPECTION_GIRS += $(BUILT_GIRSOURCES)
-
-girdir = $(GIR_DIR)
-gir_DATA = $(STATIC_GIRSOURCES) $(SUBSTITUTED_GIRSOURCES) $(BUILT_GIRSOURCES)
-
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = $(gir_DATA:.gir=.typelib)
-
-CLEANFILES += $(typelibs_DATA)
diff --git a/Makefile-girepository.am b/Makefile-girepository.am
deleted file mode 100644
index c7f74b20..00000000
--- a/Makefile-girepository.am
+++ /dev/null
@@ -1,126 +0,0 @@
-EXTRA_DIST +=						\
-	girepository/docs.c \
-	girepository/meson.build
-
-girepodir = $(includedir)/gobject-introspection-1.0/
-girepo_HEADERS =					\
-	girepository/giarginfo.h			\
-	girepository/gibaseinfo.h			\
-	girepository/gicallableinfo.h			\
-	girepository/giconstantinfo.h			\
-	girepository/gienuminfo.h			\
-	girepository/gifieldinfo.h			\
-	girepository/gifunctioninfo.h			\
-	girepository/giinterfaceinfo.h			\
-	girepository/giobjectinfo.h			\
-	girepository/gipropertyinfo.h			\
-	girepository/giregisteredtypeinfo.h		\
-	girepository/girepository.h			\
-	girepository/girffi.h				\
-	girepository/gisignalinfo.h			\
-	girepository/gistructinfo.h			\
-	girepository/gitypeinfo.h			\
-	girepository/gitypelib.h			\
-	girepository/gitypes.h				\
-	girepository/giunioninfo.h			\
-	girepository/giversionmacros.h		\
-	girepository/givfuncinfo.h			\
-	$(top_builddir)/girepository/giversion.h
-
-lib_LTLIBRARIES += libgirepository-1.0.la
-noinst_LTLIBRARIES += libgirepository-internals.la libgirepository-gthash.la
-
-libgirepository_gthash_la_SOURCES =				\
-	girepository/gthash.c
-libgirepository_gthash_la_CFLAGS =	\
-	$(WARN_CFLAGS) \
-	$(GIREPO_CFLAGS)	\
-	$(GI_HIDDEN_VISIBILITY_CFLAGS)	\
-	-I$(top_srcdir)/girepository	\
-	-I$(top_builddir)/girepository
-libgirepository_gthash_la_LDFLAGS =	\
-	$(WARN_LDFLAGS)
-libgirepository_gthash_la_LIBADD = libcmph.la $(GIREPO_LIBS)
-
-libgirepository_internals_la_SOURCES =				\
-	girepository/girmodule.c				\
-	girepository/girmodule.h				\
-	girepository/girnode.c					\
-	girepository/girnode.h					\
-	girepository/giroffsets.c				\
-	girepository/girparser.c				\
-	girepository/girparser.h				\
-	girepository/girwriter.c				\
-	girepository/girwriter.h
-
-libgirepository_internals_la_CFLAGS =	\
-	$(WARN_CFLAGS) \
-	$(GIREPO_CFLAGS)	\
-	$(GI_HIDDEN_VISIBILITY_CFLAGS)	\
-	-I$(top_srcdir)/girepository	\
-	-I$(top_builddir)/girepository
-
-libgirepository_internals_la_LDFLAGS = \
-	$(WARN_LDFLAGS)
-
-libgirepository_internals_la_LIBADD = libgirepository-gthash.la $(GIREPO_LIBS)
-
-libgirepository_1_0_la_SOURCES =			\
-	girepository/gdump.c				\
-	girepository/giarginfo.c			\
-	girepository/gibaseinfo.c			\
-	girepository/gicallableinfo.c			\
-	girepository/giconstantinfo.c			\
-	girepository/gienuminfo.c			\
-	girepository/gifieldinfo.c			\
-	girepository/gifunctioninfo.c			\
-	girepository/ginvoke.c				\
-	girepository/giinterfaceinfo.c			\
-	girepository/giobjectinfo.c			\
-	girepository/gipropertyinfo.c			\
-	girepository/giregisteredtypeinfo.c		\
-	girepository/girepository.c			\
-	girepository/girepository-private.h		\
-	girepository/girffi.c                           \
-	girepository/girffi.h				\
-	girepository/gisignalinfo.c			\
-	girepository/gistructinfo.c			\
-	girepository/gitypeinfo.c			\
-	girepository/gitypelib.c			\
-	girepository/gitypelib-internal.h		\
-	girepository/giunioninfo.c			\
-	girepository/giversion.c			\
-	girepository/givfuncinfo.c
-
-libgirepository_1_0_la_CPPFLAGS =	\
-	$(WARN_CFLAGS) \
-	$(GIREPO_CFLAGS)	\
-	$(GI_HIDDEN_VISIBILITY_CFLAGS)	\
-	-I$(top_srcdir)/girepository	\
-	-I$(top_builddir)/girepository	\
-	-DG_IREPOSITORY_COMPILATION
-libgirepository_1_0_la_LIBADD = libgirepository-gthash.la $(GIREPO_LIBS)
-libgirepository_1_0_la_LDFLAGS = \
-	$(WARN_LDFLAGS) \
-	$(EXTRA_LINK_FLAGS) \
-	-no-undefined -version-number 1:0:0
-
-gdumpdir = $(datadir)/gobject-introspection-1.0/
-gdump_DATA = girepository/gdump.c
-
-if !OS_WIN32
-noinst_PROGRAMS += gi-dump-types
-
-gi_dump_types_SOURCES = girepository/gdump.c girepository/gi-dump-types.c
-gi_dump_types_CFLAGS = $(GIO_UNIX_CFLAGS) $(GMODULE_CFLAGS) $(WARN_CFLAGS)
-gi_dump_types_LDFLAGS = $(WARN_LDFLAGS)
-gi_dump_types_LDADD = $(GIO_UNIX_LIBS) $(GMODULE_LIBS)
-endif
-
-EXTRA_PROGRAMS += gthash-test
-CLEANFILES += gthash-test
-TESTS += gthash-test
-
-gthash_test_SOURCES = girepository/gthash.c girepository/gthash-test.c
-gthash_test_CFLAGS = -I$(top_srcdir)/girepository -I$(top_builddir)/girepository $(GOBJECT_CFLAGS)
-gthash_test_LDADD = libcmph.la libgirepository-1.0.la $(GOBJECT_LIBS)
diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am
deleted file mode 100644
index 8f1fd2a2..00000000
--- a/Makefile-giscanner.am
+++ /dev/null
@@ -1,151 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-BUILT_SOURCES += 			\
-	giscanner/scannerparser.c	\
-	giscanner/scannerparser.h 	\
-	giscanner/scannerlexer.c 	\
-	giscanner/scannerlexer.h
-
-EXTRA_DIST += \
-	giscanner/meson.build
-
-AM_YFLAGS = -d -t
-
-# Why do I have to do this automake?
-giscanner/scannerlexer.h: giscanner/scannerlexer.c
-
-noinst_LTLIBRARIES += libgiscanner.la
-
-libgiscanner_la_SOURCES = \
-	giscanner/sourcescanner.c				\
-	giscanner/sourcescanner.h				\
-	giscanner/scannerlexer.l				\
-	giscanner/scannerparser.y
-libgiscanner_la_CPPFLAGS = -I$(top_srcdir)/girepository -I$(top_builddir)/girepository -I$(top_srcdir)/giscanner
-libgiscanner_la_LIBADD = $(GOBJECT_LIBS) $(GIO_LIBS)
-libgiscanner_la_CFLAGS = $(GOBJECT_CFLAGS) $(GIO_CFLAGS) $(WARN_CFLAGS_FLEX)
-libgiscanner_la_LDFLAGS = $(WARN_LDFLAGS)
-
-# Python module
-pkgpyexecdir = $(pkglibdir)/giscanner
-pkgpyexec_LTLIBRARIES = _giscanner.la
-pkgpyexec_PYTHON = 			\
-	giscanner/__init__.py		\
-	giscanner/_version.py		\
-	giscanner/annotationmain.py	\
-	giscanner/annotationparser.py	\
-	giscanner/ast.py		\
-	giscanner/cachestore.py		\
-	giscanner/ccompiler.py		\
-	giscanner/codegen.py		\
-	giscanner/docmain.py		\
-	giscanner/docwriter.py		\
-	giscanner/dumper.py		\
-	giscanner/gdumpparser.py 	\
-	giscanner/girparser.py		\
-	giscanner/girwriter.py		\
-	giscanner/introspectablepass.py	\
-	giscanner/libtoolimporter.py	\
-	giscanner/maintransformer.py	\
-	giscanner/mdextensions.py	\
-	giscanner/message.py		\
-	giscanner/msvccompiler.py	\
-	giscanner/pkgconfig.py		\
-	giscanner/scannermain.py	\
-	giscanner/sectionparser.py	\
-	giscanner/shlibs.py		\
-	giscanner/sourcescanner.py	\
-	giscanner/testcodegen.py	\
-	giscanner/transformer.py	\
-	giscanner/utils.py		\
-	giscanner/xmlwriter.py
-
-templatedir = $(pkglibdir)
-nobase_dist_template_DATA =		\
-	giscanner/doctemplates/mallard/base.tmpl		\
-	giscanner/doctemplates/mallard/class.tmpl		\
-	giscanner/doctemplates/mallard/namespace.tmpl		\
-	giscanner/doctemplates/mallard/C/callback.tmpl 		\
-	giscanner/doctemplates/mallard/C/class.tmpl		\
-	giscanner/doctemplates/mallard/C/constructor.tmpl	\
-	giscanner/doctemplates/mallard/C/default.tmpl		\
-	giscanner/doctemplates/mallard/C/enum.tmpl		\
-	giscanner/doctemplates/mallard/C/function.tmpl		\
-	giscanner/doctemplates/mallard/C/field.tmpl 		\
-	giscanner/doctemplates/mallard/C/interface.tmpl		\
-	giscanner/doctemplates/mallard/C/method.tmpl		\
-	giscanner/doctemplates/mallard/C/namespace.tmpl		\
-	giscanner/doctemplates/mallard/C/property.tmpl		\
-	giscanner/doctemplates/mallard/C/record.tmpl		\
-	giscanner/doctemplates/mallard/C/signal.tmpl		\
-	giscanner/doctemplates/mallard/C/vfunc.tmpl		\
-	giscanner/doctemplates/mallard/Python/callback.tmpl 	\
-	giscanner/doctemplates/mallard/Python/class.tmpl	\
-	giscanner/doctemplates/mallard/Python/constructor.tmpl	\
-	giscanner/doctemplates/mallard/Python/default.tmpl	\
-	giscanner/doctemplates/mallard/Python/enum.tmpl		\
-	giscanner/doctemplates/mallard/Python/function.tmpl	\
-	giscanner/doctemplates/mallard/Python/field.tmpl 	\
-	giscanner/doctemplates/mallard/Python/interface.tmpl	\
-	giscanner/doctemplates/mallard/Python/method.tmpl	\
-	giscanner/doctemplates/mallard/Python/namespace.tmpl	\
-	giscanner/doctemplates/mallard/Python/property.tmpl	\
-	giscanner/doctemplates/mallard/Python/record.tmpl	\
-	giscanner/doctemplates/mallard/Python/signal.tmpl	\
-	giscanner/doctemplates/mallard/Python/vfunc.tmpl	\
-	giscanner/doctemplates/mallard/Gjs/callback.tmpl 	\
-	giscanner/doctemplates/mallard/Gjs/class.tmpl		\
-	giscanner/doctemplates/mallard/Gjs/constructor.tmpl	\
-	giscanner/doctemplates/mallard/Gjs/default.tmpl		\
-	giscanner/doctemplates/mallard/Gjs/enum.tmpl		\
-	giscanner/doctemplates/mallard/Gjs/function.tmpl	\
-	giscanner/doctemplates/mallard/Gjs/field.tmpl 		\
-	giscanner/doctemplates/mallard/Gjs/interface.tmpl	\
-	giscanner/doctemplates/mallard/Gjs/method.tmpl		\
-	giscanner/doctemplates/mallard/Gjs/namespace.tmpl	\
-	giscanner/doctemplates/mallard/Gjs/property.tmpl	\
-	giscanner/doctemplates/mallard/Gjs/record.tmpl		\
-	giscanner/doctemplates/mallard/Gjs/signal.tmpl		\
-	giscanner/doctemplates/mallard/Gjs/vfunc.tmpl		\
-	giscanner/doctemplates/devdocs/Gjs/_doc.tmpl		\
-	giscanner/doctemplates/devdocs/Gjs/_index.tmpl		\
-	giscanner/doctemplates/devdocs/Gjs/_method.tmpl		\
-	giscanner/doctemplates/devdocs/Gjs/_methods.tmpl	\
-	giscanner/doctemplates/devdocs/Gjs/_properties.tmpl	\
-	giscanner/doctemplates/devdocs/Gjs/_signals.tmpl	\
-	giscanner/doctemplates/devdocs/Gjs/_staticmethods.tmpl	\
-	giscanner/doctemplates/devdocs/Gjs/_vfuncs.tmpl		\
-	giscanner/doctemplates/devdocs/Gjs/base.tmpl		\
-	giscanner/doctemplates/devdocs/Gjs/callback.tmpl	\
-	giscanner/doctemplates/devdocs/Gjs/class.tmpl		\
-	giscanner/doctemplates/devdocs/Gjs/default.tmpl		\
-	giscanner/doctemplates/devdocs/Gjs/enum.tmpl		\
-	giscanner/doctemplates/devdocs/Gjs/function.tmpl	\
-	giscanner/doctemplates/devdocs/Gjs/interface.tmpl	\
-	giscanner/doctemplates/devdocs/Gjs/method.tmpl		\
-	giscanner/doctemplates/devdocs/Gjs/namespace.tmpl
-
-_giscanner_la_CFLAGS = \
-	$(PYTHON_INCLUDES) \
-	$(GOBJECT_CFLAGS) \
-	$(WARN_CFLAGS_PYTHON) \
-	-I$(top_srcdir)/giscanner
-_giscanner_la_LIBADD = libgiscanner.la $(GOBJECT_LIBS)
-
-_giscanner_la_LDFLAGS = \
-	$(WARN_LDFLAGS) \
-	-module -avoid-version \
-	-export-symbols-regex "init_giscanner|PyInit__giscanner"
-
-if OS_WIN32
-# Windows requires Python extension modules to be explicitly
-# linked to libpython.
-_giscanner_la_LIBADD += \
-	$(PYTHON_LIBS)
-
-_giscanner_la_LDFLAGS += \
-	-no-undefined \
-	-shrext $(PYTHON_SO)
-endif
-
-_giscanner_la_SOURCES = giscanner/giscannermodule.c
diff --git a/Makefile-tools.am b/Makefile-tools.am
deleted file mode 100644
index 06622f4e..00000000
--- a/Makefile-tools.am
+++ /dev/null
@@ -1,55 +0,0 @@
-bin_PROGRAMS += g-ir-compiler g-ir-generate g-ir-inspect
-bin_SCRIPTS += g-ir-scanner g-ir-annotation-tool
-
-if BUILD_DOCTOOL
-bin_SCRIPTS += g-ir-doc-tool
-endif
-
-EXTRA_DIST += 				\
-	tools/g-ir-tool-template.in \
-	tools/meson.build
-
-TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON), -e s,@GIR_DIR\@,$(GIR_DIR),g
-
-g-ir-scanner: tools/g-ir-tool-template.in _giscanner.la Makefile
-	$(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,scannermain, -e s,@TOOL_FUNCTION\@,scanner_main, $< > $@.tmp && mv $@.tmp $@
-	@chmod a+x $@
-
-g-ir-annotation-tool: tools/g-ir-tool-template.in _giscanner.la Makefile
-	$(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,annotationmain, -e s,@TOOL_FUNCTION\@,annotation_main, $< > $@.tmp && mv $@.tmp $@
-	@chmod a+x $@
-
-g-ir-doc-tool: tools/g-ir-tool-template.in _giscanner.la Makefile
-	$(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,docmain, -e s,@TOOL_FUNCTION\@,doc_main, $< > $@.tmp && mv $@.tmp $@
-	@chmod a+x $@
-
-g_ir_compiler_SOURCES = tools/compiler.c
-g_ir_compiler_CPPFLAGS = -I$(top_srcdir)/girepository -I$(top_builddir)/girepository
-g_ir_compiler_CFLAGS = $(GIO_CFLAGS) $(WARN_CFLAGS)
-g_ir_compiler_LDFLAGS = $(WARN_LDFLAGS)
-g_ir_compiler_LDADD = \
-	libgirepository-internals.la	\
-	libgirepository-1.0.la		\
-	$(GIREPO_LIBS)
-
-g_ir_generate_SOURCES = tools/generate.c
-g_ir_generate_CPPFLAGS = -I$(top_srcdir)/girepository -I$(top_builddir)/girepository
-g_ir_generate_CFLAGS = $(GIO_CFLAGS) $(WARN_CFLAGS)
-g_ir_generate_LDFLAGS = $(WARN_LDFLAGS)
-g_ir_generate_LDADD = \
-	libgirepository-internals.la	\
-	libgirepository-1.0.la		\
-	$(GIREPO_LIBS)
-
-g_ir_inspect_SOURCES = tools/g-ir-inspect.c
-g_ir_inspect_CFLAGS = $(GIO_CFLAGS)  $(WARN_CFLAGS) -I$(top_srcdir)/girepository -I$(top_builddir)/girepository
-g_ir_inspect_LDFLAGS = $(WARN_LDFLAGS)
-g_ir_inspect_LDADD = \
-        libgirepository-1.0.la	\
-        $(GIREPO_LIBS)
-
-GCOVSOURCES =					\
-	$(g_ir_compiler_SOURCES)		\
-	$(g_ir_generate_SOURCES)
-
-CLEANFILES += g-ir-scanner g-ir-annotation-tool g-ir-doc-tool g-ir-inspect
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 952bf718..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-man_MANS =
-EXTRA_DIST =
-lib_LTLIBRARIES =
-noinst_LTLIBRARIES =
-BUILT_SOURCES =
-CLEANFILES = $(BUILT_SOURCES)
-INTROSPECTION_GIRS =
-check_LTLIBRARIES =
-check_PROGRAMS =
-bin_PROGRAMS =
-bin_SCRIPTS =
-noinst_PROGRAMS =
-EXTRA_LTLIBRARIES =
-EXTRA_PROGRAMS =
-TESTS =
-
-include common.mk
-include Makefile.introspection
-
-include Makefile-cmph.am
-include Makefile-girepository.am
-include Makefile-giscanner.am
-include Makefile-examples.am
-include Makefile-gir.am
-include Makefile-tools.am
-
-## Process this file with automake to produce Makefile.in
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-SUBDIRS = . docs tests
-
-DIST_SUBDIRS = $(SUBDIRS)
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-doctool
-
-man_MANS += 			\
-	docs/g-ir-compiler.1	\
-	docs/g-ir-generate.1	\
-	docs/g-ir-scanner.1
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gobject-introspection-1.0.pc gobject-introspection-no-export-1.0.pc
-
-m4dir = $(datadir)/aclocal
-m4_DATA = m4/introspection.m4
-
-makedir = $(datadir)/gobject-introspection-1.0
-dist_make_DATA = Makefile.introspection
-
-EXTRA_DIST += 			\
-	COPYING.LGPL		\
-	COPYING.GPL		\
-	autogen.sh		\
-	$(pkgconfig_DATA)	\
-	$(man_MANS)		\
-	$(m4_DATA)		\
-	misc/update-glib-annotations.py	\
-	misc/update-gtkdoc-tests.py	\
-	README.rst \
-	MSVC.README.rst \
-	meson.build \
-	meson_options.txt \
-	.flake8
-
-check.quality:
-	(cd $(abs_top_srcdir) && $(PYTHON) -m flake8 --count);
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index deebd2bf..00000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
-dnl autostars m4 macro for expanding directories using configure's prefix
-
-dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-
-dnl example:
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
-AC_DEFUN([AS_AC_EXPAND],
-[
-  EXP_VAR=[$1]
-  FROM_VAR=[$2]
-
-  dnl first expand prefix and exec_prefix if necessary
-  prefix_save=$prefix
-  exec_prefix_save=$exec_prefix
-
-  dnl if no prefix given, then use /usr/local, the default prefix
-  if test "x$prefix" = "xNONE"; then
-    prefix="$ac_default_prefix"
-  fi
-  dnl if no exec_prefix given, then use prefix
-  if test "x$exec_prefix" = "xNONE"; then
-    exec_prefix=$prefix
-  fi
-
-  full_var="$FROM_VAR"
-  dnl loop until it doesn't change anymore
-  while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var" = "x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-  dnl clean up
-  full_var=$new_full_var
-  AC_SUBST([$1], "$full_var")
-
-  dnl restore prefix and exec_prefix
-  prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-])
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 58fa019e..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-
-olddir=`pwd`
-cd "$srcdir"
-
-GTKDOCIZE=$(which gtkdocize 2>/dev/null)
-if test -z $GTKDOCIZE; then
-        echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
-        rm -f gtk-doc.make
-        cat > gtk-doc.make <<EOF
-EXTRA_DIST =
-CLEANFILES =
-EOF
-else
-        gtkdocize --flavour no-tmpl || exit $?
-fi
-
-AUTORECONF=`which autoreconf`
-if test -z $AUTORECONF; then
-        echo "*** No autoreconf found, please install it ***"
-        exit 1
-fi
-
-autoreconf --force --install --verbose || exit $?
-
-cd "$olddir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/common.mk b/common.mk
deleted file mode 100644
index 64fb02f0..00000000
--- a/common.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- Mode: make -*-
-# Copyright 2009-2010 Johan Dahlin
-#
-# This file defines variables that are compatible with
-# Makefile.introspection, but for use within the gobject-introspection
-# module itself.
-#
-
-INTROSPECTION_SCANNER = \
-    env PATH=".libs:$(PATH)" \
-        LPATH=.libs \
-        CC="$(CC)" \
-        PYTHONPATH="$(top_builddir):$(top_srcdir):$(PYTHONPATH)" \
-        UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
-        UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
-        $(top_builddir)/g-ir-scanner
-
-INTROSPECTION_SCANNER_ARGS = \
-    --verbose \
-    -I$(top_srcdir) \
-    --add-include-path=$(srcdir) \
-    --add-include-path=$(top_srcdir)/gir \
-    --add-include-path=$(builddir) \
-    --add-include-path=$(top_builddir) \
-    --add-include-path=$(top_builddir)/gir
-
-# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler.
-# Normally will be undefined but can be set (e.g. to wine or qemu)
-# when cross-compiling
-INTROSPECTION_COMPILER = \
-    env PATH=".libs:$(PATH)" \
-        $(GI_CROSS_LAUNCHER) \
-        $(top_builddir)/g-ir-compiler$(EXEEXT)
-
-INTROSPECTION_COMPILER_ARGS = \
-    --includedir=$(srcdir) \
-    --includedir=$(top_srcdir)/gir \
-    --includedir=$(builddir) \
-    --includedir=$(top_builddir) \
-    --includedir=$(top_builddir)/gir
-
-INTROSPECTION_DOCTOOL = \
-    env PATH=".libs:$(PATH)" \
-        LPATH=.libs \
-        PYTHONPATH="$(top_builddir):$(top_srcdir):$(PYTHONPATH)" \
-        UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
-        UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
-        $(top_builddir)/g-ir-doc-tool
-
-INTROSPECTION_DOCTOOL_ARGS = \
-    --add-include-path=$(srcdir) \
-    --add-include-path=$(top_srcdir)/gir \
-    --add-include-path=$(builddir) \
-    --add-include-path=$(top_builddir) \
-    --add-include-path=$(top_builddir)/gir
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 340a3aca..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,401 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-dnl the gi version number
-m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 61)
-m4_define(gi_micro_version, 1)
-m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
-
-AC_PREREQ([2.63])
-AC_INIT([gobject-introspection],
-        [gi_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection],
-        [gobject-introspection])
-
-AC_CONFIG_HEADER([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([build-aux])
-
-AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability parallel-tests subdir-objects])
-AM_MAINTAINER_MODE([enable])
-
-AM_SILENT_RULES([yes])
-
-# Used in docs/reference/version.xml
-GI_VERSION=gi_version
-AC_SUBST(GI_VERSION)
-
-GI_MAJOR_VERSION=gi_major_version
-GI_MINOR_VERSION=gi_minor_version
-GI_MICRO_VERSION=gi_micro_version
-AC_SUBST(GI_MAJOR_VERSION)
-AC_SUBST(GI_MINOR_VERSION)
-AC_SUBST(GI_MICRO_VERSION)
-
-# Check for Win32
-AC_CANONICAL_HOST
-case "$host" in
-*-*-mingw*)
-	os_win32=yes
-	;;
-*)
-	os_win32=no
-	;;
-esac
-AM_CONDITIONAL(OS_WIN32, [test "x$os_win32" = "xyes"])
-
-# Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_MKDIR_P
-
-# Initialize libtool
-LT_PREREQ([2.2])
-LT_INIT
-
-PKG_PROG_PKG_CONFIG
-
-AC_PROG_LEX
-if test "$LEX" = :; then
-	AC_MSG_ERROR([flex not found but required])
-fi
-
-AC_CHECK_PROGS(YACC, 'bison -y', :)
-if test "$YACC" = :; then
-	AC_MSG_ERROR([bison not found but required])
-fi
-
-# Default compiler warnings
-m4_ifndef([AX_COMPILER_FLAGS], [AC_MSG_ERROR(['autoconf-archive' missing])])
-AX_COMPILER_FLAGS(,, [yes])
-# These get triggered a lot, not worth it imo, but feel free to fix them
-AX_APPEND_COMPILE_FLAGS([-Wno-duplicated-branches -Wno-switch-enum])
-
-WARN_CFLAGS_PYTHON="$WARN_CFLAGS"
-AX_APPEND_COMPILE_FLAGS([-Wno-discarded-qualifiers], [WARN_CFLAGS_PYTHON])
-AC_SUBST(WARN_CFLAGS_PYTHON)
-
-WARN_CFLAGS_FLEX="$WARN_CFLAGS"
-AX_APPEND_COMPILE_FLAGS([-Wno-sign-compare -Wno-switch-default -Wno-redundant-decls], [WARN_CFLAGS_FLEX])
-AC_SUBST(WARN_CFLAGS_FLEX)
-
-# Checks for libraries.
-AC_CHECK_LIB([dl], [dlopen])
-
-AC_MSG_CHECKING(for the suffix of shared libraries)
-# libtool variables are immediately available since 2.0, prior to that we need
-# to call libtool --config explicitly
-if test "x$shrext_cmds" = x; then
-    shrext_cmds=`SED=$SED ./libtool --config | grep '^shrext_cmds='`
-    eval $shrext_cmds
-fi
-eval std_shrext=$shrext_cmds
-# chop the initial dot
-SHLIB_SUFFIX=${std_shrext#.}
-AC_MSG_RESULT(.$SHLIB_SUFFIX)
-# any reason it may fail?
-if test "x$SHLIB_SUFFIX" = x; then
-        AC_MSG_ERROR(Cannot determine shared library suffix from libtool)
-fi
-AC_DEFINE_UNQUOTED([SHLIB_SUFFIX], "$SHLIB_SUFFIX", [Define to the platform's shared library suffix])
-
-# Copied from dbus configure.in
-#### find the actual value for $prefix that we'll end up with
-##   (I know this is broken and should be done in the Makefile, but
-##    that's a major pain and almost nobody actually seems to care)
-AS_AC_EXPAND(EXPANDED_LOCALSTATEDIR, "$localstatedir")
-AS_AC_EXPAND(EXPANDED_SYSCONFDIR, "$sysconfdir")
-AS_AC_EXPAND(EXPANDED_BINDIR, "$bindir")
-AS_AC_EXPAND(EXPANDED_LIBDIR, "$libdir")
-AS_AC_EXPAND(EXPANDED_LIBEXECDIR, "$libexecdir")
-AS_AC_EXPAND(EXPANDED_DATADIR, "$datadir")
-
-#### Directory to install the libexec binaries
-GOBJECT_INTROSPECTION_LIBDIR="$EXPANDED_LIBDIR"
-AC_SUBST(GOBJECT_INTROSPECTION_LIBDIR)
-AC_DEFINE_UNQUOTED(GOBJECT_INTROSPECTION_LIBDIR,"$GOBJECT_INTROSPECTION_LIBDIR", [Directory prefix for typelib installation])
-
-#### Directory to install the gir files
-GIR_SUFFIX="gir-1.0"
-AC_SUBST(GIR_SUFFIX)
-AC_DEFINE_UNQUOTED(GIR_SUFFIX, "$GIR_SUFFIX", [Name of the gir directory])
-
-AC_ARG_WITH([gir-dir-prefix],
-		[AS_HELP_STRING([--with-gir-dir-prefix], [Directory prefix for gir installation])],
-		[GIR_DIR_PREFIX="$withval"], [])
-
-if test -z $GIR_DIR_PREFIX; then
-        GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
-        GIR_PC_DIR="\${datadir}/$GIR_SUFFIX"
-else
-        GIR_DIR="$GIR_DIR_PREFIX/$GIR_SUFFIX"
-        GIR_PC_DIR="$GIR_DIR_PREFIX/$GIR_SUFFIX"
-fi
-
-AC_SUBST(GIR_DIR)
-AC_SUBST(GIR_PC_DIR)
-AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Directory prefix for gir installation])
-
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.58.0])
-
-PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
-PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
-PKG_CHECK_MODULES(GIO, [gio-2.0])
-PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0], have_gio_unix=true, have_gio_unix=false)
-AM_CONDITIONAL(HAVE_GIO_UNIX, test x$have_gio_unix = xtrue)
-
-# Prefer cairo-gobject if we have it
-AC_ARG_WITH(cairo,
-	    AS_HELP_STRING([--with-cairo], [Use cairo @<:@default=maybe@:>@]),
-	    [], [with_cairo=maybe])
-
-AS_IF([test x${with_cairo} != xno], [
-  PKG_CHECK_MODULES(CAIRO, [cairo cairo-gobject], have_cairo=yes, have_cairo=no)
-  AS_IF([ test x$have_cairo = xno && test x$with_cairo = xyes ], [
-    AC_MSG_ERROR([cairo enabled but not found])
-  ])
-])
-AM_CONDITIONAL(HAVE_CAIRO, test x$have_cairo = xyes)
-
-case "$host" in
-  *-*-darwin*)
-    CAIRO_SHARED_LIBRARY="libcairo-gobject.2.dylib"
-    ;;
-  *-*-mingw*)
-    CAIRO_SHARED_LIBRARY="libcairo-gobject-2.dll"
-    ;;
-  *-*-openbsd*)
-    CAIRO_SHARED_LIBRARY="libcairo-gobject.so"
-    ;;
-  *)
-    CAIRO_SHARED_LIBRARY="libcairo-gobject.so.2"
-    ;;
-esac
-CAIRO_GIR_PACKAGE="cairo-gobject"
-
-AC_SUBST(CAIRO_SHARED_LIBRARY)
-AC_SUBST(CAIRO_GIR_PACKAGE)
-
-
-PKG_CHECK_MODULES(SCANNER, [gobject-2.0 gio-2.0])
-
-dnl libffi
-PKG_CHECK_MODULES(FFI, [libffi >= 3.0.0 ], have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no)
-FFI_PC_CFLAGS=""
-FFI_PC_LIBS=""
-FFI_PC_PACKAGES=""
-if test x"$have_ffi_pkgconfig" = xyes ; then
-    FFI_PC_PACKAGES="libffi"
-else
-  AC_MSG_CHECKING(for ffi.h)
-
-  AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ffi.h>]])],
-                    [have_ffi_h=yes],[have_ffi_h=no])
-  if test x"$have_ffi_h" = x"yes"; then
-
-    save_LIBS=$LIBS
-    if test x"$with_ffi" = x"yes" || test x"$with_ffi" = x"auto"; then
-      other_LIBS=
-    else
-      other_LIBS=$with_ffi
-    fi
-
-    AC_SEARCH_LIBS(ffi_call,ffi,,AC_MSG_ERROR([libffi not found]),$other_LIBS)
-    if test x"$ac_cv_search_ffi_call" = x"none required" ; then
-      FFI_LIBS=$other_LIBS
-    else
-      FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS"
-    fi
-
-    LIBS=$save_LIBS
-  fi
-  if test x"$have_ffi_h" != x"yes" ; then
-    AC_MSG_ERROR([ffi.h not found])
-  fi
-
-  FFI_PC_LIBS=$FFI_LIBS
-  FFI_PC_CFLAGS=$FFI_CFLAGS
-  FFI_CFLAGS=
-  AC_MSG_RESULT([$have_ffi_h])
-  AC_SUBST(FFI_LIBS)
-  AC_SUBST(FFI_CFLAGS)
-fi
-AC_SUBST(FFI_PC_CFLAGS)
-AC_SUBST(FFI_PC_LIBS)
-AC_SUBST(FFI_PC_PACKAGES)
-
-AC_CHECK_SIZEOF(char)
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-
-PKG_CHECK_MODULES(GIREPO, [glib-2.0 >= 2.24.0 gobject-2.0 gmodule-2.0 gio-2.0])
-
-# if we ever remove manual check for ffi and require .pc file, then
-# just put libffi in the PKG_CHECK_MODULES(GIREPO) deps
-GIREPO_LIBS="$GIREPO_LIBS $GCOV_LIBS $FFI_LIBS"
-GIREPO_CFLAGS="$GIREPO_CFLAGS $FFI_CFLAGS"
-
-GIREPO_CFLAGS="$GIREPO_CFLAGS $GCOV_CFLAGS"
-
-# gtk-doc
-# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
-# it on it's own line.
-m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.19], [--flavour no-tmpl])
-],[
-AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
-])
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-# Checks for library functions.
-AC_FUNC_STRTOD
-AC_CHECK_FUNCS([memchr strchr strspn strstr strtol strtoull])
-AC_CHECK_FUNCS([backtrace backtrace_symbols])
-
-# Python
-# option to specify python interpreter to use; this just sets $PYTHON, so that
-# we will fallback to reading $PYTHON if --with-python is not given, and
-# python.m4 will get the expected input
-AC_ARG_WITH(python,
-  AS_HELP_STRING([--with-python=PATH],[Path to Python interpreter; searches $PATH if only a program name, such as "python3" or "python3.4", is given; if not given, searches for a few standard names]),
-  [PYTHON="$withval"], [])
-if test x"$PYTHON" = xyes; then
-    AC_MSG_ERROR([--with-python option requires a path or program argument])
-fi
-AM_PATH_PYTHON(3.4,,[AC_MSG_ERROR([Requires Python >=3.4])])
-
-case "$host" in
-*-*-mingw*)
-	# Change backslashes to forward slashes in pyexecdir to avoid
-	# quoting issues
-	pyexecdir=`echo $pyexecdir | tr '\\\\' '/'`
-	;;
-esac
-AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))
-if test "x$os_win32" = "xyes"; then
-  AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.]))
-fi
-
-PYTHON_SO=`$PYTHON -c "import sysconfig, sys; get = sysconfig.get_config_var; sys.stdout.write(get('EXT_SUFFIX') or get('SO') or '.so');"`
-AC_SUBST(PYTHON_SO)
-
-dnl Not enabled by default until 3.6 cycle when we can propose mako as
-dnl an external dependency
-AC_ARG_ENABLE(doctool,[  --disable-doctool           disable g-ir-doc-tool ],,enable_doctool=auto)
-AS_IF([ test x$enable_doctool != xno], [
-   AM_CHECK_PYMOD(mako,,have_python_mako=yes,have_python_mako=no)
-   AM_CHECK_PYMOD(markdown,,have_python_markdown=yes,have_python_markdown=no)
-])
-AS_IF([ test x$enable_doctool = xauto &&
-        test x$have_python_mako = xyes &&
-        test x$have_python_markdown = xyes ],
-      [ enable_doctool=yes ],
-      [ test x$enable_doctool = xauto &&
-        (test x$have_python_mako = xno ||
-         test x$have_python_markdown = xno) ],
-      [ enable_doctool=no ],
-      [ test x$enable_doctool = xyes && test x$have_python_mako = xno ],
-      [ AC_MSG_ERROR([Python mako module not found]) ],
-      [ test x$enable_doctool = xyes && test x$have_python_markdown = xno ],
-      [ AC_MSG_ERROR([Python markdown module not found]) ])
-AM_CONDITIONAL(BUILD_DOCTOOL, test x$enable_doctool != xno)
-
-# Glib documentation
-
-GLIBSRC=
-AC_MSG_CHECKING([for glib source directory to use for documentation])
-
-AC_ARG_WITH(glib-src,
-	[  --with-glib-src=PATH    Source directory for glib - needed to add docs to gir],
-	GLIBSRC=$withval
-)
-AM_CONDITIONAL(WITH_GLIBSRC, test x"$GLIBSRC" != x)
-AC_SUBST(GLIBSRC)
-AC_MSG_RESULT([$GLIBSRC])
-
-dnl
-dnl Check for -fvisibility=hidden to determine if we can do GNU-style
-dnl visibility attributes for symbol export control
-dnl
-GI_HIDDEN_VISIBILITY_CFLAGS=""
-case "$host" in
-  *-*-mingw*)
-    dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
-    AC_DEFINE([_GI_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern],
-              [defines how to decorate public symbols while building])
-    CFLAGS="${CFLAGS} -fvisibility=hidden"
-    ;;
-  *)
-    dnl on other compilers, check if we can do -fvisibility=hidden
-    SAVED_CFLAGS="${CFLAGS}"
-    CFLAGS="-fvisibility=hidden"
-    AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
-    AC_TRY_COMPILE([], [return 0],
-                   AC_MSG_RESULT(yes)
-                   enable_fvisibility_hidden=yes,
-                   AC_MSG_RESULT(no)
-                   enable_fvisibility_hidden=no)
-    CFLAGS="${SAVED_CFLAGS}"
-
-    AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [
-      AC_DEFINE([_GI_EXTERN], [__attribute__((visibility("default"))) extern],
-                [defines how to decorate public symbols while building])
-      GI_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
-    ])
-    ;;
-esac
-AC_SUBST(GI_HIDDEN_VISIBILITY_CFLAGS)
-
-dnl
-dnl Check for -Bsymbolic-functions linker flag used to avoid
-dnl intra-library PLT jumps, if available.
-dnl
-AC_ARG_ENABLE(Bsymbolic,
-              [AS_HELP_STRING([--disable-Bsymbolic],
-                              [avoid linking with -Bsymbolic])],,
-              [SAVED_LDFLAGS="${LDFLAGS}"
-               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
-               LDFLAGS=-Wl,-Bsymbolic-functions
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0]])],
-                              [AC_MSG_RESULT(yes)
-                               enable_Bsymbolic=yes],
-                              [AC_MSG_RESULT(no)
-                               enable_Bsymbolic=no])
-               LDFLAGS="${SAVED_LDFLAGS}"])
-
-if test "x${enable_Bsymbolic}" = "xyes"; then
-  EXTRA_LINK_FLAGS=-Wl,-Bsymbolic-functions
-fi
-
-AC_SUBST(EXTRA_LINK_FLAGS)
-
-dnl
-dnl Check whether MSVC toolset is explicitly set
-dnl
-AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
-AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
-
-AC_CONFIG_FILES([
-Makefile
-tests/Makefile
-tests/offsets/Makefile
-tests/scanner/Makefile
-tests/scanner/annotationparser/Makefile
-tests/repository/Makefile
-tests/warn/Makefile
-docs/Makefile
-docs/reference/Makefile
-docs/reference/version.xml
-giscanner/_version.py
-girepository/giversion.h
-gobject-introspection-1.0.pc
-gobject-introspection-no-export-1.0.pc])
-AC_OUTPUT
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index 5505303e..00000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-if ENABLE_GTK_DOC
-SUBDIRS = reference
-endif
-
-# Install the gir-1.2 schema
-schemadir = $(datadir)/gir-1.0
-dist_schema_DATA = gir-1.2.rnc
-
-EXTRA_DIST = \
-	meson.build
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
deleted file mode 100644
index 2354f915..00000000
--- a/docs/reference/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=gi
-
-# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
-#DOC_MODULE_VERSION=2
-
-# The top-level XML file (SGML in the past). You can change this if you want to.
-DOC_MAIN_SGML_FILE=gi-docs.xml
-
-# Directories containing the source code.
-# gtk-doc will search all .c and .h files beneath these paths
-# for inline comments documenting functions and macros.
-# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk
-DOC_SOURCE_DIR=$(top_srcdir)/girepository $(top_builddir)/girepository
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--rebuild-types
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
-MKDB_OPTIONS=--xml-mode --output-format=xml --name-space=g --ignore-files=cmph
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkhtml
-MKHTML_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/girepository/*.h $(top_builddir)/girepository/*.h
-CFILE_GLOB=$(top_srcdir)/girepository/*.c
-
-# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
-# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-EXTRA_HFILES=
-
-# Header files or dirs to ignore when scanning. Use base file/dir names
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
-IGNORE_HFILES=						\
-	cmph						\
-	girnode.h					\
-	girparser.h					\
-	girwriter.h					\
-	girmodule.h					\
-	girepository-private.h
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=						\
-	gi-struct-hierarchy.xml				\
-	version.xml
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-#
-# Set to $(content_files) for simplicity, so we can always
-# simply <xi:include href="xml/whatever.xml"/>, even for manually
-# written .xml files...
-expand_content_files=$(content_files)
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=						\
-	-I$(top_srcdir)					\
-	$(GIREPO_CFLAGS)
-
-GTKDOC_LIBS=						\
-	$(top_builddir)/libgirepository-1.0.la		\
-	$(top_builddir)/libgirepository-internals.la	\
-	$(GIREPO_LIBS)
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-include $(top_srcdir)/gtk-doc.make # generated by autogen.sh
-
-# Other files to distribute
-EXTRA_DIST += \
-	version.xml.in \
-	meson.build
-
-# Files not to distribute
-# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
-# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-#DISTCLEANFILES +=
-
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-# Comment this out if you want 'make check' to test you doc status
-# and run some sanity checks
-## Note: Uncoment this when we start depending on GTK-Doc 1.20
-## which solves https://bugzilla.gnome.org/show_bug.cgi?id=701638
-##TESTS = $(GTKDOC_CHECK)
-endif
-
-gi-docs-clean: clean
-	cd $(srcdir) && rm -rf xml html
diff --git a/m4/python.m4 b/m4/python.m4
deleted file mode 100644
index 451fd74c..00000000
--- a/m4/python.m4
+++ /dev/null
@@ -1,77 +0,0 @@
-## this one is commonly used with AM_PATH_PYTHONDIR ...
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN([AM_CHECK_PYMOD],
-[AC_REQUIRE([AM_PATH_PYTHON])
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-ifelse([$2],[], [prog="
-import sys
-try:
-        import $1
-except ImportError:
-        sys.exit(1)
-except:
-        sys.exit(0)
-sys.exit(0)"], [prog="
-import $1
-$1.$2"])
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-  then
-    eval "py_cv_mod_$py_mod_var=yes"
-  else
-    eval "py_cv_mod_$py_mod_var=no"
-  fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
-  AC_MSG_RESULT(yes)
-  ifelse([$3], [],, [$3
-])dnl
-else
-  AC_MSG_RESULT(no)
-  ifelse([$4], [],, [$4
-])dnl
-fi
-])
-
-dnl a macro to check for ability to create python extensions
-dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for headers required to compile python extensions)
-dnl deduce PYTHON_INCLUDES
-PYTHON_INCLUDES=`$PYTHON-config --includes`
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])
-
-dnl a macro to check for ability to link against libpython
-dnl  AM_CHECK_PYTHON_LIBS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_LIBS
-AC_DEFUN([AM_CHECK_PYTHON_LIBS],
-[AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
-AC_MSG_CHECKING(for libraries required to link against libpython)
-dnl deduce PYTHON_LIBS
-if test "x$PYTHON_LIBS" = x; then
-	PYTHON_LIBS=`$PYTHON-config --ldflags`
-fi
-AC_SUBST(PYTHON_LIBS)
-dnl check if libpython exist:
-save_LIBS="$LIBS"
-LIBS="$LIBS $PYTHON_LIBS"
-AC_TRY_LINK_FUNC(Py_Initialize, dnl
-         [LIBS="$save_LIBS"; AC_MSG_RESULT(found); $1], dnl
-         [LIBS="$save_LIBS"; AC_MSG_RESULT(not found); $2])
-
-])
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 4bdb9c3b..00000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,82 +0,0 @@
-include $(top_srcdir)/common.mk
-
-SUBDIRS = . scanner repository offsets warn
-
-EXTRA_DIST=
-BUILT_SOURCES=
-CLEANFILES=
-
-testsdir = $(datadir)/gobject-introspection-1.0/tests
-tests_DATA =		    \
-    everything.c	    \
-    everything.h	    \
-    gimarshallingtests.c    \
-    gimarshallingtests.h    \
-    gitestmacros.h
-
-EXTRA_LTLIBRARIES = libeverything-1.0.la libgimarshallingtests-1.0.la
-
-libeverything_1_0_la_SOURCES = everything.c
-libeverything_1_0_la_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(WARN_CFLAGS) -I$(srcdir)
-libeverything_1_0_la_LDFLAGS = $(WARN_LDFLAGS)
-libeverything_1_0_la_LIBADD = $(GOBJECT_LIBS)
-
-libgimarshallingtests_1_0_la_SOURCES = gimarshallingtests.c
-libgimarshallingtests_1_0_la_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(WARN_CFLAGS) -I$(srcdir)
-libgimarshallingtests_1_0_la_LDFLAGS = $(WARN_LDFLAGS)
-libgimarshallingtests_1_0_la_LIBADD = $(GOBJECT_LIBS)
-
-EXTRA_DIST += \
-	gimarshallingtests.h \
-	gi-tester \
-	gitestmacros.h \
-	meson.build
-
-BUILT_SOURCES += everything.c everything.h
-
-CLEANFILES += \
-    $(BUILT_SOURCES) \
-    $(EXTRA_LTLIBRARIES) \
-    everything-stamp.h \
-    Everything-1.0.gir \
-    Everything-1.0.typelib \
-    GIMarshallingTests-1.0.gir \
-    GIMarshallingTests-1.0.typelib
-
-everything-stamp.h: Makefile
-	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS)	\
-	--generate-typelib-tests=Everything,everything.h,everything.c	\
-	--function-decoration=_GI_TEST_EXTERN	\
-	--include-first-in-src=config.h	\
-	--include-last-in-header=gitestmacros.h
-	touch $@
-
-everything.c: everything-stamp.h
-	@true
-
-everything.h: everything-stamp.h
-	@true
-
-Everything-1.0.gir: libeverything-1.0.la Makefile
-	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
-	--namespace=Everything --nsversion=1.0 \
-	--libtool="$(LIBTOOL)" \
-	--add-include-path=$(top_builddir) --include=Gio-2.0 \
-	--library=libeverything-1.0.la --output=$@ \
-	-I$(srcdir) \
-	everything.h everything.c
-
-GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile
-	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
-	--namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 \
-	--libtool="$(LIBTOOL)" \
-	--add-include-path=$(top_builddir) --include=Gio-2.0 \
-	--library=libgimarshallingtests-1.0.la  --output=$@ \
-	--c-include="tests/gimarshallingtests.h" \
-	$(srcdir)/gimarshallingtests.h $(srcdir)/gimarshallingtests.c
-
-%.typelib: %.gir
-	$(AM_V_GEN) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
-
-TESTS=Everything-1.0.typelib GIMarshallingTests-1.0.typelib
-LOG_COMPILER=$(PYTHON) $(srcdir)/gi-tester
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am
deleted file mode 100644
index 9ce1d013..00000000
--- a/tests/offsets/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-include $(top_srcdir)/common.mk
-include $(top_srcdir)/Makefile.introspection
-
-BUILT_SOURCES =
-CLEANFILES =
-EXTRA_DIST =
-INTROSPECTION_GIRS =
-
-EXTRA_LTLIBRARIES =
-EXTRA_PROGRAMS =
-
-############################################################
-
-EXTRA_LTLIBRARIES += liboffsets.la
-
-liboffsets_la_SOURCES = \
-	offsets.h	\
-	offsets.c
-liboffsets_la_CPPFLAGS = $(GIREPO_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) -I$(top_srcdir)/tests
-liboffsets_la_CFLAGS = $(WARN_CFLAGS)
-# dummy rpath to get built dynamically (huh?)
-liboffsets_la_LDFLAGS = $(WARN_LDFLAGS) -avoid-version -rpath $(libdir)
-
-Offsets-1.0.gir: liboffsets.la offsets.h
-Offsets_1_0_gir_INCLUDES = GObject-2.0
-Offsets_1_0_gir_LIBS = liboffsets.la
-Offsets_1_0_gir_PACKAGES = gobject-2.0
-Offsets_1_0_gir_FILES = offsets.h offsets.c
-Offsets_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error  -I$(top_srcdir)/tests
-INTROSPECTION_GIRS += Offsets-1.0.gir
-
-CLEANFILES += Offsets-1.0.gir Offsets-1.0.typelib liboffsets.la
-
-############################################################
-
-EXTRA_PROGRAMS += gitestoffsets
-
-gitestoffsets_SOURCES = gitestoffsets.c
-gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_builddir)/girepository -I$(top_srcdir)/tests
-gitestoffsets_CFLAGS = $(WARN_CFLAGS)
-gitestoffsets_LDFLAGS = $(WARN_LDFLAGS)
-gitestoffsets_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
-EXTRA_gitestoffsets_DEPENDENCIES = Offsets-1.0.typelib
-
-EXTRA_DIST += \
-	test_offsets.py \
-	meson.build
-CLEANFILES += $(EXTRA_PROGRAMS)
-
-############################################################
-
-# The trailing "echo" in LOG_COMPILER is used to ignore automake passing
-# gitestoffsets as we already run this in the same command line.
-TESTS = gitestoffsets
-TESTS_ENVIRONMENT = env top_builddir=$(top_builddir) builddir=$(builddir)
-LOG_COMPILER = $(PYTHON) $(srcdir)/test_offsets.py && echo
diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am
deleted file mode 100644
index 6b26107a..00000000
--- a/tests/repository/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-AM_CFLAGS = $(WARN_CFLAGS) $(GOBJECT_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS) -module -avoid-version
-LIBS = $(GOBJECT_LIBS)
-
-EXTRA_PROGRAMS = gitestrepo giteststructinfo gitestthrows gitypelibtest
-CLEANFILES = $(EXTRA_PROGRAMS)
-EXTRA_DIST = meson.build
-
-gitestrepo_SOURCES = gitestrepo.c
-gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_builddir)/girepository
-gitestrepo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
-
-giteststructinfo_SOURCES = giteststructinfo.c
-giteststructinfo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_builddir)/girepository
-giteststructinfo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
-
-gitestthrows_SOURCES = gitestthrows.c
-gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_builddir)/girepository
-gitestthrows_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
-
-gitypelibtest_SOURCES = gitypelibtest.c
-gitypelibtest_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_builddir)/girepository
-gitypelibtest_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
-
-TESTS = gitestrepo giteststructinfo gitestthrows gitypelibtest
-TESTS_ENVIRONMENT=env GI_TYPELIB_PATH="$(top_builddir):$(top_builddir)/gir:$(top_builddir)/tests:$(top_builddir)/tests/scanner" \
-	PATH="$(top_builddir)/tests/scanner/.libs:$(PATH)" \
-	CC="$(CC)" \
-	LD_LIBRARY_PATH="$(top_builddir)/tests/scanner/.libs:$(LD_LIBRARY_PATH)" \
-	$(DEBUG)
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
deleted file mode 100644
index fccbd352..00000000
--- a/tests/scanner/Makefile.am
+++ /dev/null
@@ -1,258 +0,0 @@
-NULL ?=
-
-include $(top_srcdir)/common.mk
-include $(top_srcdir)/Makefile.introspection
-
-SUBDIRS = . annotationparser
-
-INTROSPECTION_SCANNER_ARGS += --warn-all --reparse-validate
-
-CLEANFILES =
-
-EXTRA_LTLIBRARIES = \
-	libsletter.la \
-	libutility.la \
-	libgtkfrob.la \
-	libgettype.la \
-	libregress.la \
-	libwarnlib.la \
-	libtypedefs.la \
-	$(NULL)
-CLEANFILES += $(EXTRA_LTLIBRARIES)
-
-GI_SCANNER_CFLAGS = -I$(top_srcdir)/tests
-AM_CPPFLAGS = -I$(top_srcdir)/girepository -I$(top_builddir)/girepository
-AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(GI_SCANNER_CFLAGS) $(WARN_CFLAGS)
-# -rpath needed to force libtool to build a shared library for a check_LTLIBRARIES
-# target. See http://lists.gnu.org/archive/html/automake/2005-10/msg00107.html
-AM_LDFLAGS = $(WARN_LDFLAGS) -rpath /unused -avoid-version
-LIBS = $(GOBJECT_LIBS) $(GTHREAD_LIBS)
-
-libsletter_la_SOURCES = sletter.c sletter.h
-libsletter_la_LIBADD = $(GIO_LIBS)
-libsletter_la_CFLAGS = $(AM_CFLAGS)
-libsletter_la_LDFLAGS = $(AM_LDFLAGS)
-
-libutility_la_SOURCES = utility.c utility.h
-libgtkfrob_la_SOURCES = gtkfrob.c gtkfrob.h
-libregress_la_SOURCES = \
-	regress.c regress.h \
-	annotation.c annotation.h \
-	foo.c foo.h \
-	drawable.c drawable.h \
-	$(NULL)
-REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
-libregress_la_CPPFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND=\"$(REGRESS_PRINT_PREVIEW_COMMAND)\" \
-                         -DREGRESS_SOME_CHAR=\'c\'
-libregress_la_LIBADD = $(GIO_LIBS)
-if HAVE_CAIRO
-libregress_la_LIBADD += $(CAIRO_LIBS)
-endif
-libwarnlib_la_CFLAGS = $(AM_CFLAGS)
-libwarnlib_la_SOURCES = warnlib.c warnlib.h
-libwarnlib_la_LIBADD = $(GIO_LIBS)
-libwarnlib_la_LDFLAGS = -export-symbols-regex '^warnlib_' -no-undefined
-libgettype_la_SOURCES = gettype.c gettype.h
-libtypedefs_la_SOURCES = typedefs.c typedefs.h
-
-testsdir = $(datadir)/gobject-introspection-1.0/tests
-tests_DATA = $(libregress_la_SOURCES) $(libwarnlib_la_SOURCES) $(libutility_la_SOURCES)
-
-if !HAVE_CAIRO
-libregress_la_CPPFLAGS += -D_GI_DISABLE_CAIRO
-endif
-libregress_la_CFLAGS = $(AM_CFLAGS)
-if HAVE_CAIRO
-libregress_la_CFLAGS += $(CAIRO_CFLAGS)
-endif
-libregress_la_LDFLAGS = $(AM_LDFLAGS)
-
-
-if OS_WIN32
-AM_LDFLAGS += -no-undefined
-endif
-
-# .gir --[scanner]-> .typelib
-GIRS =
-TYPELIBS = $(GIRS:.gir=.typelib)
-CHECKGIRS = $(GIRS)
-EXPECTEDGIRS = $(GIRS:.gir=-expected.gir)
-INTROSPECTION_GIRS = $(GIRS)
-CLEANFILES += $(TYPELIBS) $(GIRS)
-EXTRA_DIST = $(EXPECTEDGIRS)
-
-SLetter-1.0.gir: $(top_builddir)/Gio-2.0.gir libsletter.la
-SLetter_1_0_gir_LIBS = libsletter.la
-SLetter_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS)
-SLetter_1_0_gir_INCLUDES = Gio-2.0
-SLetter_1_0_gir_FILES = $(libsletter_la_SOURCES)
-SLetter_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --identifier-prefix=S --c-include="sletter.h" --warn-error
-GIRS += SLetter-1.0.gir
-
-Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir Utility-1.0.gir libregress.la
-Regress_1_0_gir_LIBS = libregress.la
-Regress_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS)
-if !HAVE_CAIRO
-Regress_1_0_gir_CFLAGS += -D_GI_DISABLE_CAIRO
-endif
-Regress_1_0_gir_INCLUDES = Gio-2.0 Utility-1.0
-if HAVE_CAIRO
-Regress_1_0_gir_INCLUDES += cairo-1.0 
-endif
-Regress_1_0_gir_FILES = $(libregress_la_SOURCES)
-Regress_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="regress.h" --warn-error
-GIRS += Regress-1.0.gir
-
-WarnLib-1.0.gir: $(top_builddir)/Gio-2.0.gir libwarnlib.la
-WarnLib_1_0_gir_LIBS = libwarnlib.la
-WarnLib_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS)
-WarnLib_1_0_gir_INCLUDES = Gio-2.0
-WarnLib_1_0_gir_FILES = $(libwarnlib_la_SOURCES)
-WarnLib_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="warnlib.h" --symbol-prefix=warnlib_
-GIRS += WarnLib-1.0.gir
-
-Utility-1.0.gir: libutility.la
-Utility_1_0_gir_PACKAGES = gobject-2.0
-Utility_1_0_gir_LIBS = libutility.la
-Utility_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS)
-Utility_1_0_gir_INCLUDES = GObject-2.0
-Utility_1_0_gir_FILES = $(libutility_la_SOURCES)
-Utility_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="utility.h" --warn-error
-GIRS += Utility-1.0.gir
-
-# This one tests different --namespace and --strip-prefix
-GtkFrob-1.0.gir: libgtkfrob.la
-GtkFrob_1_0_gir_PACKAGES = gobject-2.0
-GtkFrob_1_0_gir_LIBS = libgtkfrob.la
-GtkFrob_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS)
-GtkFrob_1_0_gir_INCLUDES = GObject-2.0
-GtkFrob_1_0_gir_FILES = $(libgtkfrob_la_SOURCES)
-GtkFrob_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --identifier-prefix=Gtk --symbol-prefix=gtk_frob --warn-error
-GIRS += GtkFrob-1.0.gir
-
-# This tests that functions called _get_type are only matched if they have no
-# arguments and return GType
-GetType-1.0.gir: libgettype.la
-GetType_1_0_gir_PACKAGES = gobject-2.0
-GetType_1_0_gir_LIBS = libgettype.la
-GetType_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS)
-GetType_1_0_gir_INCLUDES = GObject-2.0
-GetType_1_0_gir_FILES = $(libgettype_la_SOURCES)
-GetType_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="gettype.h" --identifier-prefix=GetType --symbol-prefix=gettype
-GIRS += GetType-1.0.gir
-
-Typedefs-1.0.gir: libtypedefs.la
-Typedefs_1_0_gir_PACKAGES = gobject-2.0
-Typedefs_1_0_gir_LIBS = libtypedefs.la
-Typedefs_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS)
-Typedefs_1_0_gir_INCLUDES = GObject-2.0
-Typedefs_1_0_gir_FILES = $(libtypedefs_la_SOURCES)
-Typedefs_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="typedefs.h" --identifier-prefix=Typedefs --symbol-prefix=typedefs
-GIRS += Typedefs-1.0.gir
-
-if !OS_WIN32
-EXTRA_PROGRAMS = barapp
-CLEANFILES += $(EXTRA_PROGRAMS)
-
-barapp_SOURCES = barapp.c barapp.h
-barapp_LDADD = $(top_builddir)/libgirepository-1.0.la
-barapp_LDFLAGS = -export-dynamic
-
-Bar-1.0.gir: barapp
-Bar_1_0_gir_PACKAGES = gobject-2.0
-Bar_1_0_gir_PROGRAM = ./barapp
-Bar_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS)
-Bar_1_0_gir_INCLUDES = GObject-2.0
-Bar_1_0_gir_FILES = $(barapp_SOURCES)
-Bar_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --accept-unprefixed
-GIRS += Bar-1.0.gir
-endif
-
-EXTRA_DIST += \
-	headeronly.h \
-	Headeronly-1.0-expected.gir
-CLEANFILES += Headeronly-1.0.gir
-CHECKGIRS += Headeronly-1.0.gir
-
-Headeronly-1.0.gir: headeronly.h
-	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate --namespace=Headeronly --nsversion=1.0 --header-only --output=$@ $<
-
-EXTRA_DIST += \
-	identfilter.py \
-	identfilter.h \
-	Identfilter-1.0-expected.gir
-CLEANFILES += Identfilter-1.0.gir
-CHECKGIRS += Identfilter-1.0.gir
-
-Identfilter-1.0.gir: identfilter.h
-	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) \
-		--namespace=Identfilter --accept-unprefixed --nsversion=1.0 --header-only \
-		--identifier-filter-cmd="$(PYTHON) $(srcdir)/identfilter.py" \
-		--output=$@ $<
-
-EXTRA_DIST += \
-	symbolfilter.py \
-	symbolfilter.h \
-	Symbolfilter-1.0-expected.gir
-CLEANFILES += Symbolfilter-1.0.gir
-CHECKGIRS += Symbolfilter-1.0.gir
-
-Symbolfilter-1.0.gir: symbolfilter.h
-	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) \
-		--warn-all --reparse-validate \
-		--namespace=Symbolfilter --accept-unprefixed --nsversion=1.0 --header-only \
-		--symbol-filter-cmd="$(PYTHON) $(srcdir)/symbolfilter.py" \
-		--output=$@ $<
-
-if BUILD_DOCTOOL
-DOCGIRS = Regress-1.0.gir
-CHECKDOCS = $(DOCGIRS:.gir=-C) $(DOCGIRS:.gir=-Python) $(DOCGIRS:.gir=-Gjs) $(DOCGIRS:.gir=-sections.txt)
-MALLARD_DIRS = $(DOCGIRS:.gir=-C) $(DOCGIRS:.gir=-Python) $(DOCGIRS:.gir=-Gjs)
-MALLARD_CLEAN = $(DOCGIRS:.gir=-C)/* $(DOCGIRS:.gir=-Python)/* $(DOCGIRS:.gir=-Gjs)/* $(DOCGIRS:.gir=-sections.txt)
-EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected)
-CLEANFILES += $(MALLARD_CLEAN)
-
-%-C: %.gir
-	$(AM_V_GEN)rm -rf $(builddir)/$*-C
-	$(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language C $*.gir -o $(builddir)/$*-C/
-
-%-Python: %.gir
-	$(AM_V_GEN)rm -rf $(builddir)/$*-Python
-	$(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Python $*.gir -o $(builddir)/$*-Python/
-
-%-Gjs: %.gir
-	$(AM_V_GEN)rm -rf $(builddir)/$*-Gjs
-	$(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Gjs $*.gir -o $(builddir)/$*-Gjs/
-
-%-sections.txt: %.gir
-	$(AM_V_GEN)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --write-sections-file $*.gir -o $@
-
-else
-CHECKDOCS =
-endif
-
-PYTESTS = \
-	test_ccompiler.py \
-	test_shlibs.py \
-	test_pkgconfig.py \
-	test_sourcescanner.py \
-	test_transformer.py \
-	test_xmlwriter.py \
-	test_docwriter.py \
-	test_scanner.py \
-	test_maintransformer.py
-
-TESTS = $(CHECKGIRS) $(CHECKDOCS) $(TYPELIBS) $(PYTESTS)
-TESTS_ENVIRONMENT = env srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) top_builddir=$(top_builddir) \
-	CC="$(CC)" \
-	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
-LOG_COMPILER = $(PYTHON) $(top_srcdir)/tests/gi-tester
-
-EXTRA_DIST += \
-	meson.build \
-	$(PYTESTS) \
-	Regress-1.0-C-expected					\
-	Regress-1.0-Gjs-expected				\
-	Regress-1.0-Python-expected				\
-	Regress-1.0-sections-expected.txt			\
-	$(NULL)
diff --git a/tests/scanner/annotationparser/Makefile.am b/tests/scanner/annotationparser/Makefile.am
deleted file mode 100644
index fba28ff6..00000000
--- a/tests/scanner/annotationparser/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-include $(top_srcdir)/common.mk
-
-TESTS = \
-	test_parser.py \
-	test_patterns.py
-
-TESTS_ENVIRONMENT = env builddir=$(builddir) top_builddir=$(top_builddir) srcdir=$(srcdir) top_srcdir=$(top_srcdir) \
-	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
-LOG_COMPILER = $(PYTHON) $(top_srcdir)/tests/gi-tester
-
-EXTRA_DIST = \
-	$(TESTS)				\
-	README					\
-	tests.xsd				\
-	gi/annotation_allow_none.xml		\
-	gi/annotation_array.xml		\
-	gi/annotation_attributes.xml		\
-	gi/annotation_closure.xml		\
-	gi/annotation_constructor.xml		\
-	gi/annotation_destroy.xml		\
-	gi/annotation_element_type.xml		\
-	gi/annotation_foreign.xml		\
-	gi/annotation_get_value_func.xml	\
-	gi/annotation_in.xml			\
-	gi/annotation_in_out.xml		\
-	gi/annotation_method.xml		\
-	gi/annotation_not_nullable.xml		\
-	gi/annotation_out.xml			\
-	gi/annotation_ref_func.xml		\
-	gi/annotation_rename_to.xml		\
-	gi/annotation_scope.xml		\
-	gi/annotation_set_value_func.xml	\
-	gi/annotation_skip.xml			\
-	gi/annotation_transfer.xml		\
-	gi/annotation_type.xml			\
-	gi/annotation_unref_func.xml		\
-	gi/annotation_value.xml		\
-	gi/annotation_virtual.xml		\
-	gi/annotations.xml			\
-	gi/identifier.xml			\
-	gi/identifier_section.xml		\
-	gi/identifier_symbol.xml		\
-	gi/parameter.xml			\
-	gi/parameter_varargs.xml		\
-	gi/syntax.xml				\
-	gi/syntax_indentation.xml		\
-	gi/syntax_multiline_annotations.xml	\
-	gi/syntax_nested_tags.xml		\
-	gi/syntax_paragraph_breaks.xml		\
-	gi/syntax_whitespace.xml		\
-	gi/tag.xml				\
-	gi/tag_deprecated.xml			\
-	gi/tag_description.xml			\
-	gi/tag_returns.xml			\
-	gi/tag_since.xml			\
-	gi/tag_stability.xml			\
-	gtkdoc/gobject/gtypes.h.xml		\
-	gtkdoc/gobject/gtypes.c.xml		\
-	gtkdoc/gobject/giface.h.xml		\
-	gtkdoc/gobject/giface.c.xml		\
-	gtkdoc/fail/tester.h.xml		\
-	gtkdoc/fail/tester.c.xml		\
-	gtkdoc/empty/tester.c.xml		\
-	gtkdoc/bugs/tester.h.xml		\
-	gtkdoc/bugs/tester.c.xml		\
-	gtkdoc/annotations/tester.h.xml	\
-	gtkdoc/annotations/tester.c.xml	\
-	gtkdoc/gobject/gobject.h.xml		\
-	gtkdoc/gobject/gobject.c.xml		\
-	meson.build
diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am
deleted file mode 100644
index 7cdcc007..00000000
--- a/tests/warn/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-include $(top_srcdir)/common.mk
-
-TESTS = \
-	annotationparser.h \
-	callback-invalid-scope.h \
-	callback-missing-scope.h \
-	invalid-allow-none.h \
-	invalid-array.h \
-	invalid-closure.h \
-	invalid-constructor.h \
-	invalid-element-type.h \
-	invalid-method.h \
-	invalid-nullable.h \
-	invalid-option.h \
-	invalid-optional.h \
-	invalid-out.h \
-	invalid-return.h \
-	invalid-transfer.h \
-	missing-element-type.h \
-	return-gobject.h \
-	unknown-parameter.h \
-	unresolved-type.h
-
-LOG_COMPILER = env PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
-	$(PYTHON) $(srcdir)/warningtester.py
-
-EXTRA_DIST = warningtester.py common.h meson.build $(TESTS)