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=788146

11 files changed, 0 insertions, 2092 deletions

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index cb583b1b..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,988 +0,0 @@
-include $(GLIB_MAKEFILE)
--include $(INTROSPECTION_MAKEFILE)
-include $(top_srcdir)/gtk-doc.make
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-BUILT_SOURCES =
-
-bin_PROGRAMS =
-
-lib_LTLIBRARIES =
-
-noinst_LTLIBRARIES =
-
-noinst_PROGRAMS =
-
-check_PROGRAMS =
-
-check_programs =
-
-check_local =
-
-TESTS =
-
-DISTCLEANFILES =
-
-DISTCHECK_CONFIGURE_FLAGS = \
-	--disable-dependency-tracking \
-	--enable-gtk-doc \
-	--enable-introspection \
-	--enable-more-warnings=error \
-	--with-wwan \
-	--with-team \
-	--with-gcr
-
-man_MANS =
-
-pkgconfig_DATA =
-
-pkgconfigdir = $(libdir)/pkgconfig
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-BUILT_SOURCES += $(gir_DATA)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-BUILT_SOURCES += $(typelib_DATA)
-
-INTROSPECTION_GIRS =
-
-SUBDIRS = \
-	. \
-	po
-
-###############################################################################
-
-icon16dir = $(datadir)/icons/hicolor/16x16/apps
-icon16_DATA = \
-	icons/16/nm-device-wired.png \
-	icons/16/nm-no-connection.png \
-	icons/16/nm-vpn-standalone-lock.png
-EXTRA_DIST += $(icon16_DATA)
-
-icon22dir = $(datadir)/icons/hicolor/22x22/apps
-icon22_DATA = \
-	icons/22/nm-adhoc.png \
-	icons/22/nm-device-wired.png \
-	icons/22/nm-device-wwan.png \
-	icons/22/nm-mb-roam.png \
-	icons/22/nm-no-connection.png \
-	icons/22/nm-secure-lock.png \
-	icons/22/nm-signal-00.png \
-	icons/22/nm-signal-100.png \
-	icons/22/nm-signal-25.png \
-	icons/22/nm-signal-50.png \
-	icons/22/nm-signal-75.png \
-	icons/22/nm-stage01-connecting01.png \
-	icons/22/nm-stage01-connecting02.png \
-	icons/22/nm-stage01-connecting03.png \
-	icons/22/nm-stage01-connecting04.png \
-	icons/22/nm-stage01-connecting05.png \
-	icons/22/nm-stage01-connecting06.png \
-	icons/22/nm-stage01-connecting07.png \
-	icons/22/nm-stage01-connecting08.png \
-	icons/22/nm-stage01-connecting09.png \
-	icons/22/nm-stage01-connecting10.png \
-	icons/22/nm-stage01-connecting11.png \
-	icons/22/nm-stage02-connecting01.png \
-	icons/22/nm-stage02-connecting02.png \
-	icons/22/nm-stage02-connecting03.png \
-	icons/22/nm-stage02-connecting04.png \
-	icons/22/nm-stage02-connecting05.png \
-	icons/22/nm-stage02-connecting06.png \
-	icons/22/nm-stage02-connecting07.png \
-	icons/22/nm-stage02-connecting08.png \
-	icons/22/nm-stage02-connecting09.png \
-	icons/22/nm-stage02-connecting10.png \
-	icons/22/nm-stage02-connecting11.png \
-	icons/22/nm-stage03-connecting01.png \
-	icons/22/nm-stage03-connecting02.png \
-	icons/22/nm-stage03-connecting03.png \
-	icons/22/nm-stage03-connecting04.png \
-	icons/22/nm-stage03-connecting05.png \
-	icons/22/nm-stage03-connecting06.png \
-	icons/22/nm-stage03-connecting07.png \
-	icons/22/nm-stage03-connecting08.png \
-	icons/22/nm-stage03-connecting09.png \
-	icons/22/nm-stage03-connecting10.png \
-	icons/22/nm-stage03-connecting11.png \
-	icons/22/nm-tech-3g.png \
-	icons/22/nm-tech-cdma-1x.png \
-	icons/22/nm-tech-edge.png \
-	icons/22/nm-tech-evdo.png \
-	icons/22/nm-tech-gprs.png \
-	icons/22/nm-tech-hspa.png \
-	icons/22/nm-tech-lte.png \
-	icons/22/nm-tech-umts.png \
-	icons/22/nm-vpn-active-lock.png \
-	icons/22/nm-vpn-connecting01.png \
-	icons/22/nm-vpn-connecting02.png \
-	icons/22/nm-vpn-connecting03.png \
-	icons/22/nm-vpn-connecting04.png \
-	icons/22/nm-vpn-connecting05.png \
-	icons/22/nm-vpn-connecting06.png \
-	icons/22/nm-vpn-connecting07.png \
-	icons/22/nm-vpn-connecting08.png \
-	icons/22/nm-vpn-connecting09.png \
-	icons/22/nm-vpn-connecting10.png \
-	icons/22/nm-vpn-connecting11.png \
-	icons/22/nm-vpn-connecting12.png \
-	icons/22/nm-vpn-connecting13.png \
-	icons/22/nm-vpn-connecting14.png \
-	icons/22/nm-wwan-tower.png
-EXTRA_DIST += $(icon22_DATA)
-
-icon32dir = $(datadir)/icons/hicolor/32x32/apps
-icon32_DATA = \
-	icons/32/nm-device-wired.png \
-	icons/32/nm-no-connection.png
-EXTRA_DIST += $(icon32_DATA)
-
-icon48dir = $(datadir)/icons/hicolor/48x48/apps
-icon48_DATA = \
-	icons/48/nm-device-wireless.png
-EXTRA_DIST += $(icon48_DATA)
-
-iconscalabledir=$(datadir)/icons/hicolor/scalable/apps
-iconscalable_DATA = \
-	icons/scalable/nm-device-wired.svg \
-	icons/scalable/nm-no-connection.svg
-EXTRA_DIST += $(iconscalable_DATA)
-
-EXTRA_DIST += icons/meson.build
-
-###############################################################################
-
-shared_files = \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-shared-utils.h \
-	$(NULL)
-
-noinst_LTLIBRARIES += src/utils/libutils-libnm.la
-
-src_utils_libutils_libnm_la_CPPFLAGS = \
-	"-I$(srcdir)/shared" \
-	$(GTK_CFLAGS) \
-	$(LIBNM_CFLAGS)
-
-src_utils_libutils_libnm_la_SOURCES = \
-	$(shared_files) \
-	src/utils/utils.c \
-	src/utils/utils.h
-
-src_utils_libutils_libnm_la_LIBADD = \
-	$(GTK_LIBS) \
-	$(LIBNM_LIBS)
-
-if WITH_LIBNM_GTK
-
-noinst_LTLIBRARIES += src/utils/libutils-libnm-glib.la
-
-src_utils_libutils_libnm_glib_la_CPPFLAGS = \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-	"-I$(srcdir)/shared" \
-	$(GTK_CFLAGS) \
-	$(LIBNM_GLIB_CFLAGS)
-
-src_utils_libutils_libnm_glib_la_SOURCES = \
-	$(shared_files) \
-	src/utils/utils.c \
-	src/utils/utils.h
-
-src_utils_libutils_libnm_glib_la_LIBADD = \
-	$(GTK_LIBS) \
-	$(LIBNM_GLIB_LIBS)
-
-endif
-
-check_programs += src/utils/tests/test-utils
-
-src_utils_tests_test_utils_SOURCES = src/utils/tests/test-utils.c
-
-src_utils_tests_test_utils_CPPFLAGS = \
-	"-I$(srcdir)/shared/" \
-	"-I$(srcdir)/src/utils" \
-	$(GTK_CFLAGS) \
-	$(LIBNM_CFLAGS)
-
-src_utils_tests_test_utils_LDADD = \
-	src/utils/libutils-libnm.la \
-	$(GTK_LIBS) \
-	$(LIBNM_LIBS)
-
-EXTRA_DIST += src/utils/meson.build
-
-###############################################################################
-
-src/wireless-security/ws-resources.h: src/wireless-security/ws.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/wireless-security --generate-header --internal
-
-src/wireless-security/ws-resources.c: src/wireless-security/ws.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src/wireless-security --generate-dependencies $(srcdir)/src/wireless-security/ws.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/wireless-security --generate-source --internal
-
-CLEANFILES += \
-	$(wireless_security_h_gen) \
-	$(wireless_security_c_gen)
-
-wireless_security_h_gen = \
-	src/wireless-security/ws-resources.h
-
-wireless_security_c_gen = \
-	src/wireless-security/ws-resources.c
-
-wireless_security_c_real = \
-	src/wireless-security/wireless-security.h \
-	src/wireless-security/wireless-security.c \
-	src/wireless-security/ws-wep-key.h \
-	src/wireless-security/ws-wep-key.c \
-	src/wireless-security/ws-wpa-psk.h \
-	src/wireless-security/ws-wpa-psk.c \
-	src/wireless-security/ws-leap.h \
-	src/wireless-security/ws-leap.c \
-	src/wireless-security/ws-wpa-eap.h \
-	src/wireless-security/ws-wpa-eap.c \
-	src/wireless-security/ws-dynamic-wep.h \
-	src/wireless-security/ws-dynamic-wep.c \
-	src/wireless-security/eap-method.h \
-	src/wireless-security/eap-method.c \
-	src/wireless-security/eap-method-tls.h \
-	src/wireless-security/eap-method-tls.c \
-	src/wireless-security/eap-method-leap.h \
-	src/wireless-security/eap-method-leap.c \
-	src/wireless-security/eap-method-fast.h \
-	src/wireless-security/eap-method-fast.c \
-	src/wireless-security/eap-method-ttls.h \
-	src/wireless-security/eap-method-ttls.c \
-	src/wireless-security/eap-method-peap.h \
-	src/wireless-security/eap-method-peap.c \
-	src/wireless-security/eap-method-simple.h \
-	src/wireless-security/eap-method-simple.c \
-	src/wireless-security/helpers.h \
-	src/wireless-security/helpers.c
-
-
-noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm.la
-
-src_wireless_security_libwireless_security_libnm_la_SOURCES = \
-	$(wireless_security_c_real)
-
-nodist_src_wireless_security_libwireless_security_libnm_la_SOURCES = \
-	$(wireless_security_c_gen)
-
-src_wireless_security_libwireless_security_libnm_la_CPPFLAGS = \
-	"-I$(srcdir)/shared" \
-	"-I$(srcdir)/src/utils" \
-	"-I$(srcdir)/src/libnma" \
-	-Isrc/libnma \
-	$(GTK_CFLAGS) \
-	$(LIBNM_CFLAGS)
-
-src_wireless_security_libwireless_security_libnm_la_LIBADD = \
-	src/utils/libutils-libnm.la \
-	$(GTK_LIBS) \
-	$(LIBNM_LIBS)
-
-$(src_wireless_security_libwireless_security_libnm_la_OBJECTS): $(wireless_security_h_gen)
-
-if WITH_LIBNM_GTK
-
-noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm-glib.la
-
-src_wireless_security_libwireless_security_libnm_glib_la_SOURCES = \
-	$(wireless_security_c_real)
-
-nodist_src_wireless_security_libwireless_security_libnm_glib_la_SOURCES = \
-	$(wireless_security_c_gen)
-
-src_wireless_security_libwireless_security_libnm_glib_la_CPPFLAGS = \
-	$(GTK_CFLAGS) \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-	"-I$(srcdir)/shared" \
-	"-I$(srcdir)/src/utils" \
-	"-I$(srcdir)/src/libnma" \
-	-Isrc/libnma \
-	$(LIBNM_GLIB_CFLAGS)
-
-src_wireless_security_libwireless_security_libnm_glib_la_LIBADD = \
-	src/utils/libutils-libnm-glib.la \
-	$(GTK_LIBS) \
-	$(LIBNM_GLIB_LIBS)
-
-$(src_wireless_security_libwireless_security_libnm_glib_la_OBJECTS): $(wireless_security_h_gen)
-
-endif
-
-EXTRA_DIST += \
-	src/wireless-security/eap-method-fast.ui \
-	src/wireless-security/eap-method-leap.ui \
-	src/wireless-security/eap-method-peap.ui \
-	src/wireless-security/eap-method-simple.ui \
-	src/wireless-security/eap-method-tls.ui \
-	src/wireless-security/eap-method-ttls.ui \
-	src/wireless-security/ws-dynamic-wep.ui \
-	src/wireless-security/ws-leap.ui \
-	src/wireless-security/ws-wep-key.ui \
-	src/wireless-security/ws-wpa-eap.ui \
-	src/wireless-security/ws-wpa-psk.ui \
-	src/wireless-security/ws.gresource.xml \
-	src/wireless-security/meson.build
-
-###############################################################################
-
-if WITH_LIBNM_GTK
-
-src/libnm-gtk/nm-resources.h: src/libnm-gtk/nm.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnm-gtk --generate-header --internal
-
-src/libnm-gtk/nm-resources.c: src/libnm-gtk/nm.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src/libnm-gtk --generate-dependencies $(srcdir)/src/libnm-gtk/nm.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnm-gtk --generate-source --internal
-
-CLEANFILES += \
-	$(libnm_gtk_h_priv_gen) \
-	$(libnm_gtk_c_gen)
-
-libnm_gtk_h_priv_gen = \
-	src/libnm-gtk/nm-resources.h
-
-libnm_gtk_c_gen = \
-	src/libnm-gtk/nm-resources.c
-
-libnm_gtk_h_pub = \
-	src/libnm-gtk/nm-wifi-dialog.h \
-	src/libnm-gtk/nm-wireless-dialog.h \
-	src/libnm-gtk/nm-mobile-wizard.h \
-	src/libnm-gtk/nm-ui-utils.h \
-	src/libnm-gtk/nm-mobile-providers.h \
-	src/libnm-gtk/nm-vpn-password-dialog.h \
-	src/libnm-gtk/nm-cert-chooser.h
-
-libnm_gtk_c_real = \
-	src/libnm-gtk/nm-wifi-dialog.c \
-	src/libnm-gtk/nm-wireless-dialog.c \
-	src/libnm-gtk/nm-mobile-wizard.c \
-	src/libnm-gtk/nm-ui-utils.c \
-	src/libnm-gtk/nm-mobile-providers.c \
-	src/libnm-gtk/nm-vpn-password-dialog.c \
-	src/libnma/nma-cert-chooser.c \
-	src/libnma/nma-file-cert-chooser.c \
-	src/libnm-gtk/init.c
-
-src_libnm_gtk_libnmgtkdir = $(includedir)/libnm-gtk
-
-src_libnm_gtk_libnmgtk_HEADERS = \
-	$(libnm_gtk_h_pub)
-
-lib_LTLIBRARIES += src/libnm-gtk/libnm-gtk.la
-
-src_libnm_gtk_libnm_gtk_la_SOURCES = \
-	$(libnm_gtk_c_real)
-
-nodist_src_libnm_gtk_libnm_gtk_la_SOURCES = \
-	$(libnm_gtk_c_gen)
-
-src_libnm_gtk_libnm_gtk_la_CFLAGS = \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-	-DICONDIR=\""$(datadir)/icons"\" \
-	-DBINDIR=\""$(bindir)"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DLIBEXECDIR=\""$(libexecdir)"\" \
-	-DDATADIR=\""$(datadir)"\" \
-	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
-	-DNMALOCALEDIR=\"$(datadir)/locale\" \
-	"-I$(srcdir)/shared" \
-	"-I$(srcdir)/src/utils" \
-	"-I$(srcdir)/src/wireless-security" \
-	"-I$(srcdir)/src/libnm-gtk" \
-	"-I$(srcdir)/src/libnma" \
-	-Isrc/libnma \
-	$(GTK_CFLAGS) \
-	$(LIBNM_GLIB_CFLAGS) \
-	$(GUDEV_CFLAGS)
-
-src_libnm_gtk_libnm_gtk_la_LIBADD = \
-	src/wireless-security/libwireless-security-libnm-glib.la \
-	$(GTK_LIBS) \
-	$(LIBNM_GLIB_LIBS) \
-	$(GUDEV_LIBS)
-
-EXTRA_src_libnm_gtk_libnm_gtk_la_DEPENDENCIES = src/libnm-gtk/libnm-gtk.ver
-
-src_libnm_gtk_libnm_gtk_la_LDFLAGS = \
-	-Wl,-no-undefined \
-	-Wl,--version-script=$(srcdir)/src/libnm-gtk/libnm-gtk.ver
-
-$(src_libnm_gtk_libnm_gtk_la_OBJECTS): $(libnm_gtk_h_priv_gen)
-
-check-local-exports-libnm-gtk:
-	$(srcdir)/src/libnm-gtk/check-exports.sh $(builddir)/src/libnm-gtk/.libs/libnm-gtk.so $(srcdir)/src/libnm-gtk/libnm-gtk.ver
-
-check_local += check-local-exports-libnm-gtk
-
-
-pkgconfig_DATA += src/libnm-gtk/libnm-gtk.pc
-
-if HAVE_INTROSPECTION
-src/libnm-gtk/NMGtk-1.0.gir: src/libnm-gtk/libnm-gtk.la
-src_libnm_gtk_NMGtk_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0
-src_libnm_gtk_NMGtk_1_0_gir_EXPORT_PACKAGES = libnm-gtk
-src_libnm_gtk_NMGtk_1_0_gir_CFLAGS = $(src_libnm_gtk_libnm_gtk_la_CFLAGS)
-src_libnm_gtk_NMGtk_1_0_gir_LIBS = src/libnm-gtk/libnm-gtk.la
-src_libnm_gtk_NMGtk_1_0_gir_FILES = \
-	$(filter-out src/libnm-gtk/nm-wireless-dialog.h, $(libnm_gtk_h_pub)) \
-	$(filter-out src/libnm-gtk/nm-wireless-dialog.c, $(libnm_gtk_c_real))
-src_libnm_gtk_NMGtk_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
-INTROSPECTION_GIRS += src/libnm-gtk/NMGtk-1.0.gir
-endif
-
-
-check_programs += src/libnm-gtk/tests/test-mobile-providers
-
-src_libnm_gtk_tests_test_mobile_providers_CPPFLAGS = \
-	-DTEST_DATA_DIR=\""$(abs_srcdir)/src/libnm-gtk/tests"\" \
-	"-I$(srcdir)/shared" \
-	"-I$(srcdir)/src/libnm-gtk" \
-	$(GTK_CFLAGS) \
-	$(LIBNM_GLIB_CFLAGS)
-
-src_libnm_gtk_tests_test_mobile_providers_LDADD = \
-	src/libnm-gtk/libnm-gtk.la \
-	$(LIBNM_GLIB_LIBS)
-
-endif
-
-EXTRA_DIST += \
-	src/libnm-gtk/libnm-gtk.pc.in \
-	src/libnm-gtk/libnm-gtk.ver \
-	src/libnm-gtk/check-exports.sh \
-	src/libnm-gtk/wifi.ui \
-	src/libnm-gtk/nm.gresource.xml \
-	src/libnm-gtk/meson.build \
-	\
-	src/libnm-gtk/tests/iso3166-test.xml \
-	src/libnm-gtk/tests/serviceproviders-test.xml \
-	\
-	src/libnm-gtk/examples/mobile-providers.js \
-	$(NULL)
-
-###############################################################################
-
-src/libnma/nma-resources.h: src/libnma/nma.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma --generate-header --internal
-
-src/libnma/nma-resources.c: src/libnma/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src/libnma --generate-dependencies $(srcdir)/src/libnma/nma.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma --generate-source --internal
-
-CLEANFILES += \
-	$(libnma_h_priv_gen) \
-	$(libnma_c_gen)
-
-libnma_h_priv_gen = \
-	src/libnma/nma-resources.h
-
-libnma_c_gen = \
-	src/libnma/nma-resources.c
-
-libnma_h_pub = \
-	src/libnma/nma-version.h \
-	src/libnma/nma-wifi-dialog.h \
-	src/libnma/nma-mobile-wizard.h \
-	src/libnma/nma-mobile-providers.h \
-	src/libnma/nma-vpn-password-dialog.h \
-	src/libnma/nma-ui-utils.h \
-	src/libnma/nma-cert-chooser.h
-
-libnma_c_real = \
-	src/libnma/nma-wifi-dialog.c \
-	src/libnma/nma-mobile-wizard.c \
-	src/libnma/nma-mobile-providers.c \
-	src/libnma/nma-vpn-password-dialog.c \
-	src/libnma/nma-ui-utils.c \
-	src/libnma/init.c \
-	src/libnma/nma-cert-chooser.c \
-	src/libnma/nma-file-cert-chooser.c
-
-libnma_h_priv_real = \
-	src/libnma/nma-cert-chooser-private.h
-
-if WITH_GCR
-libnma_h_priv_real += \
-	src/libnma/nma-pkcs11-token-login-dialog.h \
-	src/libnma/nma-pkcs11-cert-chooser-dialog.h \
-	src/libnma/nma-cert-chooser-button.h
-
-libnma_c_real += \
-	src/libnma/nma-pkcs11-token-login-dialog.c \
-	src/libnma/nma-pkcs11-cert-chooser-dialog.c \
-	src/libnma/nma-cert-chooser-button.c \
-	src/libnma/nma-pkcs11-cert-chooser.c
-endif
-
-src_libnma_libnmadir = $(includedir)/libnma
-
-src_libnma_libnma_HEADERS = \
-	$(libnma_h_pub)
-
-lib_LTLIBRARIES += src/libnma/libnma.la
-
-src_libnma_libnma_la_SOURCES = \
-	$(libnma_h_priv_real) \
-	$(libnma_c_real)
-
-nodist_src_libnma_libnma_la_SOURCES = \
-	$(libnma_h_priv_gen) \
-	$(libnma_c_gen)
-
-src_libnma_libnma_la_CFLAGS = \
-	-DICONDIR=\""$(datadir)/icons"\" \
-	-DBINDIR=\""$(bindir)"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DLIBEXECDIR=\""$(libexecdir)"\" \
-	-DDATADIR=\""$(datadir)"\" \
-	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
-	-DNMALOCALEDIR=\"$(datadir)/locale\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-	"-I$(srcdir)/shared" \
-	"-I$(srcdir)/src/utils" \
-	"-I$(srcdir)/src/wireless-security" \
-	"-I$(srcdir)/src/libnma" \
-	-Isrc/libnma \
-	$(GTK_CFLAGS) \
-	$(LIBNM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	$(GCR_CFLAGS)
-
-src_libnma_libnma_la_LIBADD = \
-	src/wireless-security/libwireless-security-libnm.la \
-	$(GTK_LIBS) \
-	$(LIBNM_LIBS) \
-	$(GUDEV_LIBS) \
-	$(GCR_LIBS)
-
-EXTRA_src_libnma_libnma_la_DEPENDENCIES = src/libnma/libnma.ver
-
-src_libnma_libnma_la_LDFLAGS = \
-	-Wl,-no-undefined \
-	-Wl,--version-script=$(srcdir)/src/libnma/libnma.ver
-
-
-pkgconfig_DATA += src/libnma/libnma.pc
-
-if HAVE_INTROSPECTION
-src/libnma/NMA-1.0.gir: src/libnma/libnma.la
-src_libnma_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0
-src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma
-src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS)
-src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la
-src_libnma_NMA_1_0_gir_FILES = \
-	$(libnma_h_pub) \
-	$(libnma_c_real)
-src_libnma_NMA_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
-INTROSPECTION_GIRS += src/libnma/NMA-1.0.gir
-endif
-
-EXTRA_DIST += \
-	src/libnma/nma-version.h.in \
-	src/libnma/libnma.pc.in \
-	src/libnma/libnma.ver \
-	src/libnma/wifi.ui \
-	src/libnma/nma-pkcs11-token-login-dialog.ui \
-	src/libnma/nma-pkcs11-cert-chooser-dialog.ui \
-	src/libnma/nma.gresource.xml \
-	src/libnma/meson.build
-
-###############################################################################
-
-src/connection-editor/ce-resources.h: src/connection-editor/ce.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/connection-editor --generate-header --internal
-
-src/connection-editor/ce-resources.c: src/connection-editor/ce.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src/connection-editor --generate-dependencies $(srcdir)/src/connection-editor/ce.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/connection-editor --generate-source --internal
-
-CLEANFILES += \
-	$(connection_editor_h_gen) \
-	$(connection_editor_c_gen)
-
-connection_editor_h_gen = \
-	src/connection-editor/ce-resources.h
-
-connection_editor_c_gen = \
-	src/connection-editor/ce-resources.c
-
-connection_editor_hc_real = \
-	src/connection-editor/nm-connection-editor.c \
-	src/connection-editor/nm-connection-editor.h \
-	src/connection-editor/nm-connection-list.c \
-	src/connection-editor/nm-connection-list.h \
-	src/connection-editor/main.c \
-	src/connection-editor/ce-page.h \
-	src/connection-editor/ce-page.c \
-	src/connection-editor/page-general.h \
-	src/connection-editor/page-general.c \
-	src/connection-editor/page-ethernet.h \
-	src/connection-editor/page-ethernet.c \
-	src/connection-editor/page-8021x-security.h \
-	src/connection-editor/page-8021x-security.c \
-	src/connection-editor/page-wifi.h \
-	src/connection-editor/page-wifi.c \
-	src/connection-editor/page-wifi-security.h \
-	src/connection-editor/page-wifi-security.c \
-	src/connection-editor/page-infiniband.h \
-	src/connection-editor/page-infiniband.c \
-	src/connection-editor/page-ip-tunnel.h \
-	src/connection-editor/page-ip-tunnel.c \
-	src/connection-editor/page-ip4.h \
-	src/connection-editor/page-ip4.c \
-	src/connection-editor/page-ip6.h \
-	src/connection-editor/page-ip6.c \
-	src/connection-editor/page-dsl.h \
-	src/connection-editor/page-dsl.c \
-	src/connection-editor/page-macsec.h \
-	src/connection-editor/page-macsec.c \
-	src/connection-editor/page-mobile.h \
-	src/connection-editor/page-mobile.c \
-	src/connection-editor/page-bluetooth.h \
-	src/connection-editor/page-bluetooth.c \
-	src/connection-editor/page-ppp.h \
-	src/connection-editor/page-ppp.c \
-	src/connection-editor/page-proxy.h \
-	src/connection-editor/page-proxy.c \
-	src/connection-editor/page-vpn.h \
-	src/connection-editor/page-vpn.c \
-	src/connection-editor/page-master.h \
-	src/connection-editor/page-master.c \
-	src/connection-editor/page-bond.h \
-	src/connection-editor/page-bond.c \
-	src/connection-editor/page-team.h \
-	src/connection-editor/page-team.c \
-	src/connection-editor/page-team-port.h \
-	src/connection-editor/page-team-port.c \
-	src/connection-editor/page-bridge.h \
-	src/connection-editor/page-bridge.c \
-	src/connection-editor/page-bridge-port.h \
-	src/connection-editor/page-bridge-port.c \
-	src/connection-editor/page-vlan.h \
-	src/connection-editor/page-vlan.c \
-	src/connection-editor/page-dcb.c \
-	src/connection-editor/page-dcb.h \
-	src/connection-editor/vpn-helpers.h \
-	src/connection-editor/vpn-helpers.c \
-	src/connection-editor/ip4-routes-dialog.h \
-	src/connection-editor/ip4-routes-dialog.c \
-	src/connection-editor/ip6-routes-dialog.h \
-	src/connection-editor/ip6-routes-dialog.c \
-	src/connection-editor/ppp-auth-methods-dialog.c \
-	src/connection-editor/ppp-auth-methods-dialog.h \
-	src/connection-editor/ce-polkit-button.c \
-	src/connection-editor/ce-polkit-button.h \
-	src/connection-editor/ce-polkit.c \
-	src/connection-editor/ce-polkit.h \
-	src/connection-editor/connection-helpers.c \
-	src/connection-editor/connection-helpers.h
-
-bin_PROGRAMS += src/connection-editor/nm-connection-editor
-
-src_connection_editor_nm_connection_editor_SOURCES = \
-	$(connection_editor_hc_real)
-
-nodist_src_connection_editor_nm_connection_editor_SOURCES = \
-	$(connection_editor_c_gen)
-
-src_connection_editor_nm_connection_editor_CPPFLAGS = \
-	-DICONDIR=\""$(datadir)/icons"\" \
-	-DBINDIR=\""$(bindir)"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DLIBDIR=\""$(libdir)"\" \
-	-DDATADIR=\""$(datadir)"\" \
-	-DNMALOCALEDIR=\"$(datadir)/locale\" \
-	"-I$(srcdir)/shared" \
-	"-I$(srcdir)/src/utils" \
-	"-I$(srcdir)/src/wireless-security" \
-	"-I$(srcdir)/src/libnma" \
-	-Isrc/libnma \
-	$(GTK_CFLAGS) \
-	$(LIBNM_CFLAGS) \
-	$(JANSSON_CFLAGS) \
-	$(SELINUX_CFLAGS)
-
-src_connection_editor_nm_connection_editor_LDADD = \
-	src/wireless-security/libwireless-security-libnm.la \
-	src/libnma/libnma.la \
-	$(GTK_LIBS) \
-	$(LIBNM_LIBS) \
-	$(JANSSON_LIBS) \
-	$(SELINUX_LIBS) \
-	-lm
-
-$(src_connection_editor_nm_connection_editor_OBJECTS): $(connection_editor_h_gen)
-
-EXTRA_src_connection_editor_nm_connection_editor_DEPENDENCIES = linker-script-binary.ver
-
-src_connection_editor_nm_connection_editor_LDFLAGS = \
-	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
-
-
-EXTRA_DIST += \
-	src/connection-editor/ce-ip4-routes.ui \
-	src/connection-editor/ce-ip6-routes.ui \
-	src/connection-editor/ce-new-connection.ui \
-	src/connection-editor/ce-page-bluetooth.ui \
-	src/connection-editor/ce-page-bond.ui \
-	src/connection-editor/ce-page-bridge-port.ui \
-	src/connection-editor/ce-page-bridge.ui \
-	src/connection-editor/ce-page-dcb.ui \
-	src/connection-editor/ce-page-dsl.ui \
-	src/connection-editor/ce-page-ethernet.ui \
-	src/connection-editor/ce-page-general.ui \
-	src/connection-editor/ce-page-infiniband.ui \
-	src/connection-editor/ce-page-ip4.ui \
-	src/connection-editor/ce-page-ip6.ui \
-	src/connection-editor/ce-page-ip-tunnel.ui \
-	src/connection-editor/ce-page-macsec.ui \
-	src/connection-editor/ce-page-mobile.ui \
-	src/connection-editor/ce-page-ppp.ui \
-	src/connection-editor/ce-page-proxy.ui \
-	src/connection-editor/ce-page-team-port.ui \
-	src/connection-editor/ce-page-team.ui \
-	src/connection-editor/ce-page-vlan.ui \
-	src/connection-editor/ce-page-wifi-security.ui \
-	src/connection-editor/ce-page-wifi.ui \
-	src/connection-editor/ce-ppp-auth-methods.ui \
-	src/connection-editor/nm-connection-editor.ui \
-	src/connection-editor/nm-connection-list.ui \
-	src/connection-editor/ce.gresource.xml \
-	src/connection-editor/meson.build
-
-###############################################################################
-
-src/applet-resources.h: src/applet.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src --generate-header --internal
-
-src/applet-resources.c: src/applet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src --generate-dependencies $(srcdir)/src/applet.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src --generate-source --internal
-
-CLEANFILES += \
-	$(nm_applet_h_gen) \
-	$(nm_applet_c_gen)
-
-nm_applet_h_gen = \
-	src/applet-resources.h
-
-nm_applet_c_gen = \
-	src/applet-resources.c
-
-nm_applet_hc_real = \
-	src/main.c \
-	src/applet.c \
-	src/applet.h \
-	src/applet-agent.c \
-	src/applet-agent.h \
-	src/applet-vpn-request.c \
-	src/applet-vpn-request.h \
-	src/ethernet-dialog.h \
-	src/ethernet-dialog.c \
-	src/applet-dialogs.h \
-	src/applet-dialogs.c \
-	src/applet-device-ethernet.h \
-	src/applet-device-ethernet.c \
-	src/applet-device-wifi.h \
-	src/applet-device-wifi.c \
-	src/ap-menu-item.h \
-	src/ap-menu-item.c \
-	src/mb-menu-item.h \
-	src/mb-menu-item.c \
-	src/mobile-helpers.c \
-	src/mobile-helpers.h \
-	src/applet-device-bt.h \
-	src/applet-device-bt.c \
-	src/fallback-icon.h
-
-if WITH_WWAN
-nm_applet_hc_real += \
-	src/applet-device-broadband.h \
-	src/applet-device-broadband.c
-endif
-
-bin_PROGRAMS += src/nm-applet
-
-src_nm_applet_SOURCES = \
-	$(nm_applet_hc_real)
-
-nodist_src_nm_applet_SOURCES = \
-	$(nm_applet_c_gen)
-
-src_nm_applet_CPPFLAGS = \
-	-DICONDIR=\""$(datadir)/icons"\" \
-	-DBINDIR=\""$(bindir)"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DLIBEXECDIR=\""$(libexecdir)"\" \
-	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
-	-DNMALOCALEDIR=\"$(datadir)/locale\" \
-	-DG_LOG_DOMAIN=\""nm-applet"\" \
-	"-I$(srcdir)/shared" \
-	"-I$(srcdir)/src/utils" \
-	"-I$(srcdir)/src/wireless-security" \
-	"-I$(srcdir)/src/libnma" \
-	-Isrc/libnma \
-	$(GTK_CFLAGS) \
-	$(LIBNM_CFLAGS) \
-	$(LIBSECRET_CFLAGS) \
-	$(NOTIFY_CFLAGS) \
-	$(MM_GLIB_CFLAGS) \
-	$(APPINDICATOR_CFLAGS)
-
-src_nm_applet_LDADD = \
-	src/wireless-security/libwireless-security-libnm.la \
-	src/libnma/libnma.la \
-	$(GTK_LIBS) \
-	$(LIBNM_LIBS) \
-	$(LIBSECRET_LIBS) \
-	$(NOTIFY_LIBS) \
-	$(MM_GLIB_LIBS) \
-	$(APPINDICATOR_LIBS) \
-	-lm
-
-$(src_nm_applet_OBJECTS): $(nm_applet_h_gen)
-
-EXTRA_src_nm_applet_DEPENDENCIES = linker-script-binary.ver
-
-src_nm_applet_LDFLAGS = \
-	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
-
-
-EXTRA_DIST += \
-	src/8021x.ui \
-	src/gsm-unlock.ui \
-	src/info.ui \
-	src/applet.gresource.xml \
-	src/meson.build
-
-###############################################################################
-
-EXTRA_DIST += \
-	shared/nm-utils/gsystem-local-alloc.h \
-	shared/nm-utils/nm-glib.h \
-	shared/nm-utils/nm-macros-internal.h \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-shared-utils.h \
-	shared/nm-utils/nm-test-utils.h \
-	shared/nm-utils/nm-vpn-editor-plugin-call.h \
-	shared/nm-default.h \
-	shared/nm-libnm-compat.h \
-	shared/meson.build \
-	$(NULL)
-
-###############################################################################
-
-man_MANS += \
-	man/nm-applet.1 \
-	man/nm-connection-editor.1
-
-EXTRA_DIST += man/meson.build
-
-###############################################################################
-
-DOC_MODULE = libnma
-
-DOC_SOURCE_DIR = $(top_srcdir)/src/libnma
-
-SCAN_OPTIONS=--rebuild-types --rebuild-sections
-
-DOC_MAIN_SGML_FILE = libnma-docs.xml
-
-GTKDOC_LIBS = src/libnma/libnma.la
-
-scan-build.stamp: $(GTKDOC_LIBS)
-
-HFILE_GLOB = $(top_srcdir)/src/libnma/*.h
-
-CFILE_GLOB = $(top_srcdir)/src/libnma/*.c
-
-IGNORE_HFILES = \
-	nma-resources.h \
-	nma-version.h \
-	nma-cert-chooser-private.h \
-	nma-pkcs11-token-login-dialog.h \
-	nma-pkcs11-cert-chooser-dialog.h \
-	nma-cert-chooser-button.h
-
-mkdb_ignore_c_files = \
-	nma-resources.c \
-	nma-file-cert-chooser.c \
-	nma-pkcs11-token-login-dialog.c \
-	nma-pkcs11-cert-chooser-dialog.c \
-	nma-cert-chooser-button.c \
-	nma-pkcs11-cert-chooser.c
-
-MKDB_OPTIONS = --ignore-files "$(IGNORE_HFILES) $(mkdb_ignore_c_files)"
-
-###############################################################################
-
-check_PROGRAMS += $(check_programs)
-
-check-local: $(check_local)
-
-TESTS += $(check_programs)
-
-EXTRA_DIST += \
-	linker-script-binary.ver \
-	CONTRIBUTING \
-	intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in \
-	Makefile.glib \
-	autogen.sh \
-	meson.build \
-	meson_options.txt \
-	meson_post_install.py \
-	config.h.meson \
-	gtkdocentities.ent.in \
-	\
-	po/meson.build
-
-
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = nm-applet.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-
-applicationsdir = $(datadir)/applications
-applications_DATA = $(autostart_DATA)
-
-desktopdir = $(datadir)/applications
-desktop_in_files = nm-connection-editor.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml
-@GSETTINGS_RULES@
-
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = nm-connection-editor.appdata.xml.in
-@INTLTOOL_XML_RULE@
-
-convertdir=$(datadir)/GConf/gsettings
-convert_DATA=nm-applet.convert
-
-EXTRA_DIST += \
-	$(convert_DATA) \
-	$(appdata_in_files) \
-	$(autostart_in_files) \
-	$(desktop_in_files)
-
-CLEANFILES += \
-	$(INTROSPECTION_GIRS) \
-	$(typelib_DATA) \
-	\
-	$(autostart_DATA) \
-	$(desktop_DATA) \
-	$(appdata_DATA) \
-	$(BUILT_SOURCES)
-
-DISTCLEANFILES += \
-	intltool-extract \
-	intltool-merge \
-	intltool-update
diff --git a/Makefile.glib b/Makefile.glib
deleted file mode 100644
index 951ce6f8..00000000
--- a/Makefile.glib
+++ /dev/null
@@ -1,169 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# Work-in-progress...
-# See https://bugzilla.gnome.org/show_bug.cgi?id=654395
-
-_GLIB_CLEANFILES =
-_GLIB_DISTCLEANFILES =
-
-_GLIB_V_GEN = $(_glib_v_gen_$(V))
-_glib_v_gen_ = $(_glib_v_gen_$(AM_DEFAULT_VERBOSITY))
-_glib_v_gen_0 = @echo "  GEN   " $(subst .stamp,,$@);
-
-
-### glib-genmarshal
-
-_GLIB_MARSHAL_GENERATED = $(subst .h,,$(filter %marshal.h,$(GLIB_GENERATED)))
-
-_glib_marshal_prefix = $(subst marshal,,$(subst _marshal,,$(subst -,_,$(notdir $(1)))))_marshal
-_glib_marshal_sources_var = $(subst -,_,$(notdir $(1)))_sources
-_glib_marshal_sources = $(filter-out %.h,$(filter-out $(GLIB_GENERATED),$($(_glib_marshal_sources_var))))
-
-define _glib_make_genmarshal_rules
-$(if $(_glib_marshal_sources),,$(error Need to define $(_glib_marshal_sources_var) for $(1).[ch]))
-
-$(1).list.stamp: $(_glib_marshal_sources)
-	$$(_GLIB_V_GEN) LC_ALL=C sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \
-	(cmp -s $(1).list.tmp $(1).list || cp $(1).list.tmp $(1).list) && \
-	rm -f $(1).list.tmp && \
-	echo timestamp > $$@
-
-$(1).list: $(1).list.stamp
-	@true
-
-$(1).h: $(1).list
-	$$(_GLIB_V_GEN) $$(GLIB_GENMARSHAL) \
-		--prefix=_$(_glib_marshal_prefix) --header \
-		$$(GLIB_GENMARSHAL_H_FLAGS) \
-		$$($(_glib_marshal_prefix)_GENMARSHAL_H_FLAGS) \
-		$$< > $$@.tmp && \
-	mv $$@.tmp $$@
-
-$(1).c: $(1).list
-	$$(_GLIB_V_GEN) (echo "#include \"$$(subst .c,.h,$$(@F))\""; $$(GLIB_GENMARSHAL) \
-		--prefix=_$(_glib_marshal_prefix) --body \
-		$$(GLIB_GENMARSHAL_C_FLAGS) \
-		$$($(_glib_marshal_prefix)_GENMARSHAL_C_FLAGS) \
-		$$< ) > $$@.tmp && \
-	mv $$@.tmp $$@
-
-_GLIB_CLEANFILES += $(1).list.stamp $(1).list
-_GLIB_DISTCLEANFILES += $(1).h $(1).c
-endef
-
-$(foreach f,$(_GLIB_MARSHAL_GENERATED),$(eval $(call _glib_make_genmarshal_rules,$f)))
-
-
-### glib-mkenums
-
-_GLIB_ENUM_TYPES_GENERATED = $(subst .h,,$(filter %enum-types.h %enumtypes.h,$(GLIB_GENERATED)))
-
-_glib_enum_types_prefix = $(subst -,_,$(notdir $(1)))
-_glib_enum_types_guard = __$(shell LC_ALL=C echo $(_glib_enum_types_prefix) | tr 'a-z' 'A-Z')_H__
-_glib_enum_types_sources_var = $(_glib_enum_types_prefix)_sources
-_glib_enum_types_sources = $(filter-out $(GLIB_GENERATED),$($(_glib_enum_types_sources_var)))
-_glib_enum_types_h_sources = $(filter %.h,$(_glib_enum_types_sources))
-
-define _glib_make_mkenums_rules
-$(if $(_glib_enum_types_sources),,$(error Need to define $(_glib_enum_types_sources_var) for $(1).[ch]))
-
-$(1).h.stamp: $(_glib_enum_types_h_sources)
-	$$(_GLIB_V_GEN) $$(GLIB_MKENUMS) \
-		--fhead "/* Generated by glib-mkenums. Do not edit */\n\n#ifndef $(_glib_enum_types_guard)\n#define $(_glib_enum_types_guard)\n\n" \
-		$$(GLIB_MKENUMS_H_FLAGS) \
-		$$($(_glib_enum_types_prefix)_MKENUMS_H_FLAGS) \
-		--fhead "#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-		--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())\n" \
-		--ftail "G_END_DECLS\n\n#endif /* $(_glib_enum_types_guard) */" \
-		$$^ > $(1).h.tmp && \
-	(cmp -s $(1).h.tmp $(1).h || cp $(1).h.tmp $(1).h) && \
-	rm -f $(1).h.tmp && \
-	echo timestamp > $$@
-
-$(1).h: $(1).h.stamp
-	@true
-
-$(1).c.stamp: $(_glib_enum_types_h_sources)
-	$$(_GLIB_V_GEN) $$(GLIB_MKENUMS) \
-		--fhead "/* Generated by glib-mkenums. Do not edit */\n\n#include \"$(notdir $(1)).h\"\n" \
-		$$(GLIB_MKENUMS_C_FLAGS) \
-		$$($(_glib_enum_types_prefix)_MKENUMS_C_FLAGS) \
-		--fhead "$$(foreach f,$$(^F),\n#include \"$$(f)\")\n\n" \
-		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static volatile gsize g_define_type_id__volatile = 0;\n\n  if (g_once_init_enter (&g_define_type_id__volatile))\n    {\n      static const G@Type@Value values[] = {\n" \
-		--vprod "        { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" },\n" \
-		--vtail "        { 0, NULL, NULL }\n      };\n      GType g_define_type_id =\n        g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n    }\n\n  return g_define_type_id__volatile;\n}\n" \
-		$$^ > $(1).c.tmp && \
-	(cmp -s $(1).c.tmp $(1).c || cp $(1).c.tmp $(1).c) && \
-	rm -f $(1).c.tmp && \
-	echo timestamp > $$@
-
-$(1).c: $(1).c.stamp
-	@true
-
-_GLIB_CLEANFILES += $(1).h.stamp $(1).c.stamp
-_GLIB_DISTCLEANFILES += $(1).h $(1).c $(1).h.stamp $(1).c.stamp
-endef
-
-$(foreach f,$(_GLIB_ENUM_TYPES_GENERATED),$(eval $(call _glib_make_mkenums_rules,$f)))
-
-
-### glib-compile-schemas
-
-_GLIB_ENUMS_XML_GENERATED = $(filter %.enums.xml,$(GLIB_GENERATED))
-_GLIB_GSETTINGS_SCHEMA_FILES = $(filter %.gschema.xml,$(gsettingsschema_DATA))
-_GLIB_GSETTINGS_VALID_FILES = $(subst .xml,.valid,$(_GLIB_GSETTINGS_SCHEMA_FILES))
-
-_glib_enums_xml_prefix = $(subst .,_,$(notdir $(1)))
-_glib_enums_xml_sources_var = $(_glib_enums_xml_prefix)_sources
-_glib_enums_xml_sources = $(filter-out $(GLIB_GENERATED),$($(_glib_enums_xml_sources_var)))
-_glib_enums_xml_namespace = $(subst .enums.xml,,$(notdir $(1)))
-
-define _glib_make_enums_xml_rule
-$(if $(_glib_enums_xml_sources),,$(error Need to define $(_glib_enums_xml_sources_var) for $(1)))
-
-$(1): $(_glib_enums_xml_sources)
-	$$(_GLIB_V_GEN) $$(GLIB_MKENUMS) --comments '<!-- @comment@ -->' --fhead "<schemalist>" --vhead "  <@type@ id='$(_glib_enums_xml_namespace).@EnumName@'>" --vprod "    <value nick='@valuenick@' value='@valuenum@'/>" --vtail "  </@type@>" --ftail "</schemalist>" $$^ > $$@.tmp && mv $$@.tmp $$@
-endef
-
-_GLIB_V_CHECK = $(_glib_v_check_$(V))
-_glib_v_check_ = $(_glib_v_check_$(AM_DEFAULT_VERBOSITY))
-_glib_v_check_0 = @echo "  CHECK " $(subst .valid,.xml,$@);
-
-define _glib_make_schema_validate_rule
-$(subst .xml,.valid,$(1)): $(_GLIB_ENUMS_XML_GENERATED) $(1)
-	$$(_GLIB_V_CHECK) $$(GLIB_COMPILE_SCHEMAS) --strict --dry-run $$(addprefix --schema-file=,$$^) && touch $$@
-endef
-
-define _glib_make_schema_rules
-all-am: $(_GLIB_GSETTINGS_VALID_FILES)
-
-install-data-am: glib-install-schemas-hook
-
-glib-install-schemas-hook: install-gsettingsschemaDATA
-	@test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || (echo $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir))
-
-uninstall-am: glib-uninstall-schemas-hook
-
-glib-uninstall-schemas-hook: uninstall-gsettingsschemaDATA
-	@test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || (echo $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir))
-
-.PHONY: glib-install-schemas-hook glib-uninstall-schemas-hook
-endef
-
-_GLIB_CLEANFILES += $(_GLIB_ENUMS_XML_GENERATED) $(_GLIB_GSETTINGS_VALID_FILES)
-
-$(foreach f,$(_GLIB_ENUMS_XML_GENERATED),$(eval $(call _glib_make_enums_xml_rule,$f)))
-$(foreach f,$(_GLIB_GSETTINGS_SCHEMA_FILES),$(eval $(call _glib_make_schema_validate_rule,$f)))
-$(if $(_GLIB_GSETTINGS_SCHEMA_FILES),$(eval $(_glib_make_schema_rules)))
-
-
-### Cleanup
-.PHONY: clean-glib distclean-glib
-
-clean-am: clean-glib
-clean-glib:
-	$(if $(strip $(_GLIB_CLEANFILES)),-rm -f $(_GLIB_CLEANFILES))
-
-distclean-am: distclean-glib
-distclean-glib:
-	$(if $(strip $(_GLIB_DISTCLEANFILES)),-rm -f $(_GLIB_DISTCLEANFILES))
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index d783df06..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME=nm-applet
-
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/src/applet.c) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-(cd $srcdir;
-    gtkdocize &&
-    autoreconf --install --symlink &&
-    intltoolize --force &&
-    autoreconf
-)
-
-if test -z "$NOCONFIGURE"; then
-    "$srcdir/configure" --enable-maintainer-mode "$@"
-fi
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index b0473792..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,295 +0,0 @@
-AC_PREREQ([2.63])
-
-m4_define([nma_major_version], [1])
-m4_define([nma_minor_version], [8])
-m4_define([nma_micro_version], [3])
-m4_define([nma_version],
-          [nma_major_version.nma_minor_version.nma_micro_version])
-
-AC_INIT([nm-applet],
-        [nma_version],
-        [https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager],
-        [network-manager-applet])
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wno-portability])
-AM_MAINTAINER_MODE([enable])
-AM_SILENT_RULES([yes])
-
-NMA_MAJOR_VERSION=nma_major_version
-NMA_MINOR_VERSION=nma_minor_version
-NMA_MICRO_VERSION=nma_micro_version
-NMA_VERSION=nma_version
-AC_SUBST(NMA_MAJOR_VERSION)
-AC_SUBST(NMA_MINOR_VERSION)
-AC_SUBST(NMA_MICRO_VERSION)
-AC_SUBST(NMA_VERSION)
-
-dnl
-dnl Require programs
-dnl
-AC_PROG_CC
-AM_PROG_CC_C_O
-PKG_PROG_PKG_CONFIG
-
-dnl Define _GNU_SOURCE for various things like strcasestr()
-AC_USE_SYSTEM_EXTENSIONS
-
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT
-
-GIT_SHA_RECORD(NMA_GIT_SHA)
-
-dnl
-dnl Checks for typedefs, structures, and compiler characteristics.
-dnl
-AC_TYPE_PID_T
-
-dnl
-dnl translation support
-dnl
-IT_PROG_INTLTOOL([0.50.1])
-
-GETTEXT_PACKAGE=nm-applet
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-AM_GLIB_GNU_GETTEXT
-
-# Check for iso-codes for country names translation
-AC_MSG_CHECKING([whether to disable iso-codes at build-time])
-AC_ARG_ENABLE([iso-codes],
-    AS_HELP_STRING([--disable-iso-codes],[do not check for iso-codes at build-time]),
-    [],[disable_iso_codes_check=no])
-if test x$disable_iso_codes_check = xno ; then
-    AC_MSG_RESULT([no])
-else
-    AC_MSG_RESULT([yes])
-fi
-
-if test x$disable_iso_codes_check = "xno" ; then
-    AC_MSG_CHECKING([whether iso-codes has iso_3166 domain])
-    if $PKG_CONFIG --variable=domains iso-codes | grep iso_3166 >/dev/null ; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-    fi
-    AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
-    PKG_CHECK_MODULES(ISO_CODES, [iso-codes],
-        [],
-        [echo -e "\n$ISO_CODES_PKG_ERRORS.\n"
-         echo "Consider installing the package or adjusting the PKG_CONFIG_PATH environment variable."
-         echo "You can also disable build-time check for 'iso-codes' via --disable-iso-codes";
-         exit 1;])
-else
-    AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$prefix"],[ISO codes prefix])
-fi
-
-dnl
-dnl API documentation
-dnl
-GTK_DOC_CHECK(1.0)
-
-AC_ARG_WITH(libnm-gtk, AS_HELP_STRING([--without-libnm-gtk], [dont build legacy library libnm-gtk which depends on libnm-glib/libnm-util/dbus-glib]))
-if test "$with_libnm_gtk" != no; then
-	PKG_CHECK_MODULES(LIBNM_GLIB,
-			[gio-2.0 >= 2.38
-			 NetworkManager >= 1.7
-			 libnm-glib >= 1.7
-			 libnm-util >= 1.7
-			 libnm-glib-vpn >= 1.7
-			 gmodule-export-2.0],
-			 :,
-			 [AC_MSG_FAILURE([$LIBNM_GLIB_PKG_ERRORS
-
-Configure with --without-libnm-gtk if you do not need the legacy library])])
-	with_libnm_gtk=yes
-	LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
-	LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38"
-	LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4"
-	LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
-fi
-AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" != "no")
-
-PKG_CHECK_MODULES(LIBNM, [libnm >= 1.7 gio-2.0 >= 2.38 gmodule-export-2.0])
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
-
-PKG_CHECK_MODULES(LIBSECRET, [libsecret-1 >= 0.18])
-
-# Check for libnotify >= 0.7
-PKG_CHECK_MODULES(LIBNOTIFY_07, [libnotify >= 0.7], [have_libnotify_07=yes],[have_libnotify_07=no])
-if test x"$have_libnotify_07" = "xyes"; then
-	AC_DEFINE(HAVE_LIBNOTIFY_07, 1, [Define if you have libnotify 0.7 or later])
-fi
-PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.4.3])
-
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
-GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_4"
-
-AC_ARG_WITH([appindicator], AS_HELP_STRING([--with-appindicator|--without-appindicator], [Build with libappindicator support instead of xembed systray support.]))
-if test "$with_appindicator" == "yes"; then
-	PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1)
-	PKG_CHECK_MODULES(DBUSMENU, dbusmenu-gtk3-0.4 >= 16.04.0)
-	AC_DEFINE([WITH_APPINDICATOR], 1, [Enable using libappindicator])
-fi
-
-AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
-
-dnl ModemManager1 with libmm-glib for WWAN support
-AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support (default: yes)]))
-if (test "${with_wwan}" == "no"); then
-    AC_DEFINE(WITH_WWAN, 0, [Define if you have ModemManager/WWAN support])
-else
-    PKG_CHECK_MODULES(MM_GLIB,
-                      [mm-glib],,
-                      AC_MSG_ERROR([libmm-glib is needed for WWAN support. Use --without-wwan to build without it.]))
-    AC_DEFINE(WITH_WWAN, 1, [Define if you have ModemManager/WWAN support])
-fi
-AM_CONDITIONAL(WITH_WWAN, test "${with_wwan}" != "no")
-
-dnl Check for gudev
-PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
-
-dnl SELinux
-AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux], [Enable support for adjusting SELinux labels in configuration editor (default: yes)]))
-if (test "${with_selinux}" == "no"); then
-    AC_DEFINE(WITH_SELINUX, 0, [Define if libselinux is available])
-else
-    PKG_CHECK_MODULES(SELINUX,
-                      [libselinux],,
-                      AC_MSG_ERROR([libselinux is needed for SELinux label support in configuration editor. Use --without-selinux to build without it.]))
-    AC_DEFINE(WITH_SELINUX, 1, [Define if libselinux is available])
-fi
-AM_CONDITIONAL(WITH_SELINUX, test "${with_selinux}" != "no")
-
-dnl Jansson for team configuration editing
-AC_ARG_WITH(team, AS_HELP_STRING([--with-team], [Enable team configuration editor (default: yes)]))
-if (test "${with_team}" == "no"); then
-    AC_DEFINE(WITH_JANSSON, 0, [Define if Jansson is available])
-else
-    PKG_CHECK_MODULES(JANSSON,
-                      [jansson >= 2.7],,
-                      AC_MSG_ERROR([jansson is needed for team configuration editor. Use --without-team to build without it.]))
-    AC_DEFINE(WITH_JANSSON, 1, [Define if Jansson is available])
-fi
-AM_CONDITIONAL(WITH_JANSSON, test "${with_team}" != "no")
-
-dnl GCR for PKCS#11 enabled certificate chooser
-AC_ARG_WITH(gcr, AS_HELP_STRING([--with-gcr], [Enable advanced certificate chooser (default: auto)]))
-if (test "${with_gcr}" == "no"); then
-    have_gcr=no
-else
-    PKG_CHECK_MODULES(GCR,
-                      [gcr-3 >= 3.14, gck-1 >= 3.14],
-                      dnl GCR API is declared subject to change, do an extensive check of the prototypes
-                      GCR_CFLAGS="$GCR_CFLAGS -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE"
-                      CFLAGS_SAVED="$CFLAGS"
-                      CFLAGS="$CFLAGS $GCR_CFLAGS"
-                      AC_MSG_CHECKING([for GCR usefulness])
-                      AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-                                        #include <gcr/gcr.h>
-                                        #include <gck/gck.h>
-
-                                        const GckAttribute *gck_attributes_find (GckAttributes *attrs, gulong attr_type);
-                                        gboolean gck_attributes_find_string (GckAttributes *attrs, gulong attr_type, gchar **value);
-                                        gboolean gck_attributes_find_ulong (GckAttributes *attrs, gulong attr_type, gulong *value);
-                                        GckAttributes *gck_attributes_new_empty (gulong first_type, ...);
-                                        void gck_attributes_unref (gpointer attrs);
-                                        void gck_builder_add_all (GckBuilder *builder, GckAttributes *attrs);
-                                        void gck_builder_add_only (GckBuilder *builder, GckAttributes *attrs, gulong only_type, ...);
-                                        GckAttributes *gck_builder_end (GckBuilder *builder);
-                                        GckBuilder *gck_builder_new (GckBuilderFlags flags);
-                                        void gck_enumerator_next_async (GckEnumerator *self, gint max_objects, GCancellable *cancellable,
-                                                                        GAsyncReadyCallback callback, gpointer user_data);
-                                        GList *gck_enumerator_next_finish (GckEnumerator *self, GAsyncResult *result, GError **error);
-                                        void gck_list_unref_free (GList *reflist);
-                                        GList *gck_modules_get_slots (GList *modules, gboolean token_present);
-                                        void gck_modules_initialize_registered_async (GCancellable *cancellable, GAsyncReadyCallback callback,
-                                                                                      gpointer user_data);
-                                        GList *gck_modules_initialize_registered_finish (GAsyncResult *result, GError **error);
-                                        void gck_object_get_async (GckObject *self, const gulong *attr_types, guint n_attr_types,
-                                                                   GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-                                        GckAttributes *gck_object_get_finish (GckObject *self, GAsyncResult *result, GError **error);
-                                        void gck_session_login_async (GckSession *self, gulong user_type, const guchar *pin,
-                                                                      gsize n_pin, GCancellable *cancellable,
-                                                                      GAsyncReadyCallback callback, gpointer user_data);
-                                        gboolean gck_session_login_finish (GckSession *self, GAsyncResult *result, GError **error);
-                                        GckSlotInfo *gck_slot_get_info (GckSlot *self);
-                                        GckTokenInfo *gck_slot_get_token_info (GckSlot *self);
-                                        void gck_slot_open_session_async (GckSlot *self, GckSessionOptions options, GCancellable *cancellable,
-                                                                          GAsyncReadyCallback callback, gpointer user_data);
-                                        GckSession *gck_slot_open_session_finish (GckSlot *self, GAsyncResult *result, GError **error);
-                                        void gck_token_info_free (GckTokenInfo *token_info);
-                                        gchar *gck_uri_build (GckUriData *uri_data, GckUriFlags flags);
-                                        void gck_uri_data_free (GckUriData *uri_data);
-                                        GckUriData *gck_uri_parse (const gchar *string, GckUriFlags flags, GError **error);
-                                        gchar *gcr_certificate_get_issuer_name (GcrCertificate *self);
-                                        gchar *gcr_certificate_get_subject_name (GcrCertificate *self);
-                                        GcrCertificate *gcr_simple_certificate_new (const guchar *data, gsize n_data);
-                                        ])],
-                                        have_gcr=yes,
-                                        have_gcr=no)
-                      AC_MSG_RESULT(${have_gcr})
-                      CFLAGS="$CFLAGS_SAVED",
-                      have_gcr=no);
-fi
-
-if (test "${have_gcr}" == "yes"); then
-     AC_DEFINE(WITH_GCR, 1, [Define if Gcr is available])
-else
-    if (test "${with_gcr}" == "yes"); then
-        AC_MSG_ERROR([gcr support was requested, but the gcr library is not available.])
-    fi
-    AC_DEFINE(WITH_GCR, 0, [Define if Gcr is available])
-fi
-AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" == "yes")
-
-dnl Check for gobject introspection
-GOBJECT_INTROSPECTION_CHECK([0.9.6])
-
-GLIB_CONFIG_NMA
-GLIB_GSETTINGS
-AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
-
-NM_COMPILER_WARNINGS([yes])
-NM_LTO
-NM_LD_GC
-
-
-AC_ARG_WITH(more-asserts,
-            AS_HELP_STRING([--with-more-asserts=level], [Enable more assertions for debugging (default: 0)]),
-            [more_asserts=${with_more_asserts}],
-            [more_asserts=no])
-if test "${more_asserts}" = "no"; then
-    more_asserts=0
-else
-    if test "${more_asserts}" = "yes"; then
-        more_asserts=100
-    fi
-fi
-AC_DEFINE_UNQUOTED(NM_MORE_ASSERTS, $more_asserts, [Define if more asserts are enabled])
-
-
-AC_CONFIG_FILES([
-Makefile
-src/libnm-gtk/libnm-gtk.pc
-src/libnma/libnma.pc
-po/Makefile.in
-man/nm-applet.1
-man/nm-connection-editor.1
-org.gnome.nm-applet.gschema.xml
-src/libnma/nma-version.h
-])
-AC_OUTPUT
-
-echo ""
-echo "  Build legacy library libnm-gtk: --with-libnm-gtk=${with_libnm_gtk}"
-echo "  GCR: --with-gcr=$have_gcr"
-echo "  LTO: --enable-lto=$enable_lto"
-echo "  Linker garbage collection: --enable-ld-gc=$enable_ld_gc"
-echo ""
diff --git a/m4/attributes.m4 b/m4/attributes.m4
deleted file mode 100644
index 51ac88be..00000000
--- a/m4/attributes.m4
+++ /dev/null
@@ -1,292 +0,0 @@
-dnl Macros to check the presence of generic (non-typed) symbols.
-dnl Copyright (c) 2006-2008 Diego Pettenò <flameeyes@gmail.com>
-dnl Copyright (c) 2006-2008 xine project
-dnl Copyright (c) 2012 Lucas De Marchi <lucas.de.marchi@gmail.com>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program 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
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-dnl 02110-1301, USA.
-dnl
-dnl As a special exception, the copyright owners of the
-dnl macro gives unlimited permission to copy, distribute and modify the
-dnl configure scripts that are the output of Autoconf when processing the
-dnl Macro. You need not follow the terms of the GNU General Public
-dnl License when using or distributing such scripts, even though portions
-dnl of the text of the Macro appear in them. The GNU General Public
-dnl License (GPL) does govern all other use of the material that
-dnl constitutes the Autoconf Macro.
-dnl
-dnl This special exception to the GPL applies to versions of the
-dnl Autoconf Macro released by this project. When you make and
-dnl distribute a modified version of the Autoconf Macro, you may extend
-dnl this special exception to the GPL to apply to your modified version as
-dnl well.
-
-dnl Check if FLAG in ENV-VAR is supported by compiler and append it
-dnl to WHERE-TO-APPEND variable. Note that we invert -Wno-* checks to
-dnl -W* as gcc cannot test for negated warnings. If a C snippet is passed,
-dnl use it, otherwise use a simple main() definition that just returns 0.
-dnl CC_CHECK_FLAG_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG], [C-SNIPPET])
-
-AC_DEFUN([CC_CHECK_FLAG_APPEND], [
-  AC_CACHE_CHECK([if $CC supports flag $3 in envvar $2],
-                 AS_TR_SH([cc_cv_$2_$3]),
-          [eval "AS_TR_SH([cc_save_$2])='${$2}'"
-           eval "AS_TR_SH([$2])='${cc_save_$2} -Werror `echo "$3" | sed 's/^-Wno-/-W/'`'"
-           AC_LINK_IFELSE([AC_LANG_SOURCE(ifelse([$4], [],
-                                                 [int main(void) { return 0; } ],
-                                                 [$4]))],
-                          [eval "AS_TR_SH([cc_cv_$2_$3])='yes'"],
-                          [eval "AS_TR_SH([cc_cv_$2_$3])='no'"])
-           eval "AS_TR_SH([$2])='$cc_save_$2'"])
-
-  AS_IF([eval test x$]AS_TR_SH([cc_cv_$2_$3])[ = xyes],
-        [eval "$1='${$1} $3'"])
-])
-
-dnl CC_CHECK_FLAGS_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG1 FLAG2], [C-SNIPPET])
-AC_DEFUN([CC_CHECK_FLAGS_APPEND], [
-  for flag in [$3]; do
-    CC_CHECK_FLAG_APPEND([$1], [$2], $flag, [$4])
-  done
-])
-
-dnl Check if the flag is supported by linker (cacheable)
-dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-
-AC_DEFUN([CC_CHECK_LDFLAGS], [
-  AC_CACHE_CHECK([if $CC supports $1 flag],
-    AS_TR_SH([cc_cv_ldflags_$1]),
-    [ac_save_LDFLAGS="$LDFLAGS"
-     LDFLAGS="$LDFLAGS $1"
-     AC_LINK_IFELSE([int main() { return 1; }],
-       [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"],
-       [eval "AS_TR_SH([cc_cv_ldflags_$1])="])
-     LDFLAGS="$ac_save_LDFLAGS"
-    ])
-
-  AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes],
-    [$2], [$3])
-])
-
-dnl define the LDFLAGS_NOUNDEFINED variable with the correct value for
-dnl the current linker to avoid undefined references in a shared object.
-AC_DEFUN([CC_NOUNDEFINED], [
-  dnl We check $host for which systems to enable this for.
-  AC_REQUIRE([AC_CANONICAL_HOST])
-
-  case $host in
-     dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads
-     dnl are requested, as different implementations are present; to avoid problems
-     dnl use -Wl,-z,defs only for those platform not behaving this way.
-     *-freebsd* | *-openbsd*) ;;
-     *)
-        dnl First of all check for the --no-undefined variant of GNU ld. This allows
-        dnl for a much more readable command line, so that people can understand what
-        dnl it does without going to look for what the heck -z defs does.
-        for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do
-           CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"])
-           break
-        done
-     ;;
-  esac
-
-  AC_SUBST([LDFLAGS_NOUNDEFINED])
-])
-
-dnl Check for a -Werror flag or equivalent. -Werror is the GCC
-dnl and ICC flag that tells the compiler to treat all the warnings
-dnl as fatal. We usually need this option to make sure that some
-dnl constructs (like attributes) are not simply ignored.
-dnl
-dnl Other compilers don't support -Werror per se, but they support
-dnl an equivalent flag:
-dnl  - Sun Studio compiler supports -errwarn=%all
-AC_DEFUN([CC_CHECK_WERROR], [
-  AC_CACHE_CHECK(
-    [for $CC way to treat warnings as errors],
-    [cc_cv_werror],
-    [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_werror=-Werror],
-      [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_werror=-errwarn=%all])])
-    ])
-])
-
-AC_DEFUN([CC_CHECK_ATTRIBUTE], [
-  AC_REQUIRE([CC_CHECK_WERROR])
-  AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))],
-    AS_TR_SH([cc_cv_attribute_$1]),
-    [ac_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $cc_cv_werror"
-     AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])],
-       [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"],
-       [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"])
-     CFLAGS="$ac_save_CFLAGS"
-    ])
-
-  AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes],
-    [AC_DEFINE(
-       AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1,
-         [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))]
-         )
-     $4],
-    [$5])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [
-  CC_CHECK_ATTRIBUTE(
-    [constructor],,
-    [void __attribute__((constructor)) ctor() { int a; }],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_FORMAT], [
-  CC_CHECK_ATTRIBUTE(
-    [format], [format(printf, n, n)],
-    [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [
-  CC_CHECK_ATTRIBUTE(
-    [format_arg], [format_arg(printf)],
-    [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [
-  CC_CHECK_ATTRIBUTE(
-    [visibility_$1], [visibility("$1")],
-    [void __attribute__((visibility("$1"))) $1_function() { }],
-    [$2], [$3])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_NONNULL], [
-  CC_CHECK_ATTRIBUTE(
-    [nonnull], [nonnull()],
-    [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_UNUSED], [
-  CC_CHECK_ATTRIBUTE(
-    [unused], ,
-    [void some_function(void *foo, __attribute__((unused)) void *bar);],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [
-  CC_CHECK_ATTRIBUTE(
-    [sentinel], ,
-    [void some_function(void *foo, ...) __attribute__((sentinel));],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [
-  CC_CHECK_ATTRIBUTE(
-    [deprecated], ,
-    [void some_function(void *foo, ...) __attribute__((deprecated));],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_ALIAS], [
-  CC_CHECK_ATTRIBUTE(
-    [alias], [weak, alias],
-    [void other_function(void *foo) { }
-     void some_function(void *foo) __attribute__((weak, alias("other_function")));],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_MALLOC], [
-  CC_CHECK_ATTRIBUTE(
-    [malloc], ,
-    [void * __attribute__((malloc)) my_alloc(int n);],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_PACKED], [
-  CC_CHECK_ATTRIBUTE(
-    [packed], ,
-    [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_CONST], [
-  CC_CHECK_ATTRIBUTE(
-    [const], ,
-    [int __attribute__((const)) twopow(int n) { return 1 << n; } ],
-    [$1], [$2])
-])
-
-AC_DEFUN([CC_FLAG_VISIBILITY], [
-  AC_REQUIRE([CC_CHECK_WERROR])
-  AC_CACHE_CHECK([if $CC supports -fvisibility=hidden],
-    [cc_cv_flag_visibility],
-    [cc_flag_visibility_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $cc_cv_werror"
-     CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden],
-     cc_cv_flag_visibility='yes',
-     cc_cv_flag_visibility='no')
-     CFLAGS="$cc_flag_visibility_save_CFLAGS"])
-
-  AS_IF([test "x$cc_cv_flag_visibility" = "xyes"],
-    [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1,
-       [Define this if the compiler supports the -fvisibility flag])
-     $1],
-    [$2])
-])
-
-AC_DEFUN([CC_FUNC_EXPECT], [
-  AC_REQUIRE([CC_CHECK_WERROR])
-  AC_CACHE_CHECK([if compiler has __builtin_expect function],
-    [cc_cv_func_expect],
-    [ac_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $cc_cv_werror"
-     AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-       [int some_function() {
-        int a = 3;
-        return (int)__builtin_expect(a, 3);
-     }])],
-       [cc_cv_func_expect=yes],
-       [cc_cv_func_expect=no])
-     CFLAGS="$ac_save_CFLAGS"
-    ])
-
-  AS_IF([test "x$cc_cv_func_expect" = "xyes"],
-    [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1,
-     [Define this if the compiler supports __builtin_expect() function])
-     $1],
-    [$2])
-])
-
-AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [
-  AC_REQUIRE([CC_CHECK_WERROR])
-  AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported],
-    [cc_cv_attribute_aligned],
-    [ac_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $cc_cv_werror"
-     for cc_attribute_align_try in 64 32 16 8 4 2; do
-        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-          int main() {
-            static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0;
-            return c;
-          }])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break])
-     done
-     CFLAGS="$ac_save_CFLAGS"
-  ])
-
-  if test "x$cc_cv_attribute_aligned" != "x"; then
-     AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned],
-       [Define the highest alignment supported])
-  fi
-])
diff --git a/m4/compiler_options.m4 b/m4/compiler_options.m4
deleted file mode 100644
index 5275281d..00000000
--- a/m4/compiler_options.m4
+++ /dev/null
@@ -1,158 +0,0 @@
-AC_DEFUN([_NM_COMPILER_FLAG], [
-	CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror $1"
-	AC_MSG_CHECKING([whether $1 works as expected])
-
-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [
-		AC_COMPILE_IFELSE([AC_LANG_SOURCE([[$2]])], [
-			AC_MSG_RESULT(yes)
-			CFLAGS="$CFLAGS_SAVED"
-			$3
-		],[
-			AC_MSG_RESULT(no)
-			CFLAGS="$CFLAGS_SAVED"
-			$4
-		])
-	],[
-		AC_MSG_RESULT(not supported)
-		CFLAGS="$CFLAGS_SAVED"
-	])
-])
-
-dnl Check whether a particular compiler flag is supported,
-dnl add it to CFLAGS if it is
-AC_DEFUN([NM_COMPILER_FLAG], [
-        _NM_COMPILER_FLAG([$1], [], [
-		CFLAGS="$CFLAGS $1"
-		$2
-	], [$3])
-])
-
-dnl Check whether a particular warning is not emitted with code provided,
-dnl disable it in CFLAGS if the check fails.
-AC_DEFUN([NM_COMPILER_WARNING], [
-        _NM_COMPILER_FLAG([-W$1], [$2], [CFLAGS="$CFLAGS -W$1"], [CFLAGS="$CFLAGS -Wno-$1"])
-])
-
-AC_DEFUN([NM_COMPILER_WARNINGS],
-[AC_ARG_ENABLE(more-warnings,
-	AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]),
-	set_more_warnings="$enableval",set_more_warnings=$1)
-AC_MSG_CHECKING(for more warnings)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-	AC_MSG_RESULT(yes)
-
-	dnl This is enabled in clang by default, makes little sense,
-	dnl and causes the build to abort with -Werror.
-	CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS -Qunused-arguments"
-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [], CFLAGS="$CFLAGS_SAVED")
-	unset CFLAGS_SAVED
-
-	dnl clang only warns about unknown warnings, unless
-	dnl called with "-Werror=unknown-warning-option"
-	dnl Test if the compiler supports that, and if it does
-	dnl attach it to the CFLAGS.
-	NM_COMPILER_WARNING([unknown-warning-option], [])
-
-	CFLAGS_MORE_WARNINGS="-Wall -std=gnu99"
-
-	if test "x$set_more_warnings" = xerror; then
-		CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror"
-	fi
-
-	for option in \
-		      -Wextra \
-		      -Wdeclaration-after-statement \
-		      -Wfloat-equal \
-		      -Wformat-nonliteral \
-		      -Wformat-security \
-		      -Wimplicit-fallthrough \
-		      -Wimplicit-function-declaration \
-		      -Winit-self \
-		      -Wmissing-declarations \
-		      -Wmissing-include-dirs \
-		      -Wmissing-prototypes \
-		      -Wpointer-arith \
-		      -Wshadow \
-		      -Wstrict-prototypes \
-		      -Wundef \
-		      -Wno-duplicate-decl-specifier \
-		      -Wno-format-truncation \
-		      -Wno-format-y2k \
-		      -Wno-missing-field-initializers \
-		      -Wno-pragmas \
-		      -Wno-sign-compare \
-		      -Wno-unused-but-set-variable \
-		      -Wno-unused-parameter \
-		      ; do
-		dnl GCC 4.4 does not warn when checking for -Wno-* flags (https://gcc.gnu.org/wiki/FAQ#wnowarning)
-                _NM_COMPILER_FLAG([$(printf '%s' "$option" | sed 's/^-Wno-/-W/')], [],
-		                  [CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option"], [])
-	done
-	unset option
-
-	dnl Disable warnings triggered by known compiler problems
-
-	dnl https://bugzilla.gnome.org/show_bug.cgi?id=745821
-	NM_COMPILER_WARNING([unknown-attributes], [#include <glib.h>])
-
-	dnl https://bugzilla.gnome.org/show_bug.cgi?id=744473
-	NM_COMPILER_WARNING([typedef-redefinition], [#include <gio/gio.h>])
-
-	dnl https://llvm.org/bugs/show_bug.cgi?id=21614
-	NM_COMPILER_WARNING([array-bounds],
-		[#include <string.h>]
-		[void f () { strcmp ("something", "0"); }]
-	)
-
-	dnl https://llvm.org/bugs/show_bug.cgi?id=22949
-	NM_COMPILER_WARNING([parentheses-equality],
-		[#include <sys/wait.h>]
-		[void f () { if (WIFCONTINUED(0)) return; }]
-	)
-
-	dnl systemd-dhcp's log_internal macro and our handle_warn are sometimes
-	dnl used in void context,u sometimes in int. Makes clang unhappy.
-	NM_COMPILER_WARNING([unused-value],
-		[#define yolo ({ (666 + 666); })]
-		[int f () { int i = yolo; yolo; return i; }]
-	)
-
-	CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS"
-else
-	AC_MSG_RESULT(no)
-fi
-])
-
-AC_DEFUN([NM_LTO],
-[AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]))
-if (test "${enable_lto}" = "yes"); then
-	CC_CHECK_FLAG_APPEND([lto_flags], [CFLAGS], [-flto])
-	if (test -n "${lto_flags}"); then
-		CFLAGS="-flto $CFLAGS"
-	else
-		AC_MSG_ERROR([Link Time Optimization -flto is not supported.])
-	fi
-else
-	enable_lto='no'
-fi
-])
-
-AC_DEFUN([NM_LD_GC],
-[AC_ARG_ENABLE(ld-gc, AS_HELP_STRING([--enable-ld-gc], [Enable garbage collection of unused symbols on linking (default: auto)]))
-if (test "${enable_ld_gc}" != "no"); then
-	CC_CHECK_FLAG_APPEND([ld_gc_flags], [CFLAGS], [-fdata-sections -ffunction-sections -Wl,--gc-sections])
-	if (test -n "${ld_gc_flags}"); then
-		enable_ld_gc="yes"
-		CFLAGS="$ld_gc_flags $CFLAGS"
-	else
-		if (test "${enable_ld_gc}" = "yes"); then
-			AC_MSG_ERROR([Unused symbol eviction requested but not supported.])
-		else
-			enable_ld_gc="no"
-		fi
-	fi
-fi
-])
-
diff --git a/m4/git-sha-record.m4 b/m4/git-sha-record.m4
deleted file mode 100644
index e259b39f..00000000
--- a/m4/git-sha-record.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-dnl GIT_SHA_RECORD($1, $2)
-dnl
-dnl $1: the name of the assigned variable. For example NM_GIT_SHA,
-dnl     NMA_GIT_SHA, LIBNL_GIT_SHA.
-dnl $2: by default, a define to config.h is added. This can be
-dnl     suppressed by passing "no-config-h".
-dnl
-AC_DEFUN([GIT_SHA_RECORD], [
-    m4_define([git_sha_record_v],
-              [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
-$1=git_sha_record_v
-if test ""$2"" != "no-config-h" ; then
-    AC_DEFINE_UNQUOTED($1,"$$1",[git commit id of the original source code version])
-fi
-])
diff --git a/m4/glib-makefile.m4 b/m4/glib-makefile.m4
deleted file mode 100644
index e9c534af..00000000
--- a/m4/glib-makefile.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-dnl GLIB_CONFIG([MINIMUM-VERSION, [, MODULES]])
-dnl Test for GLIB (and error out if it's not available). Define
-dnl GLIB_CFLAGS and GLIB_LIBS, GLIB_MAKEFILE, and variables for
-dnl various glib developer tools (eg, GLIB_GENMARSHAL). If
-dnl gmodule, gobject, or gio is specified in MODULES, pass to
-dnl pkg-config
-dnl
-AC_DEFUN([GLIB_CONFIG_NMA],
-[dnl
-  min_glib_version=ifelse([$1], ,2.26.0,$1)
-  pkg_config_args=
-  for module in glib $2; do
-    pkg_config_args="$pkg_config_args $module-2.0 >= $min_glib_version"
-  done
-
-  PKG_CHECK_MODULES(GLIB, $pkg_config_args)
-
-  GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-
-  GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-  GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
-  #GLIB_MAKEFILE=`$PKG_CONFIG --variable=glib_makefile glib-2.0`
-  GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GLIB_MKENUMS)
-  AC_SUBST(GLIB_MAKEFILE)
-
-  GLIB_GSETTINGS
-])
diff --git a/m4/introspection.m4 b/m4/introspection.m4
deleted file mode 100644
index 1dc1556d..00000000
--- a/m4/introspection.m4
+++ /dev/null
@@ -1,96 +0,0 @@
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=auto])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-	dnl Canonicalize enable_introspection
-	enable_introspection=$found_introspection
-    ],dnl
-    [dnl	
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER, 'CFLAGS="${CFLAGS} -Wno-error" '"$INTROSPECTION_SCANNER")
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])
diff --git a/src/libnm-gtk/libnm-gtk.pc.in b/src/libnm-gtk/libnm-gtk.pc.in
deleted file mode 100644
index cd2abda3..00000000
--- a/src/libnm-gtk/libnm-gtk.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-libdir=@libdir@
-nmversion=0.9.10
-
-Name: libnm-gtk
-Description: NetworkManager UI utilities (libnm-glib version)
-Version: @PACKAGE_VERSION@
-Requires: NetworkManager >= ${nmversion} libnm-util >= ${nmversion} libnm-glib >= ${nmversion} gtk+-3.0 >= 3.4
-Cflags: -I${includedir}/libnm-gtk
-Libs: -L${libdir} -lnm-gtk
diff --git a/src/libnma/libnma.pc.in b/src/libnma/libnma.pc.in
deleted file mode 100644
index 9e6f905d..00000000
--- a/src/libnma/libnma.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-libdir=@libdir@
-
-Name: libnma
-Description: NetworkManager UI utilities (libnm version)
-Version: @PACKAGE_VERSION@
-Requires: libnm
-Cflags: -I${includedir}/libnma
-Libs: -L${libdir} -lnma