build: Drop autotoolswip/drop-autotools

19 files changed, 0 insertions, 1903 deletions

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 6270104..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-NULL =
-
-if BUILD_LIBGEOCLUE
-LIBGEOCLUE_DIR = libgeoclue
-else
-LIBGEOCLUE_DIR =
-endif
-
-if BUILD_BACKEND
-BACKEND_DIR = src
-else
-BACKEND_DIR =
-endif
-
-SUBDIRS = build-aux public-api $(BACKEND_DIR) data $(LIBGEOCLUE_DIR) demo po docs
-
-INTLTOOL_FILES =				\
-	intltool-extract.in			\
-	intltool-merge.in			\
-	intltool-update.in			\
-	$(NULL)
-
-DISTCLEANFILES =				\
-	intltool-extract			\
-	intltool-merge				\
-	intltool-update				\
-	po/.intltool-merge-cache		\
-	$(NULL)
-
-DISTCHECK_CONFIGURE_FLAGS= \
-	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
-
-EXTRA_DIST =					\
-	.version				\
-	COPYING					\
-	$(INTLTOOL_FILES)			\
-	$(NULL)
-
-MAINTAINERCLEANFILES =				\
-	ABOUT-NLS				\
-	aclocal.m4				\
-	config.h.in				\
-	build-aux/ar-lib			\
-	build-aux/compile			\
-	build-aux/config.guess			\
-	build-aux/config.rpath			\
-	build-aux/config.sub			\
-	build-aux/depcomp			\
-	build-aux/install-sh			\
-	build-aux/ltmain.sh			\
-	build-aux/missing			\
-	build-aux/mkinstalldirs			\
-	m4/intltool.m4				\
-	m4/libtool.m4				\
-	m4/ltoptions.m4				\
-	m4/ltsugar.m4				\
-	m4/ltversion.m4				\
-	m4/lt~obsolete.m4			\
-	po/Makefile.in.in			\
-	po/Makevars.template			\
-	po/Rules-quot				\
-	po/boldquot.sed				\
-	po/en@boldquot.header			\
-	po/en@quot.header			\
-	po/insert-header.sin			\
-	po/quot.sed				\
-	po/remove-potcdate.sin			\
-	$(NULL)
-
-BUILT_SOURCES = $(top_srcdir)/.version
-$(top_srcdir)/.version:
-	echo $(VERSION) > $@-t && mv $@-t $@
-
-all:
-
--include $(top_srcdir)/git.mk
diff --git a/Makefile.decl b/Makefile.decl
deleted file mode 100644
index aab33c3..0000000
--- 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 a9f65b3..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e # exit on errors
-
-REQUIRED_AUTOMAKE_VERSION=1.9
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-olddir=$(pwd)
-
-cd $srcdir
-
-PKG_NAME=GeoClue
-
-git submodule update --init --recursive
-gtkdocize
-autoreconf -v --force --install
-intltoolize -f
-
-cd "$olddir"
-if [ -z "$NOCONFIGURE" ]; then
-    "$srcdir"/configure --enable-maintainer-mode --enable-debug ${1+"$@"}
-fi
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
deleted file mode 100644
index 7857a09..0000000
--- a/build-aux/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = 			\
-	gclue-enums-template.c	\
-	gclue-enums-template.h	\
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/build-aux/gclue-enums-template.c b/build-aux/gclue-enums-template.c
deleted file mode 100644
index ecda245..0000000
--- a/build-aux/gclue-enums-template.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*** BEGIN file-header ***/
-
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
-/*** END file-production ***/
-
-/*** BEGIN value-header ***/
-static const G@Type@Value @enum_name@_values[] = {
-/*** END value-header ***/
-/*** BEGIN value-production ***/
-    { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
-/*** END value-production ***/
-/*** BEGIN value-tail ***/
-    { 0, NULL, NULL }
-};
-
-/* Define type-specific symbols */
-#undef __GCLUE_IS_ENUM__
-#undef __GCLUE_IS_FLAGS__
-#define __GCLUE_IS_@TYPE@__
-
-GType
-@enum_name@_get_type (void)
-{
-    static volatile gsize g_define_type_id__volatile = 0;
-
-    if (g_once_init_enter (&g_define_type_id__volatile)) {
-        GType g_define_type_id =
-            g_@type@_register_static (g_intern_static_string ("@EnumName@"),
-                                      @enum_name@_values);
-        g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-    }
-
-    return g_define_type_id__volatile;
-}
-
-/**
- * @enum_name@_get_string:
- * @val: a @EnumName@.
- *
- * Gets the nickname string for the #@EnumName@ specified at @val.
- *
- * Returns: (transfer none): a string with the nickname, or %NULL if not found. Do not free the returned value.
- */
-#if defined __GCLUE_IS_ENUM__
-const gchar *
-@enum_name@_get_string (@EnumName@ val)
-{
-    guint i;
-
-    for (i = 0; @enum_name@_values[i].value_nick; i++) {
-        if (val == @enum_name@_values[i].value)
-            return @enum_name@_values[i].value_nick;
-    }
-
-    return NULL;
-}
-#endif /* __GCLUE_IS_ENUM_ */
-
-/**
- * @enum_name@_build_string_from_mask:
- * @mask: bitmask of @EnumName@ values.
- *
- * Builds a string containing a comma-separated list of nicknames for
- * each #@EnumName@ in @mask.
- *
- * Returns: (transfer full): a string with the list of nicknames, or %NULL if none given. The returned value should be freed with g_free().
- */
-#if defined __GCLUE_IS_FLAGS__
-gchar *
-@enum_name@_build_string_from_mask (@EnumName@ mask)
-{
-    guint i;
-    gboolean first = TRUE;
-    GString *str = NULL;
-
-    for (i = 0; @enum_name@_values[i].value_nick; i++) {
-        /* We also look for exact matches */
-        if (mask == @enum_name@_values[i].value) {
-            if (str)
-                g_string_free (str, TRUE);
-            return g_strdup (@enum_name@_values[i].value_nick);
-        }
-
-        /* Build list with single-bit masks */
-        if (mask & @enum_name@_values[i].value) {
-            guint c;
-            gulong number = @enum_name@_values[i].value;
-
-            for (c = 0; number; c++)
-                number &= number - 1;
-
-            if (c == 1) {
-                if (!str)
-                    str = g_string_new ("");
-                g_string_append_printf (str, "%s%s",
-                                        first ? "" : ", ",
-                                        @enum_name@_values[i].value_nick);
-                if (first)
-                    first = FALSE;
-            }
-        }
-    }
-
-    return (str ? g_string_free (str, FALSE) : NULL);
-}
-#endif /* __GCLUE_IS_FLAGS__ */
-
-/*** END value-tail ***/
-
-/*** BEGIN file-tail ***/
-/*** END file-tail ***/
diff --git a/build-aux/gclue-enums-template.h b/build-aux/gclue-enums-template.h
deleted file mode 100644
index 374367a..0000000
--- a/build-aux/gclue-enums-template.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*** BEGIN file-header ***/
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-
-/* enumerations from "@filename@" */
-/*** END file-production ***/
-
-/*** BEGIN value-header ***/
-GType @enum_name@_get_type (void) G_GNUC_CONST;
-#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
-
-/* Define type-specific symbols */
-#undef __GCLUE_IS_ENUM__
-#undef __GCLUE_IS_FLAGS__
-#define __GCLUE_IS_@TYPE@__
-
-#if defined __GCLUE_IS_ENUM__
-const gchar *@enum_name@_get_string (@EnumName@ val);
-#endif
-
-#if defined __GCLUE_IS_FLAGS__
-gchar *@enum_name@_build_string_from_mask (@EnumName@ mask);
-#endif
-
-/*** END value-header ***/
-
-/*** BEGIN file-tail ***/
-G_END_DECLS
-
-/*** END file-tail ***/
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 0b61dae..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,275 +0,0 @@
-AC_PREREQ([2.63])
-
-AC_INIT([geoclue],
-        [2.4.10],
-        [http://bugs.freedesktop.org/enter_bug.cgi?product=GeoClue],
-        [geoclue],
-        [http://www.freedesktop.org/wiki/Software/GeoClue])
-
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_AUX_DIR([build-aux])
-
-AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar foreign -Wall -Werror -Wno-portability])
-AM_MAINTAINER_MODE([enable])
-
-AM_SILENT_RULES([yes])
-
-AC_SUBST([GEOCLUE_API_VERSION], [2.0])
-
-# Check for programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-AC_CHECK_TOOL([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
-
-# Initialize libtool
-LT_PREREQ([2.2])
-LT_INIT([disable-static])
-
-# Pkg-config
-PKG_PROG_PKG_CONFIG([0.22])
-
-# i18 support
-IT_PROG_INTLTOOL(0.40.0)
-
-GETTEXT_PACKAGE=AC_PACKAGE_NAME
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
-
-GLIB_MIN_VERSION=2.44.0
-JSON_GLIB_MIN_VERSION=0.14
-LIBMM_GLIB_MIN_VERSION=1.6
-LIBSOUP_MIN_VERSION=2.42
-AVAHI_MIN_VERSION=0.6.10
-
-AC_CHECK_LIB([m],[sin])
-
-dnl
-dnl Documentation
-dnl
-GTK_DOC_CHECK(1.0)
-
-PKG_CHECK_MODULES(GEOCLUE, [
-  glib-2.0 >= $GLIB_MIN_VERSION
-  gio-2.0 >= $GLIB_MIN_VERSION
-  gio-unix-2.0 >= $GLIB_MIN_VERSION
-  json-glib-1.0 >= $JSON_GLIB_MIN_VERSION
-  libsoup-2.4 >= $LIBSOUP_MIN_VERSION
-])
-
-# GObject-introspection support
-GOBJECT_INTROSPECTION_CHECK([0.9.6])
-VAPIGEN_CHECK()
-build_introspection=no
-
-# libgeoclue
-AC_ARG_ENABLE(libgeoclue,
-              AS_HELP_STRING([--disable-libgeoclue], [Disable convenience library]),
-              [build_libgeoclue=$enableval], [build_libgeoclue=yes])
-if test "x$build_libgeoclue" = "xyes"; then
-  PKG_CHECK_MODULES(LIBGEOCLUE, [
-    glib-2.0 >= $GLIB_MIN_VERSION
-    gio-2.0 >= $GLIB_MIN_VERSION
-    gio-unix-2.0 >= $GLIB_MIN_VERSION
-  ])
-  if test "x$found_introspection" == "xyes"; then
-     build_introspection=yes
-  fi
-  build_libgeoclue=yes
-
-  AC_DEFINE([BUILD_LIBGEOCLUE], [1], [Build convenience library?])
-else
-  AC_DEFINE([BUILD_LIBGEOCLUE], [0], [Build convenience library?])
-fi
-AM_CONDITIONAL([BUILD_LIBGEOCLUE], [test "x$build_libgeoclue" = "xyes"])
-
-# 3G source
-AC_ARG_ENABLE(3g-source,
-              AS_HELP_STRING([--disable-3g-source], [Disable 3G backend (requires ModemManager)]),
-              [build_3g_source=$enableval], [build_3g_source=yes])
-if test "x$build_3g_source" = "xyes"; then
-  build_modem_source=yes
-  AC_DEFINE([GCLUE_USE_3G_SOURCE], [1], [Build 3G source?])
-else
-  AC_DEFINE([GCLUE_USE_3G_SOURCE], [0], [Build 3G source?])
-fi
-AM_CONDITIONAL([BUILD_3G_SOURCE], [test "x$build_3g_source" = "xyes"])
-
-# CDMA source
-AC_ARG_ENABLE(cdma-source,
-              AS_HELP_STRING([--disable-cdma-source], [Disable CDMA backend (requires ModemManager)]),
-              [build_cdma_source=$enableval], [build_cdma_source=yes])
-if test "x$build_cdma_source" = "xyes"; then
-  build_modem_source=yes
-  AC_DEFINE([GCLUE_USE_CDMA_SOURCE], [1], [Build CDMA source?])
-else
-  AC_DEFINE([GCLUE_USE_CDMA_SOURCE], [0], [Build CDMA source?])
-fi
-AM_CONDITIONAL([BUILD_CDMA_SOURCE], [test "x$build_cdma_source" = "xyes"])
-
-# GPS source
-AC_ARG_ENABLE(modem-gps-source,
-              AS_HELP_STRING([--disable-modem-gps-source], [Disable modem GPS backend (requires ModemManager)]),
-              [build_modem_gps_source=$enableval], [build_modem_gps_source=yes])
-if test "x$build_modem_gps_source" = "xyes"; then
-  build_modem_source=yes
-  AC_DEFINE([GCLUE_USE_MODEM_GPS_SOURCE], [1], [Build modem GPS source?])
-else
-  AC_DEFINE([GCLUE_USE_MODEM_GPS_SOURCE], [0], [Build modem GPS source?])
-fi
-AM_CONDITIONAL([BUILD_MODEM_GPS_SOURCE], [test "x$build_modem_gps_source" = "xyes"])
-
-# Modem source is used in common by GPS, 3G and CDMA sources
-if test "x$build_modem_source" = "xyes"; then
-  require_modemmanager=yes
-fi
-AM_CONDITIONAL([BUILD_MODEM_SOURCE], [test "x$build_modem_source" = "xyes"])
-
-# Network NMEA Source
-AC_ARG_ENABLE(nmea-source,
-              AS_HELP_STRING([--disable-nmea-source],
-                             [Disable network NMEA source (requires avahi-client and avahi-glib)]),
-              [build_nmea_source=$enableval], [build_nmea_source=yes])
-
-if test "x$build_nmea_source" = "xyes"; then
-  AC_DEFINE([GCLUE_USE_NMEA_SOURCE], [1], [Build network NMEA source?])
-else
-  AC_DEFINE([GCLUE_USE_NMEA_SOURCE], [0], [Build network NMEA source?])
-fi
-AM_CONDITIONAL([BUILD_NMEA_SOURCE], [test "x$build_nmea_source" = "xyes"])
-
-# Backend build
-AC_ARG_ENABLE(backend,
-              AS_HELP_STRING([--disable-backend], [Disable backend]),
-              [build_backend=$enableval], [build_backend=yes])
-
-if test "x$build_backend" = "xyes"; then
-  # Check for ModemManager if one of the sources requires it
-  if test "x$require_modemmanager" = "xyes"; then
-    PKG_CHECK_MODULES(ModemManager, mm-glib >= $LIBMM_GLIB_MIN_VERSION)
-  fi
-
-  if test "x$build_nmea_source" = "xyes"; then
-      # Check for avahi-client and avahi-glib
-      PKG_CHECK_MODULES(NMEA_SOURCE, [
-                        avahi-client >= $AVAHI_MIN_VERSION
-                        avahi-glib >= $AVAHI_MIN_VERSION])
-  fi
-  AC_DEFINE([BUILD_BACKEND], [1], [Build backend?])
-else
-  AC_DEFINE([BUILD_BACKEND], [0], [Build backend?])
-fi
-AM_CONDITIONAL([BUILD_BACKEND], [test "x$build_backend" = "xyes"])
-
-# Demo agent
-AC_ARG_ENABLE(demo-agent,
-              AS_HELP_STRING([--enable-demo-agent=yes|no],
-                             [Build demo agent (default=yes)]),
-              [enable_demo_agent=$enableval],
-              [enable_demo_agent=yes])
-if test "x$enable_demo_agent" = "xyes"; then
-    PKG_CHECK_MODULES(DEMO_AGENT, [
-                      glib-2.0 >= $GLIB_MIN_VERSION
-                      gio-2.0 >= $GLIB_MIN_VERSION
-                      gio-unix-2.0 >= $GLIB_MIN_VERSION
-                      libnotify])
-else
-    AC_DEFINE([BUILD_DEMO_AGENT], [0], [Build demo agent?])
-fi
-AM_CONDITIONAL([BUILD_DEMO_AGENT], [test "x$enable_demo_agent" = "xyes"])
-
-GNOME_COMPILE_WARNINGS([maximum])
-
-dnl Debugging
-AC_ARG_ENABLE(debug,
-	AS_HELP_STRING([--enable-debug],[enable debugging]),,
-        enable_debug=no)
-if test "x$enable_debug" = "xyes"; then
-        CFLAGS="$CFLAGS -O0 -ggdb3"
-fi
-
-# DBus system directory
-AC_ARG_WITH(dbus-sys-dir, AS_HELP_STRING([--with-dbus-sys-dir=DIR], [where D-BUS system.d directory is]))
-if test -n "$with_dbus_sys_dir" ; then
-    DBUS_SYS_DIR="$with_dbus_sys_dir"
-else
-    DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d"
-fi
-AC_SUBST(DBUS_SYS_DIR)
-
-AC_ARG_WITH(dbus-service-user,
-	    AS_HELP_STRING([--with-dbus-service-user=USER],
-                           [The USER (existing) as which the service will run (default: root)]),
-	    dbus_srv_user="$with_dbus_service_user",
-	    dbus_srv_user="root")
-AC_SUBST(dbus_srv_user)
-
-# gdbus-codegen
-if test x$cross_compiling != xyes; then
-	GDBUS_CODEGEN=`$PKG_CONFIG --variable gdbus_codegen gio-2.0`
-else
-	AC_PATH_PROG([GDBUS_CODEGEN],[gdbus-codegen])
-fi
-
-AS_IF([test "$GDBUS_CODEGEN" = ""],[
-	AC_MSG_ERROR([gdbus-codegen not found])
-])
-
-# systemd
-AC_ARG_WITH([systemdsystemunitdir],
-            AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-            [],
-            [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
-if test "x$with_systemdsystemunitdir" != "xno"; then
-  AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-fi
-AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"])
-
-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-AC_SUBST(GLIB_MKENUMS)
-
-GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
-AC_SUBST(GLIB_GENMARSHAL)
-
-AC_CONFIG_FILES([
-  Makefile
-  build-aux/Makefile
-  src/Makefile
-  src/geoclue-$GEOCLUE_API_VERSION.pc:src/geoclue.pc.in
-  src/agent/Makefile
-  src/geocode-glib/Makefile
-  public-api/Makefile
-  po/Makefile.in
-  data/org.freedesktop.GeoClue2.conf
-  data/org.freedesktop.GeoClue2.Agent.conf
-  data/Makefile
-  libgeoclue/Makefile
-  libgeoclue/libgeoclue-$GEOCLUE_API_VERSION.pc:libgeoclue/libgeoclue.pc.in
-  demo/Makefile
-  docs/Makefile
-  docs/lib/Makefile
-  docs/version.xml
-  docs/lib/version.xml
-])
-
-AC_OUTPUT
-
-dnl ==========================================================================
-AC_MSG_NOTICE([
-
-        GeoClue $VERSION
-        =================
-
-        prefix:                   ${prefix}
-        c compiler:               ${CC} ${CFLAGS}
-        systemdsystemunitdir:     ${systemdsystemunitdir}
-
-        Backend:                  ${build_backend}
-        Convenience library:      ${build_libgeoclue}
-        Introspection:            ${build_introspection}
-        3G source:                ${build_3g_source}
-        CDMA source:              ${build_cdma_source}
-        Modem GPS source:         ${build_modem_gps_source}
-        Network NMEA source:      ${build_nmea_source}
-])
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index fc837d0..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-service_in_files = org.freedesktop.GeoClue2.service.in
-systemconf_in_files = geoclue.conf.in
-systemdservice_in_files = geoclue.service.in
-
-if BUILD_BACKEND
-systemconfdir    = $(sysconfdir)/geoclue
-systemconf_DATA = $(systemconf_in_files:.conf.in=.conf)
-
-if BUILD_DEMO_AGENT
-$(systemconf_DATA): $(systemconf_in_files) Makefile
-	@sed -e \
-	"s|\@demo_agent\@|geoclue-demo-agent;|" \
-	$< > $@
-else
-$(systemconf_DATA): $(systemconf_in_files) Makefile
-	@sed -e "s|\@demo_agent\@||" $< > $@
-endif
-
-servicedir       = $(datadir)/dbus-1/system-services
-service_DATA     = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< | \
-	sed -e "s|\@dbus_srv_user\@|$(dbus_srv_user)|" > $@
-
-# DBus Service policy file
-dbusservicedir = $(DBUS_SYS_DIR)
-dbusservice_DATA = org.freedesktop.GeoClue2.conf \
-		   org.freedesktop.GeoClue2.Agent.conf
-
-if HAVE_SYSTEMD
-systemdservicedir       = $(systemdsystemunitdir)
-systemdservice_DATA     = $(systemdservice_in_files:.service.in=.service)
-
-$(systemdservice_DATA): $(systemdservice_in_files) Makefile
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< | \
-	sed -e "s|\@dbus_srv_user\@|$(dbus_srv_user)|" > $@
-endif
-endif
-
-DISTCLEANFILES = $(service_DATA) \
-                 $(systemconf_DATA) \
-                 $(dbusservice_DATA) \
-                 $(systemdservice_DATA)
-EXTRA_DIST = $(service_in_files) \
-             $(systemdservice_in_files) \
-             $(systemconf_in_files)
-
--include $(top_srcdir)/git.mk
diff --git a/demo/Makefile.am b/demo/Makefile.am
deleted file mode 100644
index d640102..0000000
--- a/demo/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-demodir = $(libexecdir)/geoclue-2.0/demos
-
-if BUILD_LIBGEOCLUE
-demo_PROGRAMS = where-am-i
-else
-demo_PROGRAMS =
-endif
-
-where_am_i_SOURCES = where-am-i.c
-where_am_i_CFLAGS = $(GEOCLUE_CFLAGS)   		\
-		    $(WARN_CFLAGS)			\
-		    -DLOCALEDIR="\"$(datadir)/locale\"" \
-		    -I$(top_srcdir)/libgeoclue		\
-		    -I$(top_builddir)/libgeoclue	\
-		    -I$(top_srcdir)/public-api 	\
-		    -I$(top_builddir)/public-api
-where_am_i_LDADD = $(GEOCLUE_LIBS)			\
-		   ../libgeoclue/libgeoclue-2.la
-
-appsdir = $(datadir)/applications
-apps_DATA = geoclue-where-am-i.desktop
-
-if BUILD_DEMO_AGENT
-apps_DATA += geoclue-demo-agent.desktop
-
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_DATA = geoclue-demo-agent.desktop
-endif
-
-@INTLTOOL_DESKTOP_RULE@
-
-geoclue-where-am-i.desktop.in: geoclue-where-am-i.desktop.in.in
-	$(AM_V_GEN) sed -e "s|[@]libexecdir@|$(libexecdir)|g" $< > $@
-
-geoclue-demo-agent.desktop.in: geoclue-demo-agent.desktop.in.in
-	$(AM_V_GEN) sed -e "s|[@]libexecdir@|$(libexecdir)|g" $< > $@
-
-if BUILD_DEMO_AGENT
-demo_PROGRAMS += agent
-endif # BUILD_DEMO_AGENT
-
-agent_SOURCES = $(BUILT_SOURCES)       \
-		gclue-service-agent.h  \
-		gclue-service-agent.c  \
-    		agent.c     	       \
-		$(NULL)
-agent_CFLAGS = $(DEMO_AGENT_CFLAGS)   		   \
-	       $(WARN_CFLAGS)			   \
- 	       -DLOCALEDIR="\"$(datadir)/locale\"" \
-	       -DABS_SRCDIR=\""$(abs_srcdir)"\"	   \
-	       -I$(top_builddir)/src		   \
-	       -I$(top_srcdir)/src		   \
-	       -I$(top_builddir)/src/agent	   \
-	       -I$(top_srcdir)/src/agent	   \
-	       -I$(top_builddir)/public-api	   \
-	       -I$(top_srcdir)/public-api
-agent_LDADD = $(DEMO_AGENT_LIBS) \
-	      $(top_builddir)/src/agent/libgeoclue-agent.la
-
--include $(top_srcdir)/git.mk
-
-EXTRA_DIST = \
-	geoclue-demo-agent.desktop.in.in \
-        geoclue-where-am-i.desktop.in.in \
-        $(NULL)
-
-DISTCLEANFILES = \
-	geoclue-demo-agent.desktop \
-	geoclue-demo-agent.desktop.in \
-        geoclue-where-am-i.desktop \
-        geoclue-where-am-i.desktop.in \
-        $(NULL)
-
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index fba721d..0000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-NULL =
-
-AUTOMAKE_OPTIONS = 1.7
-
-SUBDIRS = lib
-
-# The name of the module.
-DOC_MODULE=geoclue
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=geoclue-docs.xml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--ignore-headers=config.h --rebuild-sections --rebuild-types
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/public-api
-
-# Used for dependencies
-HFILE_GLOB=
-CFILE_GLOB=
-
-# Headers to ignore
-IGNORE_HFILES= \
-	$(NULL)
-
-GTKDOC_LIBS = $(top_builddir)/public-api/libgeoclue-public-api.la
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkhtml
-MKHTML_OPTIONS=--path="$(top_srcdir)"
-
-docs-org.freedesktop.GeoClue2.Manager.xml:
-	cp $(top_builddir)/src/docs-org.freedesktop.GeoClue2.Manager.xml .
-docs-org.freedesktop.GeoClue2.Client.xml:
-	cp $(top_builddir)/src/docs-org.freedesktop.GeoClue2.Client.xml .
-docs-org.freedesktop.GeoClue2.Location.xml:
-	cp $(top_builddir)/src/docs-org.freedesktop.GeoClue2.Location.xml .
-docs-org.freedesktop.GeoClue2.Agent.xml:
-	cp $(top_builddir)/src/agent/docs-org.freedesktop.GeoClue2.Agent.xml .
-
-# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
-content_files =  			    		\
-	version.xml			    		\
-	docs-org.freedesktop.GeoClue2.Manager.xml	\
-	docs-org.freedesktop.GeoClue2.Client.xml	\
-	docs-org.freedesktop.GeoClue2.Location.xml	\
-	docs-org.freedesktop.GeoClue2.Agent.xml		\
-	$(NULL)
-
-MAINTAINERCLEANFILES =		\
-	*~			\
-	Makefile.in		\
-	geoclue.types		\
-	geoclue-*.txt		\
-	$(NULL)
-
-if ENABLE_GTK_DOC
-include $(top_srcdir)/gtk-doc.make
-else
-CLEANFILES = $(NULL)
-EXTRA_DIST = geoclue-docs.xml
-endif
-
-CLEANFILES +=						\
-	docs-org.freedesktop.GeoClue2.Manager.xml	\
-	docs-org.freedesktop.GeoClue2.Client.xml	\
-	docs-org.freedesktop.GeoClue2.Location.xml	\
-	docs-org.freedesktop.GeoClue2.Agent.xml		\
-	$(NULL)
-
-# Version information for marking the documentation
-EXTRA_DIST += version.xml.in
-
--include $(top_srcdir)/git.mk
diff --git a/docs/lib/Makefile.am b/docs/lib/Makefile.am
deleted file mode 100644
index 249dffe..0000000
--- a/docs/lib/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-NULL =
-
-AUTOMAKE_OPTIONS = 1.7
-
-# The name of the module.
-DOC_MODULE=libgeoclue
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=libgeoclue-docs.xml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--ignore-headers=config.h --rebuild-types
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../libgeoclue ../../public-api
-
-# Used for dependencies
-HFILE_GLOB=
-CFILE_GLOB=
-
-# Headers to ignore
-IGNORE_HFILES= \
-	$(NULL)
-
-GTKDOC_LIBS = $(top_builddir)/libgeoclue/libgeoclue-2.la
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-MKTMPL_OPTIONS=
-
-# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
-content_files =  			    		\
-	version.xml			    		\
-	$(NULL)
-
-MAINTAINERCLEANFILES =		\
-	*~			\
-	Makefile.in		\
-	libgeoclue.types	\
-        libgeoclue-decl-list.txt \
-        libgeoclue-decl.txt \
-        libgeoclue-overrides.txt \
-        libgeoclue-undeclared.txt \
-        libgeoclue-undocumented.txt \
-        libgeoclue-overrides.txt \
-        libgeoclue-unused.txt \
-        libgeoclue.args \
-        libgeoclue.hierarchy \
-        libgeoclue.interfaces \
-        libgeoclue.prerequisites \
-        libgeoclue.signals \
-	$(NULL)
-
-if ENABLE_GTK_DOC
-include $(top_srcdir)/gtk-doc.make
-else
-CLEANFILES = $(NULL)
-EXTRA_DIST = libgeoclue-docs.xml
-endif
-
-# Version information for marking the documentation
-EXTRA_DIST += version.xml.in
-
--include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
deleted file mode 100644
index 18c07f6..0000000
--- 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)) \
-			$(filter %$(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))),$(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/libgeoclue/Makefile.am b/libgeoclue/Makefile.am
deleted file mode 100644
index bc79399..0000000
--- a/libgeoclue/Makefile.am
+++ /dev/null
@@ -1,147 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-CLIENT_INTERFACE_XML = $(top_srcdir)/src/org.freedesktop.GeoClue2.Client.xml
-LOCATION_INTERFACE_XML = $(top_srcdir)/src/org.freedesktop.GeoClue2.Location.xml
-MANAGER_INTERFACE_XML = $(top_srcdir)/src/org.freedesktop.GeoClue2.Manager.xml
-
-dbus_built_sources = gclue-client.c   \
-		     gclue-client.h   \
-		     gclue-location.c \
-		     gclue-location.h \
-		     gclue-manager.c  \
-		     gclue-manager.h
-
-gclue-client.c: gclue-client.h
-gclue-client.h: Makefile.am $(CLIENT_INTERFACE_XML)
-	$(AM_V_GEN)$(GDBUS_CODEGEN) \
-		--interface-prefix org.freedesktop.GeoClue2.	\
-		--c-namespace GClue				\
-		--generate-c-code gclue-client			\
-		$(CLIENT_INTERFACE_XML)
-
-gclue-location.c: gclue-location.h
-gclue-location.h: Makefile.am $(LOCATION_INTERFACE_XML)
-	$(AM_V_GEN)$(GDBUS_CODEGEN) \
-		--interface-prefix org.freedesktop.GeoClue2.	\
-		--c-namespace GClue				\
-		--generate-c-code gclue-location		\
-		$(LOCATION_INTERFACE_XML)
-
-gclue-manager.c: gclue-manager.h
-gclue-manager.h: Makefile.am $(MANAGER_INTERFACE_XML)
-	$(AM_V_GEN)$(GDBUS_CODEGEN) \
-		--interface-prefix org.freedesktop.GeoClue2.	\
-		--c-namespace GClue				\
-		--generate-c-code gclue-manager			\
-		$(MANAGER_INTERFACE_XML)
-
-BUILT_SOURCES = 		\
-	$(dbus_built_sources)	\
-	$(NULL)
-
-lib_LTLIBRARIES = libgeoclue-2.la
-
-geoclue_includedir = $(includedir)/libgeoclue-$(GEOCLUE_API_VERSION)
-geoclue_include_HEADERS = geoclue.h          \
-			  gclue-client.h     \
-			  gclue-location.h   \
-			  gclue-manager.h    \
-			  gclue-helpers.h    \
-			  gclue-simple.h     \
-			  $(NULL)
-
-AM_CPPFLAGS = $(LIBGEOCLUE_CFLAGS) 		     	  \
-	      $(WARN_CFLAGS)			     	  \
-	      -DLOCALEDIR="\"$(datadir)/locale\"" 	  \
-	      -DG_LOG_DOMAIN=\""Geoclue"\"	     	  \
-	      -DABS_TOP_SRCDIR=\""$(abs_top_srcdir)"\" 	  \
-	      -DSYSCONFDIR=\""$(sysconfdir)"\"		  \
-	      -I$(top_srcdir)/public-api		  \
-	      -I$(top_builddir)/public-api
-
-ENUMS_HEADER = $(top_srcdir)/public-api/gclue-enums.h
-ENUMS_LIB = $(top_builddir)/public-api/libgeoclue-public-api.la
-
-libgeoclue_2_la_SOURCES =  \
-	gclue-client.c 	   \
-	gclue-location.c   \
-	gclue-manager.c    \
-	gclue-helpers.c    \
-	gclue-simple.c     \
-	$(NULL)
-
-libgeoclue_2_la_LIBADD =   \
-	$(LIBGEOCLUE_LIBS) \
-	$(LIBS)		   \
-	$(ENUMS_LIB) 	   \
-	$(NULL)
-
-CLEANFILES = $(BUILT_SOURCES) \
-	     $(NULL)
-
-if HAVE_INTROSPECTION
-girdir = $(datadir)/gir-1.0
-gir_DATA = Geoclue-2.0.gir
-
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = Geoclue-2.0.typelib
-
-Geoclue-2.0.gir: $(libgeoclue_2_la_SOURCES) $(geoclue_include_HEADERS)
-	$(AM_V_GEN) env CPPFLAGS="$(CPPFLAGS)"  \
-	    CFLAGS="$(CFLAGS)"			\
-	    LDFLAGS="$(LDFLAGS)"		\
-	    CC="$(CC)"				\
-	    PKG_CONFIG="$(PKG_CONFIG)"		\
-	    DLLTOOL="$(DLLTOOL)" 		\
-	    $(INTROSPECTION_SCANNER) -v 	\
-	    --warn-all                          \
-	    --namespace Geoclue                 \
-	    --identifier-prefix=GClue           \
-	    --symbol-prefix=gclue               \
-	    --nsversion=2.0                     \
-	    --include=Gio-2.0                   \
-	    --library=libgeoclue-2.la	        \
-	    --output $@                         \
-	    --pkg=glib-2.0                      \
-	    --pkg=gobject-2.0                   \
-	    --pkg=gio-2.0                       \
-	    --pkg-export=libgeoclue-2.0         \
-	    --libtool="${LIBTOOL}"   		\
-	    -I$(srcdir)				\
-	    -I$(top_srcdir)/public-api		\
-	    -I$(top_builddir)/public-api	\
-	    --c-include='geoclue.h'             \
-	    $^                                  \
-	    $(ENUMS_HEADER) 			\
-	    $(NULL)
-
-Geoclue-2.0.gir: libgeoclue-2.la $(INTROSPECTION_SCANNER) Makefile.am
-Geoclue-2.0.typelib: Geoclue-2.0.gir $(INTROSPECTION_COMPILER)
-	$(INTROSPECTION_COMPILER) $< -o $@
-
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-
-if ENABLE_VAPIGEN
--include $(VAPIGEN_MAKEFILE)
-
-libgeoclue-2.0.vapi: Geoclue-2.0.gir libgeoclue-2.0.deps
-
-VAPIGEN_VAPIS = libgeoclue-2.0.vapi
-
-libgeoclue_2_0_vapi_DEPS = glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0
-libgeoclue_2_0_vapi_FILES = Geoclue-2.0.gir
-
-vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
-
-EXTRA_DIST = libgeoclue-2.0.deps
-endif
-
-endif # HAVE_INTROSPECTION
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgeoclue-$(GEOCLUE_API_VERSION).pc
-
-DISTCLEANFILES = $(pkgconfig_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/m4/gnome-compiler-flags.m4 b/m4/gnome-compiler-flags.m4
deleted file mode 100644
index 4cb24aa..0000000
--- a/m4/gnome-compiler-flags.m4
+++ /dev/null
@@ -1,165 +0,0 @@
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings and substitute the result into
-dnl WARN_CFLAGS
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE(compile-warnings, 
-                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                                 [Turn on compiler warnings]),,
-                  [enable_compile_warnings="m4_default([$1],[yes])"])
-
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    dnl These are warning flags that aren't marked as fatal.  Can be
-    dnl overridden on a per-project basis with -Wno-foo.
-    base_warn_flags=" \
-        -Wall \
-        -Wstrict-prototypes \
-        -Wnested-externs \
-    "
-
-    dnl These compiler flags typically indicate very broken or suspicious
-    dnl code.  Some of them such as implicit-function-declaration are
-    dnl just not default because gcc compiles a lot of legacy code.
-    dnl We choose to make this set into explicit errors.
-    base_error_flags=" \
-        -Werror=missing-prototypes \
-        -Werror=implicit-function-declaration \
-        -Werror=pointer-arith \
-        -Werror=init-self \
-        -Werror=format-security \
-        -Werror=format=2 \
-        -Werror=missing-include-dirs \
-    "
-
-    case "$enable_compile_warnings" in
-    no)
-        warning_flags=
-        ;;
-    minimum)
-        warning_flags="-Wall"
-        ;;
-    yes)
-        warning_flags="$base_warn_flags $base_error_flags"
-        ;;
-    maximum|error)
-        warning_flags="$base_warn_flags $base_error_flags"
-        ;;
-    *)
-        AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-        ;;
-    esac
-
-    if test "$enable_compile_warnings" = "error" ; then
-        warning_flags="$warning_flags -Werror"
-    fi
-
-    dnl Check whether GCC supports the warning options
-    for option in $warning_flags; do
-	save_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $option"
-	AC_MSG_CHECKING([whether gcc understands $option])
-	AC_TRY_COMPILE([], [],
-	    has_option=yes,
-	    has_option=no,)
-	CFLAGS="$save_CFLAGS"
-	AC_MSG_RESULT([$has_option])
-	if test $has_option = yes; then
-	    tested_warning_flags="$tested_warning_flags $option"
-	fi
-	unset has_option
-	unset save_CFLAGS
-    done
-    unset option
-    CFLAGS="$realsave_CFLAGS"
-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($tested_warning_flags)
-
-    AC_ARG_ENABLE(iso-c,
-                  AC_HELP_STRING([--enable-iso-c],
-                                 [Try to warn if code is not ISO C ]),,
-                  [enable_iso_c=no])
-
-    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *[\ \	]-ansi[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *[\ \	]-pedantic[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    AC_MSG_RESULT($complCFLAGS)
-
-    WARN_CFLAGS="$tested_warning_flags $complCFLAGS"
-    AC_SUBST(WARN_CFLAGS)
-])
-
-dnl For C++, do basically the same thing.
-
-AC_DEFUN([GNOME_CXX_WARNINGS],[
-  AC_ARG_ENABLE(cxx-warnings,
-                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-                               [Turn on compiler warnings.]),,
-                [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
-  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-  warnCXXFLAGS=
-  if test "x$GXX" != xyes; then
-    enable_cxx_warnings=no
-  fi
-  if test "x$enable_cxx_warnings" != "xno"; then
-    if test "x$GXX" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-Wall[\ \	]*) ;;
-      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-      esac
-
-      ## -W is not all that useful.  And it cannot be controlled
-      ## with individual -Wno-xxx flags, unlike -Wall
-      if test "x$enable_cxx_warnings" = "xyes"; then
-	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-      fi
-    fi
-  fi
-  AC_MSG_RESULT($warnCXXFLAGS)
-
-   AC_ARG_ENABLE(iso-cxx,
-                 AC_HELP_STRING([--enable-iso-cxx],
-                                [Try to warn if code is not ISO C++ ]),,
-                 [enable_iso_cxx=no])
-
-   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-   complCXXFLAGS=
-   if test "x$enable_iso_cxx" != "xno"; then
-     if test "x$GXX" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-ansi[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-      esac
-
-      case " $CXXFLAGS " in
-      *[\ \	]-pedantic[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-      esac
-     fi
-   fi
-  AC_MSG_RESULT($complCXXFLAGS)
-
-  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-  AC_SUBST(WARN_CXXFLAGS)
-])
diff --git a/m4/vapigen.m4 b/m4/vapigen.m4
deleted file mode 100644
index 2c435e7..0000000
--- a/m4/vapigen.m4
+++ /dev/null
@@ -1,101 +0,0 @@
-dnl vapigen.m4
-dnl
-dnl Copyright 2012 Evan Nemerson
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License, or (at your option) any later version.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-
-# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND_INTROSPECTION], [DEFAULT])
-# --------------------------------------
-# Check vapigen existence and version
-#
-# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
-AC_DEFUN([VAPIGEN_CHECK],
-[
-  AS_IF([test "x$3" != "xyes"], [
-      m4_provide_if([GOBJECT_INTROSPECTION_CHECK], [], [
-          m4_provide_if([GOBJECT_INTROSPECTION_REQUIRE], [], [
-              AC_MSG_ERROR([[You must call GOBJECT_INTROSPECTION_CHECK or GOBJECT_INTROSPECTION_REQUIRE before using VAPIGEN_CHECK unless using the FOUND_INTROSPECTION argument is "yes"]])
-            ])
-        ])
-    ])
-
-  AC_ARG_ENABLE([vala],
-    [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[
-      AS_IF([test "x$4" = "x"], [
-          enable_vala=auto
-        ], [
-          enable_vala=$4
-        ])
-    ])
-
-  AS_CASE([$enable_vala], [no], [enable_vala=no],
-      [yes], [
-        AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
-            AC_MSG_ERROR([Vala bindings require GObject Introspection])
-          ])
-      ], [auto], [
-        AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
-            enable_vala=no
-          ])
-      ], [
-        AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@])
-      ])
-
-  AS_IF([test "x$2" = "x"], [
-      vapigen_pkg_name=vapigen
-    ], [
-      vapigen_pkg_name=vapigen-$2
-    ])
-  AS_IF([test "x$1" = "x"], [
-      vapigen_pkg="$vapigen_pkg_name"
-    ], [
-      vapigen_pkg="$vapigen_pkg_name >= $1"
-    ])
-
-  PKG_PROG_PKG_CONFIG
-
-  PKG_CHECK_EXISTS([$vapigen_pkg], [
-      AS_IF([test "$enable_vala" = "auto"], [
-          enable_vala=yes
-        ])
-    ], [
-      AS_CASE([$enable_vala], [yes], [
-          AC_MSG_ERROR([$vapigen_pkg not found])
-        ], [auto], [
-          enable_vala=no
-        ])
-    ])
-
-  AC_MSG_CHECKING([for vapigen])
-
-  AS_CASE([$enable_vala],
-    [yes], [
-      VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name`
-      VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen
-      AS_IF([test "x$2" = "x"], [
-          VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
-        ], [
-          VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
-        ])
-    ])
-
-  AC_MSG_RESULT([$enable_vala])
-
-  AC_SUBST([VAPIGEN])
-  AC_SUBST([VAPIGEN_VAPIDIR])
-  AC_SUBST([VAPIGEN_MAKEFILE])
-
-  AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes")
-])
diff --git a/public-api/Makefile.am b/public-api/Makefile.am
deleted file mode 100644
index 2bbcc1c..0000000
--- a/public-api/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-BUILT_SOURCES = 		\
-	gclue-enum-types.h	\
-	gclue-enum-types.c	\
-	$(NULL)
-
-geoclue_includedir = $(includedir)/libgeoclue-$(GEOCLUE_API_VERSION)
-geoclue_include_HEADERS = gclue-enums.h	     \
-			  gclue-enum-types.h \
-			  $(NULL)
-
-AM_CPPFLAGS = $(GEOCLUE_CFLAGS) 		       \
-	      $(WARN_CFLAGS)			       \
-	      -DLOCALEDIR="\"$(datadir)/locale\""      \
-	      -DG_LOG_DOMAIN=\""Geoclue"\"	       \
-	      -DABS_TOP_SRCDIR=\""$(abs_top_srcdir)"\" \
-	      -DSYSCONFDIR=\""$(sysconfdir)"\"
-
-noinst_LTLIBRARIES = libgeoclue-public-api.la
-libgeoclue_public_api_la_SOURCES = $(BUILT_SOURCES)
-
-CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = gclue-enums.h
-
-# Enum types
-GEOCLUE_ENUMS = \
-	$(srcdir)/gclue-enums.h
-
-gclue-enum-types.h: Makefile.am $(GEOCLUE_ENUMS) $(top_srcdir)/build-aux/gclue-enums-template.h
-	$(AM_V_GEN) $(GLIB_MKENUMS) \
-	    --fhead "#include \"gclue-enums.h\"\n#ifndef __GCLUE_ENUM_TYPES_H__\n#define __GCLUE_ENUM_TYPES_H__\n" \
-	    --template $(top_srcdir)/build-aux/gclue-enums-template.h \
-	    --ftail "#endif /* __GCLUE_ENUM_TYPES_H__ */\n" \
-	    $(GEOCLUE_ENUMS) > $@
-
-gclue-enum-types.c: Makefile.am $(top_srcdir)/build-aux/gclue-enums-template.c gclue-enum-types.h
-	$(AM_V_GEN) $(GLIB_MKENUMS) \
-	    --fhead "#include \"gclue-enum-types.h\"" \
-	    --template $(top_srcdir)/build-aux/gclue-enums-template.c \
-	    $(GEOCLUE_ENUMS) > $@
-
--include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 86d786c..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,208 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-libexec_PROGRAMS = geoclue
-
-SUBDIRS = agent geocode-glib
-
-CLIENT_INTERFACE_XML = org.freedesktop.GeoClue2.Client.xml
-LOCATION_INTERFACE_XML = org.freedesktop.GeoClue2.Location.xml
-MANAGER_INTERFACE_XML = org.freedesktop.GeoClue2.Manager.xml
-
-interfacedir = $(datadir)/dbus-1/interfaces
-interface_DATA = $(CLIENT_INTERFACE_XML)   \
-		 $(LOCATION_INTERFACE_XML) \
-		 $(MANAGER_INTERFACE_XML)
-
-# Provide a single interface file too for backwards compatiblity.
-# At least gnome-settings-daemon currently relies on that.
-install-data-hook:
-	{ (echo "<node>") && 						     \
-	  (tail -n +10 $(DESTDIR)$(interfacedir)/$(MANAGER_INTERFACE_XML) |  \
-	   grep -v node) &&  						     \
-	  (tail -n +10 $(DESTDIR)$(interfacedir)/$(CLIENT_INTERFACE_XML) |   \
-	   grep -v node) &&   						     \
-	  (tail -n +10 $(DESTDIR)$(interfacedir)/$(LOCATION_INTERFACE_XML) | \
-	   grep -v node) && 						     \
-	  (echo "</node>") } 						     \
-	> $(DESTDIR)$(interfacedir)/org.freedesktop.GeoClue2.xml
-uninstall-hook:
-	rm -r $(DESTDIR)$(interfacedir)/org.freedesktop.GeoClue2.xml
-
-dbus_built_sources = gclue-client-interface.c 	\
-		     gclue-client-interface.h 	\
-		     gclue-location-interface.c \
-		     gclue-location-interface.h \
-		     gclue-manager-interface.c 	\
-		     gclue-manager-interface.h 	\
-		     compass-interface.c 	\
-		     compass-interface.h	\
-		     wpa_supplicant-interface.c \
-		     wpa_supplicant-interface.h
-
-gclue-client-interface.c: gclue-client-interface.h
-gclue-client-interface.h: Makefile.am $(CLIENT_INTERFACE_XML)
-	$(AM_V_GEN)$(GDBUS_CODEGEN) \
-		--interface-prefix org.freedesktop.GeoClue2.	\
-		--c-namespace GClueDBus				\
-		--generate-c-code gclue-client-interface	\
-		--generate-docbook=docs				\
-		$(srcdir)/$(CLIENT_INTERFACE_XML)
-
-gclue-location-interface.c: gclue-location-interface.h
-gclue-location-interface.h: Makefile.am $(LOCATION_INTERFACE_XML)
-	$(AM_V_GEN)$(GDBUS_CODEGEN) \
-		--interface-prefix org.freedesktop.GeoClue2.	\
-		--c-namespace GClueDBus				\
-		--generate-c-code gclue-location-interface	\
-		--generate-docbook=docs				\
-		$(srcdir)/$(LOCATION_INTERFACE_XML)
-
-gclue-manager-interface.c: gclue-manager-interface.h
-gclue-manager-interface.h: Makefile.am $(MANAGER_INTERFACE_XML)
-	$(AM_V_GEN)$(GDBUS_CODEGEN) \
-		--interface-prefix org.freedesktop.GeoClue2.	\
-		--c-namespace GClueDBus				\
-		--generate-c-code gclue-manager-interface	\
-		--generate-docbook=docs				\
-		$(srcdir)/$(MANAGER_INTERFACE_XML)
-
-wpa_supplicant-interface.c: wpa_supplicant-interface.h
-wpa_supplicant-interface.h: Makefile.am fi.w1.wpa_supplicant1.xml
-	$(AM_V_GEN)$(GDBUS_CODEGEN) \
-		--interface-prefix fi.w1			\
-		--annotate "fi.w1.wpa_supplicant1"		\
-		org.gtk.GDBus.C.Name WPA_Supplicant		\
-		--annotate "fi.w1.wpa_supplicant1.Interface"	\
-		org.gtk.GDBus.C.Name WPA_Interface		\
-		--annotate "fi.w1.wpa_supplicant1.BSS"		\
-		org.gtk.GDBus.C.Name WPA_BSS			\
-		--annotate "fi.w1.wpa_supplicant1.BSS:SSID"	\
-		org.gtk.GDBus.C.ForceGVariant whatever		\
-		--annotate "fi.w1.wpa_supplicant1.BSS:BSSID"	\
-		org.gtk.GDBus.C.ForceGVariant whatever		\
-		--annotate "fi.w1.wpa_supplicant1.Interface::BSSAdded"	 \
-		org.gtk.GDBus.C.Name BSS_Added				 \
-		--annotate "fi.w1.wpa_supplicant1.Interface::BSSRemoved" \
-		org.gtk.GDBus.C.Name BSS_Removed			 \
-		--generate-c-code wpa_supplicant-interface 	\
-		$(srcdir)/fi.w1.wpa_supplicant1.xml
-
-compass-interface.c: compass-interface.h
-compass-interface.h: Makefile.am net.hadess.SensorProxy.xml
-	$(AM_V_GEN)$(GDBUS_CODEGEN) \
-		--interface-prefix net.hadess.SensorProxy \
-		--generate-c-code compass-interface 	  \
-		$(srcdir)/net.hadess.SensorProxy.xml
-
-gclue-marshal.c: gclue-marshal.list
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=gclue_marshal $(srcdir)/gclue-marshal.list --header --body > gclue-marshal.c
-
-gclue-marshal.h: gclue-marshal.list
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=gclue_marshal $(srcdir)/gclue-marshal.list --header > gclue-marshal.h
-
-BUILT_SOURCES = 		\
-	$(dbus_built_sources)	\
-	gclue-marshal.c 	\
-	gclue-marshal.h		\
-	$(NULL)
-
-noinst_LTLIBRARIES = libgeoclue-internal.la
-
-AM_CPPFLAGS = $(GEOCLUE_CFLAGS) 		     	  \
-	      $(ModemManager_CFLAGS)			  \
-	      $(NMEA_SOURCE_CFLAGS)			  \
-	      $(WARN_CFLAGS)			     	  \
-	      -DLOCALEDIR="\"$(datadir)/locale\"" 	  \
-	      -DG_LOG_DOMAIN=\""Geoclue"\"	     	  \
-	      -DABS_TOP_SRCDIR=\""$(abs_top_srcdir)"\" 	  \
-	      -DSYSCONFDIR=\""$(sysconfdir)"\"		  \
-	      -I$(srcdir)/agent				  \
-	      -I$(builddir)/agent			  \
-	      -I$(top_srcdir)/public-api		  \
-	      -I$(top_builddir)/public-api
-
-libgeoclue_internal_la_SOURCES = \
-	$(BUILT_SOURCES) 	 \
-	gclue-3g-tower.h 	 \
-	gclue-client-info.h 	 \
-	gclue-client-info.c 	 \
-	gclue-compass.h 	 \
-	gclue-compass.c 	 \
-	gclue-config.h 	 	 \
-	gclue-config.c 	 	 \
-	gclue-error.h 	 	 \
-	gclue-error.c 	 	 \
-	gclue-location-source.h	 \
-	gclue-location-source.c	 \
-	gclue-locator.h 	 \
-	gclue-locator.c 	 \
-	gclue-min-uint.h 	 \
-	gclue-min-uint.c 	 \
-	gclue-service-manager.h  \
-	gclue-service-manager.c  \
-	gclue-service-client.h   \
-	gclue-service-client.c   \
-	gclue-service-location.h \
-	gclue-service-location.c \
-	gclue-web-source.c	 \
-	gclue-web-source.h	 \
-	gclue-wifi.h 		 \
-	gclue-wifi.c		 \
-	gclue-mozilla.h		 \
-	gclue-mozilla.c		 \
-	gclue-location.h	 \
-	gclue-location.c	 \
-	$(NULL)
-
-if BUILD_MODEM_SOURCE
-libgeoclue_internal_la_SOURCES += gclue-modem.c	        \
-				  gclue-modem.h	       \
-				  gclue-modem-manager.c \
-				  gclue-modem-manager.h
-endif
-
-if BUILD_3G_SOURCE
-libgeoclue_internal_la_SOURCES += gclue-3g.c gclue-3g.h
-endif
-
-if BUILD_CDMA_SOURCE
-libgeoclue_internal_la_SOURCES += gclue-cdma.c gclue-cdma.h
-endif
-
-if BUILD_MODEM_GPS_SOURCE
-libgeoclue_internal_la_SOURCES += gclue-modem-gps.c gclue-modem-gps.h
-endif
-
-if BUILD_NMEA_SOURCE
-libgeoclue_internal_la_SOURCES += gclue-nmea-source.h gclue-nmea-source.c
-endif
-
-libgeoclue_internal_la_LIBADD = 	\
-	$(GEOCLUE_LIBS)			\
-	$(ModemManager_LIBS)		\
-	$(NMEA_SOURCE_LIBS)		\
-	$(LIBS)				\
-	$(NULL)
-
-geoclue_SOURCES =	 	  \
-	gclue-main.c	 	  \
-	$(NULL)
-geoclue_LDADD = $(GEOCLUE_LIBS) 	  		    	\
-		$(LIBS) 		  		    	\
-		$(builddir)/libgeoclue-internal.la		    	\
-		$(builddir)/agent/libgeoclue-agent.la 		\
-		$(builddir)/geocode-glib/libgeocode-glib.la 	\
-		$(top_builddir)/public-api/libgeoclue-public-api.la
-
-CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = $(interface_DATA) 	       \
-	     fi.w1.wpa_supplicant1.xml \
-	     net.hadess.SensorProxy.xml \
-	     gclue-marshal.list
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = geoclue-$(GEOCLUE_API_VERSION).pc
-
-DISTCLEANFILES = $(pkgconfig_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/src/agent/Makefile.am b/src/agent/Makefile.am
deleted file mode 100644
index e8466c7..0000000
--- a/src/agent/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-interfacedir = $(datadir)/dbus-1/interfaces
-interface_DATA = org.freedesktop.GeoClue2.Agent.xml
-
-docs-org.freedesktop.GeoClue2.Agent.xml: Makefile.am $(interface_DATA)
-	$(AM_V_GEN)$(GDBUS_CODEGEN) \
-		--interface-prefix org.freedesktop.GeoClue2.	\
-		--c-namespace GClue				\
-    		--generate-docbook=docs				\
-		--generate-c-code geoclue-agent-interface	\
-		$(srcdir)/$(interface_DATA)
-noinst_DATA = docs-org.freedesktop.GeoClue2.Agent.xml
-
-dbus_built_sources = geoclue-agent-interface.c geoclue-agent-interface.h
-geoclue-agent-interface.c: geoclue-agent-interface.h
-geoclue-agent-interface.h: Makefile.am $(noinst_DATA) $(interface_data)
-
-BUILT_SOURCES = $(dbus_built_sources) \
-		$(NULL)
-
-AM_CPPFLAGS = $(GEOCLUE_CFLAGS) 		       \
-	      $(WARN_CFLAGS)			       \
-	      -DLOCALEDIR="\"$(datadir)/locale\""      \
-	      -DG_LOG_DOMAIN=\""Geoclue"\"	       \
-	      -DABS_TOP_SRCDIR=\""$(abs_top_srcdir)"\" \
-	      -DSYSCONFDIR=\""$(sysconfdir)"\"
-
-noinst_LTLIBRARIES = libgeoclue-agent.la
-libgeoclue_agent_la_SOURCES = $(BUILT_SOURCES)
-
-CLEANFILES = $(noinst_DATA) $(BUILT_SOURCES)
-EXTRA_DIST = $(interface_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/src/geocode-glib/Makefile.am b/src/geocode-glib/Makefile.am
deleted file mode 100644
index d12abed..0000000
--- a/src/geocode-glib/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-noinst_LTLIBRARIES = libgeocode-glib.la
-
-AM_CPPFLAGS = $(GEOCLUE_CFLAGS) 		     	  \
-	      $(WARN_CFLAGS)			     	  \
-	      -DGEOCODE_LOCALEDIR="\"$(datadir)/locale\"" \
-	      -DG_LOG_DOMAIN=\""Geoclue"\"	     	  \
-	      -DABS_TOP_SRCDIR=\""$(abs_top_srcdir)"\" 	  \
-	      -DSYSCONFDIR=\""$(sysconfdir)"\"		  \
-	      -DPACKAGE_VERSION=\"@PACKAGE_VERSION@\"     \
-	      -I$(top_srcdir)/src			  \
-	      -I$(top_builddir)/src
-
-libgeocode_glib_la_SOURCES = 				\
-	geocode-location.h				\
-	geocode-location.c				\
-	geocode-forward.h				\
-	geocode-forward.c				\
-	geocode-reverse.h				\
-	geocode-reverse.c				\
-	geocode-glib.h					\
-	geocode-glib.c					\
-	geocode-error.h                                 \
-	geocode-error.c                                 \
-	geocode-enum-types.h				\
-	geocode-enum-types.c				\
-	geocode-place.h					\
-	geocode-place.c					\
-	geocode-bounding-box.h				\
-	geocode-bounding-box.c				\
-	geocode-glib-private.h				\
-	$(NULL)
-libgeocode_glib_la_LIBADD = $(GEOCLUE_LIBS) $(LIBS)
-
-GEOCODEGLIBDIR=$(top_srcdir)/../geocode-glib/geocode-glib/
-GEOCODEGLIBFILES=$(libgeocode_glib_la_SOURCES)
-update-from-geocode-glib:
-	FILES="$(GEOCODEGLIBFILES)" DIR="$(GEOCODEGLIBDIR)" $(srcdir)/update-from-geocode-glib.sh && changed=true ; \
-	git commit -m "location: Update from geocode-glib" $(GEOCODEGLIBFILES)
-
--include $(top_srcdir)/git.mk