diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 0ab838765a..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "common"]
-	path = common
-	url = https://gitlab.freedesktop.org/gstreamer/common.git
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index f88b6c8c86..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4 -I common/m4
-
-if BUILD_EXAMPLES
-SUBDIRS_TESTS = tests
-else
-SUBDIRS_TESTS =
-endif
-
-SUBDIRS = gst-libs gst $(SUBDIRS_TESTS) m4 common
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = \
-	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL)	\
-	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN)	\
-	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)	\
-	$(srcdir)/autoregen.sh $(srcdir)/INSTALL	\
-	$(NULL)
-
-EXTRA_DIST = \
-	configure.ac autogen.sh \
-	gstreamer-vaapi.doap \
-	$(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/$(PACKAGE_TARNAME)-*" ) \
-	meson_options.txt
-
--include $(top_srcdir)/common/release.mak
--include $(top_srcdir)/git.mk
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index d88efbb27f..0000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-#
-# gstreamer-vaapi autogen.sh
-#
-# Run this to generate all the initial makefiles, etc.
-#
-# This file has been generated from common/autogen.sh.in via common/update-autogen
-
-
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-
-olddir=`pwd`
-cd "$srcdir"
-
-package=gstreamer-vaapi
-srcfile=gstreamer-vaapi.doap
-
-# Make sure we have common
-if test ! -f common/gst-autogen.sh;
-then
-  echo "+ Setting up common submodule"
-  git submodule init
-fi
-git submodule update
-
-# source helper functions
-if test ! -f common/gst-autogen.sh;
-then
-  echo There is something wrong with your source tree.
-  echo You are missing common/gst-autogen.sh
-  exit 1
-fi
-. common/gst-autogen.sh
-
-# install pre-commit hook for doing clean commits
-if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \);
-then
-    rm -f .git/hooks/pre-commit
-    if ! ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit 2> /dev/null
-    then
-        echo "Failed to create commit hook symlink, copying instead ..."
-        cp common/hooks/pre-commit.hook .git/hooks/pre-commit
-    fi
-fi
-
-# GNU gettext automake support doesn't get along with git.
-# https://bugzilla.gnome.org/show_bug.cgi?id=661128
-if test -d po ; then
-  touch -t 200001010000 po/gstreamer-vaapi-1.0.pot
-fi
-
-CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc'
-
-if test "x$package" = "xgstreamer"; then
-  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --enable-docbook --enable-failing-tests --enable-poisoning"
-elif test "x$package" = "xgst-plugins-bad"; then
-  CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-player-tests"
-fi
-
-autogen_options $@
-
-printf "+ check for build tools"
-if test -z "$NOCHECK"; then
-  echo
-
-  printf "  checking for autoreconf ... "
-  echo
-  which "autoreconf" 2>/dev/null || {
-    echo "not found! Please install the autoconf package."
-    exit 1
-  }
-
-  printf "  checking for pkg-config ... "
-  echo
-  which "pkg-config" 2>/dev/null || {
-    echo "not found! Please install pkg-config."
-    exit 1
-  }
-else
-  echo ": skipped version checks"
-fi
-
-# if no arguments specified then this will be printed
-if test -z "$*" && test -z "$NOCONFIGURE"; then
-  echo "+ checking for autogen.sh options"
-  echo "  This autogen script will automatically run ./configure as:"
-  echo "  ./configure $CONFIGURE_DEF_OPT"
-  echo "  To pass any additional options, please specify them on the $0"
-  echo "  command line."
-fi
-
-toplevel_check $srcfile
-
-# autopoint
-if test -d po && grep ^AM_GNU_GETTEXT_VERSION configure.ac >/dev/null ; then
-  tool_run "autopoint" "--force"
-fi
-
-# aclocal
-if test -f acinclude.m4; then rm acinclude.m4; fi
-
-autoreconf --force --install || exit 1
-
-test -n "$NOCONFIGURE" && {
-  echo "+ skipping configure stage for package $package, as requested."
-  echo "+ autogen.sh done."
-  exit 0
-}
-
-cd "$olddir"
-
-echo "+ running configure ... "
-test ! -z "$CONFIGURE_DEF_OPT" && echo "  default flags:  $CONFIGURE_DEF_OPT"
-test ! -z "$CONFIGURE_EXT_OPT" && echo "  external flags: $CONFIGURE_EXT_OPT"
-echo
-
-echo "$srcdir/configure" $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT
-"$srcdir/configure" $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT || {
-        echo "  configure failed"
-        exit 1
-}
-
-echo "Now type 'make' to compile $package."
diff --git a/common b/common
deleted file mode 160000
index 59cb678164..0000000000
--- a/common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 59cb678164719ff59dcf6c8b93df4617a1075d11
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index a7b8bc0ba3..0000000000
--- a/configure.ac
+++ /dev/null
@@ -1,768 +0,0 @@
-# gstreamer-vaapi package version number
-m4_define([gst_vaapi_major_version], [1])
-m4_define([gst_vaapi_minor_version], [17])
-m4_define([gst_vaapi_micro_version], [0])
-m4_define([gst_vaapi_nano_version], [1])
-m4_define([gst_vaapi_version],
-          [gst_vaapi_major_version.gst_vaapi_minor_version.gst_vaapi_micro_version])
-m4_if(gst_vaapi_nano_version, [0], [],
-  [m4_append([gst_vaapi_version], gst_vaapi_nano_version, [.])])
-
-# Configure defaults
-m4_define([default_glapi],              [any])
-
-dnl - library source changed -> increment REVISION
-dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
-dnl - interfaces added -> increment AGE
-dnl - interfaces removed -> AGE = 0
-# gstreamer-vaapi library (libtool) version number
-m4_define([gst_vaapi_lt_current],       [1700])
-m4_define([gst_vaapi_lt_revision],      [0])
-m4_define([gst_vaapi_lt_age],           [1700])
-
-# glib version number
-m4_define([glib_version], [2.44])
-
-# gstreamer version number
-m4_define([gst_version],                [1.17.0.1])
-m4_define([gst_plugins_base_version],   [1.17.0.1])
-m4_define([gst_plugins_bad_version],    [1.17.0.1])
-
-# Wayland minimum version number
-m4_define([wayland_api_version], [1.11.0])
-
-# VA-API minimum version number
-m4_define([va_api_version],     [0.39.0])
-
-AC_PREREQ([2.69])
-AC_INIT([GStreamer VA-API Plug-ins], [gst_vaapi_version],
-  [http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],
-  [gstreamer-vaapi])
-
-dnl define the output header for config
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([build-aux])
-
-AG_GST_INIT
-
-dnl initialize automake
-AM_INIT_AUTOMAKE([-Wno-portability 1.14 no-dist-gzip dist-xz tar-ustar subdir-objects])
-
-dnl define PACKAGE_VERSION_* variables
-AS_VERSION
-
-dnl check if this is a release version
-AS_NANO(GST_GIT="no", GST_GIT="yes")
-
-dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
-AM_MAINTAINER_MODE([enable])
-
-dnl use pretty build output by default
-AM_SILENT_RULES([yes])
-
-dnl our libraries and install dirs use GST_API_VERSION in the filename
-dnl to allow side-by-side installation of different API versions
-GST_API_VERSION=1.0
-AC_SUBST([GST_API_VERSION])
-AC_DEFINE_UNQUOTED([GST_API_VERSION], ["$GST_API_VERSION"],
-  [GStreamer API Version])
-
-AG_GST_LIBTOOL_PREPARE
-
-dnl CURRENT, REVISION, AGE
-dnl sets GST_LT_LDFLAGS
-AS_LIBTOOL(GST, gst_vaapi_lt_current, gst_vaapi_lt_revision, gst_vaapi_lt_age)
-
-dnl *** required versions of GStreamer stuff ***
-GLIB_REQ=glib_version
-GST_REQ=gst_version
-GST_PBREQ=gst_plugins_base_version
-GST_PBADREQ=gst_plugins_bad_version
-WAYLAND_REQ=wayland_api_version
-
-dnl *** required versions of VA-API stuff ***
-VAAPI_REQ=va_api_version
-
-dnl *** autotools stuff ****
-
-dnl allow for different autotools
-AS_AUTOTOOLS_ALTERNATE
-
-dnl Add parameters for aclocal
-AC_SUBST([ACLOCAL_AMFLAGS], ["-I m4 -I common/m4"])
-
-dnl *** check for arguments to configure ***
-
-AG_GST_ARG_DISABLE_FATAL_WARNINGS
-AG_GST_ARG_ENABLE_EXTRA_CHECKS
-AG_GST_ARG_DEBUG
-
-AG_GST_ARG_EXAMPLES
-
-AG_GST_ARG_WITH_PKG_CONFIG_PATH
-
-AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
-  ["${srcdir}/gstreamer-vaapi.doap"],
-  [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO])
-
-AC_ARG_ENABLE([encoders],
-  AS_HELP_STRING([--enable-encoders],
-    [enable video encoders @<:@default=yes@:>@]),
-  [], [enable_encoders="yes"])
-
-AC_ARG_ENABLE([drm],
-  AS_HELP_STRING([--enable-drm],
-    [enable DRM backend @<:@default=yes@:>@]),
-  [], [enable_drm="yes"])
-
-AC_ARG_ENABLE([x11],
-  AS_HELP_STRING([--enable-x11],
-    [enable X11 output @<:@default=yes@:>@]),
-  [], [enable_x11="yes"])
-
-AC_ARG_ENABLE([glx],
-  AS_HELP_STRING([--enable-glx],
-    [enable OpenGL/X11 output @<:@default=yes@:>@]),
-  [], [enable_glx="yes"])
-
-AC_ARG_ENABLE([wayland],
-  AC_HELP_STRING([--enable-wayland],
-    [enable Wayland output @<:@default=yes@:>@]),
-  [], [enable_wayland="yes"])
-
-AC_ARG_ENABLE([egl],
-  AS_HELP_STRING([--enable-egl],
-    [enable EGL output @<:@default=yes@:>@]),
-  [], [enable_egl="yes"])
-
-AC_ARG_WITH([glapi],
-  AS_HELP_STRING([--with-glapi=APIs],
-    [build with the specified OpenGL APIs @<:@default=default_glapi@:>@]),
-  [GLAPI="$with_glapi"], [GLAPI=default_glapi])
-
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk],
-    [compile GTK3 based test apps @<:@default=check@:>@])],
-  [], [with_gtk="check"])
-
-dnl *** checks for platform ***
-
-dnl * hardware/architecture *
-
-dnl check CPU type
-AG_GST_ARCH
-
-dnl *** checks for programs ***
-
-dnl find a compiler
-AC_PROG_CC
-AC_PROG_CC_STDC
-
-dnl check if the compiler supports '-c' and '-o' options
-AM_PROG_CC_C_O
-
-dnl *** checks for libraries ***
-dnl check for libm, for sin() etc.
-AC_CHECK_LIB([m], [tan])
-
-dnl Check to see if dlopen/dlsym is in default libraries (like
-dnl Solaris, which has it in libc), or if libdl is needed to get it.
-AC_CHECK_FUNC([dlopen], [], [
-  AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
-AC_SUBST([DLOPEN_LIBS])
-
-dnl define LIBDIR so we can inform people where we live
-AS_AC_EXPAND([LIBDIR], [$libdir])
-AC_DEFINE_UNQUOTED([LIBDIR], ["$LIBDIR"], [library dir])
-
-dnl set location of plugin directory
-AG_GST_SET_PLUGINDIR
-
-dnl *** checks for header files ***
-
-dnl *** checks for types/defines ***
-
-dnl *** checks for structures ***
-
-dnl *** checks for compiler characteristics ***
-
-dnl *** checks for library functions ***
-
-dnl *** checks for headers ***
-
-dnl *** checks for dependency libraries ***
-
-dnl ---------------------------------------------------------------------------
-dnl -- GStreamer                                                             --
-dnl ---------------------------------------------------------------------------
-dnl GLib is required
-AG_GST_GLIB_CHECK([$GLIB_REQ])
-
-dnl checks for gstreamer
-dnl uninstalled is selected preferentially -- see pkg-config(1)
-AG_GST_CHECK_GST([$GST_API_VERSION], [$GST_REQ], [yes])
-
-dnl back compatibility
-AC_MSG_CHECKING([for GStreamer API version])
-gst_api_version=`$PKG_CONFIG --modversion "gstreamer-$GST_API_VERSION"`
-gst_major_version=`echo "$gst_api_version" | cut -d'.' -f1`
-gst_minor_version=`echo "$gst_api_version" | cut -d'.' -f2`
-GST_VERSION="${gst_major_version}.${gst_minor_version}"
-AC_MSG_RESULT([$GST_VERSION])
-AC_DEFINE_UNQUOTED([GST_API_VERSION_S], ["$GST_VERSION"],
-  [Defined to the string representation of GStreamer version])
-
-AG_GST_CHECK_GST_BASE([$GST_API_VERSION], [$GST_REQ], [yes])
-AG_GST_CHECK_GST_PLUGINS_BASE([$GST_API_VERSION], [$GST_PBREQ], [yes])
-
-dnl gst_dmabuf_memory_get_fd (gstreamer-allocators)
-AG_GST_CHECK_MODULES([GST_ALLOCATORS],
-  [gstreamer-allocators-$GST_API_VERSION], [$GST_PBREQ], [yes])
-
-dnl GstVideoOverlayComposition (gstreamer-video)
-AG_GST_CHECK_MODULES([GST_VIDEO],
-  [gstreamer-video-$GST_API_VERSION], [$GST_PBREQ], [yes])
-
-dnl ... GStreamer base utils (gstreamer-pbutils)
-AG_GST_CHECK_MODULES([GST_PBUTILS],
-  [gstreamer-pbutils-$GST_API_VERSION], [$GST_PBREQ], [yes])
-
-dnl bitstream parsers (gstreamer-codecparsers)
-AG_GST_CHECK_MODULES([GST_CODEC_PARSERS],
-  [gstreamer-codecparsers-$GST_API_VERSION], [$GST_PBADREQ], [yes])
-
-AS_IF([test "x$enable_glx" = "xyes" -o "x$enable_egl" = "xyes"],
-  [enable_opengl="yes"], [enable_opengl="no"])
-
-dnl ... opengl helper libraries
-HAVE_GSTGL=0
-if test "x$enable_opengl" = "xyes"; then
-  PKG_CHECK_MODULES([GST_GL],
-    [gstreamer-gl-$GST_API_VERSION >= $GST_PBADREQ],
-    [
-      HAVE_GSTGL=1
-      AC_CACHE_CHECK([for GStreamer OpenGL helper libraries],
-        [ac_cv_have_gst_gl_helpers],
-        [
-          saved_CPPFLAGS="$CPPFLAGS"
-          CPPFLAGS="$CPPFLAGS $GST_GL_CFLAGS $GST_VIDEO_CFLAGS"
-          saved_LIBS="$LIBS"
-          LIBS="$saved_LIBS"
-          AC_CHECK_HEADERS([gst/gl/gl.h], [], [HAVE_GSTGL=0])
-          AC_COMPILE_IFELSE(
-            [
-              AC_LANG_PROGRAM(
-                [[
-#include <gst/gl/gl.h>
-                ]],
-                [[
-GstGLContext gl_context;
-                ]])
-            ],
-            [ac_cv_have_gst_gl_helpers="yes"],
-            [ac_cv_have_gst_gl_helpers="no"])
-          CPPFLAGS="$saved_CPPFLAGS"
-          LIBS="$saved_LIBS"
-        ])
-    ], [:])
-fi
-AS_IF([test "x$ac_cv_have_gst_gl_helpers" = "xno"], [HAVE_GSTGL=0])
-AM_CONDITIONAL([USE_GST_GL_HELPERS], [test $HAVE_GSTGL -eq 1])
-AC_DEFINE_UNQUOTED([USE_GST_GL_HELPERS], [$HAVE_GSTGL],
-  [Defined to 1 if GStreamer OpenGL helper libraries are available])
-
-if test "x$enable_egl" = "xyes" -a $HAVE_GSTGL -ne 1; then
-  AC_MSG_WARN([GStreamer/GL helper libraries not found, disabling EGL support])
-  enable_egl="no"
-fi
-
-dnl ---------------------------------------------------------------------------
-dnl -- Renderers                                                             --
-dnl ---------------------------------------------------------------------------
-
-dnl Check for DRM/libudev
-USE_DRM=0
-if test "x$enable_drm" = "xyes"; then
-  PKG_CHECK_MODULES([DRM], [libdrm libudev],
-    [
-      USE_DRM=1
-      saved_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $DRM_CFLAGS"
-      AC_CHECK_HEADERS([drm_fourcc.h], [], [USE_DRM=0])
-      CPPFLAGS="$saved_CPPFLAGS"
-    ], [:])
-fi
-
-dnl Check for X11
-USE_X11=0
-if test "x$enable_x11" = "xyes"; then
-  PKG_CHECK_MODULES([X11], [x11],
-    [
-      USE_X11=1
-      saved_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $X11_CFLAGS"
-      AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h X11/Xatom.h], [], [USE_X11=0])
-      CPPFLAGS="$saved_CPPFLAGS"
-    ], [:])
-fi
-
-HAVE_XKBLIB=0
-HAVE_XRANDR=0
-HAVE_XRENDER=0
-if test $USE_X11 -eq 1; then
-  dnl Check for XKB library
-  HAVE_XKBLIB=1
-  saved_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $X11_CFLAGS"
-  AC_CHECK_HEADERS([X11/XKBlib.h], [], [HAVE_XKBLIB=0])
-  CPPFLAGS="$saved_CPPFLAGS"
-
-  dnl Check for XRandR
-  PKG_CHECK_MODULES([XRANDR], [xrandr],
-    [
-      HAVE_XRANDR=1
-      saved_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $XRANDR_CFLAGS"
-      AC_CHECK_HEADERS([X11/extensions/Xrandr.h], [], [HAVE_XRANDR=0])
-      CPPFLAGS="$saved_CPPFLAGS"
-    ], [:])
-
-  dnl Check for XRender
-  PKG_CHECK_MODULES([XRENDER], [xrender],
-    [
-      HAVE_XRENDER=1
-      saved_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
-      AC_CHECK_HEADERS([X11/extensions/Xrender.h], [], [HAVE_XRENDER=0])
-      CPPFLAGS="$saved_CPPFLAGS"
-    ], [:])
-fi
-
-AC_DEFINE_UNQUOTED([HAVE_XKBLIB], [$HAVE_XKBLIB],
-  [Defined to 1 if the XKB extension exists.])
-AC_DEFINE_UNQUOTED([HAVE_XRANDR], [$HAVE_XRANDR],
-  [Defined to 1 if the XRandR extension exists.])
-AC_DEFINE_UNQUOTED([HAVE_XRENDER], [$HAVE_XRENDER],
-  [Defined to 1 if the XRender extension exists.])
-
-dnl OpenGL
-GLES_VERSION_MASK=0
-
-HAVE_GL=0
-HAVE_GLESv2=0
-HAVE_GLESv3=0
-if test "x$enable_opengl" = "xyes"; then
-  dnl OpenGL
-  case ",$GLAPI," in
-    (*,any,*|*,gl,*)
-      HAVE_GL=1
-      PKG_CHECK_MODULES([GL], [gl],
-        [
-          saved_CPPFLAGS="$CPPFLAGS"
-          CPPFLAGS="$CPPFLAGS $GL_CFLAGS"
-          AC_CHECK_HEADERS([GL/gl.h GL/glext.h], [], [HAVE_GL=0],
-            [
-#ifdef HAVE_GL_GL_H
-# include <GL/gl.h>
-#endif
-            ])
-          CPPFLAGS="$saved_CPPFLAGS"
-        ], [HAVE_GL=0])
-      GLES_VERSION_MASK=`expr $GLES_VERSION_MASK "+" $HAVE_GL "*" 1`
-    ;;
-  esac
-
-  dnl OpenGL|ESv2
-  case ",$GLAPI," in
-    (*,any,*|*,gles2,*)
-      HAVE_GLESv2=1
-      PKG_CHECK_MODULES([GLES2], [glesv2],
-        [
-          saved_CPPFLAGS="$CPPFLAGS"
-          CPPFLAGS="$CPPFLAGS $GLES2_CFLAGS"
-          AC_CHECK_HEADERS([GLES2/gl2.h GLES2/gl2ext.h], [], [HAVE_GLESv2=0],
-            [
-#ifdef HAVE_GLES2_GL2_H
-# include <GLES2/gl2.h>
-#endif
-            ])
-          CPPFLAGS="$saved_CPPFLAGS"
-        ], [HAVE_GLESv2=0])
-      GLES_VERSION_MASK=`expr $GLES_VERSION_MASK "+" $HAVE_GLESv2 "*" 4`
-    ;;
-  esac
-
-  dnl OpenGL|ESv3
-  case ",$GLAPI," in
-    (*,any,*|*,gles3,*)
-      HAVE_GLESv3=1
-      PKG_CHECK_MODULES([GLES3], [glesv2],
-        [
-          saved_CPPFLAGS="$CPPFLAGS"
-          CPPFLAGS="$CPPFLAGS $GLES3_CFLAGS"
-          AC_CHECK_HEADERS([GLES3/gl3.h GLES3/gl3ext.h GLES2/gl2ext.h], [],
-            [HAVE_GLESv3=0],
-            [
-#ifdef HAVE_GLES3_GL3_H
-# include <GLES3/gl3.h>
-#endif
-            ])
-          CPPFLAGS="$saved_CPPFLAGS"
-        ], [HAVE_GLESv3=0])
-      GLES_VERSION_MASK=`expr $GLES_VERSION_MASK "+" $HAVE_GLESv3 "*" 8`
-    ;;
-  esac
-fi
-
-dnl ... GLX
-USE_GLX=0
-if test "x$enable_glx" = "xyes" -a $HAVE_GL -eq 1 -a $USE_X11 -eq 1; then
-  USE_GLX=1
-
-  saved_CPPFLAGS="$CPPFLAGS"
-  saved_LIBS="$LIBS"
-  CPPFLAGS="$CPPFLAGS $GL_CFLAGS"
-  LIBS="$LIBS $GL_LIBS"
-  AC_CHECK_HEADERS([GL/glx.h], [], [USE_GLX=0],
-    [
-#ifdef HAVE_GL_GL_H
-# include <GL/gl.h>
-#endif
-    ])
-  AC_CHECK_LIB([GL], [glXCreateContext], [], [USE_GLX=0])
-  CPPFLAGS="$saved_CPPFLAGS"
-  LIBS="$saved_LIBS"
-fi
-
-dnl ... EGL
-USE_EGL=0
-if test "x$enable_egl" = "xyes" -a $GLES_VERSION_MASK -ne 0; then
-  PKG_CHECK_MODULES([EGL], [egl],
-    [
-      USE_EGL=1
-
-      saved_CPPFLAGS="$CPPFLAGS"
-      saved_LIBS="$LIBS"
-      CPPFLAGS="$CPPFLAGS $EGL_CFLAGS"
-      LIBS="$LIBS $EGL_LIBS"
-      AC_CHECK_HEADERS([EGL/egl.h], [], [USE_EGL=0])
-      AC_CHECK_LIB([EGL], [eglGetDisplay], [], [USE_EGL=0])
-      CPPFLAGS="$saved_CPPFLAGS"
-      LIBS="$saved_LIBS"
-    ], [:])
-fi
-
-dnl Check for Wayland
-USE_WAYLAND=0
-if test "x$enable_wayland" = "xyes"; then
-  PKG_CHECK_MODULES([WAYLAND], [wayland-client >= $WAYLAND_REQ, wayland-protocols >= 1.15],
-    [
-      USE_WAYLAND=1
-      saved_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $WAYLAND_CFLAGS"
-      AC_CHECK_HEADERS([wayland-client.h], [], [USE_WAYLAND=0])
-      CPPFLAGS="$saved_CPPFLAGS"
-
-      AC_CHECK_PROGS(WAYLAND_SCANNER, wayland-scanner, [USE_WAYLAND=0])
-
-      WAYLAND_PROTOCOLS_DATADIR="`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`"
-      AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $WAYLAND_PROTOCOLS_DATADIR)
-    ], [:])
-fi
-
-dnl Check for GTK for tests
-USE_GTK=0
-AS_IF([test "x$BUILD_EXAMPLES" = "xyes" -a $USE_X11 -eq 1],
-  [AS_CASE([$with_gtk],
-    [yes], [PKG_CHECK_MODULES([GTK3], [gtk+-3.0], [USE_GTK=1])],
-    [no], [],
-    [PKG_CHECK_MODULES([GTK3], [gtk+-3.0], [USE_GTK=1], [USE_GTK=0])])])
-AS_IF([test $USE_GTK -eq 1],
-  [
-    saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $GTK3_CFLAGS"
-    AC_CHECK_HEADERS([gtk/gtk.h], [], [USE_GTK=0])
-    CPPFLAGS="$saved_CPPFLAGS"
-  ])
-dnl USE_GTK conditional is delayed after being sure to handle X11
-
-dnl ---------------------------------------------------------------------------
-dnl -- VA-API                                                                --
-dnl ---------------------------------------------------------------------------
-
-dnl Core API
-PKG_CHECK_MODULES([LIBVA], [libva >= $VAAPI_REQ libva != 0.99.0])
-VA_VERSION_STR=`$PKG_CONFIG --modversion libva`
-VA_DRIVERS_PATH=`$PKG_CONFIG --variable=driverdir libva`
-AC_DEFINE_UNQUOTED([VA_DRIVERS_PATH], ["$VA_DRIVERS_PATH"],
-  [VA drivers path])
-
-dnl VA/DRM API
-if test $USE_DRM -eq 1; then
-  PKG_CHECK_MODULES([LIBVA_DRM], [libva-drm >= $VAAPI_REQ],
-    [
-      saved_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $LIBVA_DRM_CFLAGS"
-      AC_CHECK_HEADERS([va/va_drm.h], [], [USE_DRM=0])
-      CPPFLAGS="$saved_CPPFLAGS"
-    ], [USE_DRM=0])
-fi
-
-dnl VA/X11 API
-if test $USE_X11 -eq 1; then
-  PKG_CHECK_MODULES(LIBVA_X11, [libva-x11 >= $VAAPI_REQ],
-    [], [
-      USE_X11=0
-      USE_GLX=0
-    ])
-fi
-
-dnl export USE_GTK after being sure to handle X11
-AM_CONDITIONAL([USE_GTK], [test $USE_X11 -eq 1 -a $USE_GTK -eq 1])
-
-dnl Check for encoding support
-USE_ENCODERS=0
-if test "x$enable_encoders" = "xyes"; then
-  USE_ENCODERS=1
-fi
-
-USE_VP9_ENCODER=0
-USE_H264_FEI_ENCODER=0
-
-if test $USE_ENCODERS -eq 1; then
-  saved_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
-
-  dnl Check for VP9 Encoding API (0.39.1+)
-  AC_CHECK_HEADERS([va/va_enc_vp9.h], [], [],
-    [
-#include <va/va.h>
-    ])
-  AC_CACHE_CHECK([for VP9 encoding API],
-    [ac_cv_have_vp9_encoding_api],
-    [
-      saved_LIBS="$LIBS"
-      LIBS="$LIBS $LIBVA_LIBS"
-      AC_COMPILE_IFELSE(
-        [
-          AC_LANG_PROGRAM(
-            [[
-#include <va/va.h>
-#ifdef HAVE_VA_VA_ENC_VP9_H
-# include <va/va_enc_vp9.h>
-#endif
-            ]],
-            [[
-VAEncSequenceParameterBufferVP9 seq_param;
-VAEncPictureParameterBufferVP9 pic_param;
-VAEncSegParamVP9 seg_param;
-VAEncMiscParameterTypeVP9PerSegmantParam misc_param;
-            ]])
-        ],
-        [ac_cv_have_vp9_encoding_api="yes"],
-        [ac_cv_have_vp9_encoding_api="no"])
-      LIBS="$saved_LIBS"
-    ])
-  AS_IF([test "x$ac_cv_have_vp9_encoding_api" = "xyes"], [USE_VP9_ENCODER=1])
-
-  dnl Check for H264 FEI Encoding API
-  AC_CHECK_HEADERS([va/va_fei_h264.h], [], [],
-    [
-#include <va/va.h>
-    ])
-  AC_CACHE_CHECK([for H264_FEI encoding API],
-    [ac_cv_have_h264_fei_encoding_api],
-    [
-      saved_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
-      saved_LIBS="$LIBS"
-      LIBS="$LIBS $LIBVA_LIBS"
-      AC_COMPILE_IFELSE(
-        [
-          AC_LANG_PROGRAM(
-            [[
-#include <va/va.h>
-#ifdef HAVE_VA_VA_FEI_H264_H
-# include <va/va_fei_h264.h>
-#endif
-            ]],
-            [[
-VAEncMiscParameterFEIFrameControlH264 framectl;
-VAEncFEIMBControlH264 mbcntrl;
-VAEncFEIMVPredictorH264 mvpred;
-VAEncFEIMBCodeH264 mbcode;
-VAEncFEIDistortionH264 dist;
-            ]])
-        ],
-        [ac_cv_have_h264_fei_encoding_api="yes"],
-        [ac_cv_have_h264_fei_encoding_api="no"])
-      CPPFLAGS="$saved_CPPFLAGS"
-      LIBS="$saved_LIBS"
-    ])
-  AS_IF([test "x$ac_cv_have_h264_fei_encoding_api" = "xyes"], [USE_H264_FEI_ENCODER=1])
-  CPPFLAGS="$saved_CPPFLAGS"
-fi
-
-dnl VA/Wayland API
-if test $USE_WAYLAND -eq 1; then
-  PKG_CHECK_MODULES([LIBVA_WAYLAND], [libva-wayland >= $VAAPI_REQ],
-    [], [USE_WAYLAND=0])
-fi
-
-dnl *** finalize CFLAGS, LDFLAGS, LIBS
-
-# set by AG_GST_PARSE_SUBSYSTEM_DISABLES above
-dnl make sure it doesn't complain about unused variables if debugging is disabled
-AG_GST_CHECK_GST_DEBUG_DISABLED([NO_WARNINGS="-Wno-unused"], [NO_WARNINGS=""])
-
-dnl define an ERROR_CFLAGS Makefile variable
-dnl FIXME Add -Wredundant-decls again if considered useful and warnings are fixed
-AG_GST_SET_ERROR_CFLAGS([$FATAL_WARNINGS], [-Wmissing-declarations -Wmissing-prototypes -Wwrite-strings -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wnested-externs $NO_WARNINGS])
-
-dnl define correct level for debugging messages
-AG_GST_SET_LEVEL_DEFAULT([$GST_GIT])
-
-dnl Overview:
-dnl GST_OPTION_CFLAGS:  common flags for profiling, debugging, errors, ...
-dnl GST_*:              flags shared by built objects to link against GStreamer
-dnl GST_ALL_LDFLAGS:    linker flags shared by all
-dnl GST_LIB_LDFLAGS:    additional linker flags for all libaries
-dnl GST_LT_LDFLAGS:     library versioning of our libraries
-dnl GST_PLUGIN_LDFLAGS: flags to be used for all plugins
-
-dnl GST_OPTION_CFLAGS
-if test "x$USE_DEBUG" = xyes; then
-   PROFILE_CFLAGS="-g"
-fi
-AC_SUBST([PROFILE_CFLAGS])
-
-if test "x$GST_GIT" = "xyes"; then
-  DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED"
-else
-  DEPRECATED_CFLAGS=""
-fi
-AC_SUBST([DEPRECATED_CFLAGS])
-
-dnl disable strict aliasing
-AS_COMPILER_FLAG([-fno-strict-aliasing], [EXTRA_CFLAGS="-fno-strict-aliasing"])
-AC_SUBST(EXTRA_CFLAGS)
-
-dnl every flag in GST_OPTION_CFLAGS and GST_OPTION_CXXFLAGS can be overridden
-dnl at make time with e.g. make ERROR_CFLAGS=""
-GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(DEPRECATED_CFLAGS)"
-AC_SUBST([GST_OPTION_CFLAGS])
-
-dnl FIXME: do we want to rename to GST_ALL_* ?
-dnl prefer internal headers to already installed ones
-dnl also add builddir include for enumtypes and marshal
-dnl add GST_OPTION_CFLAGS, but overridable
-GST_CFLAGS="$GST_CFLAGS -DGST_USE_UNSTABLE_API"
-GST_CFLAGS="$GST_CFLAGS $EXTRA_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)"
-AC_SUBST([GST_CFLAGS])
-
-dnl LDFLAGS really should only contain flags, not libs - they get added before
-dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_ALL_LDFLAGS="-no-undefined"
-if test "x${enable_Bsymbolic}" = "xyes"; then
-  GST_ALL_LDFLAGS="$GST_ALL_LDFLAGS -Wl,-Bsymbolic-functions"
-fi
-AC_SUBST([GST_ALL_LDFLAGS])
-
-dnl GST_LIB_LDFLAGS
-dnl linker flags shared by all libraries
-dnl LDFLAGS modifier defining exported symbols from built libraries
-dnl (export _gst_foo but not __gst_foo)
-GST_LIB_LDFLAGS="-export-symbols-regex ^_?\(gst_\|Gst\|GST_\).*"
-AC_SUBST([GST_LIB_LDFLAGS])
-
-dnl this really should only contain flags, not libs - they get added before
-dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_.*' $GST_ALL_LDFLAGS"
-AC_SUBST([GST_PLUGIN_LDFLAGS])
-
-dnl ---------------------------------------------------------------------------
-dnl -- Generate files and summary                                            --
-dnl ---------------------------------------------------------------------------
-
-case ":$USE_X11:$USE_GLX:$USE_EGL:$USE_WAYLAND:$USE_DRM:" in
-*:1:*) ;;
-*) AC_MSG_ERROR([No renderer is enabled]) ;;
-esac
-
-AC_DEFINE_UNQUOTED([USE_ENCODERS], [$USE_ENCODERS],
-  [Defined to 1 if video encoders are used])
-AM_CONDITIONAL([USE_ENCODERS], [test $USE_ENCODERS -eq 1])
-
-AC_DEFINE_UNQUOTED([USE_VP9_ENCODER], [$USE_VP9_ENCODER],
-  [Defined to 1 if VP9 encoder is used])
-AM_CONDITIONAL([USE_VP9_ENCODER], [test $USE_VP9_ENCODER -eq 1])
-
-AC_DEFINE_UNQUOTED([USE_H264_FEI_ENCODER], [$USE_H264_FEI_ENCODER],
-  [Defined to 1 if H264_FEI encoder is used])
-AM_CONDITIONAL([USE_H264_FEI_ENCODER], [test $USE_H264_FEI_ENCODER -eq 1])
-
-AC_DEFINE_UNQUOTED([USE_DRM], [$USE_DRM],
-  [Defined to 1 if DRM is enabled])
-AM_CONDITIONAL([USE_DRM], [test $USE_DRM -eq 1])
-
-AC_DEFINE_UNQUOTED([USE_X11], [$USE_X11],
-  [Defined to 1 if X11 is enabled])
-AM_CONDITIONAL([USE_X11], [test $USE_X11 -eq 1])
-
-AC_DEFINE_UNQUOTED([USE_GLX], [$USE_GLX],
-  [Defined to 1 if GLX is enabled])
-AM_CONDITIONAL([USE_GLX], [test $USE_GLX -eq 1])
-
-AC_DEFINE_UNQUOTED([USE_EGL], [$USE_EGL],
-  [Defined to 1 if EGL is enabled])
-AM_CONDITIONAL([USE_EGL], [test $USE_EGL -eq 1])
-
-AC_DEFINE_UNQUOTED([USE_GLES_VERSION_MASK], [$GLES_VERSION_MASK],
-  [Defined to the set of enabled OpenGL ES APIs])
-
-AC_DEFINE_UNQUOTED([USE_WAYLAND], [$USE_WAYLAND],
-  [Defined to 1 if WAYLAND is enabled])
-AM_CONDITIONAL([USE_WAYLAND], [test $USE_WAYLAND -eq 1])
-
-dnl @TODO hack for egl's dynamic module loading. remove it!
-AC_DEFINE_UNQUOTED([GST_VAAPI_MAJOR_VERSION_S], ["0"],
-  [Defined to the string representation of gstreamer-vaapi major version])
-
-AC_CONFIG_FILES([
-    Makefile
-    common/Makefile
-    common/m4/Makefile
-    m4/Makefile
-    gst-libs/Makefile
-    gst-libs/gst/Makefile
-    gst-libs/gst/vaapi/Makefile
-    gst/Makefile
-    gst/vaapi/Makefile
-    tests/Makefile
-    tests/elements/Makefile
-])
-AC_OUTPUT
-
-dnl Print summary
-yesno() {
-  test $1 -eq 1 && echo yes || echo no
-}
-
-VIDEO_OUTPUTS=""
-AS_IF([test $USE_DRM -eq 1], [VIDEO_OUTPUTS="$VIDEO_OUTPUTS drm"])
-AS_IF([test $USE_X11 -eq 1], [VIDEO_OUTPUTS="$VIDEO_OUTPUTS x11"])
-AS_IF([test $USE_GLX -eq 1], [VIDEO_OUTPUTS="$VIDEO_OUTPUTS glx"])
-AS_IF([test $USE_EGL -eq 1], [VIDEO_OUTPUTS="$VIDEO_OUTPUTS egl"])
-AS_IF([test $USE_WAYLAND -eq 1], [VIDEO_OUTPUTS="$VIDEO_OUTPUTS wayland"])
-
-echo
-echo $PACKAGE configuration summary:
-echo
-echo Installation Prefix .............. : ${prefix}
-echo GStreamer API version ............ : $GST_VERSION
-echo VA-API version ................... : $VA_VERSION_STR
-echo Video encoding ................... : $(yesno $USE_ENCODERS)
-echo Video outputs .................... : $VIDEO_OUTPUTS
-echo
diff --git a/git.mk b/git.mk
deleted file mode 100644
index 643c2ca9ae..0000000000
--- a/git.mk
+++ /dev/null
@@ -1,348 +0,0 @@
-# git.mk, a small Makefile to autogenerate .gitignore files
-# for autotools-based projects.
-#
-# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011,2012,2013 Behdad Esfahbod
-# Written by Behdad Esfahbod
-#
-# Copying and distribution of this file, with or without modification,
-# is permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-#
-# The latest version of this file can be downloaded from:
-GIT_MK_URL = https://raw.githubusercontent.com/behdad/git.mk/master/git.mk
-#
-# Bugs, etc, should be reported upstream at:
-#   https://github.com/behdad/git.mk
-#
-# To use in your project, import this file in your git repo's toplevel,
-# then do "make -f git.mk".  This modifies all Makefile.am files in
-# your project to -include git.mk.  Remember to add that line to new
-# Makefile.am files you create in your project, or just rerun the
-# "make -f git.mk".
-#
-# This enables automatic .gitignore generation.  If you need to ignore
-# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
-# But think twice before doing that.  If a file has to be in .gitignore,
-# chances are very high that it's a generated file and should be in one
-# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
-#
-# The only case that you need to manually add a file to GITIGNOREFILES is
-# when remove files in one of mostlyclean-local, clean-local, distclean-local,
-# or maintainer-clean-local make targets.
-#
-# Note that for files like editor backup, etc, there are better places to
-# ignore them.  See "man gitignore".
-#
-# If "make maintainer-clean" removes the files but they are not recognized
-# by this script (that is, if "git status" shows untracked files still), send
-# me the output of "git status" as well as your Makefile.am and Makefile for
-# the directories involved and I'll diagnose.
-#
-# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# Makefile.am.sample in the git.mk git repo.
-#
-# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
-# not tarballs.  It serves no useful purpose in tarballs and clutters the
-# build dir.
-#
-# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
-# appstream.
-#
-# This makefile provides the following targets:
-#
-# - all: "make all" will build all gitignore files.
-# - gitignore: makes all gitignore files in the current dir and subdirs.
-# - .gitignore: make gitignore file for the current dir.
-# - gitignore-recurse: makes all gitignore files in the subdirs.
-#
-# KNOWN ISSUES:
-#
-# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
-#   submodule doesn't find us.  If you have configure.{in,ac} files in
-#   subdirs, add a proxy git.mk file in those dirs that simply does:
-#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
-#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
-#   example.
-#
-
-
-
-###############################################################################
-# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
-###############################################################################
-
-#
-# Most autotools-using modules should be fine including this variable in their
-# toplevel MAINTAINERCLEANFILES:
-GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/autoscan.log \
-	$(srcdir)/configure.scan \
-	`AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
-	 test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
-	 for x in \
-		ar-lib \
-		compile \
-		config.guess \
-		config.sub \
-		depcomp \
-		install-sh \
-		ltmain.sh \
-		missing \
-		mkinstalldirs \
-		test-driver \
-		ylwrap \
-	 ; do echo "$$AUX_DIR/$$x"; done` \
-	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
-	head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
-#
-# All modules should also be fine including the following variable, which
-# removes automake-generated Makefile.in files:
-GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
-	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
-	while read f; do \
-	  case $$f in Makefile|*/Makefile) \
-	    test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
-	done`
-#
-# Modules that use libtool and use  AC_CONFIG_MACRO_DIR() may also include this,
-# though it's harmless to include regardless.
-GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
-	`MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \
-	 if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
-		for x in \
-			libtool.m4 \
-			ltoptions.m4 \
-			ltsugar.m4 \
-			ltversion.m4 \
-			lt~obsolete.m4 \
-		; do echo "$$MACRO_DIR/$$x"; done; \
-	 fi`
-
-
-
-###############################################################################
-# Default rule is to install ourselves in all Makefile.am files:
-###############################################################################
-
-git-all: git-mk-install
-
-git-mk-install:
-	@echo "Installing git makefile"
-	@any_failed=; \
-		find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
-		if grep 'include .*/git.mk' $$x >/dev/null; then \
-			echo "$$x already includes git.mk"; \
-		else \
-			failed=; \
-			echo "Updating $$x"; \
-			{ cat $$x; \
-			  echo ''; \
-			  echo '-include $$(top_srcdir)/git.mk'; \
-			} > $$x.tmp || failed=1; \
-			if test x$$failed = x; then \
-				mv $$x.tmp $$x || failed=1; \
-			fi; \
-			if test x$$failed = x; then : else \
-				echo "Failed updating $$x"; >&2 \
-				any_failed=1; \
-			fi; \
-	fi; done; test -z "$$any_failed"
-
-git-mk-update:
-	wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk
-
-.PHONY: git-all git-mk-install git-mk-update
-
-
-
-###############################################################################
-# Actual .gitignore generation:
-###############################################################################
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-	@echo "git.mk: Generating $@"
-	@{ \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
-			for x in \
-				$(DOC_MODULE)-decl-list.txt \
-				$(DOC_MODULE)-decl.txt \
-				tmpl/$(DOC_MODULE)-unused.sgml \
-				"tmpl/*.bak" \
-				$(REPORT_FILES) \
-				$(DOC_MODULE).pdf \
-				xml html \
-			; do echo "/$$x"; done; \
-			FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
-			case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
-			if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-types"; then \
-				echo "/$(DOC_MODULE).types"; \
-			fi; \
-			if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-sections"; then \
-				echo "/$(DOC_MODULE)-sections.txt"; \
-			fi; \
-			if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-				for x in \
-					$(SETUP_FILES) \
-					$(DOC_MODULE).types \
-				; do echo "/$$x"; done; \
-			fi; \
-		fi; \
-		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-			for lc in $(DOC_LINGUAS); do \
-				for x in \
-					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
-					$(DOC_PAGES) \
-					$(DOC_INCLUDES) \
-				; do echo "/$$lc/$$x"; done; \
-			done; \
-			for x in \
-				$(_DOC_OMF_ALL) \
-				$(_DOC_DSK_ALL) \
-				$(_DOC_HTML_ALL) \
-				$(_DOC_MOFILES) \
-				$(DOC_H_FILE) \
-				"*/.xml2po.mo" \
-				"*/*.omf.out" \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
-			for lc in $(HELP_LINGUAS); do \
-				for x in \
-					$(HELP_FILES) \
-					"$$lc.stamp" \
-					"$$lc.mo" \
-				; do echo "/$$lc/$$x"; done; \
-			done; \
-		fi; \
-		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
-			for x in \
-				$(gsettings_SCHEMAS:.xml=.valid) \
-				$(gsettings__enum_file) \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(appdata_XML)" = x; then :; else \
-			for x in \
-				$(appdata_XML:.xml=.valid) \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(appstream_XML)" = x; then :; else \
-			for x in \
-				$(appstream_XML:.xml=.valid) \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test -f $(srcdir)/po/Makefile.in.in; then \
-			for x in \
-				po/Makefile.in.in \
-				po/Makefile.in.in~ \
-				po/Makefile.in \
-				po/Makefile \
-				po/Makevars.template \
-				po/POTFILES \
-				po/Rules-quot \
-				po/stamp-it \
-				po/stamp-po \
-				po/.intltool-merge-cache \
-				"po/*.gmo" \
-				"po/*.header" \
-				"po/*.mo" \
-				"po/*.sed" \
-				"po/*.sin" \
-				po/$(GETTEXT_PACKAGE).pot \
-				intltool-extract.in \
-				intltool-merge.in \
-				intltool-update.in \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test -f $(srcdir)/configure; then \
-			for x in \
-				autom4te.cache \
-				configure \
-				config.h \
-				stamp-h1 \
-				libtool \
-				config.lt \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(DEJATOOL)" = x; then :; else \
-			for x in \
-				$(DEJATOOL) \
-			; do echo "/$$x.sum"; echo "/$$x.log"; done; \
-			echo /site.exp; \
-		fi; \
-		if test "x$(am__dirstamp)" = x; then :; else \
-			echo "$(am__dirstamp)"; \
-		fi; \
-		if test "x$(findstring libtool,$(LTCOMPILE))" = x -a "x$(findstring libtool,$(LTCXXCOMPILE))" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
-			for x in \
-				"*.lo" \
-				".libs" "_libs" \
-			; do echo "$$x"; done; \
-		fi; \
-		for x in \
-			.gitignore \
-			$(GITIGNOREFILES) \
-			$(CLEANFILES) \
-			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
-			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
-			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
-			so_locations \
-			$(MOSTLYCLEANFILES) \
-			$(TEST_LOGS) \
-			$(TEST_LOGS:.log=.trs) \
-			$(TEST_SUITE_LOG) \
-			$(TESTS:=.test) \
-			"*.gcda" \
-			"*.gcno" \
-			$(DISTCLEANFILES) \
-			$(am__CONFIG_DISTCLEAN_FILES) \
-			$(CONFIG_CLEAN_FILES) \
-			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-			"*.tab.c" \
-			$(MAINTAINERCLEANFILES) \
-			$(BUILT_SOURCES) \
-			$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
-			$(filter %_vala.stamp,$(DIST_COMMON)) \
-			$(filter %.vapi,$(DIST_COMMON)) \
-			$(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
-			Makefile \
-			Makefile.in \
-			"*.orig" \
-			"*.rej" \
-			"*.bak" \
-			"*~" \
-			".*.sw[nop]" \
-			".dirstamp" \
-		; do echo "/$$x"; done; \
-		for x in \
-			"*.$(OBJEXT)" \
-			$(DEPDIR) \
-		; do echo "$$x"; done; \
-	} | \
-	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
-	sed 's@/[.]/@/@g' | \
-	LC_ALL=C sort | uniq > $@.tmp && \
-	mv $@.tmp $@;
-
-all: $(srcdir)/.gitignore gitignore-recurse-maybe
-gitignore: $(srcdir)/.gitignore gitignore-recurse
-
-gitignore-recurse-maybe:
-	@for subdir in $(DIST_SUBDIRS); do \
-	  case " $(SUBDIRS) " in \
-	    *" $$subdir "*) :;; \
-	    *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
-	  esac; \
-	done
-gitignore-recurse:
-	@for subdir in $(DIST_SUBDIRS); do \
-	    test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \
-	done
-
-maintainer-clean: gitignore-clean
-gitignore-clean:
-	-rm -f $(srcdir)/.gitignore
-
-.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/gst-libs/Makefile.am b/gst-libs/Makefile.am
deleted file mode 100644
index 85cb878323..0000000000
--- a/gst-libs/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = gst
-
--include $(top_srcdir)/git.mk
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
deleted file mode 100644
index 80a5198af9..0000000000
--- a/gst-libs/gst/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = vaapi
-
--include $(top_srcdir)/git.mk
diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
deleted file mode 100644
index 9c76c24ef7..0000000000
--- a/gst-libs/gst/vaapi/Makefile.am
+++ /dev/null
@@ -1,545 +0,0 @@
-noinst_LTLIBRARIES = libgstvaapi.la
-
-if USE_DRM
-noinst_LTLIBRARIES += libgstvaapi-drm.la
-endif
-
-if USE_X11
-noinst_LTLIBRARIES += libgstvaapi-x11.la
-endif
-
-if USE_GLX
-noinst_LTLIBRARIES += libgstvaapi-glx.la
-endif
-
-if USE_EGL
-noinst_LTLIBRARIES += libgstvaapi-egl.la
-endif
-
-if USE_WAYLAND
-noinst_LTLIBRARIES += libgstvaapi-wayland.la
-endif
-
-libgstvaapi_cflags =				\
-	-DGST_USE_UNSTABLE_API			\
-	-I$(top_srcdir)/gst-libs		\
-	-I$(top_builddir)/gst-libs		\
-	$(GST_BASE_CFLAGS)			\
-	$(GST_BASEVIDEO_CFLAGS)			\
-	$(GST_VIDEO_CFLAGS)			\
-	$(GST_CFLAGS)				\
-	$(GST_CODEC_PARSERS_CFLAGS)		\
-	$(LIBVA_CFLAGS)				\
-	$(NULL)
-
-libgstvaapi_libs =				\
-	$(GST_BASE_LIBS)			\
-	$(GST_BASEVIDEO_LIBS)			\
-	$(GST_LIBS)				\
-	$(GST_VIDEO_LIBS)			\
-	$(GST_CODEC_PARSERS_LIBS)		\
-	$(LIBVA_LIBS)				\
-	$(NULL)
-
-libgstvaapi_source_c =				\
-	gstvaapibufferproxy.c			\
-	gstvaapicodec_objects.c			\
-	gstvaapicontext.c			\
-	gstvaapidecoder.c			\
-	gstvaapidecoder_dpb.c			\
-	gstvaapidecoder_h264.c			\
-	gstvaapidecoder_mpeg2.c			\
-	gstvaapidecoder_mpeg4.c			\
-	gstvaapidecoder_objects.c		\
-	gstvaapidecoder_unit.c			\
-	gstvaapidecoder_vc1.c			\
-	gstvaapidisplay.c			\
-	gstvaapifilter.c			\
-	gstvaapiimage.c				\
-	gstvaapiimagepool.c			\
-	gstvaapiminiobject.c			\
-	gstvaapiobject.c			\
-	gstvaapiparser_frame.c			\
-	gstvaapipixmap.c			\
-	gstvaapiprofile.c			\
-	gstvaapiprofilecaps.c			\
-	gstvaapisubpicture.c			\
-	gstvaapisurface.c			\
-	gstvaapisurface_drm.c			\
-	gstvaapisurfacepool.c			\
-	gstvaapisurfaceproxy.c			\
-	gstvaapitexture.c			\
-	gstvaapitexturemap.c			\
-	gstvaapiutils.c				\
-	gstvaapiutils_core.c			\
-	gstvaapiutils_h264.c			\
-	gstvaapiutils_h265.c			\
-	gstvaapiutils_h26x.c			\
-	gstvaapiutils_mpeg2.c			\
-	gstvaapivalue.c				\
-	gstvaapivideopool.c			\
-	gstvaapiwindow.c			\
-	video-format.c				\
-	$(NULL)
-
-libgstvaapi_source_h =				\
-	gstvaapibufferproxy.h			\
-	gstvaapidecoder.h			\
-	gstvaapidecoder_h264.h			\
-	gstvaapidecoder_h265.h			\
-	gstvaapidecoder_mpeg2.h			\
-	gstvaapidecoder_mpeg4.h			\
-	gstvaapidecoder_vc1.h			\
-	gstvaapidisplay.h			\
-	gstvaapifilter.h			\
-	gstvaapiimage.h				\
-	gstvaapiimagepool.h			\
-	gstvaapiobject.h			\
-	gstvaapipixmap.h			\
-	gstvaapiprofile.h			\
-	gstvaapiprofilecaps.h			\
-	gstvaapisubpicture.h			\
-	gstvaapisurface.h			\
-	gstvaapisurface_drm.h			\
-	gstvaapisurfacepool.h			\
-	gstvaapisurfaceproxy.h			\
-	gstvaapitexture.h			\
-	gstvaapitexturemap.h			\
-	gstvaapitypes.h				\
-	gstvaapiutils_h264.h			\
-	gstvaapiutils_h265.h			\
-	gstvaapiutils_mpeg2.h			\
-	gstvaapivalue.h				\
-	gstvaapivideopool.h			\
-	gstvaapiwindow.h			\
-	video-format.h				\
-	$(NULL)
-
-libgstvaapi_source_priv_h =			\
-	gstvaapibufferproxy_priv.h		\
-	gstvaapicodec_objects.h			\
-	gstvaapicompat.h			\
-	gstvaapicontext.h			\
-	gstvaapidebug.h				\
-	gstvaapidecoder_dpb.h			\
-	gstvaapidecoder_objects.h		\
-	gstvaapidecoder_priv.h			\
-	gstvaapidecoder_unit.h			\
-	gstvaapidisplay_priv.h			\
-	gstvaapiimage_priv.h			\
-	gstvaapiminiobject.h			\
-	gstvaapiobject_priv.h			\
-	gstvaapiparser_frame.h			\
-	gstvaapipixmap_priv.h			\
-	gstvaapisurface_priv.h			\
-	gstvaapisurfaceproxy_priv.h		\
-	gstvaapitexture_priv.h			\
-	gstvaapiutils.h				\
-	gstvaapiutils_core.h			\
-	gstvaapiutils_h264_priv.h		\
-	gstvaapiutils_h265_priv.h		\
-	gstvaapiutils_h26x_priv.h		\
-	gstvaapiutils_mpeg2_priv.h		\
-	gstvaapivideopool_priv.h		\
-	gstvaapiwindow_priv.h			\
-	gstvaapiworkarounds.h			\
-	sysdeps.h				\
-	$(NULL)
-
-libgstvaapi_jpegdec_source_c = gstvaapidecoder_jpeg.c
-libgstvaapi_jpegdec_source_h = gstvaapidecoder_jpeg.h
-libgstvaapi_source_c += $(libgstvaapi_jpegdec_source_c)
-libgstvaapi_source_h += $(libgstvaapi_jpegdec_source_h)
-
-libgstvaapi_vp8dec_source_c = gstvaapidecoder_vp8.c
-libgstvaapi_vp8dec_source_h = gstvaapidecoder_vp8.h
-libgstvaapi_source_c += $(libgstvaapi_vp8dec_source_c)
-libgstvaapi_source_h += $(libgstvaapi_vp8dec_source_h)
-
-libgstvaapi_hevcdec_source_c = gstvaapidecoder_h265.c
-libgstvaapi_hevcdec_source_h = gstvaapidecoder_h265.h
-libgstvaapi_source_c += $(libgstvaapi_hevcdec_source_c)
-libgstvaapi_source_h += $(libgstvaapi_hevcdec_source_h)
-
-libgstvaapi_vp9dec_source_c = gstvaapidecoder_vp9.c
-libgstvaapi_vp9dec_source_h = gstvaapidecoder_vp9.h
-libgstvaapi_source_c += $(libgstvaapi_vp9dec_source_c)
-libgstvaapi_source_h += $(libgstvaapi_vp9dec_source_h)
-
-libgstvaapi_enc_source_c =			\
-	gstvaapicodedbuffer.c			\
-	gstvaapicodedbufferpool.c		\
-	gstvaapicodedbufferproxy.c		\
-	gstvaapiencoder.c			\
-	gstvaapiencoder_h264.c			\
-	gstvaapiencoder_h265.c			\
-	gstvaapiencoder_jpeg.c			\
-	gstvaapiencoder_mpeg2.c			\
-	gstvaapiencoder_objects.c		\
-	gstvaapiencoder_vp8.c			\
-	$(NULL)
-
-libgstvaapi_enc_source_h =			\
-	gstvaapicodedbuffer.h			\
-	gstvaapicodedbufferpool.h		\
-	gstvaapicodedbufferproxy.h		\
-	gstvaapiencoder.h			\
-	gstvaapiencoder_h264.h			\
-	gstvaapiencoder_h265.h			\
-	gstvaapiencoder_jpeg.h			\
-	gstvaapiencoder_mpeg2.h			\
-	gstvaapiencoder_vp8.h			\
-	$(NULL)
-
-libgstvaapi_enc_source_priv_h =			\
-	gstvaapicodedbuffer_priv.h		\
-	gstvaapicodedbufferproxy_priv.h		\
-	gstvaapiencoder_mpeg2_priv.h		\
-	gstvaapiencoder_objects.h		\
-	gstvaapiencoder_priv.h			\
-	$(NULL)
-
-if USE_ENCODERS
-libgstvaapi_source_c += $(libgstvaapi_enc_source_c)
-libgstvaapi_source_h += $(libgstvaapi_enc_source_h)
-libgstvaapi_source_priv_h += $(libgstvaapi_enc_source_priv_h)
-endif
-
-libgstvaapi_vp9enc_source_c = gstvaapiencoder_vp9.c
-libgstvaapi_vp9enc_source_h = gstvaapiencoder_vp9.h
-if USE_VP9_ENCODER
-libgstvaapi_source_c += $(libgstvaapi_vp9enc_source_c)
-libgstvaapi_source_h += $(libgstvaapi_vp9enc_source_h)
-endif
-
-libgstvaapi_h264feienc_source_c =		\
-	gstvaapifeiutils_h264.c			\
-	gstvaapifei_objects.c			\
-	gstvaapifeienc_h264.c                   \
-	gstvaapifeipak_h264.c                   \
-	gstvaapiencoder_h264_fei.c              \
-	$(NULL)
-libgstvaapi_h264feienc_source_h =		\
-	gstvaapifeiutils_h264.h			\
-	gstvaapifei_objects.h			\
-	gstvaapifeienc_h264.h                   \
-	gstvaapifeipak_h264.h                   \
-	gstvaapiencoder_h264_fei.h              \
-	$(NULL)
-libgstvaapi_h264feienc_source_priv_h =          \
-	gstvaapifei_objects_priv.h              \
-	$(NULL)
-if USE_H264_FEI_ENCODER
-libgstvaapi_source_c += $(libgstvaapi_h264feienc_source_c)
-libgstvaapi_source_h += $(libgstvaapi_h264feienc_source_h)
-libgstvaapi_source_priv_h += $(libgstvaapi_h264feienc_source_priv_h)
-endif
-
-libgstvaapi_drm_source_c =			\
-	gstvaapidisplay_drm.c			\
-	gstvaapiwindow_drm.c			\
-	$(NULL)
-
-libgstvaapi_drm_source_h =			\
-	gstvaapidisplay_drm.h			\
-	gstvaapiwindow_drm.h			\
-	$(NULL)
-
-libgstvaapi_drm_source_priv_h =			\
-	gstvaapicompat.h			\
-	gstvaapidisplay_drm_priv.h		\
-	$(NULL)
-
-libgstvaapi_x11_source_c =			\
-	gstvaapidisplay_x11.c			\
-	gstvaapipixmap_x11.c			\
-	gstvaapiutils_x11.c			\
-	gstvaapiwindow_x11.c			\
-	$(NULL)
-
-libgstvaapi_x11_source_h =			\
-	gstvaapidisplay_x11.h			\
-	gstvaapipixmap_x11.h			\
-	gstvaapiwindow_x11.h			\
-	$(NULL)
-
-libgstvaapi_x11_source_priv_h =			\
-	gstvaapicompat.h			\
-	gstvaapidisplay_x11_priv.h		\
-	gstvaapiutils_x11.h			\
-	gstvaapiwindow_x11_priv.h		\
-	$(NULL)
-
-libgstvaapi_glx_source_c =			\
-	gstvaapidisplay_glx.c			\
-	gstvaapitexture_glx.c			\
-	gstvaapiutils_glx.c			\
-	gstvaapiwindow_glx.c			\
-	$(NULL)
-
-libgstvaapi_glx_source_h =			\
-	gstvaapidisplay_glx.h			\
-	gstvaapitexture.h			\
-	gstvaapitexture_glx.h			\
-	gstvaapiwindow_glx.h			\
-	$(NULL)
-
-libgstvaapi_glx_source_priv_h =			\
-	gstvaapicompat.h			\
-	gstvaapidisplay_glx_priv.h		\
-	gstvaapiutils.h				\
-	gstvaapiutils_glx.h			\
-	$(NULL)
-
-libgstvaapi_egl_source_c =			\
-	gstvaapidisplay_egl.c			\
-	gstvaapisurface_egl.c			\
-	gstvaapitexture_egl.c			\
-	gstvaapiutils_egl.c			\
-	gstvaapiwindow_egl.c			\
-	$(NULL)
-
-libgstvaapi_egl_source_h =			\
-	gstvaapidisplay_egl.h			\
-	gstvaapisurface_egl.h			\
-	gstvaapitexture_egl.h			\
-	gstvaapiwindow_egl.h			\
-	$(NULL)
-
-libgstvaapi_egl_source_priv_h =			\
-	egl_compat.h				\
-	egl_vtable.h				\
-	gstvaapidisplay_egl_priv.h		\
-	gstvaapiutils_egl.h			\
-	ogl_compat.h				\
-	$(NULL)
-
-BUILT_SOURCES=
-CLEANFILES=
-
-# Generate the necessary files for XDG-shell
-if USE_WAYLAND
-xdg_shell_protocol_spec = $(WAYLAND_PROTOCOLS_DATADIR)/stable/xdg-shell/xdg-shell.xml
-xdg_shell_header = xdg-shell-client-protocol.h
-xdg_shell_source = xdg-shell-client-protocol.c
-
-$(xdg_shell_header): $(xdg_shell_protocol_spec)
-	$(AM_V_GEN) $(WAYLAND_SCANNER) client-header < $< > $@
-$(xdg_shell_source): $(xdg_shell_protocol_spec)
-	$(AM_V_GEN) $(WAYLAND_SCANNER) private-code < $< > $@
-
-BUILT_SOURCES += $(xdg_shell_header) $(xdg_shell_source)
-CLEANFILES += $(BUILT_SOURCES)
-endif
-
-libgstvaapi_wayland_source_c =			\
-	gstvaapidisplay_wayland.c		\
-	gstvaapiwindow_wayland.c		\
-	$(xdg_shell_source)			\
-	$(NULL)
-
-libgstvaapi_wayland_source_h =			\
-	gstvaapidisplay_wayland.h		\
-	gstvaapiwindow_wayland.h		\
-	$(NULL)
-
-libgstvaapi_wayland_source_priv_h =		\
-	gstvaapicompat.h			\
-	gstvaapidisplay_wayland_priv.h		\
-	$(xdg_shell_header)			\
-	$(NULL)
-
-libgstvaapi_la_SOURCES =			\
-	$(libgstvaapi_source_c)			\
-	$(libgstvaapi_source_priv_h)		\
-	$(libgstvaapi_source_h)			\
-	$(NULL)
-
-libgstvaapi_la_CFLAGS =				\
-	$(libgstvaapi_cflags)			\
-	$(NULL)
-
-libgstvaapi_la_LIBADD =				\
-	$(libgstvaapi_libs)			\
-	$(NULL)
-
-libgstvaapi_la_LDFLAGS =			\
-	$(GST_ALL_LDFLAGS)			\
-	$(NULL)
-
-libgstvaapi_drm_la_SOURCES =			\
-	$(libgstvaapi_drm_source_c)		\
-	$(libgstvaapi_drm_source_priv_h)	\
-	$(libgstvaapi_drm_source_h)		\
-	$(NULL)
-
-libgstvaapi_drm_la_CFLAGS =			\
-	-DGST_USE_UNSTABLE_API			\
-	-I$(top_srcdir)/gst-libs		\
-	$(GLIB_CFLAGS)				\
-	$(GST_BASE_CFLAGS)			\
-	$(GST_VIDEO_CFLAGS)			\
-	$(UDEV_CFLAGS)				\
-	$(DRM_CFLAGS)				\
-	$(LIBVA_DRM_CFLAGS)			\
-	$(NULL)
-
-libgstvaapi_drm_la_LIBADD =			\
-	$(GLIB_LIBS)				\
-	$(GST_LIBS)				\
-	$(UDEV_LIBS)				\
-	$(DRM_LIBS)				\
-	$(LIBVA_DRM_LIBS)			\
-	$(NULL)
-
-libgstvaapi_drm_la_LDFLAGS =			\
-	$(GST_ALL_LDFLAGS)			\
-	$(NULL)
-
-libgstvaapi_x11_la_SOURCES =			\
-	$(libgstvaapi_x11_source_c)		\
-	$(libgstvaapi_x11_source_priv_h)	\
-	$(libgstvaapi_x11_source_h)		\
-	$(NULL)
-
-libgstvaapi_x11_la_CFLAGS =			\
-	-DGST_USE_UNSTABLE_API			\
-	-I$(top_srcdir)/gst-libs		\
-	$(GLIB_CFLAGS)				\
-	$(GST_BASE_CFLAGS)			\
-	$(GST_VIDEO_CFLAGS)			\
-	$(X11_CFLAGS)				\
-	$(XRANDR_CFLAGS)			\
-	$(XRENDER_CFLAGS)			\
-	$(LIBVA_X11_CFLAGS)			\
-	$(NULL)
-
-libgstvaapi_x11_la_LIBADD =			\
-	$(GLIB_LIBS)				\
-	$(GST_LIBS)				\
-	$(X11_LIBS)				\
-	$(XRANDR_LIBS)				\
-	$(XRENDER_LIBS)				\
-	$(LIBVA_X11_LIBS)			\
-	$(NULL)
-
-libgstvaapi_x11_la_LDFLAGS =			\
-	$(GST_ALL_LDFLAGS)			\
-	$(NULL)
-
-libgstvaapi_glx_la_SOURCES =			\
-	$(libgstvaapi_glx_source_c)		\
-	$(libgstvaapi_glx_source_priv_h)	\
-	$(libgstvaapi_glx_source_h)		\
-	$(NULL)
-
-libgstvaapi_glx_la_CFLAGS =			\
-	-DGST_USE_UNSTABLE_API			\
-	-I$(top_srcdir)/gst-libs		\
-	$(GLIB_CFLAGS)				\
-	$(GST_BASE_CFLAGS)			\
-	$(GST_VIDEO_CFLAGS)			\
-	$(GL_CFLAGS)				\
-	$(LIBVA_X11_CFLAGS)			\
-	$(NULL)
-
-libgstvaapi_glx_la_LIBADD =			\
-	$(GLIB_LIBS)				\
-	$(GST_LIBS)				\
-	$(GST_BASE_LIBS)			\
-	$(GST_VIDEO_LIBS)			\
-	$(X11_LIBS)				\
-	$(GL_LIBS)				\
-	$(LIBVA_X11_LIBS)			\
-	$(DLOPEN_LIBS)				\
-	$(NULL)
-
-libgstvaapi_glx_la_LDFLAGS =			\
-	$(GST_ALL_LDFLAGS)			\
-	$(NULL)
-
-libgstvaapi_egl_la_SOURCES =			\
-	$(libgstvaapi_egl_source_c)		\
-	$(libgstvaapi_egl_source_priv_h)	\
-	$(libgstvaapi_egl_source_h)		\
-	$(NULL)
-
-libgstvaapi_egl_la_CFLAGS =			\
-	-DGST_USE_UNSTABLE_API			\
-	-I$(top_srcdir)/gst-libs		\
-	$(GLIB_CFLAGS)				\
-	$(GMODULE_CFLAGS)			\
-	$(GST_BASE_CFLAGS)			\
-	$(GST_VIDEO_CFLAGS)			\
-	$(GST_GL_CFLAGS)			\
-	$(LIBVA_CFLAGS)				\
-	$(LIBVA_WAYLAND_CFLAGS)			\
-	$(EGL_CFLAGS)				\
-	$(NULL)
-
-libgstvaapi_egl_la_LIBADD =			\
-	$(GLIB_LIBS)				\
-	$(GMODULE_LIBS)				\
-	$(GST_LIBS)				\
-	$(GST_BASE_LIBS)			\
-	$(GST_VIDEO_LIBS)			\
-	$(GST_GL_LIBS)				\
-	$(EGL_LIBS)				\
-	$(NULL)
-
-libgstvaapi_egl_la_LDFLAGS =			\
-	$(GST_ALL_LDFLAGS)			\
-	$(NULL)
-
-libgstvaapi_wayland_la_SOURCES = 		\
-	$(libgstvaapi_wayland_source_c)		\
-	$(libgstvaapi_wayland_source_priv_h)	\
-	$(libgstvaapi_wayland_source_h)		\
-	$(NULL)
-
-libgstvaapi_wayland_la_CFLAGS = 		\
-	-DGST_USE_UNSTABLE_API			\
-	-I$(top_srcdir)/gst-libs		\
-	$(GLIB_CFLAGS)				\
-	$(GST_BASE_CFLAGS)			\
-	$(GST_VIDEO_CFLAGS)			\
-	$(WAYLAND_CFLAGS)			\
-	$(LIBVA_WAYLAND_CFLAGS)			\
-	$(NULL)
-
-libgstvaapi_wayland_la_LIBADD = 		\
-	$(GLIB_LIBS)				\
-	$(GST_LIBS)				\
-	$(GST_VIDEO_LIBS)			\
-	$(WAYLAND_LIBS)				\
-	$(LIBVA_WAYLAND_LIBS)			\
-	$(NULL)
-
-libgstvaapi_wayland_la_LDFLAGS = 		\
-	$(GST_ALL_LDFLAGS)			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(libgstvaapi_enc_source_c)		\
-	$(libgstvaapi_enc_source_h)		\
-	$(libgstvaapi_enc_source_priv_h)	\
-	$(libgstvaapi_jpegdec_source_c)		\
-	$(libgstvaapi_jpegdec_source_h)		\
-	$(libgstvaapi_vp8dec_source_c)		\
-	$(libgstvaapi_vp8dec_source_h)		\
-	$(libgstvaapi_hevcdec_source_c)		\
-	$(libgstvaapi_hevcdec_source_h)		\
-	$(libgstvaapi_hevcdec_source_priv_h)	\
-	$(libgstvaapi_vp9dec_source_c)		\
-	$(libgstvaapi_vp9dec_source_h)		\
-	$(libgstvaapi_vp9enc_source_h)		\
-	$(libgstvaapi_vp9enc_source_c)		\
-	$(libgstvaapi_egl_source_c)		\
-	$(libgstvaapi_egl_source_h)		\
-	$(libgstvaapi_egl_source_priv_h)	\
-	$(libgstvaapi_h264feienc_source_h)      \
-	$(libgstvaapi_h264feienc_source_c)      \
-	$(libgstvaapi_h264feienc_source_priv_h) \
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/gst/Makefile.am b/gst/Makefile.am
deleted file mode 100644
index 80a5198af9..0000000000
--- a/gst/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = vaapi
-
--include $(top_srcdir)/git.mk
diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am
deleted file mode 100644
index a829c914e7..0000000000
--- a/gst/vaapi/Makefile.am
+++ /dev/null
@@ -1,166 +0,0 @@
-plugin_LTLIBRARIES = libgstvaapi.la
-
-libgstvaapi_CFLAGS = \
-	$(LIBVA_CFLAGS)			\
-	-DGST_USE_UNSTABLE_API		\
-	-I$(top_srcdir)/gst-libs	\
-	-I$(top_builddir)/gst-libs	\
-	$(NULL)
-
-libgstvaapi_LIBS = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi.la
-
-if USE_DRM
-libgstvaapi_LIBS +=$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm.la
-endif
-
-if USE_X11
-libgstvaapi_LIBS += \
-	$(X11_LIBS) \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11.la
-endif
-
-if USE_GLX
-libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx.la
-endif
-
-if USE_EGL
-libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl.la
-endif
-
-if USE_WAYLAND
-libgstvaapi_CFLAGS += \
-	$(WAYLAND_CFLAGS)	\
-	$(NULL)
-
-libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland.la
-endif
-
-if USE_GST_GL_HELPERS
-libgstvaapi_CFLAGS	+= $(GST_GL_CFLAGS)
-libgstvaapi_LIBS	+= $(GST_GL_LIBS)
-endif
-
-libgstvaapi_source_c = \
-	gstvaapi.c		\
-	gstvaapidecode.c	\
-	gstvaapidecodedoc.c	\
-	gstvaapipluginbase.c	\
-	gstvaapipluginutil.c	\
-	gstvaapipostproc.c	\
-	gstvaapipostprocutil.c	\
-	gstvaapisink.c		\
-	gstvaapivideobuffer.c	\
-	gstvaapivideocontext.c	\
-	gstvaapivideometa.c	\
-	gstvaapidecodebin.c	\
-	gstvaapivideobufferpool.c \
-	gstvaapivideomemory.c	\
-	gstvaapivideometa_texture.c \
-	gstvaapidecode_props.c	\
-	$(NULL)
-
-libgstvaapi_source_h = \
-	gstcompat.h		\
-	gstvaapi.h		\
-	gstvaapidecode.h	\
-	gstvaapipluginbase.h	\
-	gstvaapipluginutil.h	\
-	gstvaapipostproc.h	\
-	gstvaapipostprocutil.h	\
-	gstvaapisink.h		\
-	gstvaapivideobuffer.h	\
-	gstvaapivideocontext.h	\
-	gstvaapivideometa.h	\
-	gstvaapidecodebin.h	\
-	gstvaapivideobufferpool.h \
-	gstvaapivideomemory.h	\
-	gstvaapivideometa_texture.h \
-	gstvaapidecode_props.h	\
-	$(NULL)
-
-libgstvaapi_enc_source_c =	\
-	gstvaapiencode.c	\
-	gstvaapiencode_h264.c	\
-	gstvaapiencode_h265.c	\
-	gstvaapiencode_jpeg.c	\
-	gstvaapiencode_mpeg2.c	\
-	gstvaapiencode_vp8.c	\
-	$(NULL)
-
-libgstvaapi_enc_source_h =	\
-	gstvaapiencode.h	\
-	gstvaapiencode_h264.h	\
-	gstvaapiencode_h265.h	\
-	gstvaapiencode_jpeg.h	\
-	gstvaapiencode_mpeg2.h	\
-	gstvaapiencode_vp8.h	\
-	$(NULL)
-
-if USE_ENCODERS
-libgstvaapi_source_c += $(libgstvaapi_enc_source_c)
-libgstvaapi_source_h += $(libgstvaapi_enc_source_h)
-endif
-
-libgstvaapi_vp9enc_source_c = gstvaapiencode_vp9.c
-libgstvaapi_vp9enc_source_h = gstvaapiencode_vp9.h
-if USE_VP9_ENCODER
-libgstvaapi_source_c += $(libgstvaapi_vp9enc_source_c)
-libgstvaapi_source_h += $(libgstvaapi_vp9enc_source_h)
-endif
-
-libgstvaapi_h264feienc_source_c =	  \
-		gstvaapifeivideometa.c    \
-		gstvaapiencode_h264_fei.c \
-		$(NULL)
-libgstvaapi_h264feienc_source_h =	  \
-		gstvaapifeivideometa.h    \
-		gstvaapiencode_h264_fei.h \
-		$(NULL)
-
-if USE_H264_FEI_ENCODER
-libgstvaapi_source_c += $(libgstvaapi_h264feienc_source_c)
-libgstvaapi_source_h += $(libgstvaapi_h264feienc_source_h)
-endif
-
-libgstvaapi_la_SOURCES		= $(libgstvaapi_source_c)
-noinst_HEADERS			= $(libgstvaapi_source_h)
-
-libgstvaapi_la_CFLAGS =	\
-	$(libgstvaapi_CFLAGS)	\
-	$(GST_CFLAGS)		\
-	$(GST_BASE_CFLAGS)	\
-	$(GST_VIDEO_CFLAGS)	\
-	$(GST_PBUTILS_CFLAGS)	\
-	$(GST_INTERFACES_CFLAGS) \
-	$(GST_BASEVIDEO_CFLAGS)	\
-	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_ALLOCATORS_CFLAGS)
-
-libgstvaapi_la_LIBADD =	\
-	$(libgstvaapi_LIBS)	\
-	$(GST_LIBS)		\
-	$(GST_BASE_LIBS)	\
-	$(GST_VIDEO_LIBS)	\
-	$(GST_PBUTILS_LIBS)	\
-	$(GST_INTERFACES_LIBS)	\
-	$(GST_BASEVIDEO_LIBS)	\
-	$(GST_PLUGINS_BASE_LIBS) \
-	$(GST_ALLOCATORS_LIBS)
-
-libgstvaapi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvaapi_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST = \
-	$(libgstvaapi_enc_source_c)	 \
-	$(libgstvaapi_enc_source_h)	 \
-	$(libgstvaapi_vp9enc_source_c)   \
-	$(libgstvaapi_vp9enc_source_h)   \
-	$(libgstvaapi_h264feienc_source_c) \
-	$(libgstvaapi_h264feienc_source_h) \
-	$(libgstvaapi_egl_source_c)	\
-	$(libgstvaapi_egl_source_h)	\
-	$(libgstvaapi_1_2p_source_c)	 \
-	$(libgstvaapi_1_2p_source_h)	 \
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index 398f95103f..0000000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = $(wildcard *.m4)
-
--include $(top_srcdir)/git.mk
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 892e3966fc..0000000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,182 +0,0 @@
-noinst_PROGRAMS = \
-	simple-decoder			\
-	test-decode			\
-	test-display			\
-	test-filter			\
-	test-surfaces			\
-	test-windows			\
-	test-subpicture			\
-	$(NULL)
-
-if USE_ENCODERS
-noinst_PROGRAMS += \
-	simple-encoder			\
-	$(NULL)
-endif
-
-if USE_H264_FEI_ENCODER
-noinst_PROGRAMS += \
-        test-fei-enc-out            	\
-        test-fei-enc-in            	\
-        $(NULL)
-endif
-
-if USE_GLX
-noinst_PROGRAMS += \
-	test-textures			\
-	$(NULL)
-endif
-
-TEST_CFLAGS = \
-	-DGST_USE_UNSTABLE_API		\
-	-I$(top_srcdir)/gst-libs	\
-	-I$(top_builddir)/gst-libs	\
-	$(LIBVA_CFLAGS)			\
-	$(GST_CFLAGS)			\
-	$(GST_VIDEO_CFLAGS)		\
-	$(NULL)
-
-GST_VAAPI_LIBS = $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi.la
-TEST_LIBS = \
-	$(LIBVA_LIBS)			\
-	$(GST_LIBS)			\
-	$(NULL)
-
-if USE_DRM
-GST_VAAPI_LIBS  += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm.la
-TEST_CFLAGS	+= $(LIBVA_DRM_CFLAGS)
-TEST_LIBS	+= $(LIBVA_DRM_LIBS)
-endif
-
-if USE_X11
-GST_VAAPI_LIBS  += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11.la
-TEST_CFLAGS	+= $(X11_CFLAGS)
-TEST_LIBS	+= \
-	$(LIBVA_X11_LIBS)		\
-	$(X11_LIBS)			\
-	$(NULL)
-endif
-
-if USE_GLX
-GST_VAAPI_LIBS  += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx.la
-TEST_CFLAGS	+= $(X11_CFLAGS) $(GL_CFLAGS)
-TEST_LIBS	+= \
-	$(LIBVA_GLX_LIBS)		\
-	$(X11_LIBS)			\
-	$(GL_LIBS)			\
-	$(NULL)
-endif
-
-if USE_EGL
-GST_VAAPI_LIBS  += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl.la
-TEST_CFLAGS	+= $(EGL_CFLAGS)
-TEST_LIBS	+= \
-	$(LIBVA_EGL_LIBS)		\
-	$(EGL_LIBS)			\
-	$(NULL)
-endif
-
-if USE_WAYLAND
-GST_VAAPI_LIBS  += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland.la
-TEST_CFLAGS	+= $(WAYLAND_CFLAGS)
-TEST_LIBS	+= \
-	$(LIBVA_WAYLAND_LIBS)		\
-	$(WAYLAND_LIBS)			\
-	$(NULL)
-endif
-
-test_utils_dec_source_c =	\
-	decoder.c	\
-	test-h264.c	\
-	test-jpeg.c	\
-	test-mpeg2.c	\
-	test-mpeg4.c	\
-	test-vc1.c	\
-	$(NULL)
-test_utils_dec_source_h	= $(test_utils_dec_source_c:%.c=%.h) test-decode.h
-
-test_utils_source_c	= codec.c image.c output.c
-test_utils_source_h	= codec.h image.h output.h
-
-noinst_LTLIBRARIES	= libutils.la libutils_dec.la
-
-libutils_la_SOURCES	= $(test_utils_source_c)
-libutils_la_CFLAGS	= $(TEST_CFLAGS)
-libutils_la_LDFLAGS     = $(GST_VAAPI_LIBS)
-
-libutils_dec_la_SOURCES	= $(test_utils_dec_source_c)
-libutils_dec_la_CFLAGS	= $(TEST_CFLAGS)
-libutils_dec_la_LDFLAGS = $(GST_VAAPI_LIBS)
-
-test_decode_SOURCES	= test-decode.c
-test_decode_CFLAGS	= $(TEST_CFLAGS)
-test_decode_LDADD	= libutils.la libutils_dec.la $(TEST_LIBS)
-
-test_display_SOURCES	= test-display.c
-test_display_CFLAGS	= $(TEST_CFLAGS)
-test_display_LDFLAGS    = $(GST_VAAPI_LIBS)
-test_display_LDADD	= libutils.la $(TEST_LIBS)
-
-test_filter_SOURCES	= test-filter.c
-test_filter_CFLAGS	= $(TEST_CFLAGS)
-test_filter_LDFLAGS     = $(GST_VAAPI_LIBS)
-test_filter_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
-
-test_surfaces_SOURCES	= test-surfaces.c
-test_surfaces_CFLAGS	= $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
-test_surfaces_LDFLAGS   = $(GST_VAAPI_LIBS)
-test_surfaces_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
-
-test_subpicture_SOURCES = test-subpicture.c test-subpicture-data.c
-test_subpicture_CFLAGS  = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
-test_subpicture_LDADD   = libutils.la libutils_dec.la $(TEST_LIBS) \
-	$(GST_VIDEO_LIBS)
-test_subpicture_LDFLAGS = $(GST_VAAPI_LIBS)
-
-test_windows_SOURCES	= test-windows.c
-test_windows_CFLAGS	= $(TEST_CFLAGS)
-test_windows_LDFLAGS    = $(GST_VAAPI_LIBS)
-test_windows_LDADD	= libutils.la $(TEST_LIBS)
-
-test_textures_SOURCES	= test-textures.c
-test_textures_CFLAGS	= $(TEST_CFLAGS)
-test_textures_LDFLAGS   = $(GST_VAAPI_LIBS)
-test_textures_LDADD	= libutils.la $(TEST_LIBS)
-
-test_fei_enc_out_SOURCES     = test-fei-enc-out.c ../gst/vaapi/gstvaapifeivideometa.h
-test_fei_enc_out_CFLAGS      = $(TEST_CFLAGS)
-test_fei_enc_out_LDFLAGS     = $(GST_VAAPI_LIBS)
-test_fei_enc_out_LDADD       = libutils.la $(TEST_LIBS)
-
-test_fei_enc_in_sources_c   = test-fei-enc-in.c ../gst/vaapi/gstvaapifeivideometa.h y4mreader.c
-test_fei_enc_in_sources_h   = y4mreader.h
-test_fei_enc_in_SOURCES     = $(test_fei_enc_in_sources_c)
-test_fei_enc_in_CFLAGS      = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
-test_fei_enc_in_LDFLAGS     = $(GST_VAAPI_LIBS)
-test_fei_enc_in_LDADD       = libutils.la $(TEST_LIBS)  $(GST_VIDEO_LIBS)
-
-simple_decoder_source_c	= simple-decoder.c
-simple_decoder_source_h	=
-simple_decoder_SOURCES	= $(simple_decoder_source_c)
-simple_decoder_CFLAGS	= $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
-simple_decoder_LDFLAGS  = $(GST_VAAPI_LIBS)
-simple_decoder_LDADD	= libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
-
-simple_encoder_source_c = simple-encoder.c y4mreader.c
-simple_encoder_source_h = y4mreader.h
-simple_encoder_SOURCES  = $(simple_encoder_source_c)
-simple_encoder_CFLAGS   = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS)
-simple_encoder_LDFLAGS  = $(GST_VAAPI_LIBS)
-simple_encoder_LDADD    = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS)
-
-EXTRA_DIST = \
-	test-subpicture-data.h		\
-	$(simple_decoder_source_h)	\
-	$(simple_encoder_source_h)	\
-	$(test_utils_dec_source_h)	\
-	$(test_utils_source_h)		\
-	$(NULL)
-
-SUBDIRS = elements
-
--include $(top_srcdir)/git.mk
diff --git a/tests/elements/Makefile.am b/tests/elements/Makefile.am
deleted file mode 100644
index 742d923a67..0000000000
--- a/tests/elements/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-noinst_PROGRAMS = \
-	test-vaapisink  \
-	test-vaapipostproc  \
-	test-roi  \
-	$(NULL)
-
-TEST_CFLAGS = \
-	-DGST_USE_UNSTABLE_API		\
-	$(GST_CFLAGS)			\
-	$(GST_VIDEO_CFLAGS)		\
-	$(NULL)
-
-TEST_LIBS = \
-	$(GST_LIBS) 			\
-	$(GST_VIDEO_LIBS)		\
-	$(NULL)
-
-test_vaapisink_SOURCES	= test-vaapisink.c
-test_vaapisink_CFLAGS	= $(TEST_CFLAGS)
-test_vaapisink_LDADD	= $(TEST_LIBS)
-
-test_vaapipostproc_SOURCES	= test-vaapipostproc.c
-test_vaapipostproc_CFLAGS	= $(TEST_CFLAGS)
-test_vaapipostproc_LDADD	= $(TEST_LIBS)
-
-test_roi_SOURCES = test-roi.c
-test_roi_CFLAGS  = $(TEST_CFLAGS)
-test_roi_LDADD   = $(TEST_LIBS)
-
-if USE_GTK
-noinst_PROGRAMS += test-vaapicontext
-
-test_vaapicontext_SOURCES = test-vaapicontext.c
-test_vaapicontext_CFLAGS = \
-	$(TEST_CFLAGS) 		\
-	$(GTK3_CFLAGS) 		\
-	$(X11_CFLAGS)  		\
-	$(LIBVA_CFLAGS)		\
-	$(LIBVA_X11_CFLAGS)	\
-	$(NULL)
-test_vaapicontext_LDADD = \
-	$(TEST_LIBS) 		\
-	$(GTK3_LIBS) 		\
-	$(X11_LIBS) 		\
-	$(LIBVA_LIBS)		\
-	$(LIBVA_X11_LIBS)	\
-	$(NULL)
-endif
-
--include $(top_srcdir)/git.mk