build: Remove autotools

To avoid the burden of maintaining multiple build systems, this
patch removes autotools support.

https://bugzilla.gnome.org/show_bug.cgi?id=786149

33 files changed, 0 insertions, 3097 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e8645688..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,53 +0,0 @@
-ChangeLog
-Makefile
-Makefile.in
-*~
-*.a
-*.o
-*.la
-*.lo
-*.exe
-.deps
-.libs
-aclocal.m4
-autom4te.cache
-config.cache
-config.h
-config.h.in
-config.h.win32
-config.log
-config.status
-config.guess
-config.sub
-configure
-libtool
-depcomp
-ltmain.sh
-install-sh
-m4
-missing
-mkinstalldirs
-stamp-h1
-core.*
-core
-compile
-gtk-doc.make
-*.pc
-*.service
-*-marshal.[ch]
-*.gschema.valid
-*.enums.xml
-monitor/proxy/gvfsvolumemonitordbus.*
-metadata/metadata-dbus.*
-common/gvfsdbus.*
-man/*.1
-man/*.7
-test-driver
-INSTALL
-ABOUT-NLS
-config.rpath
-Makevars.template
-Rules-quot
-*.header
-*.sed
-*.sin
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index b18a2635..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-NULL =
-
-SUBDIRS = \
-	common \
-	metadata \
-	client \
-	daemon \
-	monitor \
-	po   \
-	programs \
-	test \
-	$(NULL)
-
-if BUILD_DOCUMENTATION
-SUBDIRS += man
-endif
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-
-EXTRA_DIST = \
-	ChangeLog.pre-1-2	\
-	gvfs.doap		\
-	README.commits		\
-	MAINTAINERS		\
-	m4			\
-	gettext/its/polkit.loc	\
-	gettext/its/polkit.its	\
-	meson.build		\
-	meson_options.txt	\
-	meson_post_install.py	\
-	dbus.service.in		\
-	po/meson.build		\
-	$(NULL)
-
-distclean-local:
-	if test "$(srcdir)" = "."; then :; else \
-		rm -f ChangeLog; \
-	fi
-
-install-data-hook:
-	if test -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then					\
-		$(GIO_QUERYMODULES) $(giomodulesdir) ;	\
-	fi
-
-uninstall-local:
-	$(RM) $(DESTDIR)$(giomodulesdir)/giomodule.cache
-
-ChangeLog:
-	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GVFS_1_2_2.. --stat -M -C --name-status  --date=short --no-color) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
-	fi
-
-.PHONY: ChangeLog
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 9a0985b2..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,38 +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
-
-(test -f configure.ac) || {
-        echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
-        exit 1
-}
-
-# shellcheck disable=SC2016
-PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
-
-if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
-        echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
-        echo "*** If you wish to pass any to it, please specify them on the" >&2
-        echo "*** '$0' command line." >&2
-        echo "" >&2
-fi
-
-aclocal --install || exit 1
-gtkdocize --copy || exit 1
-autoreconf --verbose --force --install || exit 1
-
-cd "$olddir"
-if [ "$NOCONFIGURE" = "" ]; then
-        $srcdir/configure "$@" || exit 1
-
-        if [ "$1" = "--help" ]; then exit 0 else
-                echo "Now type 'make' to compile $PKG_NAME" || exit 1
-        fi
-else
-        echo "Skipping configure process."
-fi
diff --git a/client/.gitignore b/client/.gitignore
deleted file mode 100644
index 1c1f4eed..00000000
--- a/client/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-gvfsd-fuse
-test-uri-utils
diff --git a/client/Makefile.am b/client/Makefile.am
deleted file mode 100644
index bfa58710..00000000
--- a/client/Makefile.am
+++ /dev/null
@@ -1,101 +0,0 @@
-NULL =
-
-AM_CPPFLAGS = -I$(top_srcdir) \
-	-I$(top_srcdir)/client \
-	-I$(top_srcdir)/metadata \
-	-I$(top_builddir)/metadata \
-	-I$(top_srcdir)/common \
-	-I$(top_builddir)/common \
-	$(GLIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\"GVFS\" \
-	-DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\"	\
-	-DGVFS_LOCALEDIR=\""$(localedir)"\"
-
-module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_vfs_.*|g_io_module_load|g_io_module_unload|g_io_module_query'
-
-## Common to dynamic and static client libs
-
-gvfsclientincludedir=$(includedir)/gvfs-client/gvfs/
-gvfsclientinclude_HEADERS = \
-	gvfsuriutils.h gvfsurimapper.h \
-	$(NULL)
-
-URI_PARSER_SOURCES = \
-	smburi.c \
-	httpuri.c \
-	afpuri.c \
-	$(NULL)
-
-vfssources = \
-	gdaemonvfs.c gdaemonvfs.h \
-	gdaemonmount.c gdaemonmount.h \
-	gdaemonvolumemonitor.c gdaemonvolumemonitor.h \
-	gdaemonfile.c gdaemonfile.h \
-	gdaemonfileinputstream.c gdaemonfileinputstream.h \
-	gdaemonfileoutputstream.c gdaemonfileoutputstream.h \
-	gdaemonfileenumerator.c gdaemonfileenumerator.h \
-	gdaemonfilemonitor.c gdaemonfilemonitor.h \
-	gvfsdaemondbus.c gvfsdaemondbus.h \
-	gvfsiconloadable.c gvfsiconloadable.h \
-	gvfsuriutils.c gvfsuriutils.h \
-	gvfsurimapper.c gvfsurimapper.h \
-	$(URI_PARSER_SOURCES) \
-	$(NULL)
-
-vfslibs = \
-	$(top_builddir)/common/libgvfscommon.la \
-	$(GLIB_LIBS) \
-	$(NULL)
-
-## Dynamic client lib
-
-giomodules_LTLIBRARIES = libgvfsdbus.la
-
-libgvfsdbus_la_LDFLAGS = $(module_flags)
-libgvfsdbus_la_SOURCES = $(vfssources)
-libgvfsdbus_la_LIBADD  = $(vfslibs) ../metadata/libmetadata.la
-
-noinst_PROGRAMS = test-uri-utils
-
-test_uri_utils_SOURCES = test-uri-utils.c gvfsuriutils.c gvfsuriutils.h
-test_uri_utils_LDADD = $(vfslibs)
-test_uri_utils_CFLAGS = $(AM_CPPFLAGS)
-
-if USE_FUSE
-
-## FUSE daemon
-
-libexec_PROGRAMS = gvfsd-fuse
-
-gvfsd_fuse_SOURCES = \
-	gvfsfusedaemon.c
-
-gvfsd_fuse_CFLAGS = \
-	-I$(top_srcdir) \
-        -I$(top_srcdir)/common \
-        -I$(top_builddir)/common \
-        $(GLIB_CFLAGS) $(FUSE_CFLAGS) \
-        -UG_LOG_DOMAIN
-
-gvfsd_fuse_LDADD = \
-	$(top_builddir)/common/libgvfscommon.la \
-	$(GLIB_LIBS) $(FUSE_LIBS)
-
-
-# FIXME: reusing USE_LIBSYSTEMD_LOGIN as systemd has no universal header or pkg-config file
-if USE_LIBSYSTEMD_LOGIN
-
-# FIXME: hardcoded path (systemd doesn't use lib64)
-tmpfilesddir = $(prefix)/lib/tmpfiles.d
-tmpfilesd_DATA = gvfsd-fuse-tmpfiles.conf
-
-endif
-
-endif
-
-
-EXTRA_DIST = \
-	gvfsd-fuse-tmpfiles.conf	\
-	meson.build			\
-	symbol.map			\
-	$(NULL)
diff --git a/common/Makefile.am b/common/Makefile.am
deleted file mode 100644
index 67ba37fa..00000000
--- a/common/Makefile.am
+++ /dev/null
@@ -1,95 +0,0 @@
-NULL =
-
-pkglib_LTLIBRARIES=libgvfscommon.la
-noinst_LTLIBRARIES = libgvfscommon-monitor.la
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
-	-I$(top_srcdir)/daemon \
-	$(GLIB_CFLAGS) $(BLURAY_CFLAGS) \
-	-DG_LOG_DOMAIN=\"GVFS\"
-
-dbus_built_sources = gvfsdbus.c gvfsdbus.h
-BUILT_SOURCES = $(dbus_built_sources)
-
-$(dbus_built_sources) : Makefile.am org.gtk.vfs.xml
-	$(AM_V_GEN) gdbus-codegen			\
-		--interface-prefix org.gtk.vfs.		\
-		--c-namespace GVfsDBus			\
-		--generate-c-code gvfsdbus		\
-		$(srcdir)/org.gtk.vfs.xml		\
-		$(NULL)
-
-libgvfscommon_la_SOURCES = 	\
-	gmountspec.c gmountspec.h \
-	gmountoperationdbus.c gmountoperationdbus.h \
-	gmountsource.c gmountsource.h \
-	gvfsmonitorimpl.c gvfsmonitorimpl.h \
-	gmounttracker.c gmounttracker.h \
-	gvfsdaemonprotocol.c gvfsdaemonprotocol.h \
-	gvfsicon.h gvfsicon.c \
-	gvfsfileinfo.c gvfsfileinfo.h \
-	gvfsutils.c gvfsutils.h \
-	$(dbus_built_sources) \
-	$(NULL)
-
-libgvfscommon_la_CFLAGS = 	\
-	-DREMOTE_VOLUME_MONITORS_DIR=\"$(datadir)/gvfs/remote-volume-monitors\" 	\
-	$(NULL)
-
-# needed by cygwin (see bug #564003)
-libgvfscommon_la_LDFLAGS = -no-undefined -avoid-version
-
-libgvfscommon_la_LIBADD =	\
-	$(GLIB_LIBS)
-
-libgvfscommon_monitor_la_SOURCES = 	\
-	gvfsmountinfo.h gvfsmountinfo.c \
-	$(NULL)
-
-libgvfscommon_monitor_la_CFLAGS =	\
-	$(GLIB_LIBS)			\
-	$(BLURAY_CFLAGS)
-
-libgvfscommon_monitor_la_LIBADD =	\
-	libgvfscommon.la 		\
-	$(BLURAY_LIBS) 			\
-	$(GLIB_LIBS)
-
-if HAVE_AVAHI
-noinst_LTLIBRARIES += libgvfscommon-dnssd.la
-
-libgvfscommon_dnssd_la_SOURCES = 	\
-	gvfsdnssdutils.c gvfsdnssdutils.h \
-	gvfsdnssdresolver.c gvfsdnssdresolver.h \
-	$(NULL)
-
-libgvfscommon_dnssd_la_CFLAGS =	\
-	$(AVAHI_CFLAGS)
-
-libgvfscommon_dnssd_la_LIBADD =	\
-	libgvfscommon.la \
-	$(AVAHI_LIBS) \
-	$(GLIB_LIBS)
-endif
-
-if USE_GPHOTO2UTILS
-noinst_LTLIBRARIES += libgvfscommon-gphoto2.la
-
-libgvfscommon_gphoto2_la_SOURCES = \
-	gvfsgphoto2utils.c gvfsgphoto2utils.h \
-	$(NULL)
-
-libgvfscommon_gphoto2_la_CPPFLAGS = \
-	$(GUDEV_CFLAGS)
-
-libgvfscommon_gphoto2_la_LIBADD = \
-	$(GUDEV_LIBS)
-endif
-
-
-EXTRA_DIST = \
-	org.gtk.vfs.xml \
-	meson.build \
-	$(NULL)
-
-CLEANFILES = $(dbus_built_sources)
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 2f9afc99..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,839 +0,0 @@
-AC_PREREQ([2.64])
-
-AC_INIT([gvfs],[1.37.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs])
-AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz tar-ustar -Wno-portability])
-
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_MACRO_DIR([m4])
-
-AM_SANITY_CHECK
-
-AC_C_CONST
-AC_SEARCH_LIBS([strerror],[cposix])
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-AC_PATH_PROG(GIO_QUERYMODULES, gio-querymodules, no)
-AM_PROG_CC_C_O
-AC_PROG_SED
-
-# Initialize libtool
-LT_PREREQ([2.2])
-LT_INIT([disable-static])
-LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
-AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
-
-AC_ARG_ENABLE([documentation],
-              [AS_HELP_STRING([--enable-documentation],
-                              [build documentation])],,
-              [enable_documentation=yes])
-if test x$enable_documentation = xyes; then
-   AC_PATH_PROG([XSLTPROC], [xsltproc])
-   if test x$XSLTPROC = x; then
-      AC_MSG_ERROR([xsltproc is required to build documentation])
-   fi
-fi
-AM_CONDITIONAL([BUILD_DOCUMENTATION], [test x$enable_documentation = xyes])
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-AC_TYPE_PID_T
-AC_TYPE_SIGNAL
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-
-GLIB_GSETTINGS
-
-AH_VERBATIM([_GNU_SOURCE],
-[/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-#endif])
-	
-saved_CFLAGS=$CFLAGS
-AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
-CFLAGS=$saved_CFLAGS
-
-GTK_DOC_CHECK
-DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.51.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0])
-
-AC_ARG_WITH([dbus_service_dir],
-	    [AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]])],
-	    [with_dbus_service_dir="$withval"], [with_dbus_service_dir=$datadir/dbus-1/services])
-DBUS_SERVICE_DIR=$with_dbus_service_dir
-AC_SUBST(DBUS_SERVICE_DIR)
-
-giomodulesdir=$libdir/gio/modules
-AC_SUBST(giomodulesdir)
-
-dnl *********************
-dnl *** Check for gcr ***
-dnl *********************
-
-AC_ARG_ENABLE([gcr], [AS_HELP_STRING([--disable-gcr],[build without gcr])])
-msg_gcr=no
-
-if test "x$enable_gcr" != "xno"; then
-  PKG_CHECK_MODULES([GCR], [gcr-base-3], [msg_gcr=yes])
-  AC_DEFINE([HAVE_GCR], 1, [Define to 1 if gcr is available])
-fi
-
-dnl ****************************
-dnl *** Checks for gettext   ***
-dnl ****************************
-AM_GNU_GETTEXT_VERSION([0.19.4])
-AM_GNU_GETTEXT([external])
-
-GETTEXT_PACKAGE=gvfs
-AC_SUBST([GETTEXT_PACKAGE])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name])
-
-
-dnl ****************************
-dnl *** Checks for ssh stuff ***
-dnl ****************************
-
-AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
-
-dnl ****************************
-dnl *** Checks for pty stuff ***
-dnl ****************************
-
-AC_CHECK_HEADERS(sys/un.h stropts.h termios.h util.h utmp.h sys/uio.h sys/param.h)
-
-# Check for PTY handling functions.
-AC_CHECK_FUNCS(getpt posix_openpt grantpt unlockpt ptsname ptsname_r)
-
-# Pull in the right libraries for various functions which might not be
-# bundled into an exploded libc.
-AC_CHECK_FUNC(socketpair,[have_socketpair=1],AC_CHECK_LIB(socket,socketpair,[have_socketpair=1; LIBS="$LIBS -lsocket"]))
-AC_CHECK_FUNC(openpty,[have_openpty=1],AC_CHECK_LIB(util,openpty,[have_openpty=1; LIBS="$LIBS -lutil"]))
-if test x$have_socketpair = x1 ; then
-	AC_DEFINE([HAVE_SOCKETPAIR],1,[Define if you have the socketpair function.])
-fi
-if test x$have_openpty = x1 ; then
-	AC_DEFINE([HAVE_OPENPTY],1,[Define if you have the openpty function.])
-fi
-
-AC_SEARCH_LIBS([login_tty], [util], [AC_DEFINE([HAVE_LOGIN_TTY],[],[Whether login_tty is available])])
-
-dnl ***************************************************
-dnl *** Check if we should build with admin backend ***
-dnl ***************************************************
-AC_ARG_ENABLE([admin], [AS_HELP_STRING([--disable-admin],[build without admin backend])])
-msg_admin=no
-
-if test "x$enable_admin" != "xno"; then
-  PKG_CHECK_MODULES([ADMIN], [polkit-gobject-1 libcap], [msg_admin=yes])
-
-  if test "x$msg_admin" = "xyes"; then
-    AC_DEFINE([HAVE_ADMIN], 1, [Define to 1 if admin backend is going to be built])
-  fi
-fi
-
-AC_SUBST(ADMIN_CFLAGS)
-AC_SUBST(ADMIN_LIBS)
-AM_CONDITIONAL([HAVE_ADMIN], [test "$msg_admin" = "yes"])
-
-dnl **************************************************
-dnl *** Check if we should build with http backend ***
-dnl **************************************************
-AC_ARG_ENABLE([http], [AS_HELP_STRING([--disable-http],[build without http/dav backend])])
-msg_http=no
-
-if test "x$enable_http" != "xno"; then
-  PKG_CHECK_EXISTS([libsoup-2.4 >= 2.42.0], [msg_http=yes])
-
-  if test "x$msg_http" = "xyes"; then
-    PKG_CHECK_MODULES([HTTP], [libsoup-2.4 libxml-2.0])
-    AC_DEFINE([HAVE_HTTP], 1, [Define to 1 if http/dav is going to be built])
-  fi
-fi
-
-AC_SUBST(HTTP_CFLAGS)
-AC_SUBST(HTTP_LIBS)
-AM_CONDITIONAL([HAVE_HTTP], [test "$msg_http" = "yes"])
-
-dnl **************************************************
-dnl *** Check if we should build with DNS-SD backend ***
-dnl **************************************************
-AM_CONDITIONAL(HAVE_AVAHI, false)
-			  
-AC_ARG_ENABLE([avahi], [AS_HELP_STRING([--disable-avahi],[build without avahi support])])
-msg_avahi=no
-if test "x$enable_avahi" != "xno"; then
-	PKG_CHECK_MODULES([AVAHI], [avahi-glib >= 0.6 avahi-client >= 0.6],
-			[AM_CONDITIONAL([HAVE_AVAHI], [true])
-			AC_DEFINE([HAVE_AVAHI], [], [Set if we can use avahi])]
-                        [msg_avahi=yes],
-			[AM_CONDITIONAL([HAVE_AVAHI], [false])])
-	AC_SUBST(AVAHI_CFLAGS)
-	AC_SUBST(AVAHI_LIBS)
-fi
-
-dnl ************************
-dnl *** Check for libXML ***
-dnl ************************
-PKG_CHECK_MODULES([LIBXML], [libxml-2.0],
-	[AM_CONDITIONAL([HAVE_LIBXML], [true])
-	AC_DEFINE([HAVE_LIBXML], [], [Set if we have libxml])]
-	[msg_libxml=yes],
-        [AM_CONDITIONAL([HAVE_LIBXML], [false])])
-
-dnl **********************
-dnl *** Check for gudev ***
-dnl **********************
-AC_ARG_ENABLE([gudev], [AS_HELP_STRING([--disable-gudev],[build without gudev support])])
-msg_gudev=no
-GUDEV_REQUIRED=147
-
-if test "x$enable_gudev" != "xno"; then
-  PKG_CHECK_EXISTS([gudev-1.0 >= $GUDEV_REQUIRED], [msg_gudev=yes])
-
-  if test "x$msg_gudev" = "xyes"; then
-    PKG_CHECK_MODULES([GUDEV], [gudev-1.0 >= $GUDEV_REQUIRED])
-    AC_DEFINE([HAVE_GUDEV], 1, [Define to 1 if gudev is available])
-  fi
-fi
-AM_CONDITIONAL([USE_GUDEV], [test "$msg_gudev" = "yes"])
-
-dnl **********************
-dnl *** Check for FUSE ***
-dnl **********************
-AC_ARG_ENABLE([fuse], [AS_HELP_STRING([--disable-fuse],[build without FUSE support])])
-msg_fuse=no
-
-if test "x$enable_fuse" != "xno"; then
-  PKG_CHECK_EXISTS([fuse], [msg_fuse=yes])
-
-  if test "x$msg_fuse" = "xyes"; then
-    PKG_CHECK_MODULES([FUSE], [fuse >= 2.8.0])
-    AC_DEFINE([HAVE_FUSE], 1, [Define to 1 if FUSE is available])
-  fi
-fi
-
-AM_CONDITIONAL([USE_FUSE], [test "$msg_fuse" = "yes"])
-
-dnl ************************************
-dnl *** Check for gnome-disk-utility ***
-dnl ************************************
-
-AC_ARG_ENABLE([gdu], [AS_HELP_STRING([--disable-gdu],[build without GDU volume monitor])])
-msg_gdu=no
-GDU_REQUIRED=3.0.2
-
-if test "x$enable_gdu" != "xno"; then
-  PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], [msg_gdu=yes])
-
-  if test "x$msg_gdu" = "xyes"; then
-    PKG_CHECK_MODULES([GDU],[gdu >= $GDU_REQUIRED])
-    AC_DEFINE([HAVE_GDU], 1, [Define to 1 if gnome-disk-utility is available])
-  fi
-fi
-
-AM_CONDITIONAL(USE_GDU, [test "$msg_gdu" = "yes"])
-
-dnl *************************
-dnl *** Check for udisks2 ***
-dnl *************************
-
-AC_ARG_ENABLE([udisks2], [AS_HELP_STRING([--disable-udisks2],[build without libudisks2])])
-msg_udisks2=no
-UDISKS2_REQUIRED=1.97
-
-if test "x$enable_udisks2" != "xno" -a "x$msg_gudev" = "xyes"; then
-  PKG_CHECK_EXISTS([udisks2 >= $UDISKS2_REQUIRED], [msg_udisks2=yes])
-
-  if test "x$msg_udisks2" = "xyes"; then
-    PKG_CHECK_MODULES([UDISKS2],[udisks2 >= $UDISKS2_REQUIRED])
-    AC_DEFINE([HAVE_UDISKS2], 1, [Define to 1 if libudisks2 is available])
-  fi
-fi
-
-AM_CONDITIONAL(USE_UDISKS2, [test "$msg_udisks2" = "yes"])
-
-dnl ************************************
-dnl *** Check for systemd user units ***
-dnl ************************************
-
-msg_systemd_user_units=no
-
-AC_ARG_WITH([systemduserunitdir],
-            [AS_HELP_STRING([--with-systemduserunitdir=PATH], [Set directory for systemd user units, or 'no' to disable])],
-            [systemd_userdir="$withval"],
-            [systemd_userdir="${prefix}/lib/systemd/user"])
-AC_SUBST([systemd_userdir])
-
-if test "x$systemd_userdir" != "xno"; then
-  PKG_CHECK_EXISTS([systemd >= 206], [msg_systemd_user_units=yes])
-fi
-
-AM_CONDITIONAL([USE_SYSTEMD_USER_UNITS], [test "$msg_systemd_user_units" = "yes"])
-
-dnl **********************************
-dnl *** Check for libsystemd-login ***
-dnl **********************************
-
-AC_ARG_ENABLE([libsystemd_login], [AS_HELP_STRING([--disable-libsystemd-login],[build without libsystemd-login])])
-msg_libsystemd_login=no
-LIBSYSTEMD_LOGIN_REQUIRED=44
-
-if test "x$enable_libsystemd_login" != "xno"; then
-  PKG_CHECK_EXISTS([libsystemd], [msg_libsystemd_login=yes],
-                   [PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], [msg_libsystemd_login=yes])])
-
-  if test "x$msg_libsystemd_login" = "xyes"; then
-    PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd],,
-                      [PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED])])
-    AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd_login is available])
-  fi
-fi
-
-AM_CONDITIONAL(USE_LIBSYSTEMD_LOGIN, [test "$msg_libsystemd_login" = "yes"])
-
-dnl **************************************************
-dnl *** Check if we should build with CDDA backend ***
-dnl **************************************************
-AC_ARG_ENABLE([cdda], [AS_HELP_STRING([--disable-cdda],[build without CDDA backend])])
-msg_cdda=no
-
-if test "x$enable_cdda" != "xno" -a "x$msg_gudev" = "xyes"; then
-  PKG_CHECK_EXISTS([libcdio_paranoia >= 0.78.2], [msg_cdda=yes])
-
-  if test "x$msg_cdda" = "xyes"; then
-    PKG_CHECK_MODULES([CDDA], [libcdio_paranoia])
-    AC_DEFINE([HAVE_CDDA], 1, [Define to 1 if CDDA is going to be built])
-
-    # test for actual headers location
-    CPPFLAGS_save="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $CDDA_CFLAGS"
-    AC_CHECK_HEADER(cdio/paranoia/paranoia.h, [
-       AC_DEFINE([HAVE_PARANOIA_NEW_INCLUDES], 1, [Define to 1 if cdio/paranoia/paranoia.h is present]) ])
-    CPPFLAGS="$CPPFLAGS_save"
-  fi
-fi
-
-AC_SUBST(CDDA_LIBS)
-AC_SUBST(CDDA_CFLAGS)
-
-AM_CONDITIONAL([USE_CDDA], [test "$msg_cdda" = "yes"])
-
-dnl *************************************************
-dnl *** Check if we should build with AFC backend ***
-dnl *************************************************
-AC_ARG_ENABLE([afc], [AS_HELP_STRING([--disable-afc],[build without AFC backend])])
-msg_afc=no
-
-if test "x$enable_afc" != "xno" ; then
-  PKG_CHECK_EXISTS([libimobiledevice-1.0 >= 1.2 libplist >= 0.15], [msg_afc=yes])
-
-  if test "x$msg_afc" = "xyes"; then
-    PKG_CHECK_MODULES([AFC], [libimobiledevice-1.0 libplist])
-    AC_DEFINE([HAVE_AFC], 1, [Define to 1 if AFC is going to be built])
-  fi
-fi
-
-AC_SUBST(AFC_LIBS)
-AC_SUBST(AFC_CFLAGS)
-
-AM_CONDITIONAL([USE_AFC], [test "$msg_afc" = "yes"])
-
-dnl ********************************************************
-dnl *** Check if we should build with GOA volume monitor ***
-dnl ********************************************************
-AC_ARG_ENABLE([goa], [AS_HELP_STRING([--disable-goa],[build without GOA volume monitor])])
-msg_goa=no
-
-if test "x$enable_goa" != "xno" ; then
-  PKG_CHECK_EXISTS([goa-1.0 >= 3.7.1], [msg_goa=yes])
-
-  if test "x$msg_goa" = "xyes"; then
-    PKG_CHECK_MODULES([GOA], [goa-1.0])
-    AC_DEFINE([HAVE_GOA], 1, [Define to 1 if GOA is going to be built])
-  fi
-fi
-
-AC_SUBST(GOA_LIBS)
-AC_SUBST(GOA_CFLAGS)
-
-AM_CONDITIONAL([USE_GOA], [test "$msg_goa" = "yes"])
-
-dnl ****************************************************
-dnl *** Check if we should build with Google backend ***
-dnl ****************************************************
-AC_ARG_ENABLE([google], [AS_HELP_STRING([--disable-google],[build without Google backend])])
-msg_google=no
-
-if test "x$enable_google" != "xno" ; then
-  PKG_CHECK_EXISTS([goa-1.0 >= 3.17.1 libgdata >= 0.17.3], [msg_google=yes])
-
-  if test "x$msg_google" = "xyes"; then
-    PKG_CHECK_MODULES([GOOGLE], [goa-1.0 libgdata])
-    AC_DEFINE([HAVE_GOOGLE], 1, [Define to 1 if Google is going to be built])
-
-    PKG_CHECK_MODULES(LIBGDATA_0_17_7, libgdata >= 0.17.7,
-        AC_DEFINE(HAVE_LIBGDATA_0_17_7, 1, [Define to 1 if libgdata 0.17.7 is available]),
-        []
-    )
-
-    PKG_CHECK_MODULES(LIBGDATA_0_17_9, libgdata >= 0.17.9,
-        AC_DEFINE(HAVE_LIBGDATA_0_17_9, 1, [Define to 1 if libgdata 0.17.9 is available]),
-        []
-    )
-  fi
-fi
-
-AC_SUBST(GOOGLE_LIBS)
-AC_SUBST(GOOGLE_CFLAGS)
-
-AM_CONDITIONAL(USE_GOOGLE, [test "$msg_google" = "yes"])
-
-dnl *************************
-dnl *** Check for gphoto2 ***
-dnl *************************
-AC_ARG_ENABLE([gphoto2], [AS_HELP_STRING([--disable-gphoto2],[build without gphoto2 support])])
-msg_gphoto2=no
-
-if test "x$enable_gphoto2" != "xno" -a "x$msg_gudev" = "xyes"; then
-  PKG_CHECK_MODULES([GPHOTO2], [libgphoto2 >= 2.4.0], [msg_gphoto2=yes])
-
-  # Need OS tweaks in volume monitor backend
-  case "$host" in
-    *-linux* | *-freebsd* | *-kfreebsd*-gnu)
-      use_gphoto2=yes
-      ;;
-    *)
-      use_gphoto2=no
-      ;;
-  esac
-
-  if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then
-    AC_MSG_ERROR([gphoto2 support requested but not available])
-  fi
-
-  if test "x$msg_gphoto2" = "xyes"; then
-    if test "x$use_gphoto2" = "xyes"; then
-      AC_DEFINE([HAVE_GPHOTO2], 1, [Define to 1 if gphoto2 is available])
-      PKG_CHECK_MODULES([GPHOTO25], [libgphoto2 >= 2.5.0],
-         [AC_DEFINE([HAVE_GPHOTO25], 1, [Define to 1 if libgphoto2 2.5 is available])],
-	 []
-      )
-    else
-      if test "x$enable_gphoto2" = "xyes"; then
-        AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in volume monitor.])
-      else
-        AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in volume monitor.])
-      fi
-      msg_gphoto2=no
-    fi
-  fi
-fi
-
-AM_CONDITIONAL([USE_GPHOTO2], [test "$msg_gphoto2" = "yes"])
-
-dnl *******************************
-dnl *** Check for GNOME Keyring ***
-dnl *******************************
-AC_ARG_ENABLE([keyring], [AS_HELP_STRING([--disable-keyring],[build without GNOME Keyring support])])
-msg_keyring=no
-
-if test "x$enable_keyring" != "xno"; then
-  PKG_CHECK_EXISTS([libsecret-unstable], [msg_keyring=yes])
-
-  if test "x$msg_keyring" = "xyes"; then
-    PKG_CHECK_MODULES([KEYRING], [libsecret-unstable])
-    AC_DEFINE([HAVE_KEYRING], 1, [Define to 1 if GNOME Keyring is available])
-  fi
-fi
-
-AM_CONDITIONAL([USE_KEYRING], [test "$msg_keyring" = "yes"])
-
-dnl ***********************************************
-dnl *** Check if we should build with libbluray ***
-dnl ***********************************************
-AC_ARG_ENABLE([bluray], [AS_HELP_STRING([--disable-bluray],[build without bluray metadata support])])
-msg_bluray=no
-
-if test "x$enable_bluray" != "xno"; then
-  PKG_CHECK_EXISTS([libbluray], [msg_bluray=yes])
-
-  if test "x$msg_bluray" = "xyes"; then
-    PKG_CHECK_MODULES([BLURAY], [libbluray])
-    AC_DEFINE([HAVE_BLURAY], 1, [Define to 1 if bluray metadata is going to be built])
-  fi
-fi
-
-AC_SUBST(BLURAY_CFLAGS)
-AC_SUBST(BLURAY_LIBS)
-AM_CONDITIONAL([HAVE_BLURAY], [test "$msg_bluray" = "yes"])
-
-dnl ************************************************
-dnl *** Check if we should build with libusb-1.0 ***
-dnl ************************************************
-AC_ARG_ENABLE([libusb], [AS_HELP_STRING([--disable-libusb],[build without libusb support])])
-msg_libusb=no
-
-if test "x$enable_libusb" != "xno"; then
-  PKG_CHECK_EXISTS([libusb-1.0 >= 1.0.21], [msg_libusb=yes])
-
-  if test "x$msg_libusb" = "xyes"; then
-    PKG_CHECK_MODULES([LIBUSB], [libusb-1.0 >= 1.0.21])
-    AC_DEFINE([HAVE_LIBUSB], 1, [Define to 1 if libusb is going to be built])
-  fi
-fi
-
-AC_SUBST(LIBUSB_CFLAGS)
-AC_SUBST(LIBUSB_LIBS)
-AM_CONDITIONAL([HAVE_LIBUSB], [test "$msg_libusb" = "yes"])
-
-dnl *************************
-dnl *** Check for libmtp ***
-dnl *************************
-AC_ARG_ENABLE([libmtp], [AS_HELP_STRING([--disable-libmtp],[build without libmtp support])])
-msg_libmtp=no
-
-if test "x$enable_libmtp" != "xno" -a "x$msg_gudev" = "xyes"; then
-  PKG_CHECK_EXISTS([libmtp], [msg_libmtp=yes])
-
-  if test "x$msg_libmtp" = "xyes"; then
-    PKG_CHECK_MODULES([LIBMTP], [libmtp >= 1.1.0])
-    AC_DEFINE([HAVE_LIBMTP], 1, [Define to 1 if libmtp is available])
-
-    PKG_CHECK_MODULES([LIBMTP_1_1_5], [libmtp >= 1.1.5],
-        [AC_DEFINE([HAVE_LIBMTP_1_1_5], 1, [Define to 1 if libmtp 1.1.5 is available])],
-        []
-    )
-
-    PKG_CHECK_MODULES([LIBMTP_1_1_6], [libmtp >= 1.1.6],
-        [AC_DEFINE([HAVE_LIBMTP_1_1_6], 1, [Define to 1 if libmtp 1.1.6 is available])],
-        []
-    )
-
-    PKG_CHECK_MODULES([LIBMTP_1_1_9], [libmtp >= 1.1.9],
-        [AC_DEFINE([HAVE_LIBMTP_1_1_9], 1, [Define to 1 if libmtp 1.1.9 is available])],
-        []
-    )
-
-    PKG_CHECK_MODULES(LIBMTP_1_1_12, libmtp >= 1.1.12,
-        AC_DEFINE(HAVE_LIBMTP_1_1_12, 1, [Define to 1 if libmtp 1.1.12 is available]),
-        []
-    )
-
-    PKG_CHECK_MODULES(LIBMTP_1_1_15, libmtp >= 1.1.15,
-        AC_DEFINE(HAVE_LIBMTP_1_1_15, 1, [Define to 1 if libmtp 1.1.15 is available]),
-        []
-    )
-  fi
-fi
-
-AC_SUBST(LIBMTP_CFLAGS)
-AC_SUBST(LIBMTP_LIBS)
-AM_CONDITIONAL(USE_LIBMTP, [test "$msg_libmtp" = "yes"])
-
-AM_CONDITIONAL(USE_GPHOTO2UTILS,
-               [test "$msg_libmtp" = "yes" -o \( "$msg_gphoto2" = "yes" -a "$msg_gudev" = "yes" \)])
-
-dnl ***********************
-dnl *** Check for samba ***
-dnl ***********************
-AC_ARG_ENABLE([samba], [AS_HELP_STRING([--disable-samba],[build without samba support])])
-msg_samba=no
-
-if test "x$enable_samba" != "xno"; then
-  PKG_CHECK_EXISTS([smbclient], [msg_samba=yes])
-
-  if test "x$msg_samba" = "xyes"; then
-    PKG_CHECK_MODULES([SAMBA], [smbclient])
-    AC_DEFINE([HAVE_SAMBA], 1, [Define to 1 if you have the samba libraries])
-  fi
-fi
-
-AM_CONDITIONAL([HAVE_SAMBA], [test "$msg_samba" = "yes"])
-AC_SUBST(SAMBA_CFLAGS)
-AC_SUBST(SAMBA_LIBS)
-
-dnl ****************************
-dnl *** Check for libarchive ***
-dnl ****************************
-AC_ARG_ENABLE([archive], [AS_HELP_STRING([--disable-archive],[build without archive support])])
-msg_archive=no
-
-if test "x$enable_archive" != "xno"; then
-  PKG_CHECK_EXISTS([libarchive], [msg_archive=yes])
-
-  if test "x$msg_archive" = "xyes"; then
-    PKG_CHECK_MODULES([ARCHIVE], [libarchive])
-    AC_DEFINE([HAVE_ARCHIVE], 1, [Define to 1 if you have the archive libraries])
-  fi
-fi
-
-AM_CONDITIONAL([HAVE_ARCHIVE], [test "$msg_archive" = "yes"])
-AC_SUBST(ARCHIVE_CFLAGS)
-AC_SUBST(ARCHIVE_LIBS)
-
-dnl ***************************
-dnl *** Check for libgcrypt ***
-dnl ***************************
-GCRYPT_VERSION=1.2.2
-GCRYPT_LIBVER=1
-
-AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION, have_gcrypt="yes",
-	      have_gcrypt="no")
-
-if test "x$have_gcrypt" != "xno"; then
-  AC_DEFINE(HAVE_GCRYPT, 1, [Define to 1 if libgcrypt is available])
-fi
-AC_SUBST([LIBGCRYPT_CFLAGS])
-AC_SUBST([LIBGCRYPT_LIBS])
-
-dnl *******************
-dnl *** AFP backend ***
-dnl *******************
-AC_ARG_ENABLE([afp], [AS_HELP_STRING([--disable-afp], [build without AFP support])])
-msg_afp="no"
-if test "x$enable_afp" != "xno"; then
-
-  if test "x$have_gcrypt" = "xyes"; then
-    msg_afp="yes"
-  else
-    msg_afp="partial (crypt support missing! Only anonymous logins)"
-  fi
-fi
-AM_CONDITIONAL([USE_AFP], [test "x$enable_afp" != "xno"])
-
-dnl *******************
-dnl *** NFS backend ***
-dnl *******************
-AC_ARG_ENABLE([nfs], [AS_HELP_STRING([--disable-nfs], [build without NFS support])])
-msg_nfs="no"
-
-if test "x$enable_nfs" != "xno"; then
-  PKG_CHECK_EXISTS([libnfs >= 1.9.8], [msg_nfs=yes])
-
-  if test "x$msg_nfs" = "xyes"; then
-    PKG_CHECK_MODULES([NFS],[libnfs >= 1.9.8])
-    AC_DEFINE([HAVE_NFS], 1, [Define to 1 if nfs is going to be built])
-  fi
-fi
-
-AC_SUBST(NFS_CFLAGS)
-AC_SUBST(NFS_LIBS)
-AM_CONDITIONAL(HAVE_NFS, [test "$msg_nfs" = "yes"])
-
-dnl ***************************************
-dnl *** Check for nl_langinfo constants ***
-dnl ***************************************
-AC_CHECK_DECL(_NL_ADDRESS_LANG_TERM,
-              AC_DEFINE(HAVE_NL_ADDRESS_LANG_TERM, 1, Define to 1 if _NL_ADDRESS_LANG_TERM is declared),,
-              [#include <langinfo.h>])
-AC_CHECK_DECL(_NL_ADDRESS_COUNTRY_AB3,
-              AC_DEFINE(HAVE_NL_ADDRESS_COUNTRY_AB3, 1, Define to 1 if _NL_ADDRESS_COUNTRY_AB3 is declared),,
-              [#include <langinfo.h>])
-
-dnl ==========================================================================
-	
-dnl Globally define_GNU_SOURCE and therefore enable the GNU extensions
-AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU Extensions])
-
-dnl ==========================================================================
-	
-AC_DEFINE([_FILE_OFFSET_BITS], 64, [Enable LFS])
-		       
-dnl ==========================================================================
-
-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
-
-dnl ==========================================================================
-dnl Look for various fs info getters
-
-AC_HEADER_MAJOR
-AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/vfs.h sys/mount.h sys/param.h])
-AC_CHECK_FUNCS(statvfs statfs)
-AC_CHECK_MEMBERS([struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#ifdef HAVE_SYS_STATFS_H
-#include <sys/statfs.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif])
-# struct statvfs.f_basetype is available on Solaris but not for Linux. 
-AC_CHECK_MEMBERS([struct statvfs.f_basetype],,, [#include <sys/statvfs.h>])
-
-dnl
-dnl if statfs() takes 2 arguments (Posix) or 4 (Solaris)
-dnl
-if test "$ac_cv_func_statfs" = yes ; then
-  AC_MSG_CHECKING([number of arguments to statfs()])
-  AC_TRY_COMPILE([#include <unistd.h>
-  #ifdef HAVE_SYS_PARAM_H
-  #include <sys/param.h>
-  #endif
-  #ifdef HAVE_SYS_VFS_H
-  #include <sys/vfs.h>
-  #endif
-  #ifdef HAVE_SYS_MOUNT_H
-  #include <sys/mount.h>
-  #endif
-  #ifdef HAVE_SYS_STATFS_H
-  #include <sys/statfs.h>
-  #endif], [struct statfs st;
-  statfs("/", &st);],[
-    AC_MSG_RESULT([2])
-    AC_DEFINE(STATFS_ARGS, 2, [Number of arguments to statfs()])],[
-    AC_TRY_COMPILE([#include <unistd.h>
-  #ifdef HAVE_SYS_PARAM_H
-  #include <sys/param.h>
-  #endif
-  #ifdef HAVE_SYS_VFS_H
-  #include <sys/vfs.h>
-  #endif
-  #ifdef HAVE_SYS_MOUNT_H
-  #include <sys/mount.h>
-  #endif
-  #ifdef HAVE_SYS_STATFS_H
-  #include <sys/statfs.h>
-  #endif], [struct statfs st;
-  statfs("/", &st, sizeof (st), 0);],[
-      AC_MSG_RESULT([4])
-      AC_DEFINE(STATFS_ARGS, 4, [Number of arguments to statfs()])],[
-      AC_MSG_RESULT(unknown)
-      AC_MSG_ERROR([unable to determine number of arguments to statfs()])])])
-fi
-
-dnl ==========================================================================
-dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
-
-AC_ARG_ENABLE([more-warnings],
-[AS_HELP_STRING([--enable-more-warnings],[Maximum compiler warnings])],
-[set_more_warnings="$enableval"],[
-if test -f $srcdir/.git; then
-	set_more_warnings=yes
-else
-	set_more_warnings=no
-fi
-])
-AC_MSG_CHECKING([for more warnings])
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-	AC_MSG_RESULT(yes)
-	CFLAGS="\
-	-Wall \
-	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-	-Wnested-externs -Wpointer-arith \
-	-Wcast-align -Wsign-compare \
-	$CFLAGS"
-
-	for option in -Wno-strict-aliasing -Wno-sign-compare -Wtype-limits; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		if test $has_option = no; then
-			CFLAGS="$SAVE_CFLAGS"
-		fi
-		AC_MSG_RESULT($has_option)
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-else
-	AC_MSG_RESULT(no)
-fi
-
-msg_installed_tests="no"
-AC_ARG_ENABLE([installed-tests],
-              [AS_HELP_STRING([--enable-installed-tests],
-                              [Enable installation of some test cases])],
-              [case ${enableval} in
-                yes) ENABLE_INSTALLED_TESTS="1"  ;;
-                no)  ENABLE_INSTALLED_TESTS="" ;;
-                *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
-               esac])
-AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], [test "$ENABLE_INSTALLED_TESTS" = "1"])
-AC_ARG_ENABLE([always-build-tests],
-              [AS_HELP_STRING([--enable-always-build-tests],
-                              [Enable always building tests during 'make all'])],
-              [case ${enableval} in
-                yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
-                no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
-                *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
-               esac])
-AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], [test "$ENABLE_ALWAYS_BUILD_TESTS" = "1"])
-if test "$ENABLE_INSTALLED_TESTS" = "1"; then
-  AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
-  AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
-  msg_installed_tests="yes"
-fi
-
-AC_CONFIG_FILES([
-Makefile
-common/Makefile
-client/Makefile
-metadata/Makefile
-daemon/trashlib/Makefile
-daemon/Makefile
-monitor/Makefile
-monitor/proxy/Makefile
-monitor/gdu/Makefile
-monitor/udisks2/Makefile
-monitor/gphoto2/Makefile
-monitor/afc/Makefile
-monitor/mtp/Makefile
-monitor/goa/Makefile
-programs/Makefile
-man/Makefile
-test/Makefile
-po/Makefile.in
-])
-AC_OUTPUT
-
-echo 
-echo "gvfs configuration summary:"
-echo "
-        gio module directory : $giomodulesdir
-
-	Blu-ray metadata support:     $msg_bluray
-	Google support:               $msg_google
-        HTTP/WebDAV support:          $msg_http
-	Samba support:	              $msg_samba
-	FUSE support:                 $msg_fuse
-        CDDA support:                 $msg_cdda
-        Gphoto2 support:              $msg_gphoto2
-        MTP support:                  $msg_libmtp
-	Polkit support:               $msg_admin
-        USB support:                  $msg_libusb
-	archive support:              $msg_archive
-	AFC support:                  $msg_afc
-        AFP support:                  $msg_afp
-        NFS support:                  $msg_nfs
-        DNS-SD support:               $msg_avahi
-	Build GDU volume monitor:     $msg_gdu
-	Build udisks2 volume monitor: $msg_udisks2
-	Build GOA volume monitor:     $msg_goa
-        Use systemd user units:       $msg_systemd_user_units
-        Use libsystemd-login:         $msg_libsystemd_login
-        Use GCR:                      $msg_gcr
-	GNOME Keyring support:        $msg_keyring
-	Installed tests:              $msg_installed_tests
-"
-
-# The gudev gphoto monitor needs a recent libgphoto; point to the required patch if the version is too old
-if test "x$msg_gudev" = "xyes"; then
-  PKG_CHECK_EXISTS([libgphoto2 >= 2.4.7],, [msg_gphoto_patch=yes])
-  if test "x$msg_gphoto_patch" = "xyes"; then
-    AC_MSG_WARN([You are using a libgphoto2 version earlier than 2.4.7. To work with gudev, you must apply the patch in http://sourceforge.net/tracker/?func=detail&aid=2801117&group_id=8874&atid=308874])
-  fi
-fi
-
diff --git a/daemon/.gitignore b/daemon/.gitignore
deleted file mode 100644
index b63a721a..00000000
--- a/daemon/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-gvfsd
-gvfsd-afc
-gvfsd-afp
-gvfsd-afp-browse
-gvfsd-archive
-gvfsd-burn
-gvfsd-cdda
-gvfsd-computer
-gvfsd-dav
-gvfsd-dnssd
-gvfsd-ftp
-gvfsd-google
-gvfsd-gphoto2
-gvfsd-http
-gvfsd-localtest
-gvfsd-network
-gvfsd-mtp
-gvfsd-nfs
-gvfsd-recent
-gvfsd-sftp
-gvfsd-smb
-gvfsd-smb-browse
-gvfsd-test
-gvfsd-trash
-*.mount
-*.localmount
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
deleted file mode 100644
index 2b9c7e53..00000000
--- a/daemon/Makefile.am
+++ /dev/null
@@ -1,661 +0,0 @@
-SUBDIRS = trashlib
-
-NULL =
-
-mountdir = $(datadir)/gvfs/mounts
-
-AM_CPPFLAGS =					\
-	$(SAMBA_CFLAGS)                         \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/common			\
-	-I$(top_builddir)			\
-	-I$(top_builddir)/common		\
-	$(GLIB_CFLAGS) 				\
-	$(KEYRING_CFLAGS)			\
-	$(GCR_CFLAGS)                           \
-	-DLIBEXEC_DIR=\"$(libexecdir)\" 	\
-	-DMOUNTABLE_DIR=\"$(mountdir)\" 	\
-	-DGVFS_LOCALEDIR=\""$(localedir)"\"
-
-pkglib_LTLIBRARIES=libgvfsdaemon.la
-
-libraries =						\
-	libgvfsdaemon.la					\
-	$(top_builddir)/common/libgvfscommon.la		\
-	$(GLIB_LIBS) $(KEYRING_LIBS)
-
-flags = $(AM_CPPFLAGS)
-
-gvfs_gschemas =
-gvfs_gschemas_convert =
-gvfs_gschemas_dist =
-gvfs_gschemas_convert_dist =
-
-# D-Bus and systemd service files
-%.service: %.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-servicedir = $(DBUS_SERVICE_DIR)
-service_in_files = org.gtk.vfs.Daemon.service.in
-service_DATA = org.gtk.vfs.Daemon.service
-
-systemd_user_in_files = gvfs-daemon.service.in
-if USE_SYSTEMD_USER_UNITS
-systemd_user_DATA = gvfs-daemon.service
-endif
-
-%.mount: %.mount.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-%.localmount: %.mount.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_builddir)|" $< > $@
-
-libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network gvfsd-recent
-
-mount_in_files = sftp.mount.in ftp.mount.in ftps.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in recent.mount.in
-mount_DATA =  sftp.mount ftp.mount ftps.mount trash.mount computer.mount burn.mount localtest.mount network.mount recent.mount
-
-mount_in_files += admin.mount.in
-if HAVE_ADMIN
-mount_DATA += admin.mount
-libexec_PROGRAMS += gvfsd-admin
-endif
-
-mount_in_files +=google.mount.in
-if USE_GOOGLE
-mount_DATA += google.mount
-libexec_PROGRAMS += gvfsd-google
-endif
-
-mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in
-if HAVE_HTTP
-mount_DATA += http.mount dav.mount
-if HAVE_AVAHI
-mount_DATA += dav+sd.mount
-endif
-libexec_PROGRAMS += gvfsd-http gvfsd-dav
-endif
-
-mount_in_files += smb.mount.in smb-browse.mount.in
-gvfs_gschemas_dist += org.gnome.system.smb.gschema.xml
-gvfs_gschemas_convert_dist += gvfs-smb.convert
-if HAVE_SAMBA
-mount_DATA += smb.mount smb-browse.mount
-libexec_PROGRAMS += gvfsd-smb-browse gvfsd-smb
-gvfs_gschemas += org.gnome.system.smb.gschema.xml
-gvfs_gschemas_convert += gvfs-smb.convert
-endif
-
-mount_in_files += cdda.mount.in
-if USE_CDDA
-mount_DATA += cdda.mount
-libexec_PROGRAMS += gvfsd-cdda
-endif
-
-mount_in_files += gphoto2.mount.in
-if USE_GPHOTO2
-mount_DATA += gphoto2.mount
-libexec_PROGRAMS += gvfsd-gphoto2
-endif
-
-mount_in_files += mtp.mount.in
-if USE_LIBMTP
-mount_DATA += mtp.mount
-libexec_PROGRAMS += gvfsd-mtp
-endif
-
-mount_in_files += dns-sd.mount.in
-gvfs_gschemas_dist += org.gnome.system.dns_sd.gschema.xml
-gvfs_gschemas_convert_dist += gvfs-dns-sd.convert
-if HAVE_AVAHI
-mount_DATA += dns-sd.mount
-libexec_PROGRAMS += gvfsd-dnssd
-gvfs_gschemas += org.gnome.system.dns_sd.gschema.xml
-gvfs_gschemas_convert += gvfs-dns-sd.convert
-endif
-
-mount_in_files += archive.mount.in
-if HAVE_ARCHIVE
-mount_DATA += archive.mount
-libexec_PROGRAMS += gvfsd-archive
-endif
-
-mount_in_files += afc.mount.in
-if USE_AFC
-mount_DATA += afc.mount
-libexec_PROGRAMS += gvfsd-afc
-endif
-
-mount_in_files += afp-browse.mount.in afp.mount.in
-if USE_AFP
-mount_DATA += afp-browse.mount afp.mount
-libexec_PROGRAMS += gvfsd-afp-browse gvfsd-afp
-endif
-
-mount_in_files += nfs.mount.in
-if HAVE_NFS
-mount_DATA += nfs.mount
-libexec_PROGRAMS += gvfsd-nfs
-endif
-
-noinst_DATA = $(mount_DATA:.mount=.localmount)
-
-EXTRA_DIST = 				\
-	$(service_in_files)		\
-	$(systemd_user_in_files)	\
-	$(mount_in_files)		\
-	$(gvfs_gschemas_dist)		\
-	$(gvfs_gschemas_convert_dist)	\
-	$(gsettings_ENUM_FILES)		\
-	org.gtk.vfs.file-operations.policy.in.in \
-	org.gtk.vfs.file-operations.rules \
-	meson.build			\
-	$(NULL)
-
-DISTCLEANFILES = $(mount_DATA) $(noinst_DATA)
-
-CLEANFILES =					\
-	$(gsettings__enum_file)			\
-	$(service_DATA)				\
-	$(systemd_user_DATA)			\
-	$(gvfs_polkit_actions_DATA)		\
-	$(gvfs_polkit_actions_in_files)		\
-	*.gschema.valid
-
-noinst_PROGRAMS =				\
-	gvfsd-test			\
-	$(NULL)
-
-libgvfsdaemon_la_SOURCES = \
-	gvfstypes.h \
-	gvfsdaemon.c gvfsdaemon.h \
-	gvfsbackend.c gvfsbackend.h \
-	gvfschannel.c gvfschannel.h \
-	gvfsreadchannel.c gvfsreadchannel.h \
-	gvfswritechannel.c gvfswritechannel.h \
-	gvfsmonitor.c gvfsmonitor.h \
-	gvfsdaemonutils.c gvfsdaemonutils.h \
-	gvfsjob.c gvfsjob.h \
-	gvfsjobsource.c gvfsjobsource.h \
-	gvfsjobdbus.c gvfsjobdbus.h \
-	gvfsjobprogress.c gvfsjobprogress.h \
-	gvfsjobmount.c gvfsjobmount.h \
-	gvfsjobunmount.c gvfsjobunmount.h \
-	gvfsjobmountmountable.c gvfsjobmountmountable.h \
-	gvfsjobunmountmountable.c gvfsjobunmountmountable.h \
-	gvfsjobstartmountable.c gvfsjobstartmountable.h \
-	gvfsjobstopmountable.c gvfsjobstopmountable.h \
-	gvfsjobpollmountable.c gvfsjobpollmountable.h \
-	gvfsjobopenforread.c gvfsjobopenforread.h \
-	gvfsjobopeniconforread.c gvfsjobopeniconforread.h \
-	gvfsjoberror.c gvfsjoberror.h \
-	gvfsjobread.c gvfsjobread.h \
-	gvfsjobseekread.c gvfsjobseekread.h \
-	gvfsjobcloseread.c gvfsjobcloseread.h \
-	gvfsjobopenforwrite.c gvfsjobopenforwrite.h \
-	gvfsjobwrite.c gvfsjobwrite.h \
-	gvfsjobseekwrite.c gvfsjobseekwrite.h \
-	gvfsjobtruncate.c gvfsjobtruncate.h \
-	gvfsjobclosewrite.c gvfsjobclosewrite.h \
-	gvfsjobqueryinfo.c gvfsjobqueryinfo.h \
-	gvfsjobqueryinforead.c gvfsjobqueryinforead.h \
-	gvfsjobqueryinfowrite.c gvfsjobqueryinfowrite.h \
-	gvfsjobqueryfsinfo.c gvfsjobqueryfsinfo.h \
-	gvfsjobenumerate.c gvfsjobenumerate.h \
-	gvfsjobsetdisplayname.c gvfsjobsetdisplayname.h \
-	gvfsjobtrash.c gvfsjobtrash.h \
-	gvfsjobdelete.c gvfsjobdelete.h \
-	gvfsjobcopy.c gvfsjobcopy.h \
-	gvfsjobmove.c gvfsjobmove.h \
-	gvfsjobpush.c gvfsjobpush.h \
-	gvfsjobpull.c gvfsjobpull.h \
-	gvfsjobmakedirectory.c gvfsjobmakedirectory.h \
-	gvfsjobmakesymlink.c gvfsjobmakesymlink.h \
-	gvfsjobsetattribute.c gvfsjobsetattribute.h \
-	gvfsjobqueryattributes.c gvfsjobqueryattributes.h \
-	gvfsjobcreatemonitor.c gvfsjobcreatemonitor.h \
-	gvfskeyring.h gvfskeyring.c \
-        $(NULL)
-
-# needed by cygwin (see bug #564003)
-libgvfsdaemon_la_LDFLAGS = -no-undefined -avoid-version
-
-libgvfsdaemon_la_LIBADD = \
-	$(top_builddir)/common/libgvfscommon.la \
-	$(GLIB_LIBS) \
-	$(KEYRING_LIBS) \
-	$(GCR_LIBS)
-
-gvfsd_SOURCES = \
-	mount.c mount.h \
-	main.c
-
-gvfsd_LDADD = $(libraries)
-
-gvfsd_test_SOURCES = \
-	gvfsbackendtest.c gvfsbackendtest.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_test_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendtest.h \
-	-DDEFAULT_BACKEND_TYPE=test \
-	-DBACKEND_TYPES='"test", G_VFS_TYPE_BACKEND_TEST,'
-
-gvfsd_test_LDADD = $(libraries)
-
-gvfsd_localtest_SOURCES = \
-	gvfsbackendlocaltest.c gvfsbackendlocaltest.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c
-
-gvfsd_localtest_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendlocaltest.h \
-	-DDEFAULT_BACKEND_TYPE=localtest \
-	-DBACKEND_TYPES='"localtest", G_VFS_TYPE_BACKEND_LOCALTEST,'
-
-gvfsd_localtest_LDADD = $(libraries)
-
-gvfsd_smb_SOURCES = \
-	gvfsbackendsmb.c gvfsbackendsmb.h gvfsbackendsmbprivate.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_smb_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendsmb.h \
-	-DDEFAULT_BACKEND_TYPE=smb-share \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_TYPES='"smb-share", G_VFS_TYPE_BACKEND_SMB,'
-
-gvfsd_smb_LDADD = $(SAMBA_LIBS) $(libraries)
-
-gvfsd_smb_browse_SOURCES = \
-	gvfsbackendsmbbrowse.c gvfsbackendsmbbrowse.h \
-	gvfsbackendsmb.c gvfsbackendsmb.h gvfsbackendsmbprivate.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_smb_browse_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendsmbbrowse.h \
-	-DDEFAULT_BACKEND_TYPE=smb-network \
-	-DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint_smb_browse \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_TYPES='"smb-network", G_VFS_TYPE_BACKEND_SMB_BROWSE,"smb-server", G_VFS_TYPE_BACKEND_SMB_BROWSE,'
-
-gvfsd_smb_browse_LDADD = $(SAMBA_LIBS) $(libraries)
-
-gvfsd_ftp_SOURCES = \
-	gvfsftpconnection.c gvfsftpconnection.h \
-	gvfsftpdircache.c gvfsftpdircache.h \
-	gvfsftpfile.c gvfsftpfile.h \
-	gvfsftptask.c gvfsftptask.h \
-	gvfsbackendftp.c gvfsbackendftp.h \
-	ParseFTPList.c ParseFTPList.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_ftp_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendftp.h \
-	-DDEFAULT_BACKEND_TYPE=ftp \
-	-DMAX_JOB_THREADS=10 \
-	-DBACKEND_TYPES='"ftp", G_VFS_TYPE_BACKEND_FTP, "ftps", G_VFS_TYPE_BACKEND_FTP,'
-
-gvfsd_ftp_LDADD = $(libraries)
-
-gvfsd_sftp_SOURCES = \
-	sftp.h \
-	gvfsbackendsftp.c gvfsbackendsftp.h \
-	pty_open.c pty_open.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_sftp_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendsftp.h \
-	-DDEFAULT_BACKEND_TYPE=sftp \
-	-DMAX_JOB_THREADS=1 \
-	-DSSH_PROGRAM=\"$(SSH_PROGRAM)\"	\
-	-DBACKEND_TYPES='"sftp", G_VFS_TYPE_BACKEND_SFTP,'
-
-gvfsd_sftp_LDADD = $(libraries)
-
-gvfsd_trash_SOURCES = \
-	gvfsbackendtrash.c gvfsbackendtrash.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_trash_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendtrash.h \
-	-DDEFAULT_BACKEND_TYPE=trash \
-	-DMAX_JOB_THREADS=10 \
-	-DBACKEND_TYPES='"trash", G_VFS_TYPE_BACKEND_TRASH,' \
-	-Itrashlib
-
-gvfsd_trash_LDADD = trashlib/libtrash.a $(libraries)
-
-gvfsd_recent_SOURCES = \
-	gvfsbackendrecent.c gvfsbackendrecent.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c
-
-gvfsd_recent_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendrecent.h \
-	-DDEFAULT_BACKEND_TYPE=recent \
-	-DMAX_JOB_THREADS=10 \
-	-DBACKEND_USES_GVFS=1 \
-	-DBACKEND_TYPES='"recent", G_VFS_TYPE_BACKEND_RECENT,'
-
-gvfsd_recent_LDADD = $(libraries)
-
-gvfsd_computer_SOURCES = \
-	gvfsbackendcomputer.c gvfsbackendcomputer.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_computer_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendcomputer.h \
-	-DDEFAULT_BACKEND_TYPE=computer \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_USES_GVFS=1 \
-	-DBACKEND_TYPES='"computer", G_VFS_TYPE_BACKEND_COMPUTER,'
-
-gvfsd_computer_LDADD = $(libraries)
-
-gvfsd_network_SOURCES = \
-	gvfsbackendnetwork.c gvfsbackendnetwork.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_network_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendnetwork.h \
-	-DDEFAULT_BACKEND_TYPE=network \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_USES_GVFS=1 \
-	-DBACKEND_TYPES='"network", G_VFS_TYPE_BACKEND_NETWORK,'
-
-gvfsd_network_LDADD = $(libraries)
-
-gvfsd_dnssd_SOURCES = \
-	gvfsbackenddnssd.c gvfsbackenddnssd.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_dnssd_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackenddnssd.h \
-	-DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint_dnssd \
-	-DDEFAULT_BACKEND_TYPE=dns-sd \
-	-DMAX_JOB_THREADS=1 \
-	$(AVAHI_CFLAGS) \
-	-DBACKEND_TYPES='"dns-sd", G_VFS_TYPE_BACKEND_DNS_SD,'
-
-gvfsd_dnssd_LDADD = $(libraries) $(AVAHI_LIBS) $(top_builddir)/common/libgvfscommon-dnssd.la
-
-
-gvfsd_archive_SOURCES = \
-	gvfsbackendarchive.c gvfsbackendarchive.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_archive_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendarchive.h \
-	-DDEFAULT_BACKEND_TYPE=archive \
-	-DMAX_JOB_THREADS=1 \
-	$(ARCHIVE_CFLAGS) \
-	-DBACKEND_USES_GVFS=1 \
-	-DBACKEND_TYPES='"archive", G_VFS_TYPE_BACKEND_ARCHIVE,'
-
-gvfsd_archive_LDADD = $(libraries) $(ARCHIVE_LIBS)
-
-gvfsd_burn_SOURCES = \
-	gvfsbackendburn.c gvfsbackendburn.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_burn_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendburn.h \
-	-DDEFAULT_BACKEND_TYPE=burn \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_TYPES='"burn", G_VFS_TYPE_BACKEND_BURN,'
-
-gvfsd_burn_LDADD = $(libraries)
-
-gvfsd_cdda_SOURCES = \
-	gvfsbackendcdda.c gvfsbackendcdda.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_cdda_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendcdda.h \
-	-DDEFAULT_BACKEND_TYPE=cdda \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_TYPES='"cdda", G_VFS_TYPE_BACKEND_CDDA,' \
-	$(CDDA_CFLAGS) \
-	$(GUDEV_CFLAGS)
-
-gvfsd_cdda_LDADD = $(libraries) $(CDDA_LIBS) $(GUDEV_LIBS)
-
-gvfsd_admin_SOURCES = \
-	gvfsbackendadmin.c gvfsbackendadmin.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c
-
-gvfsd_admin_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendadmin.h \
-	-DDEFAULT_BACKEND_TYPE=admin \
-	-DBACKEND_TYPES='"admin", G_VFS_TYPE_BACKEND_ADMIN,' \
-	-DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint_admin \
-	$(ADMIN_CFLAGS)
-
-gvfsd_admin_LDADD = $(libraries) $(ADMIN_LIBS)
-
-gvfsd_google_SOURCES = \
-	gvfsbackendgoogle.c gvfsbackendgoogle.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c
-
-gvfsd_google_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendgoogle.h \
-	-DDEFAULT_BACKEND_TYPE=google-drive \
-	-DBACKEND_TYPES='"google-drive", G_VFS_TYPE_BACKEND_GOOGLE,' \
-	$(GOOGLE_CFLAGS)
-
-gvfsd_google_LDADD = $(libraries) $(GOOGLE_LIBS)
-
-gvfsd_gphoto2_SOURCES = \
-	gvfsbackendgphoto2.c gvfsbackendgphoto2.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_gphoto2_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendgphoto2.h \
-	-DDEFAULT_BACKEND_TYPE=gphoto2 \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_TYPES='"gphoto2", G_VFS_TYPE_BACKEND_GPHOTO2,' \
-	$(GPHOTO2_CFLAGS) \
-	$(GUDEV_CFLAGS)
-
-gvfsd_gphoto2_LDADD = $(libraries) $(GPHOTO2_LIBS) $(GUDEV_LIBS) \
-		      $(top_builddir)/common/libgvfscommon-gphoto2.la
-
-gvfsd_mtp_SOURCES = \
-	gvfsbackendmtp.c gvfsbackendmtp.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c
-
-gvfsd_mtp_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendmtp.h \
-	-DDEFAULT_BACKEND_TYPE=mtp \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_TYPES='"mtp", G_VFS_TYPE_BACKEND_MTP,' \
-	$(GUDEV_CFLAGS) $(LIBMTP_CFLAGS) $(LIBUSB_CFLAGS)
-
-gvfsd_mtp_LDADD = $(libraries) $(GUDEV_LIBS) $(LIBMTP_LIBS) $(LIBUSB_LIBS) \
-		  $(top_builddir)/common/libgvfscommon-gphoto2.la
-
-gvfsd_http_SOURCES = \
-	gvfshttpinputstream.c gvfshttpinputstream.h \
-	gvfsbackendhttp.c gvfsbackendhttp.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_http_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendhttp.h \
-	-DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint_http \
-	-DDEFAULT_BACKEND_TYPE=http \
-	-DMAX_JOB_THREADS=1 \
-	$(HTTP_CFLAGS) \
-	-DBACKEND_TYPES='"http", G_VFS_TYPE_BACKEND_HTTP,'
-
-gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
-
-gvfsd_dav_SOURCES = \
-	gvfshttpinputstream.c gvfshttpinputstream.h \
-	gvfsbackendhttp.c gvfsbackendhttp.h \
-	gvfsbackenddav.c gvfsbackenddav.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c 
-
-gvfsd_dav_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackenddav.h \
-	-DDEFAULT_BACKEND_TYPE=dav \
-	-DMAX_JOB_THREADS=1 \
-	$(HTTP_CFLAGS)
-
-if HAVE_AVAHI
-gvfsd_dav_CPPFLAGS += -DBACKEND_TYPES='"dav", G_VFS_TYPE_BACKEND_DAV, "dav+sd", G_VFS_TYPE_BACKEND_DAV, "davs+sd", G_VFS_TYPE_BACKEND_DAV,'
-else
-gvfsd_dav_CPPFLAGS += -DBACKEND_TYPES='"dav", G_VFS_TYPE_BACKEND_DAV,'
-endif
-
-gvfsd_dav_LDADD = $(libraries) $(HTTP_LIBS)
-if HAVE_AVAHI
-gvfsd_dav_LDADD += $(top_builddir)/common/libgvfscommon-dnssd.la
-endif
-
-gvfsd_afc_SOURCES = \
-	gvfsbackendafc.c gvfsbackendafc.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c
-
-gvfsd_afc_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendafc.h \
-	-DDEFAULT_BACKEND_TYPE=afc \
-	-DMAX_JOB_THREADS=1 \
-	$(AFC_CFLAGS) \
-	-DBACKEND_USES_GVFS=1 \
-	-DBACKEND_TYPES='"afc", G_VFS_TYPE_BACKEND_AFC,'
-
-gvfsd_afc_LDADD = \
-	$(libraries) \
-	$(AFC_LIBS)
-
-gvfsd_afp_browse_SOURCES = \
-	gvfsbackendafpbrowse.c gvfsbackendafpbrowse.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c \
-	gvfsafptypes.h \
-	gvfsafputils.c gvfsafputils.h \
-	gvfsafpconnection.h \
-	gvfsafpconnection.c \
-	gvfsafpserver.h \
-	gvfsafpserver.c \
-	gvfsafpvolume.h \
-	gvfsafpvolume.c
-
-gvfsd_afp_browse_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendafpbrowse.h \
-	-DDEFAULT_BACKEND_TYPE=afp-server \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_TYPES='"afp-server", G_VFS_TYPE_BACKEND_AFP_BROWSE,' \
-	$(LIBGCRYPT_CFLAGS)
-
-gvfsd_afp_browse_LDADD = \
-	$(libraries) \
-	$(LIBGCRYPT_LIBS)
-
-gvfsd_afp_SOURCES = \
-	gvfsbackendafp.c gvfsbackendafp.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c \
-	gvfsafptypes.h \
-	gvfsafputils.c gvfsafputils.h \
-	gvfsafpconnection.h \
-	gvfsafpconnection.c \
-	gvfsafpserver.h \
-	gvfsafpserver.c \
-	gvfsafpvolume.h \
-	gvfsafpvolume.c
-
-gvfsd_afp_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendafp.h \
-	-DDEFAULT_BACKEND_TYPE=afp-volume \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_TYPES='"afp-volume", G_VFS_TYPE_BACKEND_AFP,' \
-	$(LIBGCRYPT_CFLAGS)
-
-gvfsd_afp_LDADD = \
-	$(libraries) \
-	$(LIBGCRYPT_LIBS)
-
-gvfsd_nfs_SOURCES = \
-	gvfsbackendnfs.c gvfsbackendnfs.h \
-	daemon-main.c daemon-main.h \
-	daemon-main-generic.c
-
-gvfsd_nfs_CPPFLAGS = \
-	$(flags) \
-	-DBACKEND_HEADER=gvfsbackendnfs.h \
-	-DDEFAULT_BACKEND_TYPE=nfs \
-	-DMAX_JOB_THREADS=1 \
-	-DBACKEND_TYPES='"nfs", G_VFS_TYPE_BACKEND_NFS,' \
-	$(NFS_CFLAGS)
-
-gvfsd_nfs_LDADD = $(libraries) $(NFS_LIBS)
-
-# GSettings stuff
-gsettings_ENUM_NAMESPACE = org.gnome.system.gvfs
-gsettings_ENUM_FILES = $(top_srcdir)/daemon/gvfs-enums.h
-
-gsettings_SCHEMAS = $(gvfs_gschemas)
-
-@GSETTINGS_RULES@
-
-gvfs_gschemas_convertdir = $(datadir)/GConf/gsettings
-gvfs_gschemas_convert_DATA = $(gvfs_gschemas_convert)
-
-org.gtk.vfs.file-operations.policy.in: org.gtk.vfs.file-operations.policy.in.in Makefile
-	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-org.gtk.vfs.file-operations.policy: org.gtk.vfs.file-operations.policy.in Makefile
-	$(AM_V_GEN) XDG_DATA_DIRS=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || cp $< $@
-
-if HAVE_ADMIN
-gvfs_polkit_actionsdir = $(datadir)/polkit-1/actions
-gvfs_polkit_actions_in_files = org.gtk.vfs.file-operations.policy.in
-gvfs_polkit_actions_DATA = org.gtk.vfs.file-operations.policy
-
-gvfs_polkit_rulesdir = $(datadir)/polkit-1/rules.d
-gvfs_polkit_rules_DATA = org.gtk.vfs.file-operations.rules
-endif
diff --git a/daemon/trashlib/Makefile.am b/daemon/trashlib/Makefile.am
deleted file mode 100644
index e92a3214..00000000
--- a/daemon/trashlib/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-noinst_LIBRARIES = libtrash.a
-
-libtrash_a_CFLAGS = $(GLIB_CFLAGS)
-
-libtrash_a_SOURCES = \
-	dirwatch.h	\
-	dirwatch.c	\
-	trashdir.h	\
-	trashdir.c	\
-	trashitem.h	\
-	trashitem.c	\
-	trashwatcher.h	\
-	trashwatcher.c	\
-	trashexpunge.h	\
-	trashexpunge.c
-
-EXTRA_DIST = meson.build
diff --git a/glib-tap.mk b/glib-tap.mk
deleted file mode 100644
index e586122a..00000000
--- a/glib-tap.mk
+++ /dev/null
@@ -1,121 +0,0 @@
-# GLIB - Library of useful C routines
-
-TESTS_ENVIRONMENT= \
-	G_TEST_SRCDIR="$(abs_srcdir)" 		\
-	G_TEST_BUILDDIR="$(abs_builddir)" 	\
-	G_DEBUG=gc-friendly 			\
-	MALLOC_CHECK_=2 			\
-	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
-LOG_COMPILER = $(top_srcdir)/tap-test
-
-# initialize variables for unconditional += appending
-BUILT_SOURCES =
-BUILT_EXTRA_DIST =
-CLEANFILES = *.log *.trs
-DISTCLEANFILES =
-MAINTAINERCLEANFILES =
-EXTRA_DIST =
-TESTS =
-
-installed_test_LTLIBRARIES =
-installed_test_PROGRAMS =
-installed_test_SCRIPTS =
-nobase_installed_test_DATA =
-
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-noinst_SCRIPTS =
-noinst_DATA =
-
-check_LTLIBRARIES =
-check_PROGRAMS =
-check_SCRIPTS =
-check_DATA =
-
-# We support a fairly large range of possible variables.  It is expected that all types of files in a test suite
-# will belong in exactly one of the following variables.
-#
-# First, we support the usual automake suffixes, but in lowercase, with the customary meaning:
-#
-#   test_programs, test_scripts, test_data, test_ltlibraries
-#
-# The above are used to list files that are involved in both uninstalled and installed testing.  The
-# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite.
-# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is
-# installed in the same way as it appears in the package layout.
-#
-# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled',
-# like so:
-#
-#   installed_test_programs, uninstalled_test_programs
-#   installed_test_scripts, uninstalled_test_scripts
-#   installed_test_data, uninstalled_test_data
-#   installed_test_ltlibraries, uninstalled_test_ltlibraries
-#
-# Additionally, we support 'extra' infixes for programs and scripts.  This is used for support programs/scripts
-# that should not themselves be run as testcases (but exist to be used from other testcases):
-#
-#   test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs
-#   test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts
-#
-# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data
-# file automatically end up in the tarball.
-#
-#   dist_test_scripts, dist_test_data, dist_test_extra_scripts
-#   dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
-#   dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
-#
-# Note that no file is automatically disted unless it appears in one of the dist_ variables.  This follows the
-# standard automake convention of not disting programs scripts or data by default.
-#
-# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
-# variants) will be run as part of the in-tree 'make check'.  These are all assumed to be runnable under
-# gtester.  That's a bit strange for scripts, but it's possible.
-
-TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
-         $(dist_test_scripts) $(dist_uninstalled_test_scripts)
-
-# Note: build even the installed-only targets during 'make check' to ensure that they still work.
-# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
-# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
-# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
-all_test_programs     = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \
-                        $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs)
-all_test_scripts      = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \
-                        $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts)
-all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \
-                        $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts)
-all_test_scripts     += $(all_dist_test_scripts)
-EXTRA_DIST           += $(all_dist_test_scripts)
-all_test_data         = $(test_data) $(uninstalled_test_data) $(installed_test_data)
-all_dist_test_data    = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data)
-all_test_data        += $(all_dist_test_data)
-EXTRA_DIST           += $(all_dist_test_data)
-all_test_ltlibs       = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries)
-
-if ENABLE_INSTALLED_TESTS
-installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \
-                          $(test_extra_programs) $(installed_test_extra_programs)
-installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \
-                          $(test_extra_scripts) $(test_installed_extra_scripts)
-installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \
-                          $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts)
-nobase_installed_test_DATA += $(test_data) $(installed_test_data)
-nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data)
-installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries)
-installed_testcases = $(test_programs) $(installed_test_programs) \
-                      $(test_scripts) $(installed_test_scripts) \
-                      $(dist_test_scripts) $(dist_installed_test_scripts)
-
-installed_test_meta_DATA = $(installed_testcases:=.test)
-
-#%.test: %$(EXEEXT) Makefile
-#	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-#	echo 'Type=session' >> $@.tmp; \
-#	echo 'Exec=$(installed_testdir)/$(notdir $<) --tap' >> $@.tmp; \
-#	echo 'Output=TAP' >> $@.tmp; \
-#	mv $@.tmp $@)
-
-CLEANFILES += $(installed_test_meta_DATA)
-endif
diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644
index 086ecb60..00000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-XSLTPROC_FLAGS = \
-	--nonet \
-	--stringparam man.output.quietly 1 \
-	--stringparam funcsynopsis.style ansi \
-	--stringparam man.th.extra1.suppress 1 \
-	--stringparam man.authors.section.enabled 0 \
-	--stringparam man.copyright.section.enabled 0
-
-%.1: %.xml
-	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-%.7: %.xml
-	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-gvfs-mount.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-mount|" -e "s|\@replacement\@|gio mount|" $< > $@
-
-gvfs-cat.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-cat|" -e "s|\@replacement\@|gio cat|" $< > $@
-
-gvfs-open.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-open|" -e "s|\@replacement\@|gio open|" $< > $@
-
-gvfs-save.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-save|" -e "s|\@replacement\@|gio save|" $< > $@
-
-gvfs-ls.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-ls|" -e "s|\@replacement\@|gio list|" $< > $@
-
-gvfs-tree.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-tree|" -e "s|\@replacement\@|gio tree|" $< > $@
-
-gvfs-info.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-info|" -e "s|\@replacement\@|gio info|" $< > $@
-
-gvfs-set-attribute.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-set-attribute|" -e "s|\@replacement\@|gio set|" $< > $@
-
-gvfs-trash.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-trash|" -e "s|\@replacement\@|gio trash|" $< > $@
-
-gvfs-rename.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-rename|" -e "s|\@replacement\@|gio rename|" $< > $@
-
-gvfs-rm.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-rm|" -e "s|\@replacement\@|gio remove|" $< > $@
-
-gvfs-copy.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-copy|" -e "s|\@replacement\@|gio copy|" $< > $@
-
-gvfs-move.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-move|" -e "s|\@replacement\@|gio move|" $< > $@
-
-gvfs-monitor-file.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-monitor-file|" -e "s|\@replacement\@|gio monitor|" $< > $@
-
-gvfs-monitor-dir.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-monitor-dir|" -e "s|\@replacement\@|gio monitor|" $< > $@
-
-gvfs-mkdir.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-mkdir|" -e "s|\@replacement\@|gio mkdir|" $< > $@
-
-gvfs-mime.xml: deprecated.xml.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@original\@|gvfs-mime|" -e "s|\@replacement\@|gio mime|" $< > $@
-
-man_MANS = \
-	gvfs-cat.1 \
-	gvfs-copy.1 \
-	gvfs-info.1 \
-	gvfs-ls.1 \
-	gvfs-less.1 \
-	gvfs-mime.1 \
-	gvfs-mkdir.1 \
-	gvfs-monitor-dir.1 \
-	gvfs-monitor-file.1 \
-	gvfs-mount.1 \
-	gvfs-move.1 \
-	gvfs-open.1 \
-	gvfs-rename.1 \
-	gvfs-rm.1 \
-	gvfs-save.1 \
-	gvfs-set-attribute.1 \
-	gvfs-trash.1 \
-	gvfs-tree.1 \
-	gvfs.7 \
-	gvfsd.1 \
-	gvfsd-fuse.1 \
-	gvfsd-metadata.1
-
-EXTRA_DIST = \
-	deprecated.xml.in \
-	gvfsd-fuse.xml \
-	gvfsd-metadata.xml \
-	gvfsd.xml \
-	gvfs-less.xml \
-	gvfs.xml \
-	meson.build \
-	$(NULL)
-
-CLEANFILES = \
-	$(man_MANS) \
-	gvfs-cat.xml \
-	gvfs-copy.xml \
-	gvfs-info.xml \
-	gvfs-ls.xml \
-	gvfs-mime.xml \
-	gvfs-mkdir.xml \
-	gvfs-monitor-dir.xml \
-	gvfs-monitor-file.xml \
-	gvfs-mount.xml \
-	gvfs-move.xml \
-	gvfs-open.xml \
-	gvfs-rename.xml \
-	gvfs-rm.xml \
-	gvfs-save.xml \
-	gvfs-set-attribute.xml \
-	gvfs-trash.xml \
-	gvfs-tree.xml \
-	$(NULL)
diff --git a/metadata/.gitignore b/metadata/.gitignore
deleted file mode 100644
index 35d61456..00000000
--- a/metadata/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-convert-nautilus-metadata
-meta-get
-meta-ls
-meta-set
-meta-get-tree
-gvfsd-metadata
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
deleted file mode 100644
index a6da9705..00000000
--- a/metadata/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-NULL =
-
-dbus_built_sources = metadata-dbus.c metadata-dbus.h
-BUILT_SOURCES = $(dbus_built_sources)
-
-$(dbus_built_sources) : Makefile.am dbus-interface.xml
-	$(AM_V_GEN) gdbus-codegen				\
-		--interface-prefix org.gtk.vfs.			\
-		--c-namespace GVfs				\
-		--generate-c-code metadata-dbus			\
-		$(srcdir)/dbus-interface.xml			\
-		$(NULL)
-
-noinst_LTLIBRARIES=libmetadata.la
-
-APPS = 	\
-	meta-ls		\
-	meta-get	\
-	meta-set	\
-	meta-get-tree	\
-	$(NULL)
-
-if HAVE_LIBXML
-APPS += convert-nautilus-metadata
-endif
-
-noinst_PROGRAMS = $(APPS)
-
-libexec_PROGRAMS =\
-	gvfsd-metadata	\
-	$(NULL)
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common \
-	$(LIBXML_CFLAGS) $(GLIB_CFLAGS) \
-	-DGVFS_LOCALEDIR=\""$(localedir)"\"     \
-	-DG_LOG_DOMAIN=\"GVFS\" \
-	-DDBUS_API_SUBJECT_TO_CHANGE
-
-libmetadata_la_SOURCES = 		\
-	metatree.c metatree.h		\
-	metabuilder.c metabuilder.h 	\
-	crc32.c crc32.h			\
-	$(dbus_built_sources)		\
-	$(NULL)
-
-libmetadata_la_LIBADD = $(GLIB_LIBS)
-
-meta_ls_LDADD = libmetadata.la ../common/libgvfscommon.la
-meta_ls_SOURCES = meta-ls.c
-
-meta_set_LDADD = libmetadata.la ../common/libgvfscommon.la
-meta_set_SOURCES = meta-set.c
-
-meta_get_LDADD = libmetadata.la ../common/libgvfscommon.la
-meta_get_SOURCES = meta-get.c
-
-meta_get_tree_LDADD = libmetadata.la ../common/libgvfscommon.la
-meta_get_tree_SOURCES = meta-get-tree.c
-
-convert_nautilus_metadata_LDADD = libmetadata.la $(LIBXML_LIBS)
-convert_nautilus_metadata_SOURCES = metadata-nautilus.c
-
-gvfsd_metadata_LDADD = libmetadata.la ../common/libgvfscommon.la $(GUDEV_LIBS)
-gvfsd_metadata_SOURCES = meta-daemon.c
-gvfsd_metadata_CFLAGS = $(GUDEV_CFLAGS)
-
-# D-BUS service file
-%.service: %.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-servicedir = $(DBUS_SERVICE_DIR)
-service_in_files = org.gtk.vfs.Metadata.service.in
-service_DATA = org.gtk.vfs.Metadata.service
-
-systemd_user_in_files = gvfs-metadata.service.in
-if USE_SYSTEMD_USER_UNITS
-systemd_user_DATA = gvfs-metadata.service
-endif
-
-EXTRA_DIST =				\
-	$(service_in_files)		\
-	$(systemd_user_in_files)	\
-	dbus-interface.xml		\
-	meson.build			\
-	$(NULL)
-
-CLEANFILES =				\
-	$(dbus_built_sources)		\
-	$(service_DATA)			\
-	$(systemd_user_DATA)		\
-	$(NULL)
diff --git a/monitor/Makefile.am b/monitor/Makefile.am
deleted file mode 100644
index 3a8481a7..00000000
--- a/monitor/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-DIST_SUBDIRS = proxy gdu gphoto2 afc udisks2 mtp goa
-SUBDIRS = proxy
-
-if USE_GDU
-SUBDIRS += gdu
-endif
-
-if USE_UDISKS2
-SUBDIRS += udisks2
-endif
-
-if USE_GPHOTO2
-SUBDIRS += gphoto2
-endif
-
-if USE_AFC
-SUBDIRS += afc
-endif
-
-if USE_LIBMTP
-SUBDIRS += mtp
-endif
-
-if USE_GOA
-SUBDIRS += goa
-endif
-
-EXTRA_DIST = meson.build
diff --git a/monitor/afc/.gitignore b/monitor/afc/.gitignore
deleted file mode 100644
index b06527de..00000000
--- a/monitor/afc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gvfs-afc-volume-monitor
diff --git a/monitor/afc/Makefile.am b/monitor/afc/Makefile.am
deleted file mode 100644
index 2a1821db..00000000
--- a/monitor/afc/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-NULL =
-
-gvfs_src_dir = $(top_srcdir)/@with_gvfs_source@
-
-libexec_PROGRAMS = gvfs-afc-volume-monitor
-
-gvfs_afc_volume_monitor_SOURCES = \
-	afcvolume.c		afcvolume.h \
-	afcvolumemonitor.c 	afcvolumemonitor.h \
-	afcvolumemonitordaemon.c \
-	$(NULL)
-
-gvfs_afc_volume_monitor_CFLAGS = \
-	-DG_LOG_DOMAIN=\"GVFS-AFC\" \
-	-I$(top_srcdir)/common \
-	-I$(top_srcdir)/monitor/proxy \
-	$(GLIB_CFLAGS) \
-	$(AFC_CFLAGS) \
-	$(WARN_CFLAGS) \
-	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-	-DGVFS_LOCALEDIR=\"$(localedir)\" \
-	$(NULL)
-
-gvfs_afc_volume_monitor_LDADD = \
-	$(GLIB_LIBS) \
-	$(AFC_LIBS) \
-	$(top_builddir)/common/libgvfscommon.la \
-	$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
-	$(NULL)
-
-remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
-remote_volume_monitors_DATA = afc.monitor
-
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.gtk.vfs.AfcVolumeMonitor.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-systemd_user_in_files = gvfs-afc-volume-monitor.service.in
-if USE_SYSTEMD_USER_UNITS
-systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
-endif
-
-$(service_DATA): $(service_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-$(systemd_user_DATA): $(systemd_user_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-CLEANFILES = \
-	*~ \
-	*.loT \
-	$(BUILT_SOURCES) \
-	$(service_DATA) \
-	$(systemd_user_DATA) \
-	$(NULL)
-
-EXTRA_DIST = \
-	meson.build \
-	$(service_in_files) \
-	$(systemd_user_in_files) \
-	$(remote_volume_monitors_DATA) \
-	$(NULL)
diff --git a/monitor/gdu/Makefile.am b/monitor/gdu/Makefile.am
deleted file mode 100644
index 4ba128ff..00000000
--- a/monitor/gdu/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-
-NULL =
-
-libexec_PROGRAMS = gvfs-gdu-volume-monitor
-
-
-gvfs_gdu_volume_monitor_SOURCES =			\
-	gdu-volume-monitor-daemon.c			\
-	ggdudrive.c		ggdudrive.h		\
-	ggduvolume.c		ggduvolume.h		\
-	ggdumount.c		ggdumount.h		\
-	ggduvolumemonitor.c	ggduvolumemonitor.h	\
-	$(NULL)
-
-gvfs_gdu_volume_monitor_CFLAGS =		\
-	-DG_LOG_DOMAIN=\"GVFS-Gdu\"		\
-	-I$(top_srcdir)/common                  \
-	-I$(top_srcdir)/monitor/proxy           \
-	$(GLIB_CFLAGS)                          \
-	$(GDU_CFLAGS)                           \
-	$(GUDEV_CFLAGS)                         \
-	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	\
-	-DGVFS_LOCALEDIR=\""$(localedir)"\"	\
-	-DGDU_API_IS_SUBJECT_TO_CHANGE		\
-	$(NULL)
-
-gvfs_gdu_volume_monitor_LDFLAGS =	\
-	$(NULL)
-
-gvfs_gdu_volume_monitor_LDADD  =		     			      	\
-	$(GLIB_LIBS)                                 			      	\
-	$(GDU_LIBS)                                  			      	\
-	$(GUDEV_LIBS)                                  			      	\
-	$(top_builddir)/common/libgvfscommon.la 			      	\
-	$(top_builddir)/common/libgvfscommon-monitor.la			      	\
-	$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la 	\
-	$(NULL)
-
-remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
-remote_volume_monitors_DATA = gdu.monitor
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gtk.vfs.GduVolumeMonitor.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-systemd_user_in_files = gvfs-gdu-volume-monitor.service.in
-if USE_SYSTEMD_USER_UNITS
-systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
-endif
-
-$(service_DATA): $(service_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-$(systemd_user_DATA): $(systemd_user_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-CLEANFILES = \
-	*~ \
-	*.loT \
-	$(BUILT_SOURCES) \
-	$(service_DATA) \
-	$(systemd_user_DATA) \
-	$(NULL)
-
-EXTRA_DIST = \
-	meson.build \
-	$(service_in_files) \
-	$(systemd_user_in_files) \
-	$(remote_volume_monitors_DATA) \
-	$(NULL)
diff --git a/monitor/goa/.gitignore b/monitor/goa/.gitignore
deleted file mode 100644
index a0b53fb3..00000000
--- a/monitor/goa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gvfs-goa-volume-monitor
diff --git a/monitor/goa/Makefile.am b/monitor/goa/Makefile.am
deleted file mode 100644
index 9a85d04e..00000000
--- a/monitor/goa/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-NULL =
-
-gvfs_src_dir = $(top_srcdir)/@with_gvfs_source@
-
-libexec_PROGRAMS = gvfs-goa-volume-monitor
-
-gvfs_goa_volume_monitor_SOURCES = \
-	goavolume.c 		goavolume.h \
-	goavolumemonitor.c 	goavolumemonitor.h \
-	goavolumemonitordaemon.c \
-	$(NULL)
-
-gvfs_goa_volume_monitor_CFLAGS = \
-	-DG_LOG_DOMAIN=\"GVFS-GOA\" \
-	-I$(top_srcdir)/common \
-	-I$(top_srcdir)/monitor/proxy \
-	$(GLIB_CFLAGS) \
-	$(GOA_CFLAGS) \
-	$(WARN_CFLAGS) \
-	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-	-DGVFS_LOCALEDIR=\"$(localedir)\" \
-	$(NULL)
-
-gvfs_goa_volume_monitor_LDADD = \
-	$(GLIB_LIBS) \
-	$(GOA_LIBS) \
-	$(top_builddir)/common/libgvfscommon.la \
-	$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
-	$(NULL)
-
-remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
-remote_volume_monitors_DATA = goa.monitor
-
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.gtk.vfs.GoaVolumeMonitor.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-systemd_user_in_files = gvfs-goa-volume-monitor.service.in
-if USE_SYSTEMD_USER_UNITS
-systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
-endif
-
-$(service_DATA): $(service_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-$(systemd_user_DATA): $(systemd_user_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-CLEANFILES = \
-	*~ \
-	*.loT \
-	$(BUILT_SOURCES) \
-	$(service_DATA) \
-	$(systemd_user_DATA) \
-	$(NULL)
-
-EXTRA_DIST = \
-	meson.build \
-	$(service_in_files) \
-	$(systemd_user_in_files) \
-	$(remote_volume_monitors_DATA) \
-	$(NULL)
diff --git a/monitor/gphoto2/.gitignore b/monitor/gphoto2/.gitignore
deleted file mode 100644
index 515c145a..00000000
--- a/monitor/gphoto2/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gvfs-gphoto2-volume-monitor
diff --git a/monitor/gphoto2/Makefile.am b/monitor/gphoto2/Makefile.am
deleted file mode 100644
index 2beb08fc..00000000
--- a/monitor/gphoto2/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-
-NULL =
-
-libexec_PROGRAMS = gvfs-gphoto2-volume-monitor
-
-gvfs_gphoto2_volume_monitor_SOURCES =			\
-	gphoto2-volume-monitor-daemon.c			\
-	ggphoto2volume.c	ggphoto2volume.h	\
-	ggphoto2volumemonitor.c	ggphoto2volumemonitor.h	\
-	$(NULL)
-
-gvfs_gphoto2_volume_monitor_CFLAGS =		\
-	-DG_LOG_DOMAIN=\"GVFS-GPhoto2\"		\
-	-I$(top_srcdir)/common                  \
-	-I$(top_srcdir)/monitor/proxy           \
-	$(GLIB_CFLAGS)                          \
-	$(GPHOTO2_CFLAGS)			\
-	$(GUDEV_CFLAGS)				\
-	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	\
-	-DGVFS_LOCALEDIR=\""$(localedir)"\"	\
-	$(NULL)
-
-gvfs_gphoto2_volume_monitor_LDFLAGS =	\
-	$(NULL)
-
-gvfs_gphoto2_volume_monitor_LDADD  =		     			      \
-	$(GLIB_LIBS)                                 			      \
-	$(GPHOTO2_LIBS)                              			      \
-	$(GUDEV_LIBS)                                                         \
-	$(top_builddir)/common/libgvfscommon-gphoto2.la                       \
-	$(top_builddir)/common/libgvfscommon.la 			      \
-	$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
-	$(NULL)
-
-remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
-remote_volume_monitors_DATA = gphoto2.monitor
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gtk.vfs.GPhoto2VolumeMonitor.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-systemd_user_in_files = gvfs-gphoto2-volume-monitor.service.in
-if USE_SYSTEMD_USER_UNITS
-systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
-endif
-
-$(service_DATA): $(service_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-$(systemd_user_DATA): $(systemd_user_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-CLEANFILES = \
-	*~ \
-	*.loT \
-	$(BUILT_SOURCES) \
-	$(service_DATA) \
-	$(systemd_user_DATA) \
-	$(NULL)
-
-EXTRA_DIST = \
-	meson.build \
-	$(service_in_files) \
-	$(systemd_user_in_files) \
-	$(remote_volume_monitors_DATA) \
-	$(NULL)
diff --git a/monitor/mtp/.gitignore b/monitor/mtp/.gitignore
deleted file mode 100644
index 0bf331b1..00000000
--- a/monitor/mtp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gvfs-mtp-volume-monitor
diff --git a/monitor/mtp/Makefile.am b/monitor/mtp/Makefile.am
deleted file mode 100644
index af0d10e4..00000000
--- a/monitor/mtp/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-
-NULL =
-
-libexec_PROGRAMS = gvfs-mtp-volume-monitor
-
-gvfs_mtp_volume_monitor_SOURCES =
-
-gvfs_mtp_volume_monitor_SOURCES +=			\
-        mtp-volume-monitor-daemon.c \
-	gmtpvolume.c	gmtpvolume.h	\
-	gmtpvolumemonitor.c	gmtpvolumemonitor.h	\
-	$(NULL)
-
-gvfs_mtp_volume_monitor_CFLAGS =		\
-	-DG_LOG_DOMAIN=\"GVFS-MTP\"		\
-	-I$(top_srcdir)/common                  \
-	-I$(top_srcdir)/monitor/proxy           \
-	$(GLIB_CFLAGS)                          \
-	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	\
-	-DGVFS_LOCALEDIR=\""$(localedir)"\"	\
-	$(NULL)
-
-gvfs_mtp_volume_monitor_CFLAGS += $(GUDEV_CFLAGS)
-
-gvfs_mtp_volume_monitor_LDFLAGS =	\
-	$(NULL)
-
-gvfs_mtp_volume_monitor_LDADD  =		     			      \
-	$(GLIB_LIBS)                                 			      \
-	$(top_builddir)/common/libgvfscommon.la 			      \
-	$(top_builddir)/common/libgvfscommon-gphoto2.la                       \
-	$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
-	$(NULL)
-
-
-remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
-remote_volume_monitors_DATA = mtp.monitor
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gtk.vfs.MTPVolumeMonitor.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-systemd_user_in_files = gvfs-mtp-volume-monitor.service.in
-if USE_SYSTEMD_USER_UNITS
-systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
-endif
-
-$(service_DATA): $(service_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-$(systemd_user_DATA): $(systemd_user_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-CLEANFILES = \
-	*~ \
-	*.loT \
-	$(BUILT_SOURCES) \
-	$(service_DATA) \
-	$(systemd_user_DATA) \
-	$(NULL)
-
-EXTRA_DIST = \
-	$(service_in_files) \
-	$(systemd_user_in_files) \
-	$(remote_volume_monitors_DATA) \
-	meson.build \
-	$(NULL)
diff --git a/monitor/proxy/Makefile.am b/monitor/proxy/Makefile.am
deleted file mode 100644
index cf449c44..00000000
--- a/monitor/proxy/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-
-NULL =
-
-remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
-
-module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
-
-dbus_built_sources = gvfsvolumemonitordbus.c gvfsvolumemonitordbus.h
-BUILT_SOURCES = $(dbus_built_sources)
-
-$(dbus_built_sources) : Makefile.am dbus-interfaces.xml
-	$(AM_V_GEN) gdbus-codegen									\
-		--interface-prefix org.gtk.Private.					\
-		--c-namespace GVfs							\
-		--generate-c-code gvfsvolumemonitordbus					\
-		$(srcdir)/dbus-interfaces.xml							\
-		$(NULL)
-
-
-
-giomodules_LTLIBRARIES = libgioremote-volume-monitor.la
-
-libgioremote_volume_monitor_la_SOURCES =				\
-	remote-volume-monitor-module.c					\
-	gproxydrive.c			gproxydrive.h			\
-	gproxyvolume.c			gproxyvolume.h			\
-	gproxymount.c			gproxymount.h			\
-	gproxyshadowmount.c		gproxyshadowmount.h		\
-	gproxyvolumemonitor.c		gproxyvolumemonitor.h		\
-	gproxymountoperation.c		gproxymountoperation.h		\
-	$(dbus_built_sources)						\
-	$(NULL)
-
-libgioremote_volume_monitor_la_CFLAGS =					\
-	-DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitor\"			\
-	-I$(top_srcdir)/common                  			\
-	-I$(top_builddir)/common                  			\
-	$(GLIB_CFLAGS)                          			\
-	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"				\
-	-DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" 	\
-	-DGVFS_LOCALEDIR=\""$(localedir)"\"				\
-	$(NULL)
-
-libgioremote_volume_monitor_la_LDFLAGS = 				\
-	$(module_flags)               					\
-	$(NULL)
-
-libgioremote_volume_monitor_la_LIBADD  =		     		\
-	$(GLIB_LIBS)                                 			\
-	$(top_builddir)/common/libgvfscommon.la 			\
-	$(NULL)
-
-############################################################################
-
-noinst_LTLIBRARIES = libgvfsproxyvolumemonitordaemon-noin.la
-
-libgvfsproxyvolumemonitordaemon_noin_la_SOURCES =		\
-	gvfsproxyvolumemonitordaemon.c				\
-	gvfsproxyvolumemonitordaemon.h				\
-	$(dbus_built_sources)					\
-	$(NULL)
-
-libgvfsproxyvolumemonitordaemon_noin_la_CFLAGS =		\
-	-I$(top_srcdir)/common                  		\
-	$(GLIB_CFLAGS)                          		\
-	$(GDU_CFLAGS)                           		\
-	-DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitorDaemon\"	\
-	-DGVFS_LOCALEDIR=\""$(localedir)"\"			\
-	$(NULL)
-
-libgvfsproxyvolumemonitordaemon_noin_la_LIBADD  =     		\
-	$(GLIB_LIBS)                                 		\
-	$(top_builddir)/common/libgvfscommon.la 		\
-	$(NULL)
-
-clean-local:
-	rm -f *~ *.loT
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(remote_volume_monitorsdir)
-
-EXTRA_DIST =							\
-	dbus-interfaces.xml					\
-	meson.build						\
-	symbol.map						\
-	$(NULL)
-
-CLEANFILES =							\
-	$(dbus_built_sources)					\
-	$(NULL)
diff --git a/monitor/udisks2/.gitignore b/monitor/udisks2/.gitignore
deleted file mode 100644
index 6ce93f80..00000000
--- a/monitor/udisks2/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gvfs-udisks2-volume-monitor
diff --git a/monitor/udisks2/Makefile.am b/monitor/udisks2/Makefile.am
deleted file mode 100644
index 304b9c19..00000000
--- a/monitor/udisks2/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-
-NULL =
-
-libexec_PROGRAMS = gvfs-udisks2-volume-monitor
-
-gvfs_udisks2_volume_monitor_SOURCES =					\
-	udisks2volumemonitordaemon.c					\
-	gvfsudisks2volumemonitor.c	gvfsudisks2volumemonitor.h	\
-	gvfsudisks2drive.c		gvfsudisks2drive.h		\
-	gvfsudisks2volume.c		gvfsudisks2volume.h		\
-	gvfsudisks2mount.c		gvfsudisks2mount.h		\
-	gvfsudisks2utils.c		gvfsudisks2utils.h		\
-	$(NULL)
-
-gvfs_udisks2_volume_monitor_CFLAGS =		\
-	-DG_LOG_DOMAIN=\"GVFS-UDisks2\"		\
-	-I$(top_srcdir)/common                  \
-	-I$(top_srcdir)/monitor/proxy           \
-	$(GLIB_CFLAGS)                          \
-	$(UDISKS2_CFLAGS)                       \
-	$(GUDEV_CFLAGS)                         \
-	$(LIBSYSTEMD_LOGIN_CFLAGS)		\
-	$(KEYRING_CFLAGS)			\
-	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	\
-	-DGVFS_LOCALEDIR=\""$(localedir)"\"	\
-	-DG_DISABLE_DEPRECATED			\
-	-DUDISKS_API_IS_SUBJECT_TO_CHANGE	\
-	$(NULL)
-
-gvfs_udisks2_volume_monitor_LDFLAGS =	\
-	$(NULL)
-
-gvfs_udisks2_volume_monitor_LDADD  =		     			      	\
-	$(GLIB_LIBS)                                 			      	\
-	$(UDISKS2_LIBS)                                  			\
-	$(GUDEV_LIBS)                                  			      	\
-	$(LIBSYSTEMD_LOGIN_LIBS)						\
-	$(KEYRING_LIBS)								\
-	$(top_builddir)/common/libgvfscommon.la 			      	\
-	$(top_builddir)/common/libgvfscommon-monitor.la			      	\
-	$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la 	\
-	$(NULL)
-
-remote_volume_monitorsdir = $(datadir)/gvfs/remote-volume-monitors
-remote_volume_monitors_DATA = udisks2.monitor
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.gtk.vfs.UDisks2VolumeMonitor.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-systemd_user_in_files = gvfs-udisks2-volume-monitor.service.in
-if USE_SYSTEMD_USER_UNITS
-systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
-endif
-
-$(service_DATA): $(service_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-$(systemd_user_DATA): $(systemd_user_in_files) Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-CLEANFILES = \
-	*~ \
-	*.loT \
-	$(BUILT_SOURCES) \
-	$(service_DATA) \
-	$(systemd_user_DATA) \
-	$(NULL)
-
-EXTRA_DIST = \
-	what-is-shown.txt \
-	meson.build \
-	$(service_in_files) \
-	$(systemd_user_in_files) \
-	$(remote_volume_monitors_DATA) \
-	$(NULL)
diff --git a/po/.gitignore b/po/.gitignore
deleted file mode 100644
index 88fa6858..00000000
--- a/po/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.gmo
-*.mo
-*.pot
-Makefile.in.in
-POTFILES
-po2tbl.sed
-po2tbl.sed.in
-cat-id-tbl.c
-stamp-cat-id
-stamp-it
-messages
-missing
diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644
index 284dda63..00000000
--- a/po/Makevars
+++ /dev/null
@@ -1,78 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = gvfs contributors
-
-# This tells whether or not to prepend "GNU " prefix to the package
-# name that gets inserted into the header of the $(DOMAIN).pot file.
-# Possible values are "yes", "no", or empty.  If it is empty, try to
-# detect it automatically by scanning the files in $(top_srcdir) for
-# "GNU packagename" string.
-PACKAGE_GNU = no
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = https://bugzilla.gnome.org/enter_bug.cgi?product=gvfs&keywords=I18N+L10N&component=general
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
-# context.  Possible values are "yes" and "no".  Set this to yes if the
-# package uses functions taking also a message context, like pgettext(), or
-# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = no
-
-# These options get passed to msgmerge.
-# Useful options are in particular:
-#   --previous            to keep previous msgids of translated messages,
-#   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed.  Possible values are "yes" and "no".  Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = no
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/programs/.gitignore b/programs/.gitignore
deleted file mode 100644
index ed299986..00000000
--- a/programs/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-gvfs-cat
-gvfs-copy
-gvfs-info
-gvfs-ls
-gvfs-mime
-gvfs-mkdir
-gvfs-monitor-dir
-gvfs-monitor-file
-gvfs-mount
-gvfs-move
-gvfs-open
-gvfs-rename
-gvfs-rm
-gvfs-save
-gvfs-trash
-gvfs-tree
-gvfs-set-attribute
diff --git a/programs/Makefile.am b/programs/Makefile.am
deleted file mode 100644
index 0eb074b6..00000000
--- a/programs/Makefile.am
+++ /dev/null
@@ -1,99 +0,0 @@
-NULL =
-
-bin_SCRIPTS =					\
-	gvfs-mount				\
-	gvfs-cat				\
-	gvfs-open				\
-	gvfs-save				\
-	gvfs-ls					\
-	gvfs-tree				\
-	gvfs-info				\
-	gvfs-set-attribute			\
-	gvfs-trash				\
-	gvfs-rename                             \
-	gvfs-rm					\
-	gvfs-copy				\
-	gvfs-move				\
-	gvfs-monitor-file			\
-	gvfs-monitor-dir			\
-	gvfs-mkdir				\
-	gvfs-mime				\
-	gvfs-less				\
-	$(NULL)
-
-gvfs-mount: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|mount|" $< > $@
-
-gvfs-cat: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|cat|" $< > $@
-
-gvfs-open: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|open|" $< > $@
-
-gvfs-save: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|save|" $< > $@
-
-gvfs-ls: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|list|" $< > $@
-
-gvfs-tree: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|tree|" $< > $@
-
-gvfs-info: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|info|" $< > $@
-
-gvfs-set-attribute: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|set|" $< > $@
-
-gvfs-trash: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|trash|" $< > $@
-
-gvfs-rename: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|rename|" $< > $@
-
-gvfs-rm: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|remove|" $< > $@
-
-gvfs-copy: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|copy|" $< > $@
-
-gvfs-move: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|move|" $< > $@
-
-gvfs-monitor-file: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|monitor|" $< > $@
-
-gvfs-monitor-dir: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|monitor|" $< > $@
-
-gvfs-mkdir: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|mkdir|" $< > $@
-
-gvfs-mime: deprecated.in Makefile
-	$(AM_V_GEN) $(SED) -e "s|\@command\@|mime|" $< > $@
-
-EXTRA_DIST = \
-	deprecated.in \
-	gvfs-less \
-	meson.build \
-	$(NULL)
-
-CLEANFILES = \
-	gvfs-mount \
-	gvfs-cat \
-	gvfs-open \
-	gvfs-save \
-	gvfs-ls \
-	gvfs-tree \
-	gvfs-info \
-	gvfs-set-attribute \
-	gvfs-trash \
-	gvfs-rename \
-	gvfs-rm \
-	gvfs-copy \
-	gvfs-move \
-	gvfs-monitor-file \
-	gvfs-monitor-dir \
-	gvfs-mkdir \
-	gvfs-mime \
-	$(NULL)
diff --git a/test/.gitignore b/test/.gitignore
deleted file mode 100644
index c361cbf2..00000000
--- a/test/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.monitor
-*.service
-*.test
-session.conf
-benchmark-gvfs-big-files
-benchmark-gvfs-small-files
-benchmark-posix-big-files
-benchmark-posix-small-files
-test-query-info-stream
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 3142ce1e..00000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-include $(top_srcdir)/glib-tap.mk
-
-NULL =
-
-AM_CFLAGS =                       \
-	-I$(top_srcdir)           \
-	-I$(top_builddir)         \
-	$(GLIB_CFLAGS)
-
-AM_LDFLAGS =                           \
-	$(GLIB_LIBS)
-
-noinst_PROGRAMS += \
-	test-query-info-stream    \
-	benchmark-gvfs-small-files    \
-	benchmark-gvfs-big-files      \
-	benchmark-posix-small-files   \
-	benchmark-posix-big-files     \
-	$(NULL)
-
-session.conf: session.conf.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@testdir\@|.|" $< > $@
-
-org.gtk.vfs.Daemon.service: $(top_srcdir)/daemon/org.gtk.vfs.Daemon.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/daemon|" $< > $@
-
-org.gtk.vfs.Metadata.service: $(top_srcdir)/metadata/org.gtk.vfs.Metadata.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/metadata|" $< > $@
-
-%.monitor:
-	$(AM_V_GEN) ln -s $(top_srcdir)/monitor/$(*F)/$(@F) $@
-
-CONFIG_FILES=session.conf org.gtk.vfs.Daemon.service org.gtk.vfs.Metadata.service
-CONFIG_FILES_INSTALLED=session.conf $(top_builddir)/daemon/org.gtk.vfs.Daemon.service $(top_builddir)/metadata/org.gtk.vfs.Metadata.service
-
-if USE_AFC
-org.gtk.vfs.AfcVolumeMonitor.service: $(top_srcdir)/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/afc|" $< > $@
-CONFIG_FILES+=org.gtk.vfs.AfcVolumeMonitor.service afc.monitor
-CONFIG_FILES_INSTALLED+=$(top_builddir)/monitor/afc/org.gtk.vfs.AfcVolumeMonitor.service afc.monitor
-endif
-
-if USE_GDU
-org.gtk.vfs.GduVolumeMonitor.service: $(top_srcdir)/monitor/gdu/org.gtk.vfs.GduVolumeMonitor.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/gdu|" $< > $@
-CONFIG_FILES+=org.gtk.vfs.GduVolumeMonitor.service gdu.monitor
-CONFIG_FILES_INSTALLED+=$(top_builddir)/monitor/afc/org.gtk.vfs.GduVolumeMonitor.service gdu.monitor
-endif
-
-if USE_GPHOTO2
-org.gtk.vfs.GPhoto2VolumeMonitor.service: $(top_srcdir)/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/gphoto2|" $< > $@
-CONFIG_FILES+=org.gtk.vfs.GPhoto2VolumeMonitor.service gphoto2.monitor
-CONFIG_FILES_INSTALLED+=$(top_builddir)/monitor/gphoto2/org.gtk.vfs.GPhoto2VolumeMonitor.service gphoto2.monitor
-endif
-
-if USE_UDISKS2
-org.gtk.vfs.UDisks2VolumeMonitor.service: $(top_srcdir)/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service.in ../config.log
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(abs_top_builddir)/monitor/udisks2|" $< > $@
-CONFIG_FILES+=org.gtk.vfs.UDisks2VolumeMonitor.service udisks2.monitor
-CONFIG_FILES_INSTALLED+=$(top_builddir)/monitor/udisks2/org.gtk.vfs.UDisks2VolumeMonitor.service udisks2.monitor
-endif
-
-noinst_DATA += $(CONFIG_FILES)
-
-# run tests against build tree
-check: $(CONFIG_FILES) gvfs-test
-	$(srcdir)/run-in-tree.sh $(srcdir)/gvfs-test $(TEST_NAMES)
-
-# run tests against the installed system packages
-# when running as root, use gvfs-testbed to enable all tests
-installcheck-local: gvfs-test
-	if [ `id -u` = 0 ]; then \
-	    $(srcdir)/gvfs-testbed $(srcdir)/gvfs-test $(TEST_NAMES); \
-	else \
-	    $(srcdir)/gvfs-test $(TEST_NAMES); \
-	fi
-
-CLEANFILES += $(CONFIG_FILES)
-
-installed_test_DATA = $(CONFIG_FILES_INSTALLED)
-nobase_installed_test_DATA += \
-	files/source-gphoto/IMG_0001.jpg \
-	files/source-gphoto/IMG_0002.jpg \
-	files/bogus-cd.iso.bz2 \
-	files/joliet.iso.bz2 \
-	files/powershot.ioctl \
-	files/powershot.umockdev \
-	files/ssh_host_rsa_key \
-	files/ssh_host_rsa_key.pub \
-	files/testcert.pem \
-	files/vfat.img.bz2 \
-	$(NULL)
-
-test_extra_scripts = \
-	gvfs-test \
-	$(NULL)
-
-test_scripts = gvfs-all-tests
-
-gvfs-all-tests.test: gvfs-test
-	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-	echo 'Type=session' >> $@.tmp; \
-	echo 'Exec=$(installed_testdir)/gvfs-test' >> $@.tmp; \
-	echo 'Output=TAP' >> $@.tmp; \
-	mv $@.tmp $@)
-
-.PHONY: $(test_scripts)
-
-EXTRA_DIST += \
-	benchmark-common.c		\
-	session.conf.in 		\
-	gvfs-test			\
-	gvfs-testbed			\
-	run-in-tree.sh			\
-	test_polkitd.py			\
-	files/ssh_host_rsa_key files	\
-	files/ssh_host_rsa_key.pub	\
-	files/testcert.pem		\
-	files/powershot.ioctl		\
-	files/powershot.umockdev	\
-	meson.build			\
-	gvfs-all-tests.in		\
-	$(NULL)