From dc0988d47c4725e00c042e4e6c724b6552baa856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Mon, 11 Sep 2017 18:28:23 +0200
Subject: [PATCH] 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=785414
---
 Makefile.am                                   |  57 --
 Makefile.decl                                 |  53 --
 autogen.sh                                    |  31 -
 configure.ac                                  | 600 ------------------
 data/Makefile.am                              |   2 -
 data/icons/Makefile.am                        |  85 ---
 git.mk                                        | 311 ---------
 m4/as-ac-expand.m4                            |  43 --
 m4/ax_config_dir.m4                           | 109 ----
 m4/empty                                      |   1 -
 man/Makefile.am                               |  23 -
 panels/Makefile.am                            |  36 --
 panels/background/Makefile.am                 | 100 ---
 panels/bluetooth/Makefile.am                  |  38 --
 panels/color/Makefile.am                      |  50 --
 panels/color/icons/16x16/Makefile.am          |  13 -
 panels/color/icons/22x22/Makefile.am          |  13 -
 panels/color/icons/24x24/Makefile.am          |  13 -
 panels/color/icons/256x256/Makefile.am        |  13 -
 panels/color/icons/32x32/Makefile.am          |  13 -
 panels/color/icons/48x48/Makefile.am          |  13 -
 panels/color/icons/64x64/Makefile.am          |  13 -
 panels/color/icons/Makefile.am                |  22 -
 panels/color/icons/scalable/Makefile.am       |  13 -
 panels/common/Makefile.am                     | 100 ---
 panels/datetime/Makefile.am                   | 116 ----
 panels/datetime/po-timezones/Makefile.am      |  35 -
 panels/display/Makefile.am                    |  80 ---
 panels/info/Makefile.am                       |  69 --
 panels/keyboard/Makefile.am                   |  76 ---
 panels/mouse/Makefile.am                      |  56 --
 panels/network/Makefile.am                    |  65 --
 panels/network/connection-editor/Makefile.am  |  56 --
 panels/network/wireless-security/Makefile.am  |  72 ---
 panels/notifications/Makefile.am              |  39 --
 panels/online-accounts/Makefile.am            |  46 --
 .../online-accounts/icons/16x16/Makefile.am   |  14 -
 .../online-accounts/icons/22x22/Makefile.am   |  14 -
 .../online-accounts/icons/24x24/Makefile.am   |  14 -
 .../online-accounts/icons/256x256/Makefile.am |  14 -
 .../online-accounts/icons/32x32/Makefile.am   |  14 -
 .../online-accounts/icons/48x48/Makefile.am   |  14 -
 panels/online-accounts/icons/Makefile.am      |  25 -
 panels/power/Makefile.am                      |  50 --
 panels/power/icons/16x16/Makefile.am          |  14 -
 panels/power/icons/22x22/Makefile.am          |  14 -
 panels/power/icons/24x24/Makefile.am          |  14 -
 panels/power/icons/256x256/Makefile.am        |  14 -
 panels/power/icons/32x32/Makefile.am          |  14 -
 panels/power/icons/48x48/Makefile.am          |  14 -
 panels/power/icons/Makefile.am                |  24 -
 panels/printers/Makefile.am                   |  89 ---
 panels/privacy/Makefile.am                    |  38 --
 panels/region/Makefile.am                     |  52 --
 panels/search/Makefile.am                     |  41 --
 panels/sharing/Makefile.am                    |  81 ---
 panels/sound/Makefile.am                      |  74 ---
 panels/sound/data/Makefile.am                 |  42 --
 panels/sound/data/icons/16x16/Makefile.am     |   4 -
 .../sound/data/icons/16x16/apps/Makefile.am   |  19 -
 .../data/icons/16x16/devices/Makefile.am      |  18 -
 .../sound/data/icons/16x16/status/Makefile.am |  21 -
 panels/sound/data/icons/22x22/Makefile.am     |   4 -
 .../sound/data/icons/22x22/apps/Makefile.am   |  19 -
 .../sound/data/icons/22x22/status/Makefile.am |  21 -
 panels/sound/data/icons/24x24/Makefile.am     |   4 -
 .../sound/data/icons/24x24/apps/Makefile.am   |  18 -
 .../data/icons/24x24/devices/Makefile.am      |  18 -
 .../sound/data/icons/24x24/status/Makefile.am |  21 -
 panels/sound/data/icons/32x32/Makefile.am     |   4 -
 .../sound/data/icons/32x32/apps/Makefile.am   |  19 -
 .../data/icons/32x32/devices/Makefile.am      |  18 -
 .../sound/data/icons/32x32/status/Makefile.am |  21 -
 panels/sound/data/icons/48x48/Makefile.am     |   4 -
 .../sound/data/icons/48x48/apps/Makefile.am   |  18 -
 .../data/icons/48x48/devices/Makefile.am      |  18 -
 panels/sound/data/icons/Makefile.am           |  14 -
 panels/sound/data/icons/scalable/Makefile.am  |   4 -
 .../data/icons/scalable/apps/Makefile.am      |  18 -
 .../data/icons/scalable/devices/Makefile.am   |  37 --
 panels/sound/data/sounds/Makefile.am          |  29 -
 panels/sound/data/symbolic-icons/Makefile.am  |  11 -
 .../data/symbolic-icons/scalable/Makefile.am  |   3 -
 .../scalable/status/Makefile.am               |  14 -
 panels/universal-access/Makefile.am           |  40 --
 panels/user-accounts/Makefile.am              | 131 ----
 panels/user-accounts/data/Makefile.am         |  20 -
 panels/user-accounts/data/faces/Makefile.am   |  34 -
 panels/wacom/Makefile.am                      |  91 ---
 panels/wacom/calibrator/Makefile.am           |  49 --
 search-provider/Makefile.am                   |  54 --
 shell/Makefile.am                             | 161 -----
 shell/appdata/Makefile.am                     |  16 -
 93 files changed, 4154 deletions(-)
 delete mode 100644 Makefile.am
 delete mode 100644 Makefile.decl
 delete mode 100755 autogen.sh
 delete mode 100644 configure.ac
 delete mode 100644 data/Makefile.am
 delete mode 100644 data/icons/Makefile.am
 delete mode 100644 git.mk
 delete mode 100644 m4/as-ac-expand.m4
 delete mode 100644 m4/ax_config_dir.m4
 delete mode 100644 m4/empty
 delete mode 100644 man/Makefile.am
 delete mode 100644 panels/Makefile.am
 delete mode 100644 panels/background/Makefile.am
 delete mode 100644 panels/bluetooth/Makefile.am
 delete mode 100644 panels/color/Makefile.am
 delete mode 100644 panels/color/icons/16x16/Makefile.am
 delete mode 100644 panels/color/icons/22x22/Makefile.am
 delete mode 100644 panels/color/icons/24x24/Makefile.am
 delete mode 100644 panels/color/icons/256x256/Makefile.am
 delete mode 100644 panels/color/icons/32x32/Makefile.am
 delete mode 100644 panels/color/icons/48x48/Makefile.am
 delete mode 100644 panels/color/icons/64x64/Makefile.am
 delete mode 100644 panels/color/icons/Makefile.am
 delete mode 100644 panels/color/icons/scalable/Makefile.am
 delete mode 100644 panels/common/Makefile.am
 delete mode 100644 panels/datetime/Makefile.am
 delete mode 100644 panels/datetime/po-timezones/Makefile.am
 delete mode 100644 panels/display/Makefile.am
 delete mode 100644 panels/info/Makefile.am
 delete mode 100644 panels/keyboard/Makefile.am
 delete mode 100644 panels/mouse/Makefile.am
 delete mode 100644 panels/network/Makefile.am
 delete mode 100644 panels/network/connection-editor/Makefile.am
 delete mode 100644 panels/network/wireless-security/Makefile.am
 delete mode 100644 panels/notifications/Makefile.am
 delete mode 100644 panels/online-accounts/Makefile.am
 delete mode 100644 panels/online-accounts/icons/16x16/Makefile.am
 delete mode 100644 panels/online-accounts/icons/22x22/Makefile.am
 delete mode 100644 panels/online-accounts/icons/24x24/Makefile.am
 delete mode 100644 panels/online-accounts/icons/256x256/Makefile.am
 delete mode 100644 panels/online-accounts/icons/32x32/Makefile.am
 delete mode 100644 panels/online-accounts/icons/48x48/Makefile.am
 delete mode 100644 panels/online-accounts/icons/Makefile.am
 delete mode 100644 panels/power/Makefile.am
 delete mode 100644 panels/power/icons/16x16/Makefile.am
 delete mode 100644 panels/power/icons/22x22/Makefile.am
 delete mode 100644 panels/power/icons/24x24/Makefile.am
 delete mode 100644 panels/power/icons/256x256/Makefile.am
 delete mode 100644 panels/power/icons/32x32/Makefile.am
 delete mode 100644 panels/power/icons/48x48/Makefile.am
 delete mode 100644 panels/power/icons/Makefile.am
 delete mode 100644 panels/printers/Makefile.am
 delete mode 100644 panels/privacy/Makefile.am
 delete mode 100644 panels/region/Makefile.am
 delete mode 100644 panels/search/Makefile.am
 delete mode 100644 panels/sharing/Makefile.am
 delete mode 100644 panels/sound/Makefile.am
 delete mode 100644 panels/sound/data/Makefile.am
 delete mode 100644 panels/sound/data/icons/16x16/Makefile.am
 delete mode 100644 panels/sound/data/icons/16x16/apps/Makefile.am
 delete mode 100644 panels/sound/data/icons/16x16/devices/Makefile.am
 delete mode 100644 panels/sound/data/icons/16x16/status/Makefile.am
 delete mode 100644 panels/sound/data/icons/22x22/Makefile.am
 delete mode 100644 panels/sound/data/icons/22x22/apps/Makefile.am
 delete mode 100644 panels/sound/data/icons/22x22/status/Makefile.am
 delete mode 100644 panels/sound/data/icons/24x24/Makefile.am
 delete mode 100644 panels/sound/data/icons/24x24/apps/Makefile.am
 delete mode 100644 panels/sound/data/icons/24x24/devices/Makefile.am
 delete mode 100644 panels/sound/data/icons/24x24/status/Makefile.am
 delete mode 100644 panels/sound/data/icons/32x32/Makefile.am
 delete mode 100644 panels/sound/data/icons/32x32/apps/Makefile.am
 delete mode 100644 panels/sound/data/icons/32x32/devices/Makefile.am
 delete mode 100644 panels/sound/data/icons/32x32/status/Makefile.am
 delete mode 100644 panels/sound/data/icons/48x48/Makefile.am
 delete mode 100644 panels/sound/data/icons/48x48/apps/Makefile.am
 delete mode 100644 panels/sound/data/icons/48x48/devices/Makefile.am
 delete mode 100644 panels/sound/data/icons/Makefile.am
 delete mode 100644 panels/sound/data/icons/scalable/Makefile.am
 delete mode 100644 panels/sound/data/icons/scalable/apps/Makefile.am
 delete mode 100644 panels/sound/data/icons/scalable/devices/Makefile.am
 delete mode 100644 panels/sound/data/sounds/Makefile.am
 delete mode 100644 panels/sound/data/symbolic-icons/Makefile.am
 delete mode 100644 panels/sound/data/symbolic-icons/scalable/Makefile.am
 delete mode 100644 panels/sound/data/symbolic-icons/scalable/status/Makefile.am
 delete mode 100644 panels/universal-access/Makefile.am
 delete mode 100644 panels/user-accounts/Makefile.am
 delete mode 100644 panels/user-accounts/data/Makefile.am
 delete mode 100644 panels/user-accounts/data/faces/Makefile.am
 delete mode 100644 panels/wacom/Makefile.am
 delete mode 100644 panels/wacom/calibrator/Makefile.am
 delete mode 100644 search-provider/Makefile.am
 delete mode 100644 shell/Makefile.am
 delete mode 100644 shell/appdata/Makefile.am

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 05fc13dd37..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4 -I subprojects/gvc -I subprojects/libgd ${ACLOCAL_FLAGS}
-
-SUBDIRS = data subprojects/gvc subprojects/libgd po panels shell search-provider
-if BUILD_DOCUMENTATION
-SUBDIRS += man
-endif
-DIST_SUBDIRS = data subprojects/gvc subprojects/libgd po panels shell man search-provider
-
-MAINTAINERCLEANFILES = \
-	$(srcdir)/INSTALL \
-	$(srcdir)/ar-lib \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/autoscan.log \
-	$(srcdir)/compile \
-	$(srcdir)/config.guess \
-	$(srcdir)/config.h.in \
-	$(srcdir)/config.sub \
-	$(srcdir)/configure.scan \
-	$(srcdir)/depcomp \
-	$(srcdir)/install-sh \
-	$(srcdir)/ltmain.sh \
-	$(srcdir)/missing \
-	$(srcdir)/mkinstalldirs \
-	$(srcdir)/omf.make \
-	$(srcdir)/xmldocs.make \
-	$(srcdir)/gtk-doc.make \
-	`find "$(srcdir)" -type f -name Makefile.in -print`
-
-EXTRA_DIST = \
-	MAINTAINERS \
-	meson.build \
-	meson_options.txt \
-	meson_post_install.py \
-	update-from-gsd.in \
-	update-from-gsd.sh \
-	update-from-nma.in \
-	po/meson.build
-
-AM_DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb --enable-gtk-doc --disable-maintainer-mode
-
-GITIGNOREFILES=m4
-
--include $(top_srcdir)/git.mk
-
-dist-hook:
-	@if test -d "$(srcdir)/.git"; \
-	then \
-		echo Creating ChangeLog && \
-		( cd "$(top_srcdir)" && \
-		  echo '# Generated by Makefile. Do not edit.'; echo; \
-		  $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
-		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-		|| ( rm -f ChangeLog.tmp ; \
-		     echo Failed to generate ChangeLog >&2 ); \
-	else \
-		echo A git clone is required to generate a ChangeLog >&2; \
-	fi
diff --git a/Makefile.decl b/Makefile.decl
deleted file mode 100644
index aab33c3b81..0000000000
--- a/Makefile.decl
+++ /dev/null
@@ -1,53 +0,0 @@
-GTESTER        = gtester		# in $PATH for non-GLIB packages
-GTESTER_REPORT = gtester-report		# in $PATH for non-GLIB packages
-
-# initialize variables for unconditional += appending
-TEST_PROGS =
-
-# test: run all tests in cwd and subdirs
-test:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
-	@ for subdir in $(SUBDIRS) . ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done
-
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || { \
-	  case $@ in \
-	  test-report) test_options="-k";; \
-	  perf-report) test_options="-k -m=perf";; \
-	  full-report) test_options="-k -m=perf -m=slow";; \
-	  esac ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then	\
-	    ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
-	  elif test -n "${TEST_PROGS}" ; then \
-	    ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
-	  fi ; \
-	}
-	@ ignore_logdir=true ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then \
-	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
-	    ignore_logdir=false ; \
-	  fi ; \
-	  for subdir in $(SUBDIRS) . ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done ; \
-	  $$ignore_logdir || { \
-	    echo '<?xml version="1.0"?>' > $@.xml ; \
-	    echo '<report-collection>'  >> $@.xml ; \
-	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	    done ; \
-	    echo >> $@.xml ; \
-	    echo '</report-collection>' >> $@.xml ; \
-	    rm -rf "$$GTESTER_LOGDIR"/ ; \
-	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  }
-.PHONY: test test-report perf-report full-report
-# run make test as part of make check
-check-local: test
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 1428add694..0000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ACLOCAL_FLAGS="-I subprojects/gvc -I subprojects/libgd $ACLOCAL_FLAGS"
-
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/autogen.sh \
-  && test -d $srcdir/shell) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level gnome-control-center directory"
-    exit 1
-}
-
-DIE=0
-
-rm -f .using-gnome-libs-package
-
-# Fetch submodules if needed
-echo "+ Setting up submodules"
-git submodule update --init --recursive
-
-if ! which gnome-autogen.sh ; then
-  echo "You need to install the gnome-common module and make"
-  echo "sure the gnome-autogen.sh script is in your \$PATH."
-  exit 1
-fi
-
-. gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index e21c8dce1a..0000000000
--- a/configure.ac
+++ /dev/null
@@ -1,600 +0,0 @@
-m4_define([gnome_control_center_version], 3.26.0)
-AC_INIT([gnome-control-center], [gnome_control_center_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])
-
-AC_CONFIG_SRCDIR([shell])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-
-AM_INIT_AUTOMAKE([1.11.2 no-dist-gzip dist-xz tar-ustar check-news subdir-objects])
-AM_MAINTAINER_MODE([enable])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-GNOME_DEBUG_CHECK
-GNOME_COMPILE_WARNINGS([maximum])
-
-# Check for programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_HEADER_STDC
-
-# Initialize libtool
-LT_PREREQ([2.2])
-LT_INIT
-
-# Internationalization support
-
-IT_PROG_INTLTOOL([0.40.1])
-
-GETTEXT_PACKAGE=gnome-control-center-2.0
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
-
-AC_DEFINE(USER_DIR_MODE, 0700, [Permissions for creating the user's config, cache and data directories])
-
-AC_PATH_XTRA
-x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-
-AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
-
-AC_ARG_ENABLE(documentation,
-              AC_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)
-
-dnl Region panel
-savecppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_CHECK_HEADERS([X11/Xlib.h])
-AC_CHECK_LIB(Xxf86misc, XF86MiscQueryExtension, [
-  AC_CHECK_HEADERS([X11/extensions/xf86misc.h], [XF86MISC_LIBS="-lXxf86misc"],[],
-[#if HAVE_X11_XLIB_H
-#include <X11/Xlib.h>
-#endif
-])])
-AC_SUBST(XF86MISC_LIBS)
-AC_CHECK_HEADERS(X11/extensions/XKB.h)
-CPPFLAGS=$savecppflags
-
-AC_CHECK_LIBM
-AC_SUBST(LIBM)
-
-# IBus support
-IBUS_REQUIRED_VERSION=1.5.2
-
-AC_ARG_ENABLE(ibus,
-        AS_HELP_STRING([--disable-ibus],
-                       [Disable IBus support]),
-        enable_ibus=$enableval,
-        enable_ibus=yes)
-
-if test "x$enable_ibus" = "xyes" ; then
-        IBUS_MODULE="ibus-1.0 >= $IBUS_REQUIRED_VERSION"
-        AC_DEFINE(HAVE_IBUS, 1, [Defined if IBus support is enabled])
-else
-        IBUS_MODULE=
-fi
-
-dnl ==============================================
-dnl Check that we meet the  dependencies
-dnl ==============================================
-
-GLIB_REQUIRED_VERSION=2.53.0
-GTK_REQUIRED_VERSION=3.22.20
-PA_REQUIRED_VERSION=2.0
-CANBERRA_REQUIRED_VERSION=0.13
-GDKPIXBUF_REQUIRED_VERSION=2.23.0
-POLKIT_REQUIRED_VERSION=0.103
-GSD_REQUIRED_VERSION=3.25.90
-NETWORK_MANAGER_REQUIRED_VERSION=1.2.0
-NETWORK_MANAGER_APPLET_REQUIRED_VERSION=1.2.0
-MODEM_MANAGER_REQUIRED_VERSION=0.7
-LIBNOTIFY_REQUIRED_VERSION=0.7.3
-GNOME_DESKTOP_REQUIRED_VERSION=3.21.2
-SCHEMAS_REQUIRED_VERSION=3.27.2
-LIBWACOM_REQUIRED_VERSION=0.7
-CLUTTER_REQUIRED_VERSION=1.11.3
-GOA_REQUIRED_VERSION=3.25.3
-ACCOUNTSSERVICE_REQUIRED_VERSION=0.6.39
-COLORD_REQUIRED_VERSION=0.1.34
-COLORD_GTK_REQUIRED_VERSION=0.1.24
-PWQUALITY_REQUIRED_VERSION=1.2.2
-GRILO_REQUIRED_VERSION=0.3.0
-
-COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION
- glib-2.0 >= $GLIB_REQUIRED_VERSION
- gthread-2.0
- gio-2.0
- gio-unix-2.0
- gsettings-desktop-schemas >= $SCHEMAS_REQUIRED_VERSION"
-
-LIBGD_INIT([_view-common static],[subprojects/libgd])
-
-PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
-PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
-PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
-                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-                  goa-1.0 >= $GOA_REQUIRED_VERSION
-                  grilo-0.3 >= $GRILO_REQUIRED_VERSION)
-PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
-PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= 3.1.0
-                  colord >= $COLORD_REQUIRED_VERSION
-                  upower-glib >= 0.99.0)
-PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0
-		  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
-PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES
-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-                  x11)
-PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
-                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
-PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
-                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
-PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
-                  colord >= $COLORD_REQUIRED_VERSION
-                  colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-                  libsoup-2.4
-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
-                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-                  smbclient)
-PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
-                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-                  accountsservice >= $ACCOUNTSSERVICE_REQUIRED_VERSION
-                  $IBUS_MODULE)
-PKG_CHECK_MODULES(SCREEN_PANEL, $COMMON_MODULES)
-PKG_CHECK_MODULES(SEARCH_PANEL, $COMMON_MODULES)
-PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_MODULES libxml-2.0
-                  libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
-                  libpulse >= $PA_REQUIRED_VERSION
-                  libpulse-mainloop-glib >= $PA_REQUIRED_VERSION)
-PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL, $COMMON_MODULES)
-PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
-                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-                  gnome-desktop-3.0
-                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-                  pwquality >= $PWQUALITY_REQUIRED_VERSION
-                  accountsservice >= $ACCOUNTSSERVICE_REQUIRED_VERSION)
-PKG_CHECK_MODULES(SHARING_PANEL, $COMMON_MODULES)
-PKG_CHECK_MODULES(REMOTE_LOGIN_HELPER, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0)
-
-PKG_CHECK_MODULES(GVC, gobject-2.0 libpulse libpulse-mainloop-glib)
-AM_CONDITIONAL(HAVE_INTROSPECTION, false)
-
-GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
-AC_SUBST(GDESKTOP_PREFIX)
-
-PKG_CHECK_MODULES(DEVICES, $COMMON_MODULES)
-PKG_CHECK_MODULES(UDEV, gudev-1.0, have_udev=yes, have_udev=no)
-if test "x$have_udev" = xyes ; then
-	AC_DEFINE(HAVE_UDEV, 1, [System has udev])
-fi
-AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"])
-
-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no)
-if test "x$have_wayland" = xyes ; then
-	if test "x$have_udev" != xyes ; then
-		AC_MSG_ERROR([udev is required for Wayland support])
-	fi
-fi
-AM_CONDITIONAL(HAVE_WAYLAND, [test "x$have_wayland" = "xyes"])
-
-# Panels that must be built on Linux systems
-linux_error_or_warn()
-{
-	case $host_os in
-	linux*)
-		AC_MSG_ERROR([$1])
-		;;
-	*)
-		AC_MSG_WARN([$1])
-		;;
-	esac
-
-}
-
-# Panels that must be built on Linux systems with
-# USB support (so not on S390)
-linux_usb_error_or_warn()
-{
-	case $host_os in
-	linux*)
-		if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-			AC_MSG_WARN([$1 (no USB support on this platform) ***])
-		else
-			AC_MSG_ERROR([$1 ***])
-		fi
-		;;
-	*)
-		AC_MSG_NOTICE([$1])
-		;;
-	esac
-}
-
-PKG_CHECK_MODULES(NETWORK_MANAGER,
-                  libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
-                  libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
-                  mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
-                  [have_networkmanager=yes], have_networkmanager=no)
-if test "x$have_networkmanager" = xno ; then
-        linux_error_or_warn "*** Network panel will not be built (NetworkManager or ModemManager not found) ***"
-else
-	AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
-fi
-AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
-if test x${have_networkmanager} = xyes; then
-  AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
-  NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
-  NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
-  AC_SUBST(NM_VPN_CONFIG_DIR)
-  AC_SUBST(NM_VPN_MODULE_DIR)
-fi
-
-# Check for power panel
-if test x${have_networkmanager} = xyes; then
-  PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
-                    libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
-                    gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
-else
-  PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
-                    gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
-fi
-
-# Check for gnome-bluetooth
-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
-		  [have_bluetooth=yes], have_bluetooth=no)
-if test "x$have_bluetooth" = xyes ; then
-	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
-else
-	linux_usb_error_or_warn "*** Bluetooth panel will not be built"
-fi
-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
-if test x${have_bluetooth} = xyes; then
-  AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
-fi
-
-# Check for CUPS 1.4 or newer
-AC_PROG_SED
-
-AC_PATH_PROG(CUPS_CONFIG, cups-config)
-
-if test x$CUPS_CONFIG = x; then
-  AC_MSG_ERROR([cups-config not found])
-fi
-
-CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
-CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
-CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
-
-AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
-                 AC_MSG_ERROR([CUPS headers not found]))
-
-if ! test $CUPS_API_MAJOR -gt 1 -o \
-          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
-  AC_MSG_ERROR([CUPS 1.4 or newer not found])
-fi
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=696766
-CUPS_CPPFLAGS=""
-if test $CUPS_API_MAJOR -gt 1 -o \
-        $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
-   CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
-fi
-
-CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
-CUPS_LIBS=`$CUPS_CONFIG --libs`
-AC_SUBST(CUPS_CPPFLAGS)
-AC_SUBST(CUPS_CFLAGS)
-AC_SUBST(CUPS_LIBS)
-
-# Optional dependency for the user accounts panel
-AC_ARG_WITH([cheese],
-            AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),,
-            with_cheese=auto)
-
-if test x"$with_cheese" != x"no" ; then
-   PKG_CHECK_MODULES(CHEESE, cheese-gtk >= 3.5.91 cheese clutter-gtk-1.0, [have_cheese=yes], [have_cheese=no])
-   if test x${have_cheese} = xyes; then
-     AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
-   fi
-   if test x${with_cheese} = xyes && test x${have_cheese} = xno; then
-     AC_MSG_ERROR([Cheese configured but not found])
-   fi
-else
-   have_cheese=no
-fi
-AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
-
-# Wacom
-PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-                  gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-                  xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-                  clutter-gtk-1.0
-                  clutter-1.0 >= $CLUTTER_REQUIRED_VERSION,
-                  [have_wacom=yes], [have_wacom=no])
-
-if test "x$have_wacom" = xyes ; then
-	AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
-	AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
-else
-	linux_usb_error_or_warn "*** Wacom panel will not be built"
-fi
-AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
-
-# Kerberos kerberos support
-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
-if test "$KRB5_CONFIG" = "no"; then
-  AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
-fi
-
-AC_MSG_CHECKING(for krb5 libraries and flags)
-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-KRB5_LIBS="`$KRB5_CONFIG --libs`"
-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-
-AC_SUBST(KRB5_CFLAGS)
-AC_SUBST(KRB5_LIBS)
-
-USER_ACCOUNTS_PANEL_CFLAGS="$USER_ACCOUNTS_PANEL_CFLAGS $KRB5_CFLAGS"
-USER_ACCOUNTS_PANEL_LIBS="$USER_ACCOUNTS_PANEL_LIBS $KRB5_LIBS"
-
-dnl Check for info panel
-AC_ARG_WITH([gnome-session-libexecdir],
-	    AS_HELP_STRING([--with-gnome-session-libexecdir=DIR], [Directory for gnome-session s libexecdir]),
-	    [],
-	    [with_gnome_session_libexecdir=${libexecdir}])
-if test x$with_gnome_session_libexecdir == xno; then
-	with_gnome_session_libexecdir=${libexecdir}
-fi
-AS_AC_EXPAND(GNOMESESSIONDIR, $with_gnome_session_libexecdir)
-AC_SUBST([gnome_session_libexecdir], [$GNOMESESSIONDIR])
-
-dnl =======================================
-dnl Panels
-dnl =======================================
-
-PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\" -DPANEL_ID=\"\\\"\$(cappletname)\\\"\""
-AC_SUBST(PANEL_CFLAGS)
-
-PANEL_LIBS=""
-AC_SUBST(PANEL_LIBS)
-
-dnl =======================================
-dnl Update Mime Database
-dnl =======================================
-
-AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
-
-AC_ARG_ENABLE(update-mimedb,
-   AS_HELP_STRING([--disable-update-mimedb],
-                  [do not update mime database after installation]),,
-                   enable_update_mimedb=yes)
-AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
-
-CONTROL_CENTER_VERSION=gnome_control_center_version
-AC_SUBST(CONTROL_CENTER_VERSION)
-
-dnl =======================================
-dnl Finish
-dnl =======================================
-
-# Turn on the additional warnings last
-
-AC_ARG_ENABLE(more-warnings,
-              AS_HELP_STRING([--enable-more-warnings],
-                             [Maximum compiler warnings]),
-              set_more_warnings="$enableval",[
-	      if test -d $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 -Wclobbered -Wempty-body -Wignored-qualifiers \
-        -Wmissing-field-initializers -Wmissing-parameter-type \
-        -Wold-style-declaration -Woverride-init -Wtype-limits \
-        -Wuninitialized \
-        -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-        -Wnested-externs -Wpointer-arith \
-        -Wcast-align -Wsign-compare \
-        $CFLAGS"
-
-	# Only add this when optimizing is enabled (default)
-	AC_MSG_CHECKING([whether optimization is enabled])
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if __OPTIMIZE__ == 0
-	                                     #error No optimization
-	                                     #endif
-	                                   ]], [[]])],
-	                  [has_optimization=yes],
-	                  [has_optimization=no])
-	if test $has_optimization = yes; then
-		CFLAGS="$CFLAGS -Wp,-D_FORTIFY_SOURCE=2"
-	fi
-	AC_MSG_RESULT($has_optimization)
-
-        for option in -Wno-strict-aliasing -Wno-sign-compare; do
-                SAVE_CFLAGS="$CFLAGS"
-                CFLAGS="$CFLAGS $option"
-                AC_MSG_CHECKING([whether gcc understands $option])
-                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-                                  [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
-
-AC_CONFIG_FILES([
-Makefile
-data/Makefile
-data/icons/Makefile
-panels/Makefile
-panels/common/Makefile
-panels/background/Makefile
-panels/background/gnome-background-panel.desktop.in
-panels/bluetooth/Makefile
-panels/bluetooth/gnome-bluetooth-panel.desktop.in
-panels/datetime/Makefile
-panels/datetime/gnome-datetime-panel.desktop.in
-panels/datetime/po-timezones/Makefile
-panels/display/Makefile
-panels/display/gnome-display-panel.desktop.in
-panels/keyboard/Makefile
-panels/keyboard/gnome-keyboard-panel.desktop.in
-panels/keyboard/gnome-keybindings.pc
-panels/region/Makefile
-panels/region/gnome-region-panel.desktop.in
-panels/mouse/Makefile
-panels/mouse/gnome-mouse-panel.desktop.in
-panels/online-accounts/Makefile
-panels/online-accounts/gnome-online-accounts-panel.desktop.in
-panels/online-accounts/icons/Makefile
-panels/online-accounts/icons/16x16/Makefile
-panels/online-accounts/icons/22x22/Makefile
-panels/online-accounts/icons/24x24/Makefile
-panels/online-accounts/icons/32x32/Makefile
-panels/online-accounts/icons/48x48/Makefile
-panels/online-accounts/icons/256x256/Makefile
-panels/search/Makefile
-panels/search/gnome-search-panel.desktop.in
-panels/sharing/Makefile
-panels/sharing/gnome-sharing-panel.desktop.in
-panels/sound/Makefile
-panels/sound/data/Makefile
-panels/sound/data/gnome-sound-panel.desktop.in
-panels/sound/data/symbolic-icons/Makefile
-panels/sound/data/symbolic-icons/scalable/Makefile
-panels/sound/data/symbolic-icons/scalable/status/Makefile
-panels/sound/data/icons/Makefile
-panels/sound/data/icons/16x16/Makefile
-panels/sound/data/icons/16x16/apps/Makefile
-panels/sound/data/icons/16x16/devices/Makefile
-panels/sound/data/icons/16x16/status/Makefile
-panels/sound/data/icons/22x22/Makefile
-panels/sound/data/icons/22x22/apps/Makefile
-panels/sound/data/icons/22x22/status/Makefile
-panels/sound/data/icons/24x24/Makefile
-panels/sound/data/icons/24x24/apps/Makefile
-panels/sound/data/icons/24x24/devices/Makefile
-panels/sound/data/icons/24x24/status/Makefile
-panels/sound/data/icons/32x32/Makefile
-panels/sound/data/icons/32x32/apps/Makefile
-panels/sound/data/icons/32x32/devices/Makefile
-panels/sound/data/icons/32x32/status/Makefile
-panels/sound/data/icons/48x48/Makefile
-panels/sound/data/icons/48x48/apps/Makefile
-panels/sound/data/icons/48x48/devices/Makefile
-panels/sound/data/icons/scalable/Makefile
-panels/sound/data/icons/scalable/apps/Makefile
-panels/sound/data/icons/scalable/devices/Makefile
-panels/sound/data/sounds/Makefile
-panels/info/Makefile
-panels/info/gnome-info-overview-panel.desktop.in
-panels/info/gnome-default-apps-panel.desktop.in
-panels/info/gnome-removable-media-panel.desktop.in
-panels/power/Makefile
-panels/power/gnome-power-panel.desktop.in
-panels/power/icons/Makefile
-panels/power/icons/16x16/Makefile
-panels/power/icons/22x22/Makefile
-panels/power/icons/24x24/Makefile
-panels/power/icons/32x32/Makefile
-panels/power/icons/48x48/Makefile
-panels/power/icons/256x256/Makefile
-panels/color/Makefile
-panels/color/gnome-color-panel.desktop.in
-panels/color/icons/Makefile
-panels/color/icons/16x16/Makefile
-panels/color/icons/22x22/Makefile
-panels/color/icons/24x24/Makefile
-panels/color/icons/32x32/Makefile
-panels/color/icons/48x48/Makefile
-panels/color/icons/64x64/Makefile
-panels/color/icons/256x256/Makefile
-panels/color/icons/scalable/Makefile
-panels/printers/Makefile
-panels/printers/gnome-printers-panel.desktop.in
-panels/privacy/Makefile
-panels/privacy/gnome-privacy-panel.desktop.in
-panels/network/Makefile
-panels/network/wireless-security/Makefile
-panels/network/connection-editor/Makefile
-panels/network/gnome-network-panel.desktop.in
-panels/network/gnome-wifi-panel.desktop.in
-panels/notifications/Makefile
-panels/notifications/gnome-notifications-panel.desktop.in
-panels/universal-access/Makefile
-panels/universal-access/gnome-universal-access-panel.desktop.in
-panels/user-accounts/Makefile
-panels/user-accounts/data/Makefile
-panels/user-accounts/data/gnome-user-accounts-panel.desktop.in
-panels/user-accounts/data/faces/Makefile
-panels/wacom/Makefile
-panels/wacom/calibrator/Makefile
-panels/wacom/gnome-wacom-panel.desktop.in
-po/Makefile.in
-search-provider/Makefile
-shell/appdata/Makefile
-shell/Makefile
-shell/gnome-control-center.desktop.in
-subprojects/gvc/Makefile
-subprojects/libgd/Makefile
-man/Makefile
-])
-
-AC_OUTPUT
-
-AC_MSG_NOTICE([gnome-control-center was configured with the following options:])
-if test "x$have_networkmanager" = "xyes"; then
-	AC_MSG_NOTICE([** NetworkManager (Network panel)])
-else
-	AC_MSG_NOTICE([   Network panel disabled])
-fi
-if test "x$have_bluetooth" = "xyes"; then
-	AC_MSG_NOTICE([** gnome-bluetooth (Bluetooth panel)])
-else
-	AC_MSG_NOTICE([   Bluetooth panel disabled])
-fi
-if test "x$have_cheese" = "xyes"; then
-	AC_MSG_NOTICE([** Cheese (Users panel webcam support)])
-else
-	AC_MSG_NOTICE([   Users panel webcam support disabled])
-fi
-if test "x$have_wacom" = "xyes"; then
-	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
-else
-	AC_MSG_NOTICE([   Wacom panel disabled])
-fi
-if test "x$enable_ibus" = "xyes"; then
-	AC_MSG_NOTICE([** IBus (Region panel IBus support)])
-else
-	AC_MSG_NOTICE([   Region panel IBus support disabled])
-fi
-AC_MSG_NOTICE([** gnome-session libexecdir: $GNOMESESSIONDIR])
-AC_MSG_NOTICE([End options])
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index b90cde9557..0000000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = icons
-DIST_SUBDIRS = icons
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
deleted file mode 100644
index 9d6d435f8a..0000000000
--- a/data/icons/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-NULL =
-
-public_icons_themes = \
-	hicolor \
-	$(NULL)
-
-public_icons = \
-	hicolor_apps_16x16_gnome-control-center.png \
-	hicolor_apps_24x24_gnome-control-center.png \
-	hicolor_apps_32x32_gnome-control-center.png \
-	hicolor_apps_48x48_gnome-control-center.png \
-	hicolor_apps_512x512_gnome-control-center.png \
-	hicolor_apps_symbolic_gnome-control-center-symbolic.svg \
-	$(NULL)
-
-private_icons = \
-	$(NULL)
-
-noinst_DATA = \
-	gnome-control-center-src.svg \
-	$(NULL)
-
-EXTRA_DIST = \
-	$(public_icons)		\
-	$(private_icons)	\
-	$(noinst_DATA)		\
-	meson.build		\
-	$(NULL)
-
-###############################################################################
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t
-
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		for theme in $(public_icons_themes); do \
-			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
-		done; \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		for theme in $(public_icons_themes); do \
-			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
-		done; \
-	fi
-
-install-icons:
-	for icon in $(public_icons); do \
-		THEME=`echo $$icon | cut -d_ -f1`; \
-		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		SIZE=`echo $$icon | cut -d_ -f3`; \
-		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-	done; \
-	for icon in $(private_icons); do \
-		THEME=`echo $$icon | cut -d_ -f1`; \
-		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		SIZE=`echo $$icon | cut -d_ -f3`; \
-		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-	done
-
-uninstall-icons:
-	-for icon in $(public_icons); do \
-		THEME=`echo $$icon | cut -d_ -f1`; \
-		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		SIZE=`echo $$icon | cut -d_ -f3`; \
-		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-	done; \
-	for icon in $(private_icons); do \
-		THEME=`echo $$icon | cut -d_ -f1`; \
-		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		SIZE=`echo $$icon | cut -d_ -f3`; \
-		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-	done
-
-install-data-local: install-icons update-icon-cache
-
-uninstall-local: uninstall-icons update-icon-cache
-
--include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
deleted file mode 100644
index b19bd33325..0000000000
--- a/git.mk
+++ /dev/null
@@ -1,311 +0,0 @@
-# git.mk
-#
-# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011,2012,2013 Behdad Esfahbod
-# Written by Behdad Esfahbod
-#
-# Copying and distribution of this file, with or without modification,
-# is permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-#
-# The latest version of this file can be downloaded from:
-#   https://raw.github.com/behdad/git.mk/master/git.mk
-# Bugs, etc, should be reported upstream at:
-#   https://github.com/behdad/git.mk
-#
-# To use in your project, import this file in your git repo's toplevel,
-# then do "make -f git.mk".  This modifies all Makefile.am files in
-# your project to -include git.mk.  Remember to add that line to new
-# Makefile.am files you create in your project, or just rerun the
-# "make -f git.mk".
-#
-# This enables automatic .gitignore generation.  If you need to ignore
-# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
-# But think twice before doing that.  If a file has to be in .gitignore,
-# chances are very high that it's a generated file and should be in one
-# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
-#
-# The only case that you need to manually add a file to GITIGNOREFILES is
-# when remove files in one of mostlyclean-local, clean-local, distclean-local,
-# or maintainer-clean-local make targets.
-#
-# Note that for files like editor backup, etc, there are better places to
-# ignore them.  See "man gitignore".
-#
-# If "make maintainer-clean" removes the files but they are not recognized
-# by this script (that is, if "git status" shows untracked files still), send
-# me the output of "git status" as well as your Makefile.am and Makefile for
-# the directories involved and I'll diagnose.
-#
-# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# Makefile.am.sample in the git.mk git repo.
-#
-# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
-# not tarballs.  It serves no useful purpose in tarballs and clutters the
-# build dir.
-#
-# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
-#
-# This makefile provides the following targets:
-#
-# - all: "make all" will build all gitignore files.
-# - gitignore: makes all gitignore files in the current dir and subdirs.
-# - .gitignore: make gitignore file for the current dir.
-# - gitignore-recurse: makes all gitignore files in the subdirs.
-#
-# KNOWN ISSUES:
-#
-# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
-#   submodule doesn't find us.  If you have configure.{in,ac} files in
-#   subdirs, add a proxy git.mk file in those dirs that simply does:
-#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
-#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
-#   example.
-#
-
-
-
-###############################################################################
-# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
-###############################################################################
-
-#
-# Most autotools-using modules should be fine including this variable in their
-# toplevel MAINTAINERCLEANFILES:
-GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/autoscan.log \
-	$(srcdir)/configure.scan \
-	`AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
-	 test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
-	 for x in \
-		ar-lib \
-		compile \
-		config.guess \
-		config.sub \
-		depcomp \
-		install-sh \
-		ltmain.sh \
-		missing \
-		mkinstalldirs \
-		test-driver \
-	 ; do echo "$$AUX_DIR/$$x"; done` \
-	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
-	head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
-#
-# All modules should also be fine including the following variable, which
-# removes automake-generated Makefile.in files:
-GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
-	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
-	while read f; do \
-	  case $$f in Makefile|*/Makefile) \
-	    test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
-	done`
-#
-# Modules that use libtool and use  AC_CONFIG_MACRO_DIR() may also include this,
-# though it's harmless to include regardless.
-GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
-	`MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \
-	 if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
-		for x in \
-			libtool.m4 \
-			ltoptions.m4 \
-			ltsugar.m4 \
-			ltversion.m4 \
-			lt~obsolete.m4 \
-		; do echo "$$MACRO_DIR/$$x"; done; \
-	 fi`
-
-
-
-###############################################################################
-# Default rule is to install ourselves in all Makefile.am files:
-###############################################################################
-
-git-all: git-mk-install
-
-git-mk-install:
-	@echo "Installing git makefile"
-	@any_failed=; \
-		find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
-		if grep 'include .*/git.mk' $$x >/dev/null; then \
-			echo "$$x already includes git.mk"; \
-		else \
-			failed=; \
-			echo "Updating $$x"; \
-			{ cat $$x; \
-			  echo ''; \
-			  echo '-include $$(top_srcdir)/git.mk'; \
-			} > $$x.tmp || failed=1; \
-			if test x$$failed = x; then \
-				mv $$x.tmp $$x || failed=1; \
-			fi; \
-			if test x$$failed = x; then : else \
-				echo "Failed updating $$x"; >&2 \
-				any_failed=1; \
-			fi; \
-	fi; done; test -z "$$any_failed"
-
-.PHONY: git-all git-mk-install
-
-
-
-###############################################################################
-# Actual .gitignore generation:
-###############################################################################
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-	@echo "git.mk: Generating $@"
-	@{ \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
-			for x in \
-				$(DOC_MODULE)-decl-list.txt \
-				$(DOC_MODULE)-decl.txt \
-				tmpl/$(DOC_MODULE)-unused.sgml \
-				"tmpl/*.bak" \
-				xml html \
-			; do echo "/$$x"; done; \
-			FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
-			case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
-		fi; \
-		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-			for lc in $(DOC_LINGUAS); do \
-				for x in \
-					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
-					$(DOC_PAGES) \
-					$(DOC_INCLUDES) \
-				; do echo "/$$lc/$$x"; done; \
-			done; \
-			for x in \
-				$(_DOC_OMF_ALL) \
-				$(_DOC_DSK_ALL) \
-				$(_DOC_HTML_ALL) \
-				$(_DOC_MOFILES) \
-				$(DOC_H_FILE) \
-				"*/.xml2po.mo" \
-				"*/*.omf.out" \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
-			for lc in $(HELP_LINGUAS); do \
-				for x in \
-					$(HELP_FILES) \
-					"$$lc.stamp" \
-					"$$lc.mo" \
-				; do echo "/$$lc/$$x"; done; \
-			done; \
-		fi; \
-		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
-			for x in \
-				$(gsettings_SCHEMAS:.xml=.valid) \
-				$(gsettings__enum_file) \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test -f $(srcdir)/po/Makefile.in.in; then \
-			for x in \
-				po/Makefile.in.in \
-				po/Makefile.in.in~ \
-				po/Makefile.in \
-				po/Makefile \
-				po/Makevars.template \
-				po/POTFILES \
-				po/Rules-quot \
-				po/stamp-it \
-				po/.intltool-merge-cache \
-				"po/*.gmo" \
-				"po/*.header" \
-				"po/*.mo" \
-				"po/*.sed" \
-				"po/*.sin" \
-				po/$(GETTEXT_PACKAGE).pot \
-				intltool-extract.in \
-				intltool-merge.in \
-				intltool-update.in \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test -f $(srcdir)/configure; then \
-			for x in \
-				autom4te.cache \
-				configure \
-				config.h \
-				stamp-h1 \
-				libtool \
-				config.lt \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(DEJATOOL)" = x; then :; else \
-			for x in \
-				$(DEJATOOL) \
-			; do echo "/$$x.sum"; echo "/$$x.log"; done; \
-			echo /site.exp; \
-		fi; \
-		if test "x$(am__dirstamp)" = x; then :; else \
-			echo "$(am__dirstamp)"; \
-		fi; \
-		if test "x$(LTCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
-			for x in \
-				"*.lo" \
-				".libs" "_libs" \
-			; do echo "$$x"; done; \
-		fi; \
-		for x in \
-			.gitignore \
-			$(GITIGNOREFILES) \
-			$(CLEANFILES) \
-			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
-			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
-			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
-			so_locations \
-			$(MOSTLYCLEANFILES) \
-			$(TEST_LOGS) \
-			$(TEST_LOGS:.log=.trs) \
-			$(TEST_SUITE_LOG) \
-			"*.$(OBJEXT)" \
-			$(DISTCLEANFILES) \
-			$(am__CONFIG_DISTCLEAN_FILES) \
-			$(CONFIG_CLEAN_FILES) \
-			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-			"*.tab.c" \
-			$(MAINTAINERCLEANFILES) \
-			$(BUILT_SOURCES) \
-			$(DEPDIR) \
-			$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
-			$(filter %_vala.stamp,$(DIST_COMMON)) \
-			$(filter %.vapi,$(DIST_COMMON)) \
-			$(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \
-			Makefile \
-			Makefile.in \
-			"*.orig" \
-			"*.rej" \
-			"*.bak" \
-			"*~" \
-			".*.sw[nop]" \
-			".dirstamp" \
-		; do echo "/$$x"; done; \
-	} | \
-	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
-	sed 's@/[.]/@/@g' | \
-	LC_ALL=C sort | uniq > $@.tmp && \
-	mv $@.tmp $@;
-
-all: $(srcdir)/.gitignore gitignore-recurse-maybe
-gitignore: $(srcdir)/.gitignore gitignore-recurse
-
-gitignore-recurse-maybe:
-	@for subdir in $(DIST_SUBDIRS); do \
-	  case " $(SUBDIRS) " in \
-	    *" $$subdir "*) :;; \
-	    *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
-	  esac; \
-	done
-gitignore-recurse:
-	@for subdir in $(DIST_SUBDIRS); do \
-	    test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \
-	done
-
-maintainer-clean: gitignore-clean
-gitignore-clean:
-	-rm -f $(srcdir)/.gitignore
-
-.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4
deleted file mode 100644
index d6c9e33060..0000000000
--- a/m4/as-ac-expand.m4
+++ /dev/null
@@ -1,43 +0,0 @@
-dnl as-ac-expand.m4 0.2.0
-dnl autostars m4 macro for expanding directories using configure's prefix
-dnl thomas@apestaart.org
-
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl example
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
-AC_DEFUN([AS_AC_EXPAND],
-[
-  EXP_VAR=[$1]
-  FROM_VAR=[$2]
-
-  dnl first expand prefix and exec_prefix if necessary
-  prefix_save=$prefix
-  exec_prefix_save=$exec_prefix
-
-  dnl if no prefix given, then use /usr/local, the default prefix
-  if test "x$prefix" = "xNONE"; then
-    prefix="$ac_default_prefix"
-  fi
-  dnl if no exec_prefix given, then use prefix
-  if test "x$exec_prefix" = "xNONE"; then
-    exec_prefix=$prefix
-  fi
-
-  full_var="$FROM_VAR"
-  dnl loop until it doesn't change anymore
-  while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var" = "x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-  dnl clean up
-  full_var=$new_full_var
-  AC_SUBST([$1], "$full_var")
-
-  dnl restore prefix and exec_prefix
-  prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-])
diff --git a/m4/ax_config_dir.m4 b/m4/ax_config_dir.m4
deleted file mode 100644
index 0ba313faa3..0000000000
--- a/m4/ax_config_dir.m4
+++ /dev/null
@@ -1,109 +0,0 @@
-dnl Copied from Audacity 1.3.10 which itself is licensed under the GPL v2 or
-dnl any later version
-
-dnl Function to configure a sub-library now, because we need to know the result
-dnl of the configuration now in order to take decisions.
-dnl We don't worry about whether the configuration worked or not - it is
-dnl assumed that the next thing after this will be a package-specific check to
-dnl see if the package is actually available. (Hint: use pkg-config and
-dnl -uninstalled.pc files if available).
-dnl code based on a simplification of _AC_OUTPUT_SUBDIRS in 
-dnl /usr/share/autoconf/autoconf/status.m4 which implements part of 
-dnl AC_CONFIG_SUBDIRS
-
-AC_DEFUN([AX_CONFIG_DIR],
-[AC_REQUIRE([AC_DISABLE_OPTION_CHECKING])]
-[m4_append([_AC_LIST_SUBDIRS], [$1], [])]
-[
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ax_sub_configure_args=
-  ax_prev=
-  eval "set x $ac_configure_args"
-  shift
-  for ax_arg
-  do
-    if test -n "$ax_prev"; then
-      ax_prev=
-      continue
-    fi
-    case $ax_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ax_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ax_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ax_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    *)
-      case $ax_arg in
-      *\'*) ax_arg=`echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-      esac
-      ax_sub_configure_args="$ax_sub_configure_args '$ax_arg'" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ax_arg="--prefix=$prefix"
-  case $ax_arg in
-  *\'*) ax_arg=`echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args"
-
-  # Pass --silent
-  if test "$silent" = yes; then
-    ax_sub_configure_args="--silent $ax_sub_configure_args"
-  fi
-
-  ax_popdir=`pwd`
-  AC_MSG_NOTICE([Configuring sources in $1])
-  dnl for out-of-place builds srcdir and builddir will be different, and
-  dnl builddir may not exist, so we must create it
-  AS_MKDIR_P(["$1"])
-  dnl and also set the variables. As this isn't autoconf, the following may be
-  dnl risky:
-  _AC_SRCDIRS(["$1"])
-  cd "$1"
-
-  # Check for guested configure; otherwise get Cygnus style configure.
-  if test -f "configure.gnu"; then
-    ax_sub_configure=$ac_srcdir/configure.gnu
-  elif test -f "$ac_srcdir/configure"; then
-    ax_sub_configure=$ac_srcdir/configure
-  elif test -f "$ac_srcdir/configure.in"; then
-    # This should be Cygnus configure.
-	ax_sub_configure=$ac_aux_dir/configure
-  else
-    AC_MSG_WARN([no configuration information is in $1])
-    ax_sub_configure=
-  fi
-
-  # The recursion is here.
-  if test -n "$ax_sub_configure"; then
-    # Make the cache file name correct relative to the subdirectory.
-    case $cache_file in
-    [[\\/]]* | ?:[[\\/]]* ) ax_sub_cache_file=$cache_file ;;
-    *) # Relative name.
-	ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-    esac
-
-    AC_MSG_NOTICE([running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir])
-    # The eval makes quoting arguments work.
-    eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \
-	   --cache-file=\"\$ax_sub_cache_file\" --srcdir=\"\$ax_srcdir\""
-  fi
-
-  cd "$ax_popdir"
-  AC_MSG_NOTICE([Done configuring in $1])
-])
-
diff --git a/m4/empty b/m4/empty
deleted file mode 100644
index e64632f5f2..0000000000
--- a/m4/empty
+++ /dev/null
@@ -1 +0,0 @@
-Empty file to keep stub m4 directory here.
diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644
index 440e4d3c84..0000000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1,23 +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
-
-.xml.1:
-	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-man_MANS = \
-	gnome-control-center.1
-
-xml_files = $(man_MANS:.1=.xml)
-
-EXTRA_DIST = \
-	$(xml_files) \
-	meson.build
-
-DISTCLEANFILES = $(man_MANS)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/Makefile.am b/panels/Makefile.am
deleted file mode 100644
index b5d95342a4..0000000000
--- a/panels/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-SUBDIRS= \
-	common \
-	background \
-	power \
-	color \
-	display \
-	mouse \
-	notifications \
-	online-accounts \
-	region \
-	info \
-	sound \
-	keyboard \
-	universal-access \
-	user-accounts \
-	datetime \
-	search \
-	privacy \
-	sharing \
-	printers
-
-if BUILD_WACOM
-SUBDIRS += wacom
-endif
-
-if BUILD_NETWORK
-SUBDIRS += network
-endif
-
-if BUILD_BLUETOOTH
-SUBDIRS += bluetooth
-endif
-
-EXTRA_DIST = meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
deleted file mode 100644
index c06503e65b..0000000000
--- a/panels/background/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-# This is used in PANEL_CFLAGS
-cappletname = background
-
-slideshowicondir = $(datadir)/icons/hicolor/scalable/categories/
-dist_slideshowicon_DATA = slideshow-symbolic.svg
-
-slideshowemblemdir = $(datadir)/icons/hicolor/scalable/emblems/
-dist_slideshowemblem_DATA = slideshow-emblem.svg
-
-AM_CPPFLAGS =						\
-	$(PANEL_CFLAGS)					\
-	$(BACKGROUND_PANEL_CFLAGS)			\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-DDATADIR="\"$(datadir)\""			\
-	-DGNOME_DESKTOP_USE_UNSTABLE_API		\
-	$(NULL)
-
-BUILT_SOURCES = 			\
-	cc-background-resources.c 	\
-	cc-background-resources.h 	\
-	gdesktop-enums-types.c		\
-	gdesktop-enums-types.h
-
-noinst_LTLIBRARIES = libbackground.la libbackground-chooser.la
-
-libbackground_chooser_la_SOURCES =	\
-	$(BUILT_SOURCES)		\
-	cc-background-chooser-dialog.c	\
-	cc-background-chooser-dialog.h	\
-	cc-background-grilo-miner.c	\
-	cc-background-grilo-miner.h	\
-	cc-background-item.c		\
-	cc-background-item.h		\
-	cc-background-xml.c		\
-	cc-background-xml.h		\
-	bg-source.c			\
-	bg-source.h			\
-	bg-pictures-source.c		\
-	bg-pictures-source.h		\
-	bg-wallpapers-source.c		\
-	bg-wallpapers-source.h		\
-	bg-colors-source.c		\
-	bg-colors-source.h
-
-libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
-
-libbackground_la_SOURCES =		\
-	cc-background-panel.c		\
-	cc-background-panel.h
-
-libbackground_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) libbackground-chooser.la
-
-noinst_PROGRAMS = test-chooser-dialog
-test_chooser_dialog_SOURCES = test-chooser-dialog.c
-test_chooser_dialog_LDADD = libbackground-chooser.la $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/background.gresource.xml)
-cc-background-resources.c: background.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_background $<
-cc-background-resources.h: background.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_background $<
-
-gdesktop-enums-types.h: stamp-gdesktop-enums-types.h
-	@true
-
-stamp-gdesktop-enums-types.h: $(GDESKTOP_PREFIX)/include/gsettings-desktop-schemas/gdesktop-enums.h cc-background-item.h Makefile
-	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#ifndef __GDESKTOP_ENUMS_TYPES_H__\n#define __GDESKTOP_ENUMS_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename@\" */\n" \
-			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define G_DESKTOP_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-			--ftail "G_END_DECLS\n\n#endif /* __GDESKTOP_ENUMS_TYPES_H__ */" $(GDESKTOP_PREFIX)/include/gsettings-desktop-schemas/gdesktop-enums.h cc-background-item.h) >> xgen-gtbh \
-	&& (cmp -s xgen-gtbh gdesktop-enums-types.h || cp xgen-gtbh gdesktop-enums-types.h ) \
-	&& rm -f xgen-gtbh \
-	&& echo timestamp > $(@F)
-
-gdesktop-enums-types.c: $(GDESKTOP_PREFIX)/include/gsettings-desktop-schemas/gdesktop-enums.h cc-background-item.h Makefile gdesktop-enums-types.h
-	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#include <gdesktop-enums.h>\n#include \"gdesktop-enums-types.h\"\n#include \"cc-background-item.h\"" \
-			--fprod "\n/* enumerations from \"@filename@\" */" \
-			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
-			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(GDESKTOP_PREFIX)/include/gsettings-desktop-schemas/gdesktop-enums.h cc-background-item.h) > xgen-gtbc \
-	&& cp xgen-gtbc gdesktop-enums-types.c  \
-	&& rm -f xgen-gtbc
-
-@INTLTOOL_DESKTOP_RULE@
-
-pixmapdir  = $(pkgdatadir)/pixmaps
-dist_pixmap_DATA = \
-	noise-texture-light.png
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-background-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES) stamp-gdesktop-enums-types.h
-EXTRA_DIST = $(resource_files) background.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/bluetooth/Makefile.am b/panels/bluetooth/Makefile.am
deleted file mode 100644
index 2598470ab0..0000000000
--- a/panels/bluetooth/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-# This is used in PANEL_CFLAGS
-cappletname = bluetooth
-
-noinst_LTLIBRARIES = libbluetooth.la
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(BLUETOOTH_CFLAGS)				\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	$(NULL)
-
-BUILT_SOURCES =				\
-	cc-bluetooth-resources.h	\
-	cc-bluetooth-resources.c
-
-libbluetooth_la_SOURCES =			\
-	$(BUILT_SOURCES)			\
-	cc-bluetooth-panel.c			\
-	cc-bluetooth-panel.h
-
-libbluetooth_la_LIBADD = $(PANEL_LIBS) $(BLUETOOTH_LIBS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/bluetooth.gresource.xml)
-cc-bluetooth-resources.c: bluetooth.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_bluetooth $<
-cc-bluetooth-resources.h: bluetooth.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_bluetooth $<
-
-desktopdir = $(datadir)/applications
-desktop_in_in_files = gnome-bluetooth-panel.desktop.in.in
-desktop_in_files = gnome-bluetooth-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-CLEANFILES = $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(man_MANS) $(desktop_in_in_files) $(resource_files) bluetooth.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/color/Makefile.am b/panels/color/Makefile.am
deleted file mode 100644
index bb670ed96b..0000000000
--- a/panels/color/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-SUBDIRS = icons
-
-cappletname = color
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(COLOR_PANEL_CFLAGS)				\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-DBINDIR="\"$(bindir)\""			\
-	$(NULL)
-
-noinst_LTLIBRARIES = libcolor.la
-
-BUILT_SOURCES =			\
-	cc-color-resources.h	\
-	cc-color-resources.c
-
-libcolor_la_SOURCES =		\
-	$(BUILT_SOURCES)	\
-	cc-color-calibrate.c		\
-	cc-color-calibrate.h		\
-	cc-color-cell-renderer-text.c	\
-	cc-color-cell-renderer-text.h	\
-	cc-color-profile.c	\
-	cc-color-profile.h	\
-	cc-color-device.c	\
-	cc-color-device.h	\
-	cc-color-common.c	\
-	cc-color-common.h	\
-	cc-color-panel.c	\
-	cc-color-panel.h
-
-libcolor_la_LIBADD = $(PANEL_LIBS) $(COLOR_PANEL_LIBS) $(LIBM)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/color.gresource.xml)
-cc-color-resources.c: color.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_color $<
-cc-color-resources.h: color.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_color $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-color-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) color.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/color/icons/16x16/Makefile.am b/panels/color/icons/16x16/Makefile.am
deleted file mode 100644
index 335fc1ebd7..0000000000
--- a/panels/color/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 16x16
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	preferences-color.png
-
-EXTRA_DIST =		\
-	$(icons_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/color/icons/22x22/Makefile.am b/panels/color/icons/22x22/Makefile.am
deleted file mode 100644
index b423d54826..0000000000
--- a/panels/color/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 22x22
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	preferences-color.png
-
-EXTRA_DIST =		\
-	$(icons_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/color/icons/24x24/Makefile.am b/panels/color/icons/24x24/Makefile.am
deleted file mode 100644
index 9bd5583c4a..0000000000
--- a/panels/color/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 24x24
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	preferences-color.png
-
-EXTRA_DIST =		\
-	$(icons_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/color/icons/256x256/Makefile.am b/panels/color/icons/256x256/Makefile.am
deleted file mode 100644
index e61b58e5a2..0000000000
--- a/panels/color/icons/256x256/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 256x256
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	preferences-color.png
-
-EXTRA_DIST =		\
-	$(icons_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/color/icons/32x32/Makefile.am b/panels/color/icons/32x32/Makefile.am
deleted file mode 100644
index bbd04f229d..0000000000
--- a/panels/color/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 32x32
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	preferences-color.png
-
-EXTRA_DIST =		\
-	$(icons_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/color/icons/48x48/Makefile.am b/panels/color/icons/48x48/Makefile.am
deleted file mode 100644
index 3e8e99398d..0000000000
--- a/panels/color/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 48x48
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	preferences-color.png
-
-EXTRA_DIST =		\
-	$(icons_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/color/icons/64x64/Makefile.am b/panels/color/icons/64x64/Makefile.am
deleted file mode 100644
index abddefdb61..0000000000
--- a/panels/color/icons/64x64/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 64x64
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	preferences-color.png
-
-EXTRA_DIST =		\
-	$(icons_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/color/icons/Makefile.am b/panels/color/icons/Makefile.am
deleted file mode 100644
index 9f51a77b13..0000000000
--- a/panels/color/icons/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-SUBDIRS = scalable 16x16 22x22 24x24 32x32 48x48 64x64 256x256
-
-EXTRA_DIST = meson.build
-
-if MAINTAINER_MODE
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/panels/color/icons/scalable/Makefile.am b/panels/color/icons/scalable/Makefile.am
deleted file mode 100644
index 6ac724e307..0000000000
--- a/panels/color/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = scalable
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = 		 		\
-	preferences-color.svg
-
-EXTRA_DIST =				\
-	$(icons_DATA)			\
-	$(appicons_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/common/Makefile.am b/panels/common/Makefile.am
deleted file mode 100644
index c0e6f24a63..0000000000
--- a/panels/common/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-# This is used in PANEL_CFLAGS
-cappletname = common
-
-noinst_LTLIBRARIES = liblanguage.la libdevice.la
-
-AM_CPPFLAGS =						\
-	$(DEVICES_CFLAGS)				\
-	$(PANEL_CFLAGS)					\
-	$(LIBLANGUAGE_CFLAGS)
-
-BUILT_SOURCES =			\
-	cc-common-resources.c	\
-	cc-common-resources.h	\
-	gsd-common-enums.c	\
-	gsd-common-enums.h
-
-liblanguage_la_SOURCES =		\
-	$(BUILT_SOURCES)		\
-	cc-util.c			\
-	cc-util.h			\
-	cc-common-language.c		\
-	cc-common-language.h		\
-	cc-language-chooser.c		\
-	cc-language-chooser.h
-
-liblanguage_la_LIBADD = 		\
-	$(LIBLANGUAGE_LIBS)
-
-#libdevice
-GSD_COMMON_ENUM_FILES = gsd-common-enums.c gsd-common-enums.h
-
-BUILT_SOURCES += $(GSD_COMMON_ENUM_FILES)
-
-gsd-common-enums.h: gsd-device-manager.h Makefile
-	$(AM_V_GEN)($(GLIB_MKENUMS) \
-			--fhead "#ifndef GSD_COMMON_ENUMS_H\n#define GSD_COMMON_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename@\" */\n" \
-			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GSD_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-			--ftail "G_END_DECLS\n\n#endif /* !GSD_COMMON_ENUMS_H */" \
-		$(srcdir)/gsd-device-manager.h > $@)
-
-gsd-common-enums.c: gsd-device-manager.h Makefile gsd-common-enums.h
-	$(AM_V_GEN)($(GLIB_MKENUMS) \
-			--fhead "#include \"gsd-device-manager.h\"\n#include \"gsd-common-enums.h\"\n" \
-			--fprod "\n/* enumerations from \"@filename@\" */" \
-			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
-			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(srcdir)/gsd-device-manager.h > $@)
-
-libdevice_la_SOURCES =			\
-	gsd-common-enums.c 		\
-	gsd-common-enums.h		\
-	gsd-input-helper.c		\
-	gsd-input-helper.h		\
-	gsd-device-manager.c		\
-	gsd-device-manager.h		\
-	gsd-device-manager-x11.c	\
-	gsd-device-manager-x11.h	\
-	gnome-settings-bus.h
-
-libdevice_la_LIBADD =			\
-	$(DEVICES_LIBS)
-
-if HAVE_WAYLAND
-AM_CPPFLAGS += $(UDEV_CFLAGS)
-libdevice_la_LIBADD += $(UDEV_LIBS)
-libdevice_la_SOURCES +=			\
-	gsd-device-manager-udev.c	\
-	gsd-device-manager-udev.h
-endif
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/common.gresource.xml)
-cc-common-resources.c: common.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_common $<
-cc-common-resources.h: common.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_common $<
-
-rulesdir = $(datadir)/polkit-1/rules.d/
-rules_DATA = gnome-control-center.rules
-
-EXTRA_DIST = $(rules_DATA) $(resource_files) common.gresource.xml meson.build
-CLEANFILES = $(BUILT_SOURCES) $(GSD_COMMON_ENUM_FILES)
-
-INPUTDIR=$(top_srcdir)/../gnome-settings-daemon/plugins/common/
-INPUTFILES=				\
-	gsd-input-helper.c 		\
-	gsd-input-helper.h 		\
-	gsd-device-manager.c 		\
-	gsd-device-manager.h		\
-	gsd-device-manager-x11.c	\
-	gsd-device-manager-x11.h	\
-	gsd-device-manager-udev.c	\
-	gsd-device-manager-udev.h
-
-update-from-gsd:
-	FILES="$(INPUTFILES)" DIR="$(INPUTDIR)" $(top_srcdir)/update-from-gsd.sh && changed=true ; \
-	git commit -m "common: Update from gnome-settings-daemon" $(INPUTFILES)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
deleted file mode 100644
index 9a5f5093f9..0000000000
--- a/panels/datetime/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-# This is used in PANEL_CFLAGS
-cappletname = datetime
-
-SUBDIRS = po-timezones
-
-icons16dir = $(datadir)/icons/hicolor/16x16/apps
-dist_icons16_DATA = icons/16x16/preferences-system-time.png
-icons22dir = $(datadir)/icons/hicolor/22x22/apps
-dist_icons22_DATA = icons/22x22/preferences-system-time.png
-icons32dir = $(datadir)/icons/hicolor/32x32/apps
-dist_icons32_DATA = icons/32x32/preferences-system-time.png
-icons48dir = $(datadir)/icons/hicolor/48x48/apps
-dist_icons48_DATA = icons/48x48/preferences-system-time.png
-icons256dir = $(datadir)/icons/hicolor/256x256/apps
-dist_icons256_DATA = icons/256x256/preferences-system-time.png
-iconsscalabledir = $(datadir)/icons/hicolor/scalable/apps
-dist_iconsscalable_DATA = icons/scalable/preferences-system-time.svg
-
-AM_CPPFLAGS =						\
-	$(PANEL_CFLAGS)					\
-	$(DATETIME_PANEL_CFLAGS)			\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
-	$(NULL)
-
-# test-timezone is still too noisy
-noinst_PROGRAMS = $(TEST_PROGS) test-timezone
-TEST_PROGS += test-timezone-gfx test-endianess
-
-test_timezone_SOURCES = test-timezone.c cc-timezone-map.h cc-timezone-map.c tz.c tz.h cc-datetime-resources.c cc-datetime-resources.h
-test_timezone_LDADD = $(DATETIME_PANEL_LIBS) $(LIBM)
-test_timezone_CFLAGS = $(DATETIME_PANEL_CFLAGS)
-
-test_timezone_gfx_SOURCES = test-timezone-gfx.c tz.c tz.h cc-datetime-resources.c cc-datetime-resources.h
-test_timezone_gfx_LDADD = $(DATETIME_PANEL_LIBS) $(LIBM)
-test_timezone_gfx_CFLAGS = $(DATETIME_PANEL_CFLAGS) -DSRCDIR="\"$(srcdir)\""
-
-test_endianess_SOURCES = test-endianess.c date-endian.c date-endian.h
-test_endianess_LDADD = $(DATETIME_PANEL_LIBS)
-test_endianess_CFLAGS = $(DATETIME_PANEL_CFLAGS)
-
-noinst_LTLIBRARIES = libdate_time.la
-
-# This requires running d-bus session and accessible timedate1 daemon
-# FIXME: need to find a way how to filter out unnecessary d-bus stuff (introspectable, properties)
-#timedated1-interface.xml:
-#	gdbus introspect					\
-#		--xml						\
-#		--system					\
-#		--dest org.freedesktop.timedate1		\
-#		--object-path /org/freedesktop/timedate1	\
-#		 > timedated1-interface.xml
-
-dbus_built_sources = timedated.c timedated.h
-timedated.c: timedated.h
-timedated.h: Makefile.am timedated1-interface.xml
-	gdbus-codegen						\
-		--interface-prefix org.freedesktop.		\
-		--generate-c-code timedated			\
-		$(srcdir)/timedated1-interface.xml
-
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/datetime.gresource.xml)
-cc-datetime-resources.c: datetime.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_datetime $<
-cc-datetime-resources.h: datetime.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_datetime $<
-
-BUILT_SOURCES = 		\
-	$(dbus_built_sources)	\
-	cc-datetime-resources.h	\
-	cc-datetime-resources.c
-
-libdate_time_la_SOURCES =	\
-	$(BUILT_SOURCES)	\
-	cc-datetime-panel.c	\
-	cc-datetime-panel.h	\
-	cc-timezone-map.c	\
-	cc-timezone-map.h	\
-	date-endian.c		\
-	date-endian.h		\
-	tz.c tz.h		\
-	$(NULL)
-
-libdate_time_la_LIBADD = $(PANEL_LIBS) $(DATETIME_PANEL_LIBS)
-
-polkitdir = $(datadir)/polkit-1/actions
-polkit_in_files = org.gnome.controlcenter.datetime.policy.in
-
-@INTLTOOL_POLICY_RULE@
-polkit_DATA = $(polkit_in_files:.policy.in=.policy)
-
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-datetime-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES =					\
-	$(desktop_in_files)			\
-	$(desktop_DATA)				\
-	$(BUILT_SOURCES)			\
-	org.gnome.controlcenter.datetime.policy
-
-EXTRA_DIST =				\
-	timedated1-interface.xml	\
-	$(polkit_in_files)		\
-	$(resource_files)		\
-	datetime.gresource.xml		\
-	meson.build			\
-	icons/meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/datetime/po-timezones/Makefile.am b/panels/datetime/po-timezones/Makefile.am
deleted file mode 100644
index cb56b489a6..0000000000
--- a/panels/datetime/po-timezones/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-PO_LINGUAS = $(subst .po,,$(wildcard *.po))
-
-USER_LINGUAS = $(filter $(LINGUAS),$(PO_LINGUAS))
-
-USE_LINGUAS = $(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else LLINGUAS="$(PO_LINGUAS)"; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-ALL_CATALOGS = $(patsubst %.po,%.mo,$(wildcard *.po))
-
-CATALOGS = $(USE_LINGUAS:%=%.mo)
-
-all: $(CATALOGS)
-
-NLSPACKAGE = $(GETTEXT_PACKAGE)-timezones
-
-%.mo: %.po
-	$(AM_V_GEN) msgfmt -o $@ $<
-
-test:
-
-install: $(CATALOGS)
-	@mkdir -p $(DESTDIR)$(localedir)
-	for n in $(CATALOGS); do \
-		l=`basename $$n .mo`; \
-		$(INSTALL) -m 755 -d $(DESTDIR)$(localedir)/$$l; \
-		$(INSTALL) -m 755 -d $(DESTDIR)$(localedir)/$$l/LC_MESSAGES; \
-		if [ -f $$n ]; then \
-			$(INSTALL) -m 644 $$n $(DESTDIR)$(localedir)/$$l/LC_MESSAGES/$(NLSPACKAGE).mo; \
-		fi; \
-	done
-
-EXTRA_DIST=$(wildcard *.po) meson.build
-
-CLEANFILES = $(ALL_CATALOGS)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/display/Makefile.am b/panels/display/Makefile.am
deleted file mode 100644
index b53a07ec2e..0000000000
--- a/panels/display/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-# This is used in PANEL_CFLAGS
-cappletname = display
-
-noinst_LTLIBRARIES = libdisplay.la
-
-BUILT_SOURCES =			\
-	cc-display-resources.h	\
-	cc-display-resources.c
-
-libdisplay_la_SOURCES =		\
-	$(BUILT_SOURCES)	\
-	cc-display-config.c	\
-	cc-display-config.h	\
-	cc-display-config-dbus.c	\
-	cc-display-config-dbus.h	\
-	cc-display-config-manager.c	\
-	cc-display-config-manager.h	\
-	cc-display-config-manager-dbus.c	\
-	cc-display-config-manager-dbus.h	\
-	cc-display-panel.c	\
-	cc-display-panel.h	\
-	cc-night-light-dialog.c	\
-	cc-night-light-dialog.h	\
-	cc-night-light-widget.c	\
-	cc-night-light-widget.h	\
-	scrollarea.c		\
-	scrollarea.h
-
-libdisplay_la_LIBADD = $(PANEL_LIBS) $(DISPLAY_PANEL_LIBS) $(LIBM)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --sourcedir=$(srcdir)/icons --generate-dependencies $(srcdir)/display.gresource.xml)
-cc-display-resources.c: display.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --sourcedir=$(srcdir)/icons --generate-source --c-name cc_display $<
-cc-display-resources.h: display.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --sourcedir=$(srcdir)/icons --generate-header --c-name cc_display $<
-
-# You will need a recent intltool or the patch from this bug
-# http://bugzilla.gnome.org/show_bug.cgi?id=462312
-@INTLTOOL_POLICY_RULE@
-
-@INTLTOOL_DESKTOP_RULE@
-
-icons16dir = $(datadir)/icons/hicolor/16x16/apps
-dist_icons16_DATA = icons/16x16/preferences-desktop-display.png
-icons22dir = $(datadir)/icons/hicolor/22x22/apps
-dist_icons22_DATA = icons/22x22/preferences-desktop-display.png
-icons24dir = $(datadir)/icons/hicolor/24x24/apps
-dist_icons24_DATA = icons/24x24/preferences-desktop-display.png
-icons32dir = $(datadir)/icons/hicolor/32x32/apps
-dist_icons32_DATA = icons/32x32/preferences-desktop-display.png
-iconssvgdir = $(datadir)/icons/hicolor/scalable/apps
-dist_iconssvg_DATA = icons/scalable/preferences-desktop-display.svg
-
-desktopdir = $(datadir)/applications
-Desktop_in_files = gnome-display-panel.desktop.in
-desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-
-AM_CPPFLAGS   = $(PANEL_CFLAGS) \
-	     $(DISPLAY_PANEL_CFLAGS) \
-	     -DDATADIR="\"$(datadir)\""\
-	     -DGNOMELOCALEDIR="\"$(datadir)/locale\""
-
-CLEANFILES = $(Desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) display.gresource.xml meson.build icons/meson.build
-
-if MAINTAINER_MODE
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/panels/info/Makefile.am b/panels/info/Makefile.am
deleted file mode 100644
index ce27366925..0000000000
--- a/panels/info/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-cappletname = info
-
-AM_CPPFLAGS =							\
-	$(PANEL_CFLAGS)						\
-	$(INFO_PANEL_CFLAGS)					\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""		\
-	-DDATADIR="\"$(datadir)\""				\
-	-DGNOME_SESSION_DIR="\"$(gnome_session_libexecdir)\""	\
-	-DBINDIR="\"$(bindir)\""				\
-	$(NULL)
-
-noinst_LTLIBRARIES = libinfo.la
-
-BUILT_SOURCES =			\
-	cc-info-resources.c	\
-	cc-info-resources.h
-
-libinfo_la_SOURCES =			\
-	$(BUILT_SOURCES)		\
-	cc-info-overview-panel.c	\
-	cc-info-overview-panel.h	\
-	cc-info-default-apps-panel.c	\
-	cc-info-default-apps-panel.h	\
-	cc-info-removable-media-panel.c	\
-	cc-info-removable-media-panel.h	\
-	gsd-disk-space-helper.h		\
-	gsd-disk-space-helper.c		\
-	info-cleanup.h			\
-	info-cleanup.c
-
-libinfo_la_LIBADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
-
-noinst_PROGRAMS = test-info-cleanup
-TEST_PROGS += $(noinst_PROGRAMS)
-test_info_cleanup_SOURCES =		\
-	test-info-cleanup.c		\
-	info-cleanup.h			\
-	info-cleanup.c
-test_info_cleanup_LDADD = $(libinfo_la_LIBADD)
-test_info_cleanup_CFLAGS = $(AM_CPPFLAGS) -DTEST_SRCDIR="\"$(srcdir)\""
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/info.gresource.xml)
-cc-info-resources.c: info.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_info $<
-cc-info-resources.h: info.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_info $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = \
-		gnome-info-overview-panel.desktop.in	\
-		gnome-default-apps-panel.desktop.in	\
-		gnome-removable-media-panel.desktop.in
-
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-SPACEDIR=$(top_srcdir)/../gnome-settings-daemon/plugins/housekeeping/
-SPACEFILES=gsd-disk-space-helper.c gsd-disk-space-helper.h
-update-from-gsd:
-	FILES="$(SPACEFILES)" DIR="$(SPACEDIR)" $(top_srcdir)/update-from-gsd.sh && changed=true ; \
-	git commit -m "info: Update from gnome-settings-daemon" $(SPACEFILES)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) info.gresource.xml info-cleanup-test.txt meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/keyboard/Makefile.am b/panels/keyboard/Makefile.am
deleted file mode 100644
index 696307e15b..0000000000
--- a/panels/keyboard/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-# This is used in PANEL_CFLAGS
-cappletname = keyboard
-
-noinst_LTLIBRARIES = libkeyboard.la
-
-BUILT_SOURCES =			\
-	cc-keyboard-resources.c	\
-	cc-keyboard-resources.h
-
-libkeyboard_la_SOURCES =   \
-	$(BUILT_SOURCES)		\
-	cc-keyboard-manager.c		\
-	cc-keyboard-manager.h		\
-	cc-keyboard-panel.c		\
-	cc-keyboard-panel.h		\
-	cc-keyboard-item.c		\
-	cc-keyboard-item.h		\
-	cc-keyboard-option.c		\
-	cc-keyboard-option.h		\
-	cc-keyboard-shortcut-editor.c	\
-	cc-keyboard-shortcut-editor.h	\
-	wm-common.c			\
-	wm-common.h			\
-	keyboard-shortcuts.c		\
-	keyboard-shortcuts.h
-
-libkeyboard_la_CFLAGS = $(PANEL_CFLAGS) $(KEYBOARD_PANEL_CFLAGS) -I$(top_srcdir)/panels/common/
-libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/keyboard.gresource.xml)
-cc-keyboard-resources.c: keyboard.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_keyboard $<
-cc-keyboard-resources.h: keyboard.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_keyboard $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-Desktop_in_files = gnome-keyboard-panel.desktop.in
-desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-
-itsdir = $(datadir)/gettext/its
-its_DATA = gnome-keybindings.loc gnome-keybindings.its
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-xmldir       = $(pkgdatadir)/keybindings
-xml_in_files = 			\
-	00-multimedia.xml.in 	\
-	01-input-sources.xml.in	\
-	01-launchers.xml.in 	\
-	01-screenshot.xml.in 	\
-	01-system.xml.in 	\
-	50-accessibility.xml.in
-xml_DATA     = $(xml_in_files:.xml.in=.xml)
-
-pkgconfigdir = $(datadir)/pkgconfig
-pkgconfig_DATA = gnome-keybindings.pc
-
-AM_CPPFLAGS = \
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
-
-CLEANFILES = \
-	$(Desktop_in_files) \
-	$(desktop_DATA) \
-	$(xml_DATA) \
-	$(BUILT_SOURCES)
-EXTRA_DIST = $(xml_in_files) \
-	gnome-keybindings.its \
-	gnome-keybindings.loc \
-	gnome-keybindings.pc.in \
-	$(resource_files) \
-	keyboard.gresource.xml \
-	meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/mouse/Makefile.am b/panels/mouse/Makefile.am
deleted file mode 100644
index fe01efb1ed..0000000000
--- a/panels/mouse/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-# This is used in PANEL_CFLAGS
-cappletname = mouse
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(MOUSE_PANEL_CFLAGS)				\
-	-I$(top_srcdir)/panels/common			\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	$(NULL)
-
-noinst_LTLIBRARIES = libmouse-properties.la
-
-BUILT_SOURCES =			\
-	cc-mouse-resources.c	\
-	cc-mouse-resources.h
-
-libmouse_properties_la_SOURCES =	\
-	$(BUILT_SOURCES)		\
-	cc-mouse-caps-helper.c		\
-	cc-mouse-caps-helper.h		\
-	cc-mouse-panel.c		\
-	cc-mouse-panel.h		\
-	gnome-mouse-properties.c	\
-	gnome-mouse-properties.h	\
-	gnome-mouse-test.c		\
-	gnome-mouse-test.h
-
-libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS) $(LIBM) $(top_builddir)/panels/common/libdevice.la
-
-test_gnome_mouse_test_SOURCES =		\
-	$(BUILT_SOURCES)		\
-	gnome-mouse-test.c		\
-	gnome-mouse-test.h		\
-	test-gnome-mouse-test.c
-
-noinst_PROGRAMS = test-gnome-mouse-test
-
-test_gnome_mouse_test_CPPFLAGS = $(AM_CPPFLAGS)
-test_gnome_mouse_test_LDADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS) $(LIBM)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/mouse.gresource.xml)
-cc-mouse-resources.c: mouse.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_mouse $<
-cc-mouse-resources.h: mouse.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_mouse $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-Desktop_in_files = gnome-mouse-panel.desktop.in
-desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(Desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) mouse.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/network/Makefile.am b/panels/network/Makefile.am
deleted file mode 100644
index ee368a88b0..0000000000
--- a/panels/network/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-cappletname = network
-
-SUBDIRS = wireless-security connection-editor
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(NETWORK_PANEL_CFLAGS)				\
-	$(NETWORK_MANAGER_CFLAGS)			\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-I$(srcdir)/wireless-security			\
-	$(NULL)
-
-noinst_LTLIBRARIES = libnetwork.la
-
-BUILT_SOURCES =			\
-	cc-network-resources.c	\
-	cc-network-resources.h
-
-libnetwork_la_SOURCES =					\
-	$(BUILT_SOURCES)				\
-	panel-common.c					\
-	panel-common.h					\
-	net-object.c					\
-	net-object.h					\
-	net-device.c					\
-	net-device.h					\
-	net-device-wifi.c				\
-	net-device-wifi.h				\
-	net-device-simple.c				\
-	net-device-simple.h				\
-	net-device-ethernet.c				\
-	net-device-ethernet.h				\
-	net-device-mobile.c				\
-	net-device-mobile.h				\
-	net-vpn.c					\
-	net-vpn.h					\
-	net-proxy.c					\
-	net-proxy.h					\
-	network-dialogs.c				\
-	network-dialogs.h				\
-	cc-network-panel.c				\
-	cc-network-panel.h                              \
-	cc-wifi-panel.c					\
-	cc-wifi-panel.h
-
-libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS) $(builddir)/connection-editor/libconnection-editor.la
-
-libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/network.gresource.xml)
-cc-network-resources.c: network.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_network $<
-cc-network-resources.h: network.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_network $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-network-panel.desktop.in gnome-wifi-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) network.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/network/connection-editor/Makefile.am b/panels/network/connection-editor/Makefile.am
deleted file mode 100644
index d384b0d3d1..0000000000
--- a/panels/network/connection-editor/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-noinst_LTLIBRARIES = libconnection-editor.la
-
-BUILT_SOURCES =					\
-	net-connection-editor-resources.c	\
-	net-connection-editor-resources.h
-
-libconnection_editor_la_SOURCES = 		\
-	$(BUILT_SOURCES)			\
-	net-connection-editor.h			\
-	net-connection-editor.c			\
-	ce-page.h				\
-	ce-page.c				\
-	ce-page-details.h			\
-	ce-page-details.c			\
-	ce-page-wifi.h				\
-	ce-page-wifi.c				\
-	ce-page-ip4.h				\
-	ce-page-ip4.c				\
-	ce-page-ip6.h				\
-	ce-page-ip6.c				\
-	ce-page-security.h			\
-	ce-page-security.c			\
-	ce-page-ethernet.h			\
-	ce-page-ethernet.c			\
-	ce-page-8021x-security.h		\
-	ce-page-8021x-security.c		\
-	ce-page-vpn.h				\
-	ce-page-vpn.c				\
-	vpn-helpers.h				\
-	vpn-helpers.c				\
-	ui-helpers.h				\
-	ui-helpers.c
-
-libconnection_editor_la_CPPFLAGS = 		\
-	$(PANEL_CFLAGS)				\
-	-I$(srcdir)/../wireless-security	\
-	$(NETWORK_PANEL_CFLAGS) 		\
-        $(NETWORK_MANAGER_CFLAGS)		\
-	-DNM_VPN_CONFIG_DIR=\""$(NM_VPN_CONFIG_DIR)"\" \
-	-DNM_VPN_MODULE_DIR=\""$(NM_VPN_MODULE_DIR)"\"
-
-libconnection_editor_la_LIBADD = 		\
-	$(builddir)/../wireless-security/libwireless-security.la \
-	$(NETWORK_PANEL_LIBS) 			\
-	$(NETWORK_MANAGER_LIBS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/connection-editor.gresource.xml)
-net-connection-editor-resources.c: connection-editor.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name net_connection_editor $<
-net-connection-editor-resources.h: connection-editor.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name net_connection_editor $<
-
-EXTRA_DIST = \
-	$(resource_files) connection-editor.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/network/wireless-security/Makefile.am b/panels/network/wireless-security/Makefile.am
deleted file mode 100644
index d6d9252998..0000000000
--- a/panels/network/wireless-security/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-noinst_LTLIBRARIES = libwireless-security.la
-
-BUILT_SOURCES = \
-	wireless-security-resources.h \
-	wireless-security-resources.c
-
-NM_APPLET_SOURCES = \
-	wireless-security.h \
-	wireless-security.c \
-	ws-wep-key.h \
-	ws-wep-key.c \
-	ws-wpa-psk.h \
-	ws-wpa-psk.c \
-	ws-leap.h \
-	ws-leap.c \
-	ws-wpa-eap.h \
-	ws-wpa-eap.c \
-	ws-dynamic-wep.h \
-	ws-dynamic-wep.c \
-	eap-method.h \
-	eap-method.c \
-	eap-method-tls.h \
-	eap-method-tls.c \
-	eap-method-leap.h \
-	eap-method-leap.c \
-	eap-method-fast.h \
-	eap-method-fast.c \
-	eap-method-ttls.h \
-	eap-method-ttls.c \
-	eap-method-peap.h \
-	eap-method-peap.c \
-	eap-method-simple.h \
-	eap-method-simple.c \
-	helpers.h \
-	helpers.c
-
-libwireless_security_la_SOURCES = \
-	$(BUILT_SOURCES) \
-	$(NM_APPLET_SOURCES) \
-	utils.c \
-	utils.h \
-	nm-default.h
-
-libwireless_security_la_CPPFLAGS = \
-	$(NETWORK_PANEL_CFLAGS) \
-        $(NETWORK_MANAGER_CFLAGS)                       \
-	-DUIDIR=\""$(uidir)"\"
-
-libwireless_security_la_LIBADD = \
-	$(NETWORK_PANEL_LIBS) \
-	$(NETWORK_MANAGER_LIBS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/wireless-security.gresource.xml)
-wireless-security-resources.c: wireless-security.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name wireless_security $<
-wireless-security-resources.h: wireless-security.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name wireless_security $<
-
-WIRELESS_SECURITY_DIR=$(top_srcdir)/../network-manager-applet/src/wireless-security
-update-from-nma:
-	FILES="$(NM_APPLET_SOURCES)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && \
-	      patch -p4 < $(srcdir)/nm-connection-editor-to-network-panel.patch && \
-	      git add $(NM_APPLET_SOURCES) && \
-	      git commit -m "network: Update wireless-security from network-manager-applet"
-	FILES="$(resource_files)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && \
-	      patch -p4 < $(srcdir)/nm-connection-editor-ui-to-network-panel.patch && \
-	      git add $(resource_files) && \
-	      git commit -m "network: Update wireless-security UI from network-manager-applet"
-
-EXTRA_DIST = $(resource_files) wireless-security.gresource.xml nm-connection-editor-to-network-panel.patch nm-connection-editor-ui-to-network-panel.patch meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/notifications/Makefile.am b/panels/notifications/Makefile.am
deleted file mode 100644
index 9eda62e6e2..0000000000
--- a/panels/notifications/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-cappletname = notifications
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(NOTIFICATIONS_PANEL_CFLAGS)			\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	$(NULL)
-
-noinst_LTLIBRARIES = libnotifications.la
-
-BUILT_SOURCES =				\
-	cc-notifications-resources.c	\
-	cc-notifications-resources.h
-
-libnotifications_la_SOURCES =		\
-	$(BUILT_SOURCES)		\
-	cc-edit-dialog.c		\
-	cc-edit-dialog.h		\
-	cc-notifications-panel.c	\
-	cc-notifications-panel.h
-
-libnotifications_la_LIBADD = $(NOTIFICATIONS_PANEL_LIBS) $(PANEL_LIBS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/notifications.gresource.xml)
-cc-notifications-resources.c: notifications.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_notifications $<
-cc-notifications-resources.h: notifications.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_notifications $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-notifications-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) notifications.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/online-accounts/Makefile.am b/panels/online-accounts/Makefile.am
deleted file mode 100644
index 6ad371cbc3..0000000000
--- a/panels/online-accounts/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-cappletname = online-accounts
-
-SUBDIRS = icons
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(ONLINE_ACCOUNTS_PANEL_CFLAGS)			\
-	-I$(top_srcdir)/subprojects/libgd		\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	$(NULL)
-
-noinst_LTLIBRARIES = libonline-accounts.la
-
-BUILT_SOURCES =				\
-	cc-online-accounts-resources.c	\
-	cc-online-accounts-resources.h
-
-libonline_accounts_la_SOURCES =		\
-	$(BUILT_SOURCES)		\
-	cc-online-accounts-panel.c	\
-	cc-online-accounts-panel.h
-
-libonline_accounts_la_LIBADD =				\
-	$(PANEL_LIBS)					\
-	$(ONLINE_ACCOUNTS_PANEL_LIBS)			\
-	$(top_builddir)/subprojects/libgd/libgd.la	\
-	$(NULL)
-
-libonline_accounts_la_LDFLAGS = $(PANEL_LDFLAGS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/online-accounts.gresource.xml)
-cc-online-accounts-resources.c: online-accounts.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_online_accounts $<
-cc-online-accounts-resources.h: online-accounts.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_online_accounts $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-online-accounts-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) online-accounts.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/online-accounts/icons/16x16/Makefile.am b/panels/online-accounts/icons/16x16/Makefile.am
deleted file mode 100644
index c4fe7aa643..0000000000
--- a/panels/online-accounts/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/16x16/apps
-icon_DATA =				\
-	goa-panel.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/online-accounts/icons/22x22/Makefile.am b/panels/online-accounts/icons/22x22/Makefile.am
deleted file mode 100644
index 46b3c774f3..0000000000
--- a/panels/online-accounts/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = 				\
-	goa-panel.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/online-accounts/icons/24x24/Makefile.am b/panels/online-accounts/icons/24x24/Makefile.am
deleted file mode 100644
index 5e59331b2c..0000000000
--- a/panels/online-accounts/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/24x24/apps
-icon_DATA = 				\
-	goa-panel.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/online-accounts/icons/256x256/Makefile.am b/panels/online-accounts/icons/256x256/Makefile.am
deleted file mode 100644
index 9a9f940e4e..0000000000
--- a/panels/online-accounts/icons/256x256/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/256x256/apps
-icon_DATA = 				\
-	goa-panel.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/online-accounts/icons/32x32/Makefile.am b/panels/online-accounts/icons/32x32/Makefile.am
deleted file mode 100644
index 956c316f5f..0000000000
--- a/panels/online-accounts/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = 				\
-	goa-panel.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/online-accounts/icons/48x48/Makefile.am b/panels/online-accounts/icons/48x48/Makefile.am
deleted file mode 100644
index ce7d003df8..0000000000
--- a/panels/online-accounts/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = 				\
-	goa-panel.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/online-accounts/icons/Makefile.am b/panels/online-accounts/icons/Makefile.am
deleted file mode 100644
index e0899663ea..0000000000
--- a/panels/online-accounts/icons/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256
-
-EXTRA_DIST = meson.build
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-if MAINTAINER_MODE
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
-endif
-
-clean-local :
-	rm -f *~
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/power/Makefile.am b/panels/power/Makefile.am
deleted file mode 100644
index fc8131d8a3..0000000000
--- a/panels/power/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-cappletname = power
-
-SUBDIRS = icons
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(POWER_PANEL_CFLAGS)				\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-I$(srcdir)/../../shell/			\
-	$(NULL)
-
-noinst_LTLIBRARIES = libpower.la
-
-BUILT_SOURCES =			\
-	cc-power-resources.c	\
-	cc-power-resources.h
-
-libpower_la_SOURCES =		\
-	$(BUILT_SOURCES)	\
-	cc-power-panel.c	\
-	cc-power-panel.h
-
-libpower_la_LIBADD = $(PANEL_LIBS) $(POWER_PANEL_LIBS)
-
-if BUILD_BLUETOOTH
-AM_CPPFLAGS += $(BLUETOOTH_CFLAGS)
-libpower_la_LIBADD += $(BLUETOOTH_LIBS)
-endif
-
-if BUILD_NETWORK
-AM_CPPFLAGS += $(NETWORK_MANAGER_CFLAGS)
-libpower_la_LIBADD += $(NETWORK_MANAGER_LIBS)
-endif
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/power.gresource.xml)
-cc-power-resources.c: power.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_power $<
-cc-power-resources.h: power.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_power $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-power-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) power.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/16x16/Makefile.am b/panels/power/icons/16x16/Makefile.am
deleted file mode 100644
index 0a1f2a7a85..0000000000
--- a/panels/power/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/16x16/apps
-icon_DATA =				\
-	gnome-power-manager.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/22x22/Makefile.am b/panels/power/icons/22x22/Makefile.am
deleted file mode 100644
index 927521380b..0000000000
--- a/panels/power/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = 				\
-	gnome-power-manager.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/24x24/Makefile.am b/panels/power/icons/24x24/Makefile.am
deleted file mode 100644
index 13f910dc7f..0000000000
--- a/panels/power/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/24x24/apps
-icon_DATA = 				\
-	gnome-power-manager.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/256x256/Makefile.am b/panels/power/icons/256x256/Makefile.am
deleted file mode 100644
index 03327473a6..0000000000
--- a/panels/power/icons/256x256/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/256x256/apps
-icon_DATA = 				\
-	gnome-power-manager.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/32x32/Makefile.am b/panels/power/icons/32x32/Makefile.am
deleted file mode 100644
index 505eb36d62..0000000000
--- a/panels/power/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = 				\
-	gnome-power-manager.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/48x48/Makefile.am b/panels/power/icons/48x48/Makefile.am
deleted file mode 100644
index 6dd8c652f1..0000000000
--- a/panels/power/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = 				\
-	gnome-power-manager.png			\
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon_DATA)
-
-clean-local :
-	rm -f *~
-
--include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/Makefile.am b/panels/power/icons/Makefile.am
deleted file mode 100644
index 2c42044ca4..0000000000
--- a/panels/power/icons/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256
-
-EXTRA_DIST = meson.build
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-if MAINTAINER_MODE
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
-clean-local :
-	rm -f *~
-
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
deleted file mode 100644
index a465770870..0000000000
--- a/panels/printers/Makefile.am
+++ /dev/null
@@ -1,89 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-cappletname = printers
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(PRINTERS_PANEL_CFLAGS)			\
-	$(CUPS_CFLAGS)					\
-	-I$(srcdir)/../common/				\
-	-I$(top_srcdir)/shell/				\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-DTEST_SRCDIR=\""$(srcdir)/"\"			\
-	$(NULL)
-
-noinst_LTLIBRARIES = libprinters.la
-
-BUILT_SOURCES =			\
-	cc-printers-resources.c	\
-	cc-printers-resources.h
-
-libprinters_la_SOURCES =		\
-	$(BUILT_SOURCES)		\
-	pp-printer.c			\
-	pp-printer.h			\
-	pp-new-printer.c		\
-	pp-new-printer.h		\
-	pp-maintenance-command.c	\
-	pp-maintenance-command.h	\
-	pp-host.c			\
-	pp-host.h			\
-	pp-cups.c			\
-	pp-cups.h			\
-	pp-utils.c			\
-	pp-utils.h			\
-	pp-ppd-option-widget.c		\
-	pp-ppd-option-widget.h		\
-	pp-ipp-option-widget.c		\
-	pp-ipp-option-widget.h		\
-	pp-new-printer-dialog.c		\
-	pp-new-printer-dialog.h		\
-	pp-ppd-selection-dialog.c	\
-	pp-ppd-selection-dialog.h	\
-	pp-options-dialog.c		\
-	pp-options-dialog.h		\
-	pp-job.c			\
-	pp-job.h			\
-	pp-jobs-dialog.c		\
-	pp-jobs-dialog.h		\
-	pp-details-dialog.c		\
-	pp-details-dialog.h		\
-	pp-samba.c			\
-	pp-samba.h			\
-	pp-print-device.c		\
-	pp-print-device.h		\
-	pp-printer-entry.c		\
-	pp-printer-entry.h		\
-	cc-printers-panel.c		\
-	cc-printers-panel.h
-
-libprinters_la_CPPFLAGS = $(AM_CPPFLAGS)
-libprinters_la_LIBADD = $(PRINTERS_PANEL_LIBS) $(PANEL_LIBS) $(CUPS_LIBS) $(LIBM)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/printers.gresource.xml)
-cc-printers-resources.c: printers.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_printers $<
-cc-printers-resources.h: printers.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_printers $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-printers-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) printers.gresource.xml meson.build
-
-noinst_PROGRAMS = $(TEST_PROGS)
-TEST_PROGS += test-shift test-canonicalization
-test_shift_SOURCES = pp-print-device.c pp-print-device.h pp-utils.c pp-utils.h test-shift.c
-test_shift_LDADD = $(PANEL_LIBS) $(PRINTERS_PANEL_LIBS) $(CUPS_LIBS)
-test_canonicalization_SOURCES = pp-print-device.c pp-print-device.h pp-utils.c pp-utils.h test-canonicalization.c
-test_canonicalization_LDADD = $(PANEL_LIBS) $(PRINTERS_PANEL_LIBS) $(CUPS_LIBS)
-
-EXTRA_DIST +=				\
-	shift-test.txt			\
-	canonicalization-test.txt
-
--include $(top_srcdir)/git.mk
diff --git a/panels/privacy/Makefile.am b/panels/privacy/Makefile.am
deleted file mode 100644
index 73d5084596..0000000000
--- a/panels/privacy/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-cappletname = privacy
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(PRIVACY_PANEL_CFLAGS)				\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-I$(top_srcdir)/panels/common/			\
-	$(NULL)
-
-noinst_LTLIBRARIES = libprivacy.la
-
-BUILT_SOURCES =			\
-	cc-privacy-resources.c	\
-	cc-privacy-resources.h
-
-libprivacy_la_SOURCES =		\
-	$(BUILT_SOURCES)	\
-	cc-privacy-panel.c	\
-	cc-privacy-panel.h
-
-libprivacy_la_LIBADD = $(PANEL_LIBS) $(PRIVACY_PANEL_LIBS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/privacy.gresource.xml)
-cc-privacy-resources.c: privacy.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_privacy $<
-cc-privacy-resources.h: privacy.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_privacy $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-privacy-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) privacy.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/region/Makefile.am b/panels/region/Makefile.am
deleted file mode 100644
index c289ce3ead..0000000000
--- a/panels/region/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-# This is used in PANEL_CFLAGS
-cappletname = region
-
-AM_CPPFLAGS =						\
-	$(PANEL_CFLAGS)					\
-	$(REGION_PANEL_CFLAGS)				\
-	-I$(srcdir)/../common/				\
-	-I$(top_srcdir)/subprojects/libgd/		\
-	$(NULL)
-
-noinst_LTLIBRARIES = libregion.la
-
-BUILT_SOURCES =			\
-	cc-region-resources.c	\
-	cc-region-resources.h
-
-libregion_la_SOURCES =	\
-	$(BUILT_SOURCES) \
-	cc-region-panel.c \
-	cc-region-panel.h \
-	cc-format-chooser.c \
-	cc-format-chooser.h \
-	cc-input-options.c \
-	cc-input-options.h \
-	cc-input-chooser.c \
-	cc-input-chooser.h \
-	cc-ibus-utils.c	\
-	cc-ibus-utils.h \
-	$(NULL)
-
-libregion_la_LIBADD = \
-	$(PANEL_LIBS) \
-	$(REGION_PANEL_LIBS) \
-	$(top_builddir)/subprojects/libgd/libgd.la \
-	$(builddir)/../common/liblanguage.la
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/region.gresource.xml)
-cc-region-resources.c: region.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_region $<
-cc-region-resources.h: region.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_region $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-Desktop_in_files = gnome-region-panel.desktop.in
-desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(Desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) region.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/search/Makefile.am b/panels/search/Makefile.am
deleted file mode 100644
index 323cb033d6..0000000000
--- a/panels/search/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-cappletname = search
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(SEARCH_PANEL_CFLAGS)				\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-DDATADIR="\"$(datadir)\""			\
-	-I$(top_srcdir)/panels/common/			\
-	$(NULL)
-
-noinst_LTLIBRARIES = libsearch.la
-
-BUILT_SOURCES =			\
-	cc-search-resources.c	\
-	cc-search-resources.h
-
-libsearch_la_SOURCES =		\
-	$(BUILT_SOURCES)	\
-	cc-search-locations-dialog.c \
-	cc-search-locations-dialog.h \
-	cc-search-panel.c	\
-	cc-search-panel.h
-
-libsearch_la_LIBADD = $(PANEL_LIBS) $(SEARCH_PANEL_LIBS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/search.gresource.xml)
-cc-search-resources.c: search.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_search $<
-cc-search-resources.h: search.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_search $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-search-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) search.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sharing/Makefile.am b/panels/sharing/Makefile.am
deleted file mode 100644
index 24b805d213..0000000000
--- a/panels/sharing/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-# This is used in PANEL_CFLAGS
-cappletname = sharing
-
-uidir = $(pkgdatadir)/ui/sharing
-dbus_built_sources = org.gnome.SettingsDaemon.Sharing.c org.gnome.SettingsDaemon.Sharing.h
-
-AM_CPPFLAGS =						\
-	$(PANEL_CFLAGS)					\
-	$(SHARING_PANEL_CFLAGS)				\
-	-DLIBEXECDIR=\"$(libexecdir)\"			\
-	-DSYSCONFDIR=\"$(sysconfdir)\"			\
-	$(NULL)
-
-noinst_LTLIBRARIES = libsharing.la
-
-BUILT_SOURCES = 		\
-	cc-sharing-resources.c	\
-	cc-sharing-resources.h	\
-	$(dbus_built_sources)	\
-	$(NULL)
-
-libsharing_la_SOURCES =		\
-	$(BUILT_SOURCES)	\
-	cc-sharing-panel.c	\
-	cc-sharing-panel.h	\
-	cc-remote-login.c	\
-	cc-remote-login.h	\
-	cc-media-sharing.c	\
-	cc-media-sharing.h	\
-	vino-preferences.c	\
-	vino-preferences.h	\
-	file-share-properties.c \
-	file-share-properties.h \
-	cc-sharing-networks.c	\
-	cc-sharing-networks.h	\
-	cc-sharing-switch.c	\
-	cc-sharing-switch.h	\
-	gsd-sharing-enums.h	\
-	$(NULL)
-
-
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/sharing.gresource.xml)
-cc-sharing-resources.c: sharing.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_sharing $<
-cc-sharing-resources.h: sharing.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_sharing $<
-
-$(dbus_built_sources) : Makefile.am org.gnome.SettingsDaemon.Sharing.xml
-	$(AM_V_GEN) gdbus-codegen \
-	--interface-prefix org.gnome.SettingsDaemon. \
-	--c-namespace Gsd \
-	--generate-c-code org.gnome.SettingsDaemon.Sharing \
-	$(srcdir)/org.gnome.SettingsDaemon.Sharing.xml
-
-libsharing_la_LIBADD = $(PANEL_LIBS) $(SHARING_PANEL_LIBS)
-libsharing_la_LDFLAGS = $(PANEL_LDFLAGS)
-
-libexec_PROGRAMS = cc-remote-login-helper
-
-cc_remote_login_helper_SOURCES = cc-remote-login-helper.c
-cc_remote_login_helper_LDADD = $(REMOTE_LOGIN_HELPER_LIBS)
-cc_remote_login_helper_CFLAGS = $(REMOTE_LOGIN_HELPER_CFLAGS)
-
-org.gnome.controlcenter.remote-login-helper.policy.in: org.gnome.controlcenter.remote-login-helper.policy.in.in Makefile
-	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-@INTLTOOL_POLICY_RULE@
-polkit_policydir = $(datadir)/polkit-1/actions
-polkit_policy_in_files = org.gnome.controlcenter.remote-login-helper.policy.in
-polkit_policy_DATA = $(polkit_policy_in_files:.policy.in=.policy)
-
-
-@INTLTOOL_DESKTOP_RULE@
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-sharing-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(polkit_policy_DATA) $(polkit_policy_in_files) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) sharing.gresource.xml org.gnome.controlcenter.remote-login-helper.policy.in.in org.gnome.SettingsDaemon.Sharing.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/Makefile.am b/panels/sound/Makefile.am
deleted file mode 100644
index a9a42fd90b..0000000000
--- a/panels/sound/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-SUBDIRS = data
-
-# This is used in PANEL_CFLAGS
-cappletname = sound
-NULL =
-
-noinst_LTLIBRARIES = libsound.la libgvcgtk.la
-
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)/subprojects/gvc/	\
-	$(PANEL_CFLAGS) 			\
-	$(SOUND_PANEL_CFLAGS)			\
-	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
-	-DLIBEXECDIR=\"$(libexecdir)\"		\
-	-DGLADEDIR=\""$(pkgdatadir)"\"		\
-        -DSOUND_DATA_DIR="\"$(datadir)/sounds\""	\
-        -DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\""	\
-	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" \
-	$(NULL)
-
-# Needed because Automake complains if
-# the same source file is used in a library
-# and in an executable
-libgvcgtk_la_SOURCES = 				\
-	gvc-channel-bar.h			\
-	gvc-channel-bar.c			\
-	$(NULL)
-
-libsound_la_LIBADD =					\
-	$(top_builddir)/subprojects/gvc/libgvc.la	\
-	libgvcgtk.la					\
-	$(PANEL_LIBS)					\
-	$(SOUND_PANEL_LIBS)				\
-	$(LIBM)						\
-	$(NULL)
-
-libsound_la_LDFLAGS =				\
-	$(PANEL_LDFLAGS)			\
-	$(NULL)
-
-libsound_la_SOURCES =				\
-	gvc-balance-bar.h			\
-	gvc-balance-bar.c			\
-	gvc-mixer-dialog.h			\
-	gvc-mixer-dialog.c			\
-	gvc-level-bar.h				\
-	gvc-level-bar.c				\
-	gvc-combo-box.h				\
-	gvc-combo-box.c				\
-	gvc-speaker-test.h			\
-	gvc-speaker-test.c			\
-	gvc-sound-theme-chooser.c		\
-	gvc-sound-theme-chooser.h		\
-	sound-theme-file-utils.c		\
-	sound-theme-file-utils.h		\
-	cc-sound-panel.c			\
-	cc-sound-panel.h			\
-	$(NULL)
-
-BUILT_SOURCES =				\
-	$(NULL)
-
-CLEANFILES =				\
-	$(BUILT_SOURCES)		\
-	$(NULL)
-
-EXTRA_DIST =				\
-	meson.build
-
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/Makefile.am b/panels/sound/data/Makefile.am
deleted file mode 100644
index 43064f0dcb..0000000000
--- a/panels/sound/data/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-NULL =
-
-SUBDIRS =			\
-	icons			\
-	symbolic-icons		\
-	sounds			\
-	$(NULL)
-
-@INTLTOOL_DESKTOP_RULE@
-
-appsdir = $(datadir)/applications
-apps_in_files = gnome-sound-panel.desktop.in
-apps_DATA = $(apps_in_files:.desktop.in=.desktop)
-
-EXTRA_DIST =					\
-	$(autostart_in_files)			\
-	gnome-sound-panel.desktop.in.in		\
-	$(NULL)
-
-
-if MAINTAINER_MODE
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
-endif
-
-CLEANFILES =					\
-	gnome-sound-panel.desktop		\
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/16x16/Makefile.am b/panels/sound/data/icons/16x16/Makefile.am
deleted file mode 100644
index 00c42b1c70..0000000000
--- a/panels/sound/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = status apps devices
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/16x16/apps/Makefile.am b/panels/sound/data/icons/16x16/apps/Makefile.am
deleted file mode 100644
index 613c6b21d1..0000000000
--- a/panels/sound/data/icons/16x16/apps/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-NULL =
-
-themedir = $(datadir)/icons/hicolor
-size = 16x16
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	multimedia-volume-control.png		\
-	multimedia-volume-control.svg
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/16x16/devices/Makefile.am b/panels/sound/data/icons/16x16/devices/Makefile.am
deleted file mode 100644
index f9b4252d4d..0000000000
--- a/panels/sound/data/icons/16x16/devices/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = devices
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =					\
-	audio-headset.svg			\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/16x16/status/Makefile.am b/panels/sound/data/icons/16x16/status/Makefile.am
deleted file mode 100644
index 9ca7ba0b4e..0000000000
--- a/panels/sound/data/icons/16x16/status/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	audio-input-microphone-high.png		\
-	audio-input-microphone-low.png		\
-	audio-input-microphone-medium.png	\
-	audio-input-microphone-muted.png	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/22x22/Makefile.am b/panels/sound/data/icons/22x22/Makefile.am
deleted file mode 100644
index 9ed74c7bf9..0000000000
--- a/panels/sound/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = status apps
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/22x22/apps/Makefile.am b/panels/sound/data/icons/22x22/apps/Makefile.am
deleted file mode 100644
index 84943a41f0..0000000000
--- a/panels/sound/data/icons/22x22/apps/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-NULL =
-
-themedir = $(datadir)/icons/hicolor
-size = 22x22
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	multimedia-volume-control.png		\
-	multimedia-volume-control.svg
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/22x22/status/Makefile.am b/panels/sound/data/icons/22x22/status/Makefile.am
deleted file mode 100644
index d855c3814d..0000000000
--- a/panels/sound/data/icons/22x22/status/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	audio-input-microphone-high.png		\
-	audio-input-microphone-low.png		\
-	audio-input-microphone-medium.png	\
-	audio-input-microphone-muted.png	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/24x24/Makefile.am b/panels/sound/data/icons/24x24/Makefile.am
deleted file mode 100644
index 00c42b1c70..0000000000
--- a/panels/sound/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = status apps devices
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/24x24/apps/Makefile.am b/panels/sound/data/icons/24x24/apps/Makefile.am
deleted file mode 100644
index d59fb5ad32..0000000000
--- a/panels/sound/data/icons/24x24/apps/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-
-themedir = $(datadir)/icons/hicolor
-size = 24x24
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	multimedia-volume-control.png		\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/24x24/devices/Makefile.am b/panels/sound/data/icons/24x24/devices/Makefile.am
deleted file mode 100644
index 40b4b1ca52..0000000000
--- a/panels/sound/data/icons/24x24/devices/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = devices
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =					\
-	audio-headset.svg			\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/24x24/status/Makefile.am b/panels/sound/data/icons/24x24/status/Makefile.am
deleted file mode 100644
index 6b9b71cfb4..0000000000
--- a/panels/sound/data/icons/24x24/status/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	audio-input-microphone-high.png		\
-	audio-input-microphone-low.png		\
-	audio-input-microphone-medium.png	\
-	audio-input-microphone-muted.png	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/32x32/Makefile.am b/panels/sound/data/icons/32x32/Makefile.am
deleted file mode 100644
index 00c42b1c70..0000000000
--- a/panels/sound/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = status apps devices
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/32x32/apps/Makefile.am b/panels/sound/data/icons/32x32/apps/Makefile.am
deleted file mode 100644
index e209d40a7b..0000000000
--- a/panels/sound/data/icons/32x32/apps/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-NULL =
-
-themedir = $(datadir)/icons/hicolor
-size = 32x32
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	multimedia-volume-control.png		\
-	multimedia-volume-control.svg
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/32x32/devices/Makefile.am b/panels/sound/data/icons/32x32/devices/Makefile.am
deleted file mode 100644
index dd7a1d6051..0000000000
--- a/panels/sound/data/icons/32x32/devices/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = devices
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =					\
-	audio-headset.svg			\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/32x32/status/Makefile.am b/panels/sound/data/icons/32x32/status/Makefile.am
deleted file mode 100644
index 24d4e984f7..0000000000
--- a/panels/sound/data/icons/32x32/status/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	audio-input-microphone-high.png		\
-	audio-input-microphone-low.png		\
-	audio-input-microphone-medium.png	\
-	audio-input-microphone-muted.png	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/48x48/Makefile.am b/panels/sound/data/icons/48x48/Makefile.am
deleted file mode 100644
index eb00566d44..0000000000
--- a/panels/sound/data/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = apps devices
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/48x48/apps/Makefile.am b/panels/sound/data/icons/48x48/apps/Makefile.am
deleted file mode 100644
index 8c80e3c7e2..0000000000
--- a/panels/sound/data/icons/48x48/apps/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-
-themedir = $(datadir)/icons/hicolor
-size = 48x48
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			 	      	\
-	multimedia-volume-control.png		\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/48x48/devices/Makefile.am b/panels/sound/data/icons/48x48/devices/Makefile.am
deleted file mode 100644
index a745f5fc40..0000000000
--- a/panels/sound/data/icons/48x48/devices/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-
-themedir = $(datadir)/icons/hicolor
-size = 48x48
-context = devices
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =					\
-	audio-headset.svg			\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/Makefile.am b/panels/sound/data/icons/Makefile.am
deleted file mode 100644
index c2884eadcb..0000000000
--- a/panels/sound/data/icons/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-SUBDIRS = \
-	scalable	\
-	16x16		\
-	22x22		\
-	24x24		\
-	32x32		\
-	48x48		\
-	$(NULL)
-
-EXTRA_DIST = meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/scalable/Makefile.am b/panels/sound/data/icons/scalable/Makefile.am
deleted file mode 100644
index eb00566d44..0000000000
--- a/panels/sound/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = apps devices
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/scalable/apps/Makefile.am b/panels/sound/data/icons/scalable/apps/Makefile.am
deleted file mode 100644
index 3c97ab1bad..0000000000
--- a/panels/sound/data/icons/scalable/apps/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-
-themedir = $(datadir)/icons/hicolor
-size = scalable
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			        	\
-	multimedia-volume-control.svg		\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/icons/scalable/devices/Makefile.am b/panels/sound/data/icons/scalable/devices/Makefile.am
deleted file mode 100644
index b09c309f6e..0000000000
--- a/panels/sound/data/icons/scalable/devices/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-NULL =
-
-themedir = $(pkgdatadir)/icons/hicolor
-size = 48x48
-context = devices
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =					\
-	audio-speaker-center.svg		\
-	audio-speaker-center-testing.svg	\
-	audio-speaker-left-back.svg		\
-	audio-speaker-left-back-testing.svg	\
-	audio-speaker-left.svg			\
-	audio-speaker-left-side.svg		\
-	audio-speaker-left-side-testing.svg	\
-	audio-speaker-left-testing.svg		\
-	audio-speaker-mono.svg		\
-	audio-speaker-mono-testing.svg		\
-	audio-speaker-right-back.svg		\
-	audio-speaker-right-back-testing.svg	\
-	audio-speaker-right.svg			\
-	audio-speaker-right-side.svg		\
-	audio-speaker-right-side-testing.svg	\
-	audio-speaker-right-testing.svg		\
-	audio-speaker-center-back-testing.svg	\
-	audio-speaker-center-back.svg		\
-	audio-subwoofer.svg			\
-	audio-subwoofer-testing.svg		\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(NULL)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/sounds/Makefile.am b/panels/sound/data/sounds/Makefile.am
deleted file mode 100644
index ed0cac5d44..0000000000
--- a/panels/sound/data/sounds/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-NULL =
-
-sounddir = $(datadir)/sounds/gnome/default/alerts
-
-sound_DATA =			\
-	bark.ogg		\
-	drip.ogg		\
-	glass.ogg		\
-	sonar.ogg		\
-	$(NULL)
-
-metadata_in_files = gnome-sounds-default.xml.in
-metadatadir = $(pkgdatadir)/sounds
-metadata_DATA = $(metadata_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
-
-noinst_DATA = gnome-sounds-default.xml.in
-CLEANFILES = gnome-sounds-default.xml gnome-sounds-default.xml.in
-
-EXTRA_DIST = $(sound_DATA) gnome-sounds-default.xml.in.in meson.build
-
-gnome-sounds-default.xml.in: gnome-sounds-default.xml.in.in Makefile
-	$(AM_V_GEN)sed -e 's^\@datadir\@^$(datadir)^g' < $(srcdir)/gnome-sounds-default.xml.in.in > gnome-sounds-default.xml.in.tmp \
-	&& mv gnome-sounds-default.xml.in.tmp gnome-sounds-default.xml.in
-
-MAINTAINERCLEANFILES = \
-	Makefile.in
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/symbolic-icons/Makefile.am b/panels/sound/data/symbolic-icons/Makefile.am
deleted file mode 100644
index b6ca043c0f..0000000000
--- a/panels/sound/data/symbolic-icons/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-NULL =
-
-SUBDIRS = scalable
-
-EXTRA_DIST =					\
-	src					\
-	r.rb					\
-	meson.build				\
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/symbolic-icons/scalable/Makefile.am b/panels/sound/data/symbolic-icons/scalable/Makefile.am
deleted file mode 100644
index b17aad85dc..0000000000
--- a/panels/sound/data/symbolic-icons/scalable/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = status
-
--include $(top_srcdir)/git.mk
diff --git a/panels/sound/data/symbolic-icons/scalable/status/Makefile.am b/panels/sound/data/symbolic-icons/scalable/status/Makefile.am
deleted file mode 100644
index 26809918b7..0000000000
--- a/panels/sound/data/symbolic-icons/scalable/status/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-NULL =
-
-iconsdir = $(datadir)/icons/hicolor/scalable/status
-
-icons_DATA =						\
-        audio-input-microphone-high-symbolic.svg	\
-        audio-input-microphone-low-symbolic.svg		\
-        audio-input-microphone-medium-symbolic.svg	\
-        audio-input-microphone-muted-symbolic.svg	\
-        $(NULL)
-
-EXTRA_DIST = $(icons_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/universal-access/Makefile.am b/panels/universal-access/Makefile.am
deleted file mode 100644
index 779bb96691..0000000000
--- a/panels/universal-access/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-cappletname = universal-access
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(UNIVERSAL_ACCESS_PANEL_CFLAGS)		\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-I$(top_srcdir)/panels/common/			\
-	$(NULL)
-
-noinst_LTLIBRARIES = libuniversal-access.la
-
-BUILT_SOURCES =			\
-	cc-ua-resources.c	\
-	cc-ua-resources.h
-
-libuniversal_access_la_SOURCES =		\
-	$(BUILT_SOURCES)			\
-	cc-ua-panel.c				\
-	cc-ua-panel.h				\
-	zoom-options.c				\
-	zoom-options.h
-
-libuniversal_access_la_LIBADD = $(PANEL_LIBS) $(UNIVERSAL_ACCESS_PANEL_LIBS) $(LIBM)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/universal-access.gresource.xml)
-cc-ua-resources.c: universal-access.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_universal_access $<
-cc-ua-resources.h: universal-access.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_universal_access $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-universal-access-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) universal-access.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/user-accounts/Makefile.am b/panels/user-accounts/Makefile.am
deleted file mode 100644
index b85a01868b..0000000000
--- a/panels/user-accounts/Makefile.am
+++ /dev/null
@@ -1,131 +0,0 @@
-SUBDIRS = data
-
-# This is used in PANEL_CFLAGS
-cappletname = user-accounts
-NULL =
-
-noinst_LTLIBRARIES = libuser-accounts.la
-
-AM_CPPFLAGS =						\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"	\
-	-DHAVE_LIBPWQUALITY				\
-	-I$(srcdir)/../common/				\
-	-I$(srcdir)/../../shell/			\
-	-I$(top_srcdir)/subprojects/libgd/		\
-	$(PANEL_CFLAGS)					\
-	$(USER_ACCOUNTS_PANEL_CFLAGS)
-
-if BUILD_CHEESE
-AM_CPPFLAGS += $(CHEESE_CFLAGS)
-endif
-
-BUILT_SOURCES = \
-	um-realm-generated.c \
-	um-realm-generated.h \
-	um-resources.c \
-	um-resources.h
-
-libuser_accounts_la_SOURCES =		\
-	um-account-type.h		\
-	um-account-type.c 		\
-	um-account-dialog.h		\
-	um-account-dialog.c		\
-	um-carousel.h			\
-	um-carousel.c			\
-	um-password-dialog.h		\
-	um-password-dialog.c		\
-	pw-utils.h			\
-	pw-utils.c			\
-	um-photo-dialog.h		\
-	um-photo-dialog.c		\
-	cc-crop-area.h			\
-	cc-crop-area.c			\
-	um-fingerprint-dialog.h		\
-	um-fingerprint-dialog.c		\
-	um-utils.h			\
-	um-utils.c			\
-	fingerprint-strings.h		\
-	run-passwd.h			\
-	run-passwd.c			\
-	um-user-panel.h 		\
-	um-user-panel.c			\
-	um-realm-manager.c		\
-	um-realm-manager.h		\
-	um-history-dialog.h		\
-	um-history-dialog.c		\
-	um-user-image.h			\
-	um-user-image.c			\
-	um-cell-renderer-user-image.h	\
-	um-cell-renderer-user-image.c	\
-	$(BUILT_SOURCES)
-
-libuser_accounts_la_LIBADD = 				\
-	$(PANEL_LIBS)					\
-	$(USER_ACCOUNTS_PANEL_LIBS)			\
-	$(builddir)/../common/liblanguage.la		\
-	-lpwquality					\
-	-lcrypt						\
-	$(LIBM)						\
-	$(top_builddir)/subprojects/libgd/libgd.la
-
-if BUILD_CHEESE
-libuser_accounts_la_LIBADD += $(CHEESE_LIBS)
-endif
-
-um-realm-generated.c: $(srcdir)/data/org.freedesktop.realmd.xml
-	$(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.realmd. \
-		--generate-c-code um-realm-generated --c-namespace UmRealm \
-		--annotate "org.freedesktop.realmd.Realm" org.gtk.GDBus.C.Name Common \
-		--c-generate-object-manager $<
-um-realm-generated.h: um-realm-generated.c
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/user-accounts.gresource.xml)
-um-resources.c: user-accounts.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name um $<
-um-resources.h: user-accounts.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name um $<
-
-noinst_PROGRAMS = frob-account-dialog
-
-frob_account_dialog_SOURCES = \
-	frob-account-dialog.c \
-	um-account-dialog.h \
-	um-account-dialog.c \
-	um-realm-manager.c \
-	um-realm-manager.h \
-	um-utils.h \
-	um-utils.c \
-	pw-utils.h \
-	pw-utils.c \
-	$(BUILT_SOURCES)
-
-frob_account_dialog_LDADD = \
-	$(libuser_accounts_la_LIBADD)
-
-frob_account_dialog_CFLAGS = \
-	$(AM_CFLAGS)
-
-polkitdir = $(datadir)/polkit-1/actions
-polkit_in_files = org.gnome.controlcenter.user-accounts.policy.in
-
-@INTLTOOL_POLICY_RULE@
-polkit_DATA = $(polkit_in_files:.policy.in=.policy)
-
-EXTRA_DIST =				\
-	$(polkit_in_files)		\
-	$(resource_files)		\
-	user-accounts.gresource.xml	\
-	meson.build			\
-	$(NULL)
-
-CLEANFILES =				\
-	$(BUILT_SOURCES)		\
-	$(polkit_DATA)			\
-	$(NULL)
-
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
-
--include $(top_srcdir)/git.mk
diff --git a/panels/user-accounts/data/Makefile.am b/panels/user-accounts/data/Makefile.am
deleted file mode 100644
index ac08ad37bd..0000000000
--- a/panels/user-accounts/data/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-SUBDIRS = faces
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-Desktop_in_files = gnome-user-accounts-panel.desktop.in
-desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-
-EXTRA_DIST = 					\
-	gnome-user-accounts-panel.desktop.in.in	\
-	org.freedesktop.realmd.xml
-
-CLEANFILES =					\
-	gnome-user-accounts-panel.desktop	\
-	$(NULL)
-
-DISTCLEANFILES =				\
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/panels/user-accounts/data/faces/Makefile.am b/panels/user-accounts/data/faces/Makefile.am
deleted file mode 100644
index a9c39cca2b..0000000000
--- a/panels/user-accounts/data/faces/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-
-imagedir = $(datadir)/pixmaps/faces
-
-image_DATA = \
-	astronaut.jpg \
-	baseball.png \
-	butterfly.png \
-	cat-eye.jpg \
-	chess.jpg \
-	coffee.jpg \
-	dice.jpg \
-	energy-arc.jpg \
-	fish.jpg \
-	flake.jpg \
-	flower.jpg \
-	grapes.jpg \
-	guitar.jpg \
-	launch.jpg \
-	leaf.jpg \
-	lightning.jpg \
-	penguin.jpg \
-	puppy.jpg \
-	sky.jpg \
-	soccerball.png \
-	sunflower.jpg \
-	sunset.jpg \
-	tennis-ball.png \
-	yellow-rose.jpg
-
-EXTRA_DIST = \
-	$(image_DATA)
-
--include $(top_srcdir)/git.mk
-
diff --git a/panels/wacom/Makefile.am b/panels/wacom/Makefile.am
deleted file mode 100644
index e678abcac6..0000000000
--- a/panels/wacom/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-# This is used in PANEL_CFLAGS
-cappletname = wacom
-
-SUBDIRS = calibrator
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(WACOM_PANEL_CFLAGS)				\
-	-I$(srcdir)/calibrator				\
-	-I$(top_srcdir)/panels/common			\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	$(NULL)
-
-noinst_LTLIBRARIES = libwacom-properties.la
-
-BUILT_SOURCES =			\
-	cc-wacom-resources.c	\
-	cc-wacom-resources.h
-
-libwacom_properties_la_SOURCES =	\
-	$(BUILT_SOURCES)		\
-	cc-drawing-area.c		\
-	cc-drawing-area.h		\
-	cc-tablet-tool-map.c		\
-	cc-tablet-tool-map.h		\
-	cc-wacom-device.c		\
-	cc-wacom-device.h		\
-	cc-wacom-tool.c			\
-	cc-wacom-tool.h			\
-	cc-wacom-panel.c		\
-	cc-wacom-panel.h		\
-	gsd-wacom-key-shortcut-button.c \
-	gsd-wacom-key-shortcut-button.h \
-	cc-wacom-button-row.c		\
-	cc-wacom-button-row.h		\
-	cc-wacom-page.c			\
-	cc-wacom-page.h			\
-	cc-wacom-stylus-page.c		\
-	cc-wacom-stylus-page.h		\
-	cc-wacom-nav-button.c		\
-	cc-wacom-nav-button.h		\
-	cc-wacom-mapping-panel.c	\
-	cc-wacom-mapping-panel.h	\
-	gsd-enums.h
-
-libwacom_properties_la_LIBADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(builddir)/calibrator/libwacom-calibrator.la $(top_builddir)/panels/common/libdevice.la
-
-noinst_PROGRAMS = test-wacom
-
-test_wacom_SOURCES =			\
-	$(BUILT_SOURCES)		\
-	test-wacom.c			\
-	cc-tablet-tool-map.c		\
-	cc-tablet-tool-map.h		\
-	cc-wacom-device.c		\
-	cc-wacom-device.h		\
-	cc-wacom-tool.c			\
-	cc-wacom-tool.h			\
-	cc-wacom-button-row.c		\
-	cc-wacom-button-row.h		\
-	gsd-wacom-key-shortcut-button.c \
-	gsd-wacom-key-shortcut-button.h \
-	cc-wacom-page.c			\
-	cc-wacom-page.h			\
-	cc-wacom-stylus-page.c		\
-	cc-wacom-stylus-page.h		\
-	cc-wacom-nav-button.c		\
-	cc-wacom-nav-button.h		\
-	cc-wacom-mapping-panel.c	\
-	cc-wacom-mapping-panel.h	\
-	gsd-enums.h
-
-test_wacom_CPPFLAGS = $(AM_CPPFLAGS) -DFAKE_AREA
-test_wacom_LDADD = $(builddir)/calibrator/libwacom-calibrator-test.la $(top_builddir)/panels/common/libdevice.la $(PANEL_LIBS) $(WACOM_PANEL_LIBS)
-
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/wacom.gresource.xml)
-cc-wacom-resources.c: wacom.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_wacom $<
-cc-wacom-resources.h: wacom.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_wacom $<
-
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = gnome-wacom-panel.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(Desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(resource_files) wacom.gresource.xml meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/panels/wacom/calibrator/Makefile.am b/panels/wacom/calibrator/Makefile.am
deleted file mode 100644
index c0df5f5ae0..0000000000
--- a/panels/wacom/calibrator/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-# This is used in PANEL_CFLAGS
-cappletname = wacom
-
-AM_CPPFLAGS = 						\
-	$(PANEL_CFLAGS)					\
-	$(WACOM_PANEL_CFLAGS)				\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	$(NULL)
-
-noinst_LTLIBRARIES = libwacom-calibrator.la libwacom-calibrator-test.la
-
-libwacom_calibrator_la_SOURCES =	\
-	calibrator.c			\
-	calibrator.h			\
-	calibrator-gui.c		\
-	calibrator-gui.h		\
-	cc-clock-actor.c		\
-	cc-clock-actor.h		\
-	cc-target-actor.c		\
-	cc-target-actor.h
-
-libwacom_calibrator_la_LIBADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(LIBM)
-libwacom_calibrator_la_LDFLAGS = $(PANEL_LDFLAGS)
-
-libwacom_calibrator_test_la_SOURCES = $(libwacom_calibrator_la_SOURCES)
-
-libwacom_calibrator_test_la_CPPFLAGS = -DFAKE_AREA $(AM_CPPFLAGS)
-libwacom_calibrator_test_la_LIBADD = $(libwacom_calibrator_la_LIBADD)
-libwacom_calibrator_test_la_LDFLAGS = $(libwacom_calibrator_la_LDFLAGS)
-
-noinst_PROGRAMS = test-calibrator
-
-test_calibrator_SOURCES =		\
-	main.c				\
-	calibrator.c			\
-	calibrator.h			\
-	calibrator-gui.c		\
-	calibrator-gui.h		\
-	cc-clock-actor.c		\
-	cc-clock-actor.h		\
-	cc-target-actor.c		\
-	cc-target-actor.h
-
-test_calibrator_CPPFLAGS = $(AM_CPPFLAGS)
-test_calibrator_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(LIBM)
-
-EXTRA_DIST = meson.build
-
--include $(top_srcdir)/git.mk
diff --git a/search-provider/Makefile.am b/search-provider/Makefile.am
deleted file mode 100644
index a07599cbe5..0000000000
--- a/search-provider/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-dbus_shell_search_provider_built_sources =	\
-	cc-shell-search-provider-generated.c	\
-	cc-shell-search-provider-generated.h
-
-# The upstream for the DBus interface definition is
-# at http://git.gnome.org/browse/gnome-shell/plain/data/org.gnome.ShellSearchProvider2.xml
-$(dbus_shell_search_provider_built_sources) : Makefile.am $(srcdir)/org.gnome.ShellSearchProvider2.xml
-	$(AM_V_GEN)gdbus-codegen					\
-		--interface-prefix org.gnome.				\
-		--c-namespace Cc					\
-		--generate-c-code cc-shell-search-provider-generated	\
-		$(srcdir)/org.gnome.ShellSearchProvider2.xml		\
-		$(NULL)
-
-AM_CPPFLAGS =					\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""\
-	-I$(top_srcdir)				\
-	$(SHELL_CFLAGS)				\
-	-I$(top_srcdir)/panels/common/		\
-	-I$(top_srcdir)/subprojects/libgd
-
-libexec_PROGRAMS = gnome-control-center-search-provider
-
-BUILT_SOURCES =	$(dbus_shell_search_provider_built_sources)
-
-gnome_control_center_search_provider_SOURCES =	\
-	$(BUILT_SOURCES)			\
-	control-center-search-provider.c	\
-	control-center-search-provider.h	\
-	cc-search-provider.c			\
-	cc-search-provider.h
-
-gnome_control_center_search_provider_LDADD =	\
-	$(top_builddir)/panels/common/liblanguage.la	\
-	$(top_builddir)/shell/libshell.la		\
-	$(top_builddir)/shell/libpanel_loader.la	\
-	$(SHELL_LIBS)
-
-CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
-
-servicedir = $(datadir)/dbus-1/services
-service_DATA = $(service_in_files:.service.in=.service)
-service_in_files = 				\
-	org.gnome.ControlCenter.SearchProvider.service.in
-
-org.gnome.ControlCenter.SearchProvider.service: org.gnome.ControlCenter.SearchProvider.service.in Makefile
-	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-EXTRA_DIST = $(service_in_files) org.gnome.ShellSearchProvider2.xml meson.build
-
-searchproviderdir = $(datadir)/gnome-shell/search-providers
-dist_searchprovider_DATA = gnome-control-center-search-provider.ini
-
--include $(top_srcdir)/git.mk
diff --git a/shell/Makefile.am b/shell/Makefile.am
deleted file mode 100644
index 2adc5f279f..0000000000
--- a/shell/Makefile.am
+++ /dev/null
@@ -1,161 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = appdata
-
-AM_CPPFLAGS =					\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""\
-	-DTEST_SRCDIR=\""$(srcdir)/"\"		\
-	-DTEST_TOPSRCDIR=\""$(top_srcdir)/"\"	\
-	-I$(top_srcdir)				\
-	$(SHELL_CFLAGS)				\
-	$(CHEESE_CFLAGS)			\
-	$(WACOM_PANEL_CFLAGS)			\
-	-I$(top_srcdir)/panels/common/		\
-	-I$(top_srcdir)/subprojects/libgd
-
-all-local: check-local
-
-noinst_LTLIBRARIES = libshell.la
-
-libshell_la_SOURCES = \
-	cc-shell-model.c			\
-	cc-shell-model.h
-
-bin_PROGRAMS = gnome-control-center
-
-common_sources =				\
-	$(BUILT_SOURCES)			\
-	main.c					\
-	cc-application.c			\
-	cc-application.h			\
-	cc-shell-log.c				\
-	cc-shell-log.h				\
-	cc-shell-category-view.c		\
-	cc-shell-category-view.h		\
-	cc-shell-item-view.c			\
-	cc-shell-item-view.h			\
-	cc-editable-entry.c			\
-	cc-editable-entry.h			\
-	cc-panel-loader.c			\
-	cc-panel-loader.h			\
-	cc-panel.c				\
-	cc-panel.h				\
-	cc-shell.c				\
-	cc-shell.h				\
-	hostname-helper.c			\
-	hostname-helper.h			\
-	cc-hostname-entry.c			\
-	cc-hostname-entry.h			\
-	list-box-helper.h			\
-	list-box-helper.c			\
-	$(MARSHAL_FILES)
-
-gnome_control_center_SOURCES =			\
-	$(common_sources)			\
-	cc-panel-list.c				\
-	cc-panel-list.h				\
-	cc-window.c				\
-	cc-window.h
-
-gnome_control_center_LDFLAGS = -export-dynamic
-
-gnome_control_center_LDADD =						\
-	libshell.la							\
-	$(SHELL_LIBS)							\
-	$(CHEESE_LIBS)							\
-	$(top_builddir)/subprojects/libgd/libgd.la			\
-	$(top_builddir)/panels/common/liblanguage.la			\
-	$(top_builddir)/panels/common/libdevice.la			\
-	$(top_builddir)/panels/background/libbackground.la		\
-	$(top_builddir)/panels/color/libcolor.la			\
-	$(top_builddir)/panels/datetime/libdate_time.la			\
-	$(top_builddir)/panels/display/libdisplay.la			\
-	$(top_builddir)/panels/info/libinfo.la				\
-	$(top_builddir)/panels/keyboard/libkeyboard.la			\
-	$(top_builddir)/panels/mouse/libmouse-properties.la		\
-	$(top_builddir)/panels/notifications/libnotifications.la	\
-	$(top_builddir)/panels/online-accounts/libonline-accounts.la	\
-	$(top_builddir)/panels/power/libpower.la			\
-	$(top_builddir)/panels/privacy/libprivacy.la			\
-	$(top_builddir)/panels/region/libregion.la			\
-	$(top_builddir)/panels/search/libsearch.la			\
-	$(top_builddir)/panels/sharing/libsharing.la			\
-	$(top_builddir)/panels/sound/libsound.la			\
-	$(top_builddir)/panels/universal-access/libuniversal-access.la	\
-	$(top_builddir)/panels/user-accounts/libuser-accounts.la	\
-	$(top_builddir)/panels/printers/libprinters.la
-
-if BUILD_WACOM
-gnome_control_center_LDADD += $(top_builddir)/panels/wacom/libwacom-properties.la
-endif
-
-if BUILD_NETWORK
-gnome_control_center_LDADD += $(top_builddir)/panels/network/libnetwork.la
-endif
-
-if BUILD_BLUETOOTH
-gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
-endif
-
-# Because it is confusing and somewhat problematic to directly add and compile
-# cc-panel-loader.o by another directory (i.e. the shell search provider), we
-# have to create a library and link it there, just like libshell.la.
-noinst_LTLIBRARIES += libpanel_loader.la
-
-libpanel_loader_la_SOURCES = \
-	cc-panel-loader.c			\
-	cc-panel-loader.h
-
-libpanel_loader_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)				\
-	-DCC_PANEL_LOADER_NO_GTYPES
-
-
-# Dbus service file
-servicefiledir = $(datadir)/dbus-1/services
-servicefile_in_files = org.gnome.ControlCenter.service.in
-servicefile_DATA = $(servicefile_in_files:.service.in=.service)
-$(servicefile_DATA): $(servicefile_in_files) Makefile
-	$(AM_V_GEN) sed -e 's|[@]bindir[@]|$(bindir)|' $< > $@
-
-sysdir = $(datadir)/applications
-sys_in_files = gnome-control-center.desktop.in
-sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-completiondir = $(datadir)/bash-completion/completions
-completion_in_files = completions/gnome-control-center.in
-completion_DATA = $(completion_in_files:.in=)
-completions/gnome-control-center: completions/gnome-control-center.in list-panel.sh
-	$(AM_V_GEN) mkdir -p `dirname $@` && cat $< | sed "s,@PANELS@,`$(srcdir)/list-panel.sh $(top_srcdir)`," > $@
-
-resource_files = $(shell glib-compile-resources --generate-dependencies --sourcedir=$(srcdir) gnome-control-center.gresource.xml)
-resources.c: gnome-control-center.gresource.xml $(resource_files)
-	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source $<
-
-BUILT_SOURCES = resources.c
-
-EXTRA_DIST =					\
-	gnome-control-center.desktop.in.in	\
-	$(servicefile_in_files)                 \
-	$(completion_in_files)			\
-	gnome-control-center.gresource.xml	\
-	help-overlay.ui				\
-	panel-list.ui				\
-	window.ui				\
-	$(resource_files)			\
-	list-panel.sh				\
-	meson.build				\
-	completions/meson.build
-
-CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) $(servicefile_DATA)
-DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in
-
-TEST_PROGS += test-hostname
-noinst_PROGRAMS = test-hostname
-test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c
-test_hostname_LDADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
-
-EXTRA_DIST += hostnames-test.txt ssids-test.txt
-
--include $(top_srcdir)/git.mk
diff --git a/shell/appdata/Makefile.am b/shell/appdata/Makefile.am
deleted file mode 100644
index 29e3d2be6b..0000000000
--- a/shell/appdata/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-@INTLTOOL_XML_RULE@
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files =						\
-	gnome-control-center.appdata.xml.in
-
-test:
-
-EXTRA_DIST =			\
-	$(appdata_in_files)	\
-	meson.build
-
-CLEANFILES =							\
-	gnome-control-center.appdata.xml
-
--include $(top_srcdir)/git.mk