about summary refs log tree commit diff
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in2583
1 files changed, 1347 insertions, 1236 deletions
diff --git a/Makefile.in b/Makefile.in
index 45c5b28d..a00210be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,15 +134,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = $(am__EXEEXT_17)
-check_PROGRAMS = $(am__EXEEXT_16)
+noinst_PROGRAMS = $(am__EXEEXT_16)
+check_PROGRAMS = $(am__EXEEXT_15)
 sbin_PROGRAMS = src/NetworkManager$(EXEEXT)
 bin_PROGRAMS = clients/nm-online$(EXEEXT) $(am__EXEEXT_1) \
 	$(am__EXEEXT_2)
 libexec_PROGRAMS = src/nm-iface-helper$(EXEEXT) \
 	src/dhcp/nm-dhcp-helper$(EXEEXT) \
 	dispatcher/nm-dispatcher$(EXEEXT)
-TESTS = $(am__EXEEXT_12)
+TESTS = $(am__EXEEXT_11)
 @HAVE_DOCS_TRUE@am__append_1 = \
 @HAVE_DOCS_TRUE@	docs/libnm \
 @HAVE_DOCS_TRUE@	docs/api
@@ -156,29 +156,31 @@ TESTS = $(am__EXEEXT_12)
 
 ###############################################################################
 @WITH_LEGACY_LIBRARIES_TRUE@am__append_5 = NetworkManager.pc
-@WITH_JANSSON_TRUE@am__append_6 = \
-@WITH_JANSSON_TRUE@	libnm-core/nm-json.h
+@WITH_JSON_VALIDATION_TRUE@am__append_6 = \
+@WITH_JSON_VALIDATION_TRUE@	libnm-core/nm-json.h
 
-@WITH_JANSSON_TRUE@am__append_7 = \
-@WITH_JANSSON_TRUE@	libnm-core/nm-json.c
+@WITH_JSON_VALIDATION_TRUE@am__append_7 = \
+@WITH_JSON_VALIDATION_TRUE@	libnm-core/nm-json.c
 
-@WITH_JANSSON_TRUE@am__append_8 = $(JANSSON_CFLAGS)
-@WITH_GNUTLS_TRUE@am__append_9 = $(GNUTLS_CFLAGS)
-@WITH_NSS_TRUE@am__append_10 = $(NSS_CFLAGS)
+@WITH_GNUTLS_TRUE@am__append_8 = $(GNUTLS_CFLAGS)
+@WITH_NSS_TRUE@am__append_9 = $(NSS_CFLAGS)
+@WITH_JSON_VALIDATION_TRUE@am__append_10 = $(JANSSON_CFLAGS)
 @WITH_GNUTLS_TRUE@am__append_11 = libnm-core/crypto_gnutls.c
 @WITH_GNUTLS_TRUE@am__append_12 = $(GNUTLS_LIBS)
 @WITH_NSS_TRUE@am__append_13 = libnm-core/crypto_nss.c
 @WITH_NSS_TRUE@am__append_14 = $(NSS_LIBS)
 @HAVE_INTROSPECTION_TRUE@am__append_15 = libnm/NM-1.0.gir
-@HAVE_INTROSPECTION_TRUE@am__append_16 = $(libnm_noinst_data)
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@am__append_16 = \
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/typelibs.c \
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/NMClient.typelib \
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/NetworkManager.typelib
+
 @HAVE_INTROSPECTION_TRUE@am__append_17 = $(libnm_noinst_data)
-@WITH_WEXT_TRUE@am__append_18 = \
+@HAVE_INTROSPECTION_TRUE@am__append_18 = $(libnm_noinst_data)
+@WITH_WEXT_TRUE@am__append_19 = \
 @WITH_WEXT_TRUE@	src/platform/wifi/wifi-utils-wext.c \
 @WITH_WEXT_TRUE@	src/platform/wifi/wifi-utils-wext.h
 
-@WITH_CONCHECK_TRUE@am__append_19 = \
-@WITH_CONCHECK_TRUE@	src/nm-connectivity.c
-
 @REQUIRE_ROOT_TESTS_TRUE@am__append_20 = -DREQUIRE_ROOT_TESTS=1
 
 ###############################################################################
@@ -236,126 +238,131 @@ TESTS = $(am__EXEEXT_12)
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_37 = src/settings/plugins/ifupdown/tests/test-ifupdown
 
 ###############################################################################
-# src/settings/plugins/ifnet
-###############################################################################
-@CONFIG_PLUGIN_IFNET_TRUE@am__append_38 = src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la
-@CONFIG_PLUGIN_IFNET_TRUE@am__append_39 = src/settings/plugins/ifnet/libnms-ifnet-core.la
-@CONFIG_PLUGIN_IFNET_TRUE@am__append_40 = check-local-symbols-settings-ifnet
-
-###############################################################################
-@CONFIG_PLUGIN_IFNET_TRUE@am__append_41 = src/settings/plugins/ifnet/tests/test-ifnet
-
-###############################################################################
 # src/devices/bluetooth
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@am__append_42 =  \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_38 =  \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-device-plugin-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm-device-plugin-bluetooth.la
-@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_43 = \
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_39 = \
 @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@	src/devices/wwan/nm-modem-ofono.c \
 @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@	src/devices/wwan/nm-modem-ofono.h
 
-@WITH_MODEM_MANAGER_1_TRUE@am__append_44 = check-local-devices-wwan \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = check-local-devices-wwan \
 @WITH_MODEM_MANAGER_1_TRUE@	check-local-devices-bluetooth
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_45 = $(BLUEZ5_CFLAGS)
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_46 = \
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_41 = $(BLUEZ5_CFLAGS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = \
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bluez5-dun.c \
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bluez5-dun.h
 
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_47 = $(BLUEZ5_LIBS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = $(BLUEZ5_LIBS)
 
 ###############################################################################
 # src/devices/wifi
 ###############################################################################
-@WITH_WIFI_TRUE@am__append_48 = src/devices/wifi/libnm-device-plugin-wifi.la
-@WITH_WIFI_TRUE@am__append_49 = check-local-devices-wifi
-@WITH_WIFI_TRUE@am__append_50 = src/devices/wifi/tests/test-general
+@WITH_WIFI_TRUE@am__append_44 = src/devices/wifi/libnm-device-plugin-wifi.la
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_45 = \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-iwd.c \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-iwd.h \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-iwd-manager.c \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-iwd-manager.h
+
+@WITH_WIFI_TRUE@am__append_46 = check-local-devices-wifi
+@WITH_WIFI_TRUE@am__append_47 = src/devices/wifi/tests/test-general
 
 ###############################################################################
 # src/devices/team
 ###############################################################################
-@WITH_TEAMDCTL_TRUE@am__append_51 = src/devices/team/libnm-device-plugin-team.la
-@WITH_TEAMDCTL_TRUE@am__append_52 = check-local-devices-team
-@WITH_OPENVSWITCH_TRUE@am__append_53 = src/devices/ovs/libnm-device-plugin-ovs.la
-@HAVE_INTROSPECTION_TRUE@am__append_54 = $(clients_common_settings_doc_c)
-@HAVE_INTROSPECTION_TRUE@am__append_55 = check-local-settings-docs
-@HAVE_INTROSPECTION_TRUE@am__append_56 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_FALSE@am__append_57 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_TRUE@am__append_58 = clients/common/tests/test-general
-@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_59 = clients/common/tests/test-general
+@WITH_TEAMDCTL_TRUE@am__append_48 = src/devices/team/libnm-device-plugin-team.la
+@WITH_TEAMDCTL_TRUE@am__append_49 = check-local-devices-team
+@WITH_OPENVSWITCH_TRUE@am__append_50 = src/devices/ovs/libnm-device-plugin-ovs.la
+@HAVE_INTROSPECTION_TRUE@am__append_51 = $(clients_common_settings_doc_h)
+@HAVE_INTROSPECTION_TRUE@am__append_52 = check-local-settings-docs
+@HAVE_INTROSPECTION_TRUE@am__append_53 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_FALSE@am__append_54 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_TRUE@am__append_55 = clients/common/tests/test-general
+@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_56 = clients/common/tests/test-general
 
 ###############################################################################
 # clients/cli
 ###############################################################################
-@BUILD_NMCLI_TRUE@am__append_60 = clients/cli/nmcli
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_61 = $(POLKIT_CFLAGS)
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_62 = \
+@BUILD_NMCLI_TRUE@am__append_57 = clients/cli/nmcli
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_58 = $(POLKIT_CFLAGS)
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_59 = \
 @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@	clients/common/nm-polkit-listener.c \
 @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@	clients/common/nm-polkit-listener.h
 
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_63 = $(POLKIT_LIBS)
-@BUILD_NMCLI_TRUE@am__append_64 = install-data-hook-nmcli
-@BUILD_NMCLI_TRUE@am__append_65 = uninstall-hook-nmcli
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_60 = $(POLKIT_LIBS)
+@BUILD_NMCLI_TRUE@am__append_61 = install-data-hook-nmcli
+@BUILD_NMCLI_TRUE@am__append_62 = uninstall-hook-nmcli
 
 ###############################################################################
 # clients/tui
 ###############################################################################
-@BUILD_NMTUI_TRUE@am__append_66 = clients/tui/newt/libnmt-newt.a
-@BUILD_NMTUI_TRUE@am__append_67 = clients/tui/nmtui
-@BUILD_NMTUI_TRUE@am__append_68 = install-exec-hook-nmtui
-@BUILD_NMTUI_TRUE@am__append_69 = uninstall-hook-nmtui
-@HAVE_SYSTEMD_TRUE@am__append_70 = data/org.freedesktop.NetworkManager.service
+@BUILD_NMTUI_TRUE@am__append_63 = clients/tui/newt/libnmt-newt.a
+@BUILD_NMTUI_TRUE@am__append_64 = clients/tui/nmtui
+@BUILD_NMTUI_TRUE@am__append_65 = install-exec-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_66 = uninstall-hook-nmtui
+@HAVE_SYSTEMD_TRUE@am__append_67 = data/org.freedesktop.NetworkManager.service
 
 ###############################################################################
 # libnm-util
 ###############################################################################
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = libnm-util/libnm-util.la \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_68 = libnm-util/libnm-util.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 =  \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_69 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_pub_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_c_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_h_pub_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_c_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_h_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_c_mkenums)
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = $(GNUTLS_CFLAGS)
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_74 = libnm-util/crypto_gnutls.c
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_75 = $(GNUTLS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_76 = $(NSS_CFLAGS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_77 = libnm-util/crypto_nss.c
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_78 = $(NSS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 =  \
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_70 = $(GNUTLS_CFLAGS)
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = libnm-util/crypto_gnutls.c
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = $(GNUTLS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_73 = $(NSS_CFLAGS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_74 = libnm-util/crypto_nss.c
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_75 = $(NSS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_76 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto_gnutls.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto_nss.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/COPYING \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.pc.in \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.ver \
+@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.c.template \
+@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.h.template \
+@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/meson.build \
+@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/meson.build \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc.in \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.pc.in \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.ver \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.ver
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 = libnm-util/libtest-crypto.la
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_81 = libnm-util/crypto_gnutls.c
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = $(GNUTLS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_83 = libnm-util/crypto_nss.c
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_84 = $(NSS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 = libnm-util/libnm-util.pc \
+@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.ver \
+@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-enum-types.c.template \
+@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-enum-types.h.template \
+@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-glib-enum-types.c.template \
+@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-glib-enum-types.h.template \
+@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/meson.build
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 = libnm-util/libtest-crypto.la
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_78 = libnm-util/crypto_gnutls.c
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = $(GNUTLS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_80 = libnm-util/crypto_nss.c
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_81 = $(NSS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = libnm-util/libnm-util.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.pc
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 = libnm-util/libnm-util.pc \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/libnm-util.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/NetworkManager-1.0.gir \
+@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = libnm-util/NetworkManager-1.0.gir \
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/NMClient-1.0.gir
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 =  \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	check-local-exports-libnm-util \
 @WITH_LEGACY_LIBRARIES_TRUE@	check-local-exports-libnm-glib
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-util/libnm-util.la \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 = libnm-util/libnm-util.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = libnm-util/tests/test-settings-defaults \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/tests/test-settings-defaults \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-crypto \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-secrets \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-general \
@@ -363,53 +370,53 @@ TESTS = $(am__EXEEXT_12)
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-dcb \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-nm-client \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-remote-settings-client
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = libnm-util/tests/test-libnm-linking \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = libnm-util/tests/test-libnm-linking \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-test
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = libnm-glib/libdeprecated-nm-glib.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-glib/libdeprecated-nm-glib.la
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-plugin-glue.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-secret-agent-glue.h
 
-@HAVE_INTROSPECTION_TRUE@am__append_94 = $(man_nm_settings_xml)
-@WITH_OPENVSWITCH_TRUE@am__append_95 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_96 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_97 = man/nm-openvswitch.7
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_98 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_99 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_100 = man/nm-settings-ifcfg-rh.5
-@HAVE_DOCS_TRUE@am__append_101 = install-data-hook-man
-@HAVE_DOCS_TRUE@am__append_102 = uninstall-hook-man
-@HAVE_DOCS_TRUE@am__append_103 = $(man_pages) $(man_pages_autogen)
-@BUILD_DOCS_TRUE@am__append_104 = $(man_pages) $(man_pages_autogen)
+@HAVE_INTROSPECTION_TRUE@am__append_91 = $(man_nm_settings_xml)
+@WITH_OPENVSWITCH_TRUE@am__append_92 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_93 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_94 = man/nm-openvswitch.7
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_95 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_96 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_97 = man/nm-settings-ifcfg-rh.5
+@HAVE_DOCS_TRUE@am__append_98 = install-data-hook-man
+@HAVE_DOCS_TRUE@am__append_99 = uninstall-hook-man
+@HAVE_DOCS_TRUE@am__append_100 = $(man_pages) $(man_pages_autogen)
+@BUILD_DOCS_TRUE@am__append_101 = $(man_pages) $(man_pages_autogen)
 
 ###############################################################################
 # vapi
 ###############################################################################
-@ENABLE_VAPIGEN_TRUE@am__append_105 = \
+@ENABLE_VAPIGEN_TRUE@am__append_102 = \
 @ENABLE_VAPIGEN_TRUE@	vapi/libnm.vapi
 
-@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_106 = \
+@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_103 = \
 @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	vapi/libnm-util.vapi \
 @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	vapi/libnm-glib.vapi
 
-@ENABLE_VAPIGEN_TRUE@am__append_107 = \
+@ENABLE_VAPIGEN_TRUE@am__append_104 = \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS) \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS:.vapi=.deps)
 
-@ENABLE_VAPIGEN_TRUE@am__append_108 = $(VAPIGEN_VAPIS)
+@ENABLE_VAPIGEN_TRUE@am__append_105 = $(VAPIGEN_VAPIS)
 
 ###############################################################################
-@ENABLE_TESTS_TRUE@am__append_109 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_TRUE@am__append_110 = $(check_ltlibraries)
-@ENABLE_TESTS_FALSE@am__append_111 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_FALSE@am__append_112 = $(check_ltlibraries)
-@WITH_QT_TRUE@am__append_113 = \
+@ENABLE_TESTS_TRUE@am__append_106 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_TRUE@am__append_107 = $(check_ltlibraries)
+@ENABLE_TESTS_FALSE@am__append_108 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_FALSE@am__append_109 = $(check_ltlibraries)
+@WITH_QT_TRUE@am__append_110 = \
 @WITH_QT_TRUE@	examples/C/qt/add-connection-wired \
 @WITH_QT_TRUE@	examples/C/qt/list-connections \
 @WITH_QT_TRUE@	examples/C/qt/change-ipv4-addresses \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running
 
-@WITH_QT_TRUE@am__append_114 = \
+@WITH_QT_TRUE@am__append_111 = \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running.moc
 
 subdir = .
@@ -576,7 +583,6 @@ am_clients_common_libnmc_base_la_OBJECTS = shared/nm-utils/clients_common_libnmc
 	shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo \
 	shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo \
 	shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo \
-	shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo \
 	clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo \
 	clients/common/clients_common_libnmc_base_la-nm-vpn-helpers.lo \
 	clients/common/clients_common_libnmc_base_la-nm-client-utils.lo
@@ -703,18 +709,7 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-keyfile-internal.h libnm-core/nm-keyfile-utils.h \
 	libnm-core/nm-property-compare.h \
 	libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \
-	libnm-core/nm-json.h shared/nm-utils/c-list-util.c \
-	shared/nm-utils/nm-dedup-multi.c \
-	shared/nm-utils/nm-enum-utils.c \
-	shared/nm-utils/nm-hash-utils.c \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-random-utils.c \
-	shared/nm-utils/nm-udev-utils.c shared/nm-utils/siphash24.c \
-	shared/nm-meta-setting.c libnm-core/crypto.c \
-	libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \
-	libnm-core/nm-errors.c libnm-core/nm-keyfile-reader.c \
-	libnm-core/nm-keyfile-utils.c libnm-core/nm-keyfile-writer.c \
-	libnm-core/nm-property-compare.c libnm-core/nm-setting-8021x.c \
+	libnm-core/nm-json.h libnm-core/nm-setting-8021x.c \
 	libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c \
 	libnm-core/nm-setting-bond.c \
 	libnm-core/nm-setting-bridge-port.c \
@@ -741,34 +736,24 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wimax.c \
 	libnm-core/nm-setting-wired.c \
 	libnm-core/nm-setting-wireless-security.c \
-	libnm-core/nm-setting-wireless.c libnm-core/nm-setting.c \
+	libnm-core/nm-setting-wireless.c shared/nm-utils/c-list-util.c \
+	shared/nm-utils/nm-dedup-multi.c \
+	shared/nm-utils/nm-enum-utils.c \
+	shared/nm-utils/nm-hash-utils.c \
+	shared/nm-utils/nm-shared-utils.c \
+	shared/nm-utils/nm-random-utils.c \
+	shared/nm-utils/nm-udev-utils.c shared/nm-meta-setting.c \
+	libnm-core/crypto.c libnm-core/nm-connection.c \
+	libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \
+	libnm-core/nm-keyfile.c libnm-core/nm-keyfile-utils.c \
+	libnm-core/nm-property-compare.c libnm-core/nm-setting.c \
 	libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \
 	libnm-core/nm-vpn-editor-plugin.c \
 	libnm-core/nm-vpn-plugin-info.c libnm-core/nm-json.c \
 	libnm-core/crypto_gnutls.c libnm-core/crypto_nss.c
 am__objects_2 =
 am__objects_3 = $(am__objects_2)
-@WITH_JANSSON_TRUE@am__objects_4 = libnm-core/libnm_core_libnm_core_la-nm-json.lo
-@WITH_GNUTLS_TRUE@am__objects_5 = libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo
-@WITH_NSS_TRUE@am__objects_6 = libnm-core/libnm_core_libnm_core_la-crypto_nss.lo
-am__objects_7 =  \
-	shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo \
-	shared/libnm_core_libnm_core_la-nm-meta-setting.lo \
-	libnm-core/libnm_core_libnm_core_la-crypto.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-connection.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-errors.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo \
+am__objects_4 =  \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-adsl.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-bluetooth.lo \
@@ -808,19 +793,38 @@ am__objects_7 =  \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-wimax.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-wired.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-wireless-security.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo
+@WITH_JSON_VALIDATION_TRUE@am__objects_5 = libnm-core/libnm_core_libnm_core_la-nm-json.lo
+@WITH_GNUTLS_TRUE@am__objects_6 = libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo
+@WITH_NSS_TRUE@am__objects_7 = libnm-core/libnm_core_libnm_core_la-crypto_nss.lo
+am__objects_8 = $(am__objects_4) \
+	shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo \
+	shared/libnm_core_libnm_core_la-nm-meta-setting.lo \
+	libnm-core/libnm_core_libnm_core_la-crypto.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-connection.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-errors.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-simple-connection.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-utils.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-vpn-editor-plugin.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-vpn-plugin-info.lo \
-	$(am__objects_4) $(am__objects_5) $(am__objects_6)
+	$(am__objects_5) $(am__objects_6) $(am__objects_7)
 am_libnm_core_libnm_core_la_OBJECTS = $(am__objects_2) \
-	$(am__objects_3) $(am__objects_7)
-am__objects_8 =  \
+	$(am__objects_3) $(am__objects_8)
+am__objects_9 =  \
 	libnm-core/libnm_core_libnm_core_la-nm-core-enum-types.lo
 nodist_libnm_core_libnm_core_la_OBJECTS = $(am__objects_2) \
-	$(am__objects_8)
+	$(am__objects_9)
 libnm_core_libnm_core_la_OBJECTS =  \
 	$(am_libnm_core_libnm_core_la_OBJECTS) \
 	$(nodist_libnm_core_libnm_core_la_OBJECTS)
@@ -845,14 +849,14 @@ am__libnm_glib_libnm_glib_vpn_la_SOURCES_DIST =  \
 	libnm-glib/nm-vpn-plugin.c \
 	libnm-glib/nm-vpn-plugin-ui-interface.c \
 	libnm-glib/nm-vpn-plugin-utils.c
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_9 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin.lo \
+@WITH_LEGACY_LIBRARIES_TRUE@am__objects_10 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin-utils.lo
 @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_vpn_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_9)
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_10 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo
-@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_10)
+@WITH_LEGACY_LIBRARIES_TRUE@am__objects_11 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo
+@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS =  \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_11)
 libnm_glib_libnm_glib_vpn_la_OBJECTS =  \
 	$(am_libnm_glib_libnm_glib_vpn_la_OBJECTS) \
 	$(nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS)
@@ -904,7 +908,7 @@ am__libnm_glib_libnm_glib_la_SOURCES_DIST =  \
 	libnm-glib/nm-object-cache.h \
 	libnm-glib/nm-remote-connection-private.h \
 	libnm-glib/nm-dbus-helpers-private.h
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_11 = shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo \
+@WITH_LEGACY_LIBRARIES_TRUE@am__objects_12 = shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_libnm_glib_la-nm-object.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_libnm_glib_la-nm-dbus-helpers.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_libnm_glib_la-nm-client.lo \
@@ -936,11 +940,11 @@ am__libnm_glib_libnm_glib_la_SOURCES_DIST =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_libnm_glib_la-nm-device-wimax.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_libnm_glib_la-nm-wimax-nsp.lo
 @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_11) $(am__objects_2) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_12) $(am__objects_2) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_2)
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_12 = libnm-glib/libnm_glib_libnm_glib_la-nm-glib-enum-types.lo
+@WITH_LEGACY_LIBRARIES_TRUE@am__objects_13 = libnm-glib/libnm_glib_libnm_glib_la-nm-glib-enum-types.lo
 @WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_12) $(am__objects_2)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_13) $(am__objects_2)
 libnm_glib_libnm_glib_la_OBJECTS =  \
 	$(am_libnm_glib_libnm_glib_la_OBJECTS) \
 	$(nodist_libnm_glib_libnm_glib_la_OBJECTS)
@@ -1005,9 +1009,9 @@ am__libnm_util_libnm_util_la_SOURCES_DIST =  \
 	libnm-util/nm-gvaluearray-compat.h \
 	libnm-util/nm-param-spec-specialized.h \
 	libnm-util/nm-setting-private.h libnm-util/nm-utils-private.h
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_13 = libnm-util/libnm_util_libnm_util_la-crypto_gnutls.lo
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_14 = libnm-util/libnm_util_libnm_util_la-crypto_nss.lo
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_15 = shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo \
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_14 = libnm-util/libnm_util_libnm_util_la-crypto_gnutls.lo
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_15 = libnm-util/libnm_util_libnm_util_la-crypto_nss.lo
+@WITH_LEGACY_LIBRARIES_TRUE@am__objects_16 = shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_libnm_util_la-crypto.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_libnm_util_la-nm-connection.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_libnm_util_la-nm-param-spec-specialized.lo \
@@ -1040,14 +1044,14 @@ am__libnm_util_libnm_util_la_SOURCES_DIST =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_libnm_util_la-nm-setting-vpn.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_libnm_util_la-nm-utils.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_libnm_util_la-nm-value-transforms.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_13) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_14)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_14) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_15)
 @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libnm_util_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_15) $(am__objects_2) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_16) $(am__objects_2) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_2)
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_16 = libnm-util/libnm_util_libnm_util_la-nm-utils-enum-types.lo
+@WITH_LEGACY_LIBRARIES_TRUE@am__objects_17 = libnm-util/libnm_util_libnm_util_la-nm-utils-enum-types.lo
 @WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_util_libnm_util_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_2) $(am__objects_16)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_2) $(am__objects_17)
 libnm_util_libnm_util_la_OBJECTS =  \
 	$(am_libnm_util_libnm_util_la_OBJECTS) \
 	$(nodist_libnm_util_libnm_util_la_OBJECTS)
@@ -1063,11 +1067,11 @@ libnm_util_libnm_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_5)
 am__libnm_util_libtest_crypto_la_SOURCES_DIST = libnm-util/crypto.c \
 	libnm-util/crypto_gnutls.c libnm-util/crypto_nss.c
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_17 = libnm-util/libnm_util_libtest_crypto_la-crypto_gnutls.lo
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_18 = libnm-util/libnm_util_libtest_crypto_la-crypto_nss.lo
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_18 = libnm-util/libnm_util_libtest_crypto_la-crypto_gnutls.lo
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_19 = libnm-util/libnm_util_libtest_crypto_la-crypto_nss.lo
 @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_OBJECTS = libnm-util/libnm_util_libtest_crypto_la-crypto.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_17) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_18)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_18) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_19)
 libnm_util_libtest_crypto_la_OBJECTS =  \
 	$(am_libnm_util_libtest_crypto_la_OBJECTS)
 @ENABLE_TESTS_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_rpath =
@@ -1076,12 +1080,15 @@ libnm_libnm_utils_la_DEPENDENCIES = libnm-core/libnm-core.la \
 	introspection/libnmdbus.la $(am__DEPENDENCIES_1)
 am_libnm_libnm_utils_la_OBJECTS =  \
 	libnm/libnm_libnm_utils_la-nm-libnm-utils.lo
-libnm_libnm_utils_la_OBJECTS = $(am_libnm_libnm_utils_la_OBJECTS)
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@nodist_libnm_libnm_utils_la_OBJECTS = libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo
+libnm_libnm_utils_la_OBJECTS = $(am_libnm_libnm_utils_la_OBJECTS) \
+	$(nodist_libnm_libnm_utils_la_OBJECTS)
 libnm_libnm_la_DEPENDENCIES = libnm/libnm-utils.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__objects_19 = libnm/libnm_libnm_la-nm-access-point.lo \
+am__objects_20 = libnm/libnm_libnm_la-nm-access-point.lo \
 	libnm/libnm_libnm_la-nm-active-connection.lo \
+	libnm/libnm_libnm_la-nm-checkpoint.lo \
 	libnm/libnm_libnm_la-nm-client.lo \
 	libnm/libnm_libnm_la-nm-dbus-helpers.lo \
 	libnm/libnm_libnm_la-nm-device-adsl.lo \
@@ -1126,9 +1133,9 @@ am__objects_19 = libnm/libnm_libnm_la-nm-access-point.lo \
 	libnm/libnm_libnm_la-nm-vpn-service-plugin.lo \
 	libnm/libnm_libnm_la-nm-wimax-nsp.lo
 am_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_2) \
-	$(am__objects_2) $(am__objects_19)
-am__objects_20 = libnm/libnm_libnm_la-nm-enum-types.lo
-nodist_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_20)
+	$(am__objects_20)
+am__objects_21 = libnm/libnm_libnm_la-nm-enum-types.lo
+nodist_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_21)
 libnm_libnm_la_OBJECTS = $(am_libnm_libnm_la_OBJECTS) \
 	$(nodist_libnm_libnm_la_OBJECTS)
 libnm_libnm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1147,8 +1154,20 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_LINK = $(LIBTOOL) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 @ENABLE_TESTS_FALSE@am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath =
 @ENABLE_TESTS_TRUE@am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath =
+shared_libcsiphash_la_LIBADD =
+am_shared_libcsiphash_la_OBJECTS =  \
+	shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo
+shared_libcsiphash_la_OBJECTS = $(am_shared_libcsiphash_la_OBJECTS)
+shared_libnacd_la_LIBADD =
+am_shared_libnacd_la_OBJECTS =  \
+	shared/n-acd/src/shared_libnacd_la-n-acd.lo
+shared_libnacd_la_OBJECTS = $(am_shared_libnacd_la_OBJECTS)
+shared_libnacd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(shared_libnacd_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES =  \
-	introspection/libnmdbus.la $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am_src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS = src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo \
 	src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-device-adsl.lo
 src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS =  \
@@ -1160,7 +1179,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LINK = $(LIBTOOL) \
 	$(LDFLAGS) -o $@
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES =  \
-@WITH_MODEM_MANAGER_1_TRUE@	introspection/libnmdbus.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_6)
@@ -1181,7 +1199,7 @@ am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST =  \
 	src/devices/bluetooth/nm-device-bt.h \
 	src/devices/bluetooth/nm-bluez5-dun.c \
 	src/devices/bluetooth/nm-bluez5-dun.h
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_21 = src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_22 = src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo
 @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez-device.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez4-adapter.lo \
@@ -1189,7 +1207,7 @@ am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST =  \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-manager.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bt-error.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-device-bt.lo \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_21)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_22)
 src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = $(am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS)
 src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK =  \
 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -1199,7 +1217,6 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK =  \
 @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_rpath =  \
 @WITH_MODEM_MANAGER_1_TRUE@	-rpath $(pkglibdir)
 @WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES =  \
-@WITH_OPENVSWITCH_TRUE@	introspection/libnmdbus.la \
 @WITH_OPENVSWITCH_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_OPENVSWITCH_TRUE@	$(am__DEPENDENCIES_1)
 am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST =  \
@@ -1226,7 +1243,6 @@ src_devices_ovs_libnm_device_plugin_ovs_la_LINK = $(LIBTOOL) \
 @WITH_OPENVSWITCH_TRUE@am_src_devices_ovs_libnm_device_plugin_ovs_la_rpath =  \
 @WITH_OPENVSWITCH_TRUE@	-rpath $(pkglibdir)
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_DEPENDENCIES =  \
-@WITH_TEAMDCTL_TRUE@	introspection/libnmdbus.la \
 @WITH_TEAMDCTL_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_TEAMDCTL_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_TEAMDCTL_TRUE@	$(am__DEPENDENCIES_1)
@@ -1246,7 +1262,6 @@ src_devices_team_libnm_device_plugin_team_la_LINK = $(LIBTOOL) \
 @WITH_TEAMDCTL_TRUE@am_src_devices_team_libnm_device_plugin_team_la_rpath =  \
 @WITH_TEAMDCTL_TRUE@	-rpath $(pkglibdir)
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES =  \
-@WITH_WIFI_TRUE@	introspection/libnmdbus.la \
 @WITH_WIFI_TRUE@	$(am__DEPENDENCIES_1)
 am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
 	src/devices/wifi/nm-wifi-factory.c \
@@ -1255,13 +1270,23 @@ am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
 	src/devices/wifi/nm-wifi-ap.c src/devices/wifi/nm-wifi-ap.h \
 	src/devices/wifi/nm-wifi-utils.c \
 	src/devices/wifi/nm-wifi-utils.h \
+	src/devices/wifi/nm-wifi-common.c \
+	src/devices/wifi/nm-wifi-common.h \
 	src/devices/wifi/nm-device-olpc-mesh.c \
-	src/devices/wifi/nm-device-olpc-mesh.h
+	src/devices/wifi/nm-device-olpc-mesh.h \
+	src/devices/wifi/nm-device-iwd.c \
+	src/devices/wifi/nm-device-iwd.h \
+	src/devices/wifi/nm-iwd-manager.c \
+	src/devices/wifi/nm-iwd-manager.h
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__objects_23 = src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo
 @WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-factory.lo \
 @WITH_WIFI_TRUE@	src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-wifi.lo \
 @WITH_WIFI_TRUE@	src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-ap.lo \
 @WITH_WIFI_TRUE@	src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo
+@WITH_WIFI_TRUE@	src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo \
+@WITH_WIFI_TRUE@	src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo \
+@WITH_WIFI_TRUE@	$(am__objects_23)
 src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS =  \
 	$(am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS)
 src_devices_wifi_libnm_device_plugin_wifi_la_LINK = $(LIBTOOL) \
@@ -1272,7 +1297,6 @@ src_devices_wifi_libnm_device_plugin_wifi_la_LINK = $(LIBTOOL) \
 @WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath =  \
 @WITH_WIFI_TRUE@	-rpath $(pkglibdir)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_DEPENDENCIES =  \
-@WITH_MODEM_MANAGER_1_TRUE@	introspection/libnmdbus.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1)
 am__src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST =  \
@@ -1302,11 +1326,11 @@ am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST =  \
 	src/devices/wwan/nm-modem.c src/devices/wwan/nm-modem.h \
 	src/devices/wwan/nm-modem-ofono.c \
 	src/devices/wwan/nm-modem-ofono.h
-@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_22 = src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_24 = src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo
 @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_wwan_la_OBJECTS = src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-broadband.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-manager.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem.lo \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_22)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_24)
 src_devices_wwan_libnm_wwan_la_OBJECTS =  \
 	$(am_src_devices_wwan_libnm_wwan_la_OBJECTS)
 src_devices_wwan_libnm_wwan_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1316,113 +1340,18 @@ src_devices_wwan_libnm_wwan_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_wwan_la_rpath =  \
 @WITH_MODEM_MANAGER_1_TRUE@	-rpath $(pkglibdir)
 src_libNetworkManager_la_DEPENDENCIES = src/libNetworkManagerBase.la \
-	src/libsystemd-nm.la $(am__DEPENDENCIES_1) \
+	src/libsystemd-nm.la shared/libcsiphash.la shared/libnacd.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am__src_libNetworkManager_la_SOURCES_DIST =  \
-	src/nm-checkpoint-manager.c src/nm-checkpoint-manager.h \
-	src/nm-checkpoint.c src/nm-checkpoint.h \
-	src/devices/nm-device.c src/devices/nm-device.h \
-	src/devices/nm-lldp-listener.c src/devices/nm-lldp-listener.h \
-	src/devices/nm-arping-manager.c \
-	src/devices/nm-arping-manager.h \
-	src/devices/nm-device-ethernet-utils.c \
-	src/devices/nm-device-ethernet-utils.h \
-	src/devices/nm-device-factory.c \
-	src/devices/nm-device-factory.h \
-	src/devices/nm-device-generic.c \
-	src/devices/nm-device-generic.h \
-	src/devices/nm-device-logging.h \
-	src/devices/nm-device-private.h src/devices/nm-device-bond.c \
-	src/devices/nm-device-bond.h src/devices/nm-device-bridge.c \
-	src/devices/nm-device-bridge.h src/devices/nm-device-dummy.c \
-	src/devices/nm-device-dummy.h src/devices/nm-device-ethernet.c \
-	src/devices/nm-device-ethernet.h \
-	src/devices/nm-device-infiniband.c \
-	src/devices/nm-device-infiniband.h \
-	src/devices/nm-device-ip-tunnel.c \
-	src/devices/nm-device-ip-tunnel.h \
-	src/devices/nm-device-macsec.c src/devices/nm-device-macsec.h \
-	src/devices/nm-device-macvlan.c \
-	src/devices/nm-device-macvlan.h src/devices/nm-device-ppp.c \
-	src/devices/nm-device-ppp.h src/devices/nm-device-tun.c \
-	src/devices/nm-device-tun.h src/devices/nm-device-veth.c \
-	src/devices/nm-device-veth.h src/devices/nm-device-vlan.c \
-	src/devices/nm-device-vlan.h src/devices/nm-device-vxlan.c \
-	src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhcpcanon.c \
-	src/dhcp/nm-dhcp-dhclient.c src/dhcp/nm-dhcp-dhcpcd.c \
-	src/dhcp/nm-dhcp-helper-api.h src/dhcp/nm-dhcp-listener.c \
-	src/dhcp/nm-dhcp-listener.h src/dhcp/nm-dhcp-dhclient-utils.c \
-	src/dhcp/nm-dhcp-dhclient-utils.h src/dns/nm-dns-dnsmasq.c \
-	src/dns/nm-dns-dnsmasq.h src/dns/nm-dns-systemd-resolved.c \
-	src/dns/nm-dns-systemd-resolved.h src/dns/nm-dns-unbound.c \
-	src/dns/nm-dns-unbound.h src/dns/nm-dns-manager.c \
-	src/dns/nm-dns-manager.h src/dns/nm-dns-plugin.c \
-	src/dns/nm-dns-plugin.h src/dnsmasq/nm-dnsmasq-manager.c \
-	src/dnsmasq/nm-dnsmasq-manager.h \
-	src/dnsmasq/nm-dnsmasq-utils.c src/dnsmasq/nm-dnsmasq-utils.h \
-	src/ppp/nm-ppp-manager-call.c src/ppp/nm-ppp-manager-call.h \
-	src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \
-	src/nm-hostname-manager.c src/nm-hostname-manager.h \
-	src/settings/nm-agent-manager.c \
-	src/settings/nm-agent-manager.h src/settings/nm-secret-agent.c \
-	src/settings/nm-secret-agent.h \
-	src/settings/nm-settings-connection.c \
-	src/settings/nm-settings-connection.h \
-	src/settings/nm-settings-plugin.c \
-	src/settings/nm-settings-plugin.h src/settings/nm-settings.c \
-	src/settings/nm-settings.h \
-	src/settings/plugins/keyfile/nms-keyfile-connection.c \
-	src/settings/plugins/keyfile/nms-keyfile-connection.h \
-	src/settings/plugins/keyfile/nms-keyfile-plugin.c \
-	src/settings/plugins/keyfile/nms-keyfile-plugin.h \
-	src/settings/plugins/keyfile/nms-keyfile-reader.c \
-	src/settings/plugins/keyfile/nms-keyfile-reader.h \
-	src/settings/plugins/keyfile/nms-keyfile-utils.c \
-	src/settings/plugins/keyfile/nms-keyfile-utils.h \
-	src/settings/plugins/keyfile/nms-keyfile-writer.c \
-	src/settings/plugins/keyfile/nms-keyfile-writer.h \
-	src/supplicant/nm-supplicant-config.c \
-	src/supplicant/nm-supplicant-config.h \
-	src/supplicant/nm-supplicant-interface.c \
-	src/supplicant/nm-supplicant-interface.h \
-	src/supplicant/nm-supplicant-manager.c \
-	src/supplicant/nm-supplicant-manager.h \
-	src/supplicant/nm-supplicant-settings-verify.c \
-	src/supplicant/nm-supplicant-settings-verify.h \
-	src/supplicant/nm-supplicant-types.h \
-	src/vpn/nm-vpn-connection.c src/vpn/nm-vpn-connection.h \
-	src/vpn/nm-vpn-manager.c src/vpn/nm-vpn-manager.h \
-	src/nm-act-request.c src/nm-act-request.h \
-	src/nm-active-connection.c src/nm-active-connection.h \
-	src/nm-audit-manager.c src/nm-audit-manager.h \
-	src/nm-bus-manager.c src/nm-bus-manager.h src/nm-config.c \
-	src/nm-config.h src/nm-config-data.c src/nm-config-data.h \
-	src/nm-connectivity.h src/nm-dcb.c src/nm-dcb.h src/nm-netns.c \
-	src/nm-netns.h src/nm-dhcp4-config.c src/nm-dhcp4-config.h \
-	src/nm-dhcp6-config.c src/nm-dhcp6-config.h \
-	src/nm-dispatcher.c src/nm-dispatcher.h \
-	src/nm-firewall-manager.c src/nm-firewall-manager.h \
-	src/nm-proxy-config.c src/nm-proxy-config.h \
-	src/nm-auth-manager.c src/nm-auth-manager.h \
-	src/nm-auth-subject.c src/nm-auth-subject.h \
-	src/nm-auth-utils.c src/nm-auth-utils.h src/nm-manager.c \
-	src/nm-manager.h src/nm-pacrunner-manager.c \
-	src/nm-pacrunner-manager.h src/nm-policy.c src/nm-policy.h \
-	src/nm-rfkill-manager.c src/nm-rfkill-manager.h \
-	src/nm-session-monitor.h src/nm-session-monitor.c \
-	src/nm-sleep-monitor.c src/nm-sleep-monitor.h src/nm-types.h \
-	src/nm-connectivity.c
-@WITH_CONCHECK_TRUE@am__objects_23 = src/src_libNetworkManager_la-nm-connectivity.lo
 am_src_libNetworkManager_la_OBJECTS =  \
-	src/src_libNetworkManager_la-nm-checkpoint-manager.lo \
 	src/src_libNetworkManager_la-nm-checkpoint.lo \
+	src/src_libNetworkManager_la-nm-checkpoint-manager.lo \
 	src/devices/src_libNetworkManager_la-nm-device.lo \
 	src/devices/src_libNetworkManager_la-nm-lldp-listener.lo \
-	src/devices/src_libNetworkManager_la-nm-arping-manager.lo \
+	src/devices/src_libNetworkManager_la-nm-acd-manager.lo \
 	src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo \
 	src/devices/src_libNetworkManager_la-nm-device-factory.lo \
 	src/devices/src_libNetworkManager_la-nm-device-generic.lo \
@@ -1444,11 +1373,11 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcd.lo \
 	src/dhcp/src_libNetworkManager_la-nm-dhcp-listener.lo \
 	src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient-utils.lo \
+	src/dns/src_libNetworkManager_la-nm-dns-manager.lo \
+	src/dns/src_libNetworkManager_la-nm-dns-plugin.lo \
 	src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo \
 	src/dns/src_libNetworkManager_la-nm-dns-systemd-resolved.lo \
 	src/dns/src_libNetworkManager_la-nm-dns-unbound.lo \
-	src/dns/src_libNetworkManager_la-nm-dns-manager.lo \
-	src/dns/src_libNetworkManager_la-nm-dns-plugin.lo \
 	src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo \
 	src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-utils.lo \
 	src/ppp/src_libNetworkManager_la-nm-ppp-manager-call.lo \
@@ -1472,9 +1401,10 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/src_libNetworkManager_la-nm-act-request.lo \
 	src/src_libNetworkManager_la-nm-active-connection.lo \
 	src/src_libNetworkManager_la-nm-audit-manager.lo \
-	src/src_libNetworkManager_la-nm-bus-manager.lo \
+	src/src_libNetworkManager_la-nm-dbus-manager.lo \
 	src/src_libNetworkManager_la-nm-config.lo \
 	src/src_libNetworkManager_la-nm-config-data.lo \
+	src/src_libNetworkManager_la-nm-connectivity.lo \
 	src/src_libNetworkManager_la-nm-dcb.lo \
 	src/src_libNetworkManager_la-nm-netns.lo \
 	src/src_libNetworkManager_la-nm-dhcp4-config.lo \
@@ -1490,16 +1420,16 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/src_libNetworkManager_la-nm-policy.lo \
 	src/src_libNetworkManager_la-nm-rfkill-manager.lo \
 	src/src_libNetworkManager_la-nm-session-monitor.lo \
-	src/src_libNetworkManager_la-nm-sleep-monitor.lo \
-	$(am__objects_23)
+	src/src_libNetworkManager_la-nm-sleep-monitor.lo
 src_libNetworkManager_la_OBJECTS =  \
 	$(am_src_libNetworkManager_la_OBJECTS)
 src_libNetworkManagerBase_la_DEPENDENCIES = libnm-core/libnm-core.la \
-	introspection/libnmdbus.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
 	src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \
 	src/NetworkManagerUtils.c src/NetworkManagerUtils.h \
+	src/platform/nm-netlink.c src/platform/nm-netlink.h \
 	src/platform/nmp-netns.c src/platform/nmp-netns.h \
 	src/platform/nmp-object.c src/platform/nmp-object.h \
 	src/platform/nm-platform-utils.c \
@@ -1513,21 +1443,22 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
 	src/platform/wifi/wifi-utils.c src/platform/wifi/wifi-utils.h \
 	src/ndisc/nm-lndp-ndisc.c src/ndisc/nm-lndp-ndisc.h \
 	src/ndisc/nm-ndisc.c src/ndisc/nm-ndisc.h \
-	src/ndisc/nm-ndisc-private.h src/nm-exported-object.c \
-	src/nm-exported-object.h src/nm-ip4-config.c \
-	src/nm-ip4-config.h src/nm-ip6-config.c src/nm-ip6-config.h \
-	src/dhcp/nm-dhcp-client.c src/dhcp/nm-dhcp-client.h \
-	src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \
-	src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \
-	src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \
-	src/main-utils.c src/main-utils.h \
+	src/ndisc/nm-ndisc-private.h src/nm-dbus-utils.c \
+	src/nm-dbus-utils.h src/nm-dbus-object.c src/nm-dbus-object.h \
+	src/nm-ip4-config.c src/nm-ip4-config.h src/nm-ip6-config.c \
+	src/nm-ip6-config.h src/dhcp/nm-dhcp-client.c \
+	src/dhcp/nm-dhcp-client.h src/dhcp/nm-dhcp-client-logging.h \
+	src/dhcp/nm-dhcp-utils.c src/dhcp/nm-dhcp-utils.h \
+	src/dhcp/nm-dhcp-systemd.c src/dhcp/nm-dhcp-manager.c \
+	src/dhcp/nm-dhcp-manager.h src/main-utils.c src/main-utils.h \
 	src/platform/wifi/wifi-utils-wext.c \
 	src/platform/wifi/wifi-utils-wext.h
-@WITH_WEXT_TRUE@am__objects_24 = src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo
+@WITH_WEXT_TRUE@am__objects_25 = src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo
 am_src_libNetworkManagerBase_la_OBJECTS =  \
 	src/src_libNetworkManagerBase_la-nm-core-utils.lo \
 	src/src_libNetworkManagerBase_la-nm-logging.lo \
 	src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo \
+	src/platform/src_libNetworkManagerBase_la-nm-netlink.lo \
 	src/platform/src_libNetworkManagerBase_la-nmp-netns.lo \
 	src/platform/src_libNetworkManagerBase_la-nmp-object.lo \
 	src/platform/src_libNetworkManagerBase_la-nm-platform-utils.lo \
@@ -1537,7 +1468,8 @@ am_src_libNetworkManagerBase_la_OBJECTS =  \
 	src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils.lo \
 	src/ndisc/src_libNetworkManagerBase_la-nm-lndp-ndisc.lo \
 	src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo \
-	src/src_libNetworkManagerBase_la-nm-exported-object.lo \
+	src/src_libNetworkManagerBase_la-nm-dbus-utils.lo \
+	src/src_libNetworkManagerBase_la-nm-dbus-object.lo \
 	src/src_libNetworkManagerBase_la-nm-ip4-config.lo \
 	src/src_libNetworkManagerBase_la-nm-ip6-config.lo \
 	src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-client.lo \
@@ -1545,12 +1477,12 @@ am_src_libNetworkManagerBase_la_OBJECTS =  \
 	src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-systemd.lo \
 	src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-manager.lo \
 	src/src_libNetworkManagerBase_la-main-utils.lo \
-	$(am__objects_24)
+	$(am__objects_25)
 src_libNetworkManagerBase_la_OBJECTS =  \
 	$(am_src_libNetworkManagerBase_la_OBJECTS)
 src_libNetworkManagerTest_la_DEPENDENCIES = src/libNetworkManager.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am_src_libNetworkManagerTest_la_OBJECTS =  \
 	src/ndisc/src_libNetworkManagerTest_la-nm-fake-ndisc.lo \
 	src/platform/src_libNetworkManagerTest_la-nm-fake-platform.lo \
@@ -1613,7 +1545,6 @@ am_src_libsystemd_nm_la_OBJECTS =  \
 	src/systemd/src/shared/src_libsystemd_nm_la-dns-domain.lo
 src_libsystemd_nm_la_OBJECTS = $(am_src_libsystemd_nm_la_OBJECTS)
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_DEPENDENCIES =  \
-@WITH_PPP_TRUE@	introspection/libnmdbus.la \
 @WITH_PPP_TRUE@	$(am__DEPENDENCIES_1)
 am__src_ppp_libnm_ppp_plugin_la_SOURCES_DIST =  \
 	src/ppp/nm-pppd-plugin.h src/ppp/nm-ppp-manager.c \
@@ -1665,8 +1596,7 @@ am__src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES_DIST =  \
 src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS =  \
 	$(am_src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS)
 @CONFIG_PLUGIN_IBFT_TRUE@am_src_settings_plugins_ibft_libnms_ibft_core_la_rpath =
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES = src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES = src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 am__src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES_DIST =  \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h \
@@ -1706,39 +1636,6 @@ am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST =  \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo
 src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS = $(am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS)
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_rpath =
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_DEPENDENCIES = src/settings/plugins/ifnet/libnms-ifnet-core.la
-am__src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES_DIST =  \
-	src/settings/plugins/ifnet/nms-ifnet-connection.c \
-	src/settings/plugins/ifnet/nms-ifnet-connection.h \
-	src/settings/plugins/ifnet/nms-ifnet-plugin.c \
-	src/settings/plugins/ifnet/nms-ifnet-plugin.h
-@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS = src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo
-src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS = $(am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS)
-src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LINK =  \
-	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_rpath =  \
-@CONFIG_PLUGIN_IFNET_TRUE@	-rpath $(pkglibdir)
-src_settings_plugins_ifnet_libnms_ifnet_core_la_LIBADD =
-am__src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES_DIST =  \
-	src/settings/plugins/ifnet/nms-ifnet-net-parser.c \
-	src/settings/plugins/ifnet/nms-ifnet-net-parser.h \
-	src/settings/plugins/ifnet/nms-ifnet-connection-parser.c \
-	src/settings/plugins/ifnet/nms-ifnet-connection-parser.h \
-	src/settings/plugins/ifnet/nms-ifnet-net-utils.h \
-	src/settings/plugins/ifnet/nms-ifnet-net-utils.c \
-	src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h \
-	src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
-@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS = src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo
-src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS =  \
-	$(am_src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS)
-@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnms_ifnet_core_la_rpath =
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES = src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(am__DEPENDENCIES_1)
 am__src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST =  \
@@ -1776,12 +1673,11 @@ am__EXEEXT_3 = libnm/tests/test-general$(EXEEXT) \
 @CONFIG_PLUGIN_IBFT_TRUE@am__EXEEXT_4 = src/settings/plugins/ibft/tests/test-ibft$(EXEEXT)
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@am__EXEEXT_5 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@am__EXEEXT_6 = src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)
-@CONFIG_PLUGIN_IFNET_TRUE@am__EXEEXT_7 = src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT)
-@WITH_WIFI_TRUE@am__EXEEXT_8 =  \
+@WITH_WIFI_TRUE@am__EXEEXT_7 =  \
 @WITH_WIFI_TRUE@	src/devices/wifi/tests/test-general$(EXEEXT)
-@HAVE_INTROSPECTION_TRUE@am__EXEEXT_9 = clients/common/tests/test-general$(EXEEXT)
-@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_10 = clients/common/tests/test-general$(EXEEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_11 = libnm-util/tests/test-settings-defaults$(EXEEXT) \
+@HAVE_INTROSPECTION_TRUE@am__EXEEXT_8 = clients/common/tests/test-general$(EXEEXT)
+@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_9 = clients/common/tests/test-general$(EXEEXT)
+@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_10 = libnm-util/tests/test-settings-defaults$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-crypto$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-secrets$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-general$(EXEEXT) \
@@ -1789,7 +1685,7 @@ am__EXEEXT_3 = libnm/tests/test-general$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-dcb$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-nm-client$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-remote-settings-client$(EXEEXT)
-am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \
+am__EXEEXT_11 = libnm-core/tests/test-compare$(EXEEXT) \
 	libnm-core/tests/test-crypto$(EXEEXT) \
 	libnm-core/tests/test-general$(EXEEXT) \
 	libnm-core/tests/test-keyfile$(EXEEXT) \
@@ -1800,8 +1696,7 @@ am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \
 	src/dhcp/tests/test-dhcp-utils$(EXEEXT) \
 	src/settings/plugins/keyfile/tests/test-keyfile$(EXEEXT) \
 	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
-	$(am__EXEEXT_7) $(am__EXEEXT_8) \
-	src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) \
+	$(am__EXEEXT_7) src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) \
 	src/platform/tests/test-link-fake$(EXEEXT) \
 	src/platform/tests/test-link-linux$(EXEEXT) \
 	src/platform/tests/test-address-fake$(EXEEXT) \
@@ -1813,7 +1708,7 @@ am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \
 	src/platform/tests/test-cleanup-fake$(EXEEXT) \
 	src/platform/tests/test-cleanup-linux$(EXEEXT) \
 	src/devices/tests/test-lldp$(EXEEXT) \
-	src/devices/tests/test-arping$(EXEEXT) \
+	src/devices/tests/test-acd$(EXEEXT) \
 	src/ndisc/tests/test-ndisc-fake$(EXEEXT) \
 	src/supplicant/tests/test-supplicant-config$(EXEEXT) \
 	src/tests/config/test-config$(EXEEXT) \
@@ -1822,20 +1717,19 @@ am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \
 	src/tests/test-ip4-config$(EXEEXT) \
 	src/tests/test-ip6-config$(EXEEXT) src/tests/test-dcb$(EXEEXT) \
 	src/tests/test-systemd$(EXEEXT) \
-	src/tests/test-resolvconf-capture$(EXEEXT) \
 	src/tests/test-wired-defname$(EXEEXT) \
 	src/tests/test-utils$(EXEEXT) \
-	dispatcher/tests/test-dispatcher-envp$(EXEEXT) $(am__EXEEXT_9) \
-	$(am__EXEEXT_10) $(am__EXEEXT_11)
-@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_13 = libnm-util/tests/test-libnm-linking$(EXEEXT) \
+	dispatcher/tests/test-dispatcher-envp$(EXEEXT) $(am__EXEEXT_8) \
+	$(am__EXEEXT_9) $(am__EXEEXT_10)
+@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_12 = libnm-util/tests/test-libnm-linking$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-test$(EXEEXT)
-@WITH_QT_TRUE@am__EXEEXT_14 =  \
+@WITH_QT_TRUE@am__EXEEXT_13 =  \
 @WITH_QT_TRUE@	examples/C/qt/add-connection-wired$(EXEEXT) \
 @WITH_QT_TRUE@	examples/C/qt/list-connections$(EXEEXT) \
 @WITH_QT_TRUE@	examples/C/qt/change-ipv4-addresses$(EXEEXT) \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running$(EXEEXT)
-am__EXEEXT_15 = src/platform/tests/monitor$(EXEEXT) \
-	src/ndisc/tests/test-ndisc-linux$(EXEEXT) $(am__EXEEXT_13) \
+am__EXEEXT_14 = src/platform/tests/monitor$(EXEEXT) \
+	src/ndisc/tests/test-ndisc-linux$(EXEEXT) $(am__EXEEXT_12) \
 	examples/C/glib/add-connection-gdbus$(EXEEXT) \
 	examples/C/glib/add-connection-libnm$(EXEEXT) \
 	examples/C/glib/get-active-connections-gdbus$(EXEEXT) \
@@ -1844,9 +1738,9 @@ am__EXEEXT_15 = src/platform/tests/monitor$(EXEEXT) \
 	examples/C/glib/list-connections-libnm$(EXEEXT) \
 	examples/C/glib/monitor-nm-running-gdbus$(EXEEXT) \
 	examples/C/glib/monitor-nm-state-gdbus$(EXEEXT) \
-	$(am__EXEEXT_14)
-@ENABLE_TESTS_FALSE@am__EXEEXT_16 = $(am__EXEEXT_12) $(am__EXEEXT_15)
-@ENABLE_TESTS_TRUE@am__EXEEXT_17 = $(am__EXEEXT_12) $(am__EXEEXT_15)
+	$(am__EXEEXT_13)
+@ENABLE_TESTS_FALSE@am__EXEEXT_15 = $(am__EXEEXT_11) $(am__EXEEXT_14)
+@ENABLE_TESTS_TRUE@am__EXEEXT_16 = $(am__EXEEXT_11) $(am__EXEEXT_14)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) \
 	$(sbin_PROGRAMS)
 am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \
@@ -1859,7 +1753,7 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \
 	clients/cli/polkit-agent.c clients/cli/polkit-agent.h \
 	clients/common/nm-polkit-listener.c \
 	clients/common/nm-polkit-listener.h
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_25 = clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT)
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_26 = clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT)
 @BUILD_NMCLI_TRUE@am_clients_cli_nmcli_OBJECTS = clients/cli/clients_cli_nmcli-common.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-utils.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-agent.$(OBJEXT) \
@@ -1869,7 +1763,7 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \
 @BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-settings.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-nmcli.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-polkit-agent.$(OBJEXT) \
-@BUILD_NMCLI_TRUE@	$(am__objects_25)
+@BUILD_NMCLI_TRUE@	$(am__objects_26)
 clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS)
 @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES = libnm/libnm.la \
@@ -1887,6 +1781,10 @@ clients_common_tests_test_general_OBJECTS = clients/common/tests/clients_common_
 clients_common_tests_test_general_DEPENDENCIES = libnm/libnm.la \
 	clients/common/libnmc-base.la clients/common/libnmc.la \
 	$(am__DEPENDENCIES_1)
+clients_common_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(clients_common_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@
 clients_nm_online_SOURCES = clients/nm-online.c
 clients_nm_online_OBJECTS =  \
 	clients/clients_nm_online-nm-online.$(OBJEXT)
@@ -1995,8 +1893,8 @@ clients_tui_nmtui_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	-o $@
 am_dispatcher_nm_dispatcher_OBJECTS =  \
 	dispatcher/dispatcher_nm_dispatcher-nm-dispatcher.$(OBJEXT)
-am__objects_26 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT)
-nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_26)
+am__objects_27 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT)
+nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_27)
 dispatcher_nm_dispatcher_OBJECTS =  \
 	$(am_dispatcher_nm_dispatcher_OBJECTS) \
 	$(nodist_dispatcher_nm_dispatcher_OBJECTS)
@@ -2011,6 +1909,11 @@ dispatcher_tests_test_dispatcher_envp_SOURCES =  \
 dispatcher_tests_test_dispatcher_envp_OBJECTS = dispatcher/tests/dispatcher_tests_test_dispatcher_envp-test-dispatcher-envp.$(OBJEXT)
 dispatcher_tests_test_dispatcher_envp_DEPENDENCIES = libnm/libnm.la \
 	dispatcher/libnm-dispatcher-core.la $(am__DEPENDENCIES_1)
+dispatcher_tests_test_dispatcher_envp_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(dispatcher_tests_test_dispatcher_envp_LDFLAGS) $(LDFLAGS) -o \
+	$@
 examples_C_glib_add_connection_gdbus_SOURCES =  \
 	examples/C/glib/add-connection-gdbus.c
 examples_C_glib_add_connection_gdbus_OBJECTS = examples/C/glib/examples_C_glib_add_connection_gdbus-add-connection-gdbus.$(OBJEXT)
@@ -2084,32 +1987,61 @@ libnm_core_tests_test_compare_SOURCES =  \
 libnm_core_tests_test_compare_OBJECTS = libnm-core/tests/libnm_core_tests_test_compare-test-compare.$(OBJEXT)
 am__DEPENDENCIES_9 = libnm-core/libnm-core.la $(am__DEPENDENCIES_1)
 libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_9)
+libnm_core_tests_test_compare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_core_tests_test_compare_LDFLAGS) $(LDFLAGS) -o $@
 libnm_core_tests_test_crypto_SOURCES = libnm-core/tests/test-crypto.c
 libnm_core_tests_test_crypto_OBJECTS = libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.$(OBJEXT)
 libnm_core_tests_test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_9)
+libnm_core_tests_test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libnm_core_tests_test_crypto_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests_test_general-test-general.$(OBJEXT)
 nodist_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.$(OBJEXT)
 libnm_core_tests_test_general_OBJECTS =  \
 	$(am_libnm_core_tests_test_general_OBJECTS) \
 	$(nodist_libnm_core_tests_test_general_OBJECTS)
 libnm_core_tests_test_general_DEPENDENCIES = $(am__DEPENDENCIES_9)
+libnm_core_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_core_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@
 libnm_core_tests_test_keyfile_SOURCES =  \
 	libnm-core/tests/test-keyfile.c
 libnm_core_tests_test_keyfile_OBJECTS = libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.$(OBJEXT)
 libnm_core_tests_test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_9)
+libnm_core_tests_test_keyfile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_core_tests_test_keyfile_LDFLAGS) $(LDFLAGS) -o $@
 libnm_core_tests_test_secrets_SOURCES =  \
 	libnm-core/tests/test-secrets.c
 libnm_core_tests_test_secrets_OBJECTS = libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT)
 libnm_core_tests_test_secrets_DEPENDENCIES = $(am__DEPENDENCIES_9)
+libnm_core_tests_test_secrets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_core_tests_test_secrets_LDFLAGS) $(LDFLAGS) -o $@
 libnm_core_tests_test_setting_SOURCES =  \
 	libnm-core/tests/test-setting.c
 libnm_core_tests_test_setting_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting-test-setting.$(OBJEXT)
 libnm_core_tests_test_setting_DEPENDENCIES = $(am__DEPENDENCIES_9)
+libnm_core_tests_test_setting_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_core_tests_test_setting_LDFLAGS) $(LDFLAGS) -o $@
 libnm_core_tests_test_settings_defaults_SOURCES =  \
 	libnm-core/tests/test-settings-defaults.c
 libnm_core_tests_test_settings_defaults_OBJECTS = libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT)
 libnm_core_tests_test_settings_defaults_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_9)
+libnm_core_tests_test_settings_defaults_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_core_tests_test_settings_defaults_LDFLAGS) $(LDFLAGS) \
+	-o $@
 libnm_glib_libnm_glib_test_SOURCES = libnm-glib/libnm-glib-test.c
 libnm_glib_libnm_glib_test_OBJECTS = libnm-glib/libnm_glib_libnm_glib_test-libnm-glib-test.$(OBJEXT)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_test_DEPENDENCIES =  \
@@ -2154,58 +2086,107 @@ libnm_util_tests_test_crypto_OBJECTS = libnm-util/tests/libnm_util_tests_test_cr
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_DEPENDENCIES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libtest-crypto.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_10)
+libnm_util_tests_test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libnm_util_tests_test_crypto_LDFLAGS) \
+	$(LDFLAGS) -o $@
 libnm_util_tests_test_general_SOURCES =  \
 	libnm-util/tests/test-general.c
 libnm_util_tests_test_general_OBJECTS = libnm-util/tests/libnm_util_tests_test_general-test-general.$(OBJEXT)
+libnm_util_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_util_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@
 libnm_util_tests_test_libnm_linking_SOURCES =  \
 	libnm-util/tests/test-libnm-linking.c
 libnm_util_tests_test_libnm_linking_OBJECTS = libnm-util/tests/libnm_util_tests_test_libnm_linking-test-libnm-linking.$(OBJEXT)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_DEPENDENCIES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm/libnm.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_10)
+libnm_util_tests_test_libnm_linking_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_util_tests_test_libnm_linking_LDFLAGS) $(LDFLAGS) -o \
+	$@
 libnm_util_tests_test_secrets_SOURCES =  \
 	libnm-util/tests/test-secrets.c
 libnm_util_tests_test_secrets_OBJECTS = libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.$(OBJEXT)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_DEPENDENCIES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_10)
+libnm_util_tests_test_secrets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_util_tests_test_secrets_LDFLAGS) $(LDFLAGS) -o $@
 libnm_util_tests_test_setting_8021x_SOURCES =  \
 	libnm-util/tests/test-setting-8021x.c
 libnm_util_tests_test_setting_8021x_OBJECTS = libnm-util/tests/libnm_util_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_DEPENDENCIES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_10)
+libnm_util_tests_test_setting_8021x_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_util_tests_test_setting_8021x_LDFLAGS) $(LDFLAGS) -o \
+	$@
 libnm_util_tests_test_setting_dcb_SOURCES =  \
 	libnm-util/tests/test-setting-dcb.c
 libnm_util_tests_test_setting_dcb_OBJECTS = libnm-util/tests/libnm_util_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_DEPENDENCIES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_10)
+libnm_util_tests_test_setting_dcb_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_util_tests_test_setting_dcb_LDFLAGS) $(LDFLAGS) -o $@
 libnm_util_tests_test_settings_defaults_SOURCES =  \
 	libnm-util/tests/test-settings-defaults.c
 libnm_util_tests_test_settings_defaults_OBJECTS = libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_DEPENDENCIES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_10)
+libnm_util_tests_test_settings_defaults_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_util_tests_test_settings_defaults_LDFLAGS) $(LDFLAGS) \
+	-o $@
 am_libnm_tests_test_general_OBJECTS =  \
+	shared/nm-utils/libnm_tests_test_general-nm-compat.$(OBJEXT) \
 	libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT)
 libnm_tests_test_general_OBJECTS =  \
 	$(am_libnm_tests_test_general_OBJECTS)
 am__DEPENDENCIES_11 = libnm/libnm.la $(am__DEPENDENCIES_1)
 libnm_tests_test_general_DEPENDENCIES = libnm/libnm-utils.la \
 	$(am__DEPENDENCIES_11)
+libnm_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libnm_tests_test_general_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_libnm_tests_test_nm_client_OBJECTS = shared/libnm_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT) \
 	libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT)
 libnm_tests_test_nm_client_OBJECTS =  \
 	$(am_libnm_tests_test_nm_client_OBJECTS)
 libnm_tests_test_nm_client_DEPENDENCIES = $(am__DEPENDENCIES_11)
+libnm_tests_test_nm_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libnm_tests_test_nm_client_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_libnm_tests_test_remote_settings_client_OBJECTS = shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT) \
 	libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT)
 libnm_tests_test_remote_settings_client_OBJECTS =  \
 	$(am_libnm_tests_test_remote_settings_client_OBJECTS)
 libnm_tests_test_remote_settings_client_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_11)
+libnm_tests_test_remote_settings_client_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_tests_test_remote_settings_client_LDFLAGS) $(LDFLAGS) \
+	-o $@
 am_libnm_tests_test_secret_agent_OBJECTS = shared/libnm_tests_test_secret_agent-nm-test-utils-impl.$(OBJEXT) \
 	libnm/tests/libnm_tests_test_secret_agent-test-secret-agent.$(OBJEXT)
 libnm_tests_test_secret_agent_OBJECTS =  \
 	$(am_libnm_tests_test_secret_agent_OBJECTS)
 libnm_tests_test_secret_agent_DEPENDENCIES = $(am__DEPENDENCIES_11)
+libnm_tests_test_secret_agent_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(libnm_tests_test_secret_agent_LDFLAGS) $(LDFLAGS) -o $@
 am_src_NetworkManager_OBJECTS = src/src_NetworkManager-main.$(OBJEXT)
 src_NetworkManager_OBJECTS = $(am_src_NetworkManager_OBJECTS)
 src_NetworkManager_DEPENDENCIES = src/libNetworkManager.la
@@ -2213,15 +2194,14 @@ src_NetworkManager_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_NetworkManager_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_devices_tests_test_arping_SOURCES =  \
-	src/devices/tests/test-arping.c
-src_devices_tests_test_arping_OBJECTS = src/devices/tests/src_devices_tests_test_arping-test-arping.$(OBJEXT)
-src_devices_tests_test_arping_DEPENDENCIES =  \
+src_devices_tests_test_acd_SOURCES = src/devices/tests/test-acd.c
+src_devices_tests_test_acd_OBJECTS = src/devices/tests/src_devices_tests_test_acd-test-acd.$(OBJEXT)
+src_devices_tests_test_acd_DEPENDENCIES =  \
 	src/libNetworkManagerTest.la
-src_devices_tests_test_arping_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+src_devices_tests_test_acd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_tests_test_arping_LDFLAGS) $(LDFLAGS) -o $@
+	$(AM_CFLAGS) $(CFLAGS) $(src_devices_tests_test_acd_LDFLAGS) \
+	$(LDFLAGS) -o $@
 src_devices_tests_test_lldp_SOURCES = src/devices/tests/test-lldp.c
 src_devices_tests_test_lldp_OBJECTS = src/devices/tests/src_devices_tests_test_lldp-test-lldp.$(OBJEXT)
 src_devices_tests_test_lldp_DEPENDENCIES =  \
@@ -2242,6 +2222,11 @@ src_devices_wifi_tests_test_general_OBJECTS =  \
 	$(am_src_devices_wifi_tests_test_general_OBJECTS)
 @WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_DEPENDENCIES =  \
 @WITH_WIFI_TRUE@	src/libNetworkManagerTest.la
+src_devices_wifi_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_devices_wifi_tests_test_general_LDFLAGS) $(LDFLAGS) -o \
+	$@
 am_src_dhcp_nm_dhcp_helper_OBJECTS =  \
 	src/dhcp/src_dhcp_nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT)
 src_dhcp_nm_dhcp_helper_OBJECTS =  \
@@ -2256,15 +2241,28 @@ src_dhcp_tests_test_dhcp_dhclient_SOURCES =  \
 src_dhcp_tests_test_dhcp_dhclient_OBJECTS = src/dhcp/tests/src_dhcp_tests_test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT)
 src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES =  \
 	$(src_dhcp_tests_ldadd)
+src_dhcp_tests_test_dhcp_dhclient_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_dhcp_tests_test_dhcp_dhclient_LDFLAGS) $(LDFLAGS) -o $@
 src_dhcp_tests_test_dhcp_utils_SOURCES =  \
 	src/dhcp/tests/test-dhcp-utils.c
 src_dhcp_tests_test_dhcp_utils_OBJECTS = src/dhcp/tests/src_dhcp_tests_test_dhcp_utils-test-dhcp-utils.$(OBJEXT)
 src_dhcp_tests_test_dhcp_utils_DEPENDENCIES = $(src_dhcp_tests_ldadd)
+src_dhcp_tests_test_dhcp_utils_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(src_dhcp_tests_test_dhcp_utils_LDFLAGS) $(LDFLAGS) -o $@
 src_dnsmasq_tests_test_dnsmasq_utils_SOURCES =  \
 	src/dnsmasq/tests/test-dnsmasq-utils.c
 src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS = src/dnsmasq/tests/src_dnsmasq_tests_test_dnsmasq_utils-test-dnsmasq-utils.$(OBJEXT)
 src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES =  \
 	src/libNetworkManagerTest.la
+src_dnsmasq_tests_test_dnsmasq_utils_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS) $(LDFLAGS) -o \
+	$@
 src_ndisc_tests_test_ndisc_fake_SOURCES =  \
 	src/ndisc/tests/test-ndisc-fake.c
 src_ndisc_tests_test_ndisc_fake_OBJECTS = src/ndisc/tests/src_ndisc_tests_test_ndisc_fake-test-ndisc-fake.$(OBJEXT)
@@ -2290,7 +2288,7 @@ src_nm_iface_helper_OBJECTS = $(am_src_nm_iface_helper_OBJECTS)
 src_nm_iface_helper_DEPENDENCIES = src/libNetworkManagerBase.la \
 	src/libsystemd-nm.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_nm_iface_helper_LDFLAGS) \
@@ -2298,8 +2296,7 @@ src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 src_platform_tests_monitor_SOURCES = src/platform/tests/monitor.c
 src_platform_tests_monitor_OBJECTS = src/platform/tests/src_platform_tests_monitor-monitor.$(OBJEXT)
 am__DEPENDENCIES_13 = src/libNetworkManagerTest.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_13)
 src_platform_tests_monitor_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -2421,16 +2418,6 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LINK = $(LIBTOOL) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_settings_plugins_ifnet_tests_test_ifnet_SOURCES =  \
-	src/settings/plugins/ifnet/tests/test-ifnet.c
-src_settings_plugins_ifnet_tests_test_ifnet_OBJECTS = src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.$(OBJEXT)
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_DEPENDENCIES = src/settings/plugins/ifnet/libnms-ifnet-core.la \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/libNetworkManagerTest.la
-src_settings_plugins_ifnet_tests_test_ifnet_LINK = $(LIBTOOL) \
-	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS) \
-	$(LDFLAGS) -o $@
 src_settings_plugins_ifupdown_tests_test_ifupdown_SOURCES =  \
 	src/settings/plugins/ifupdown/tests/test-ifupdown.c
 src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS = src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.$(OBJEXT)
@@ -2456,12 +2443,21 @@ src_supplicant_tests_test_supplicant_config_SOURCES =  \
 src_supplicant_tests_test_supplicant_config_OBJECTS = src/supplicant/tests/src_supplicant_tests_test_supplicant_config-test-supplicant-config.$(OBJEXT)
 src_supplicant_tests_test_supplicant_config_DEPENDENCIES =  \
 	src/libNetworkManagerTest.la
+src_supplicant_tests_test_supplicant_config_LINK = $(LIBTOOL) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_supplicant_tests_test_supplicant_config_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_src_tests_config_test_config_OBJECTS = src/tests/config/src_tests_config_test_config-nm-test-device.$(OBJEXT) \
 	src/tests/config/src_tests_config_test_config-test-config.$(OBJEXT)
 src_tests_config_test_config_OBJECTS =  \
 	$(am_src_tests_config_test_config_OBJECTS)
 src_tests_config_test_config_DEPENDENCIES =  \
 	src/libNetworkManagerTest.la
+src_tests_config_test_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(src_tests_config_test_config_LDFLAGS) \
+	$(LDFLAGS) -o $@
 src_tests_test_dcb_SOURCES = src/tests/test-dcb.c
 src_tests_test_dcb_OBJECTS =  \
 	src/tests/src_tests_test_dcb-test-dcb.$(OBJEXT)
@@ -2502,14 +2498,6 @@ src_tests_test_ip6_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_ip6_config_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_tests_test_resolvconf_capture_SOURCES =  \
-	src/tests/test-resolvconf-capture.c
-src_tests_test_resolvconf_capture_OBJECTS = src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.$(OBJEXT)
-src_tests_test_resolvconf_capture_DEPENDENCIES = $(src_tests_ldadd)
-src_tests_test_resolvconf_capture_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_tests_test_resolvconf_capture_LDFLAGS) $(LDFLAGS) -o $@
 am_src_tests_test_systemd_OBJECTS =  \
 	shared/nm-utils/src_tests_test_systemd-siphash24.$(OBJEXT) \
 	src/tests/src_tests_test_systemd-test-systemd.$(OBJEXT)
@@ -2598,9 +2586,11 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(libnm_util_libnm_util_la_SOURCES) \
 	$(nodist_libnm_util_libnm_util_la_SOURCES) \
 	$(libnm_util_libtest_crypto_la_SOURCES) \
-	$(libnm_libnm_utils_la_SOURCES) $(libnm_libnm_la_SOURCES) \
-	$(nodist_libnm_libnm_la_SOURCES) \
+	$(libnm_libnm_utils_la_SOURCES) \
+	$(nodist_libnm_libnm_utils_la_SOURCES) \
+	$(libnm_libnm_la_SOURCES) $(nodist_libnm_libnm_la_SOURCES) \
 	$(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \
+	$(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \
 	$(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \
 	$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES) \
 	$(src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES) \
@@ -2619,8 +2609,6 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES) \
 	$(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) \
 	$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES) \
-	$(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES) \
-	$(src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES) \
 	$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES) \
 	$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES) \
 	$(clients_cli_nmcli_SOURCES) \
@@ -2661,7 +2649,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(libnm_tests_test_nm_client_SOURCES) \
 	$(libnm_tests_test_remote_settings_client_SOURCES) \
 	$(libnm_tests_test_secret_agent_SOURCES) \
-	$(src_NetworkManager_SOURCES) src/devices/tests/test-arping.c \
+	$(src_NetworkManager_SOURCES) src/devices/tests/test-acd.c \
 	src/devices/tests/test-lldp.c \
 	$(src_devices_wifi_tests_test_general_SOURCES) \
 	$(src_dhcp_nm_dhcp_helper_SOURCES) \
@@ -2683,14 +2671,12 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(src_platform_tests_test_route_linux_SOURCES) \
 	src/settings/plugins/ibft/tests/test-ibft.c \
 	$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES) \
-	src/settings/plugins/ifnet/tests/test-ifnet.c \
 	src/settings/plugins/ifupdown/tests/test-ifupdown.c \
 	src/settings/plugins/keyfile/tests/test-keyfile.c \
 	src/supplicant/tests/test-supplicant-config.c \
 	$(src_tests_config_test_config_SOURCES) src/tests/test-dcb.c \
 	src/tests/test-general.c src/tests/test-general-with-expect.c \
 	src/tests/test-ip4-config.c src/tests/test-ip6-config.c \
-	src/tests/test-resolvconf-capture.c \
 	$(src_tests_test_systemd_SOURCES) src/tests/test-utils.c \
 	src/tests/test-wired-defname.c
 DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
@@ -2705,6 +2691,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(am__libnm_util_libtest_crypto_la_SOURCES_DIST) \
 	$(libnm_libnm_utils_la_SOURCES) $(libnm_libnm_la_SOURCES) \
 	$(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \
+	$(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \
 	$(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \
 	$(am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST) \
 	$(am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST) \
@@ -2712,7 +2699,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST) \
 	$(am__src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST) \
 	$(am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST) \
-	$(am__src_libNetworkManager_la_SOURCES_DIST) \
+	$(src_libNetworkManager_la_SOURCES) \
 	$(am__src_libNetworkManagerBase_la_SOURCES_DIST) \
 	$(src_libNetworkManagerTest_la_SOURCES) \
 	$(src_libsystemd_nm_la_SOURCES) \
@@ -2722,8 +2709,6 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(am__src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES_DIST) \
 	$(am__src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES_DIST) \
 	$(am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST) \
-	$(am__src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES_DIST) \
-	$(am__src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES_DIST) \
 	$(am__src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST) \
 	$(am__src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES_DIST) \
 	$(am__clients_cli_nmcli_SOURCES_DIST) \
@@ -2762,7 +2747,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(libnm_tests_test_nm_client_SOURCES) \
 	$(libnm_tests_test_remote_settings_client_SOURCES) \
 	$(libnm_tests_test_secret_agent_SOURCES) \
-	$(src_NetworkManager_SOURCES) src/devices/tests/test-arping.c \
+	$(src_NetworkManager_SOURCES) src/devices/tests/test-acd.c \
 	src/devices/tests/test-lldp.c \
 	$(am__src_devices_wifi_tests_test_general_SOURCES_DIST) \
 	$(src_dhcp_nm_dhcp_helper_SOURCES) \
@@ -2784,14 +2769,12 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(src_platform_tests_test_route_linux_SOURCES) \
 	src/settings/plugins/ibft/tests/test-ibft.c \
 	$(am__src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES_DIST) \
-	src/settings/plugins/ifnet/tests/test-ifnet.c \
 	src/settings/plugins/ifupdown/tests/test-ifupdown.c \
 	src/settings/plugins/keyfile/tests/test-keyfile.c \
 	src/supplicant/tests/test-supplicant-config.c \
 	$(src_tests_config_test_config_SOURCES) src/tests/test-dcb.c \
 	src/tests/test-general.c src/tests/test-general-with-expect.c \
 	src/tests/test-ip4-config.c src/tests/test-ip6-config.c \
-	src/tests/test-resolvconf-capture.c \
 	$(src_tests_test_systemd_SOURCES) src/tests/test-utils.c \
 	src/tests/test-wired-defname.c
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -3190,7 +3173,7 @@ GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
@@ -3244,14 +3227,13 @@ LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBNDP_CFLAGS = @LIBNDP_CFLAGS@
 LIBNDP_LIBS = @LIBNDP_LIBS@
-LIBNL_CFLAGS = @LIBNL_CFLAGS@
-LIBNL_LIBS = @LIBNL_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBPSL_CFLAGS = @LIBPSL_CFLAGS@
 LIBPSL_LIBS = @LIBPSL_LIBS@
 LIBS = @LIBS@
 LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
 LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
+LIBSYSTEMD_NM_CFLAGS = @LIBSYSTEMD_NM_CFLAGS@
 LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
 LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
@@ -3322,8 +3304,11 @@ QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READELF = @READELF@
 READLINE_LIBS = @READLINE_LIBS@
-SANITIZERS = @SANITIZERS@
 SANITIZER_ENV = @SANITIZER_ENV@
+SANITIZER_EXEC_CFLAGS = @SANITIZER_EXEC_CFLAGS@
+SANITIZER_EXEC_LDFLAGS = @SANITIZER_EXEC_LDFLAGS@
+SANITIZER_LIB_CFLAGS = @SANITIZER_LIB_CFLAGS@
+SANITIZER_LIB_LDFLAGS = @SANITIZER_LIB_LDFLAGS@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -3444,60 +3429,67 @@ AUTOMAKE_OPTIONS = subdir-objects
 noinst_LTLIBRARIES = introspection/libnmdbus.la \
 	libnm-core/libnm-core.la libnm/libnm-utils.la \
 	src/libNetworkManagerBase.la src/libNetworkManager.la \
-	src/libsystemd-nm.la $(am__append_24) $(am__append_29) \
-	$(am__append_35) $(am__append_39) \
-	dispatcher/libnm-dispatcher-core.la $(am__append_92) \
-	$(am__append_110)
-check_LTLIBRARIES = $(am__append_112)
-noinst_LIBRARIES = $(am__append_66)
-noinst_DATA = $(am__append_16)
+	src/libsystemd-nm.la shared/libcsiphash.la shared/libnacd.la \
+	$(am__append_24) $(am__append_29) $(am__append_35) \
+	dispatcher/libnm-dispatcher-core.la $(am__append_89) \
+	$(am__append_107)
+check_LTLIBRARIES = $(am__append_109)
+noinst_LIBRARIES = $(am__append_63)
+noinst_DATA = $(am__append_17)
 
 ###############################################################################
-lib_LTLIBRARIES = libnm/libnm.la $(am__append_71)
+lib_LTLIBRARIES = libnm/libnm.la $(am__append_68)
 pkglib_LTLIBRARIES = $(core_plugins)
 
 ###############################################################################
 # src/devices/adsl
 ###############################################################################
 core_plugins = $(am__append_21) $(am__append_23) $(am__append_28) \
-	$(am__append_34) $(am__append_38) \
-	src/devices/adsl/libnm-device-plugin-adsl.la $(am__append_42) \
-	$(am__append_48) $(am__append_51) $(am__append_53)
-service_DATA = $(am__append_70)
-man_MANS = $(am__append_103)
+	$(am__append_34) src/devices/adsl/libnm-device-plugin-adsl.la \
+	$(am__append_38) $(am__append_44) $(am__append_48) \
+	$(am__append_50)
+service_DATA = $(am__append_67)
+man_MANS = $(am__append_100)
 examples_DATA = data/server.conf
 CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \
-	src/NetworkManager.ver $(am__append_30) \
+	$(am__append_16) src/NetworkManager.ver $(am__append_30) \
 	$(dispatcher_nmdbus_dispatcher_sources) \
 	dispatcher/org.freedesktop.nm_dispatcher.service \
 	data/NetworkManager.service \
 	data/NetworkManager-wait-online.service \
 	data/NetworkManager-dispatcher.service \
 	data/org.freedesktop.NetworkManager.service data/server.conf \
-	$(am__append_93) $(am__append_94) man/common.ent \
-	$(am__append_104) $(am__append_108) $(GLIB_GENERATED) \
+	$(am__append_90) $(am__append_91) man/common.ent \
+	$(am__append_101) $(am__append_105) $(GLIB_GENERATED) \
 	$(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \
-	cscope.po.out $(NULL) $(am__append_114)
+	cscope.po.out $(NULL) $(am__append_111)
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
-	$(polkit_policy_DATA) libnm/libnm.pc $(am__append_54) \
-	$(am__append_86)
+	$(polkit_policy_DATA) libnm/libnm.pc $(am__append_51) \
+	$(am__append_83)
 
 # test-cert.p12 created with:
 #
 # openssl pkcs12 -export \
-#	-in test_key_and_cert.pem \
-#	-inkey test_key_and_cert.pem \
-#	-certfile test_ca_cert.pem \
-#	-name "test-pkcs12" \
-#	-out test-cert.p12
+#    -in test_key_and_cert.pem \
+#    -inkey test_key_and_cert.pem \
+#    -certfile test_ca_cert.pem \
+#    -name "test-pkcs12" \
+#    -out test-cert.p12
 
 ###############################################################################
 
 ###############################################################################
+# src/devices
+###############################################################################
+
+###############################################################################
 # examples
 ###############################################################################
-EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
-	libnm-core/crypto_nss.c \
+EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
+	libnm-core/crypto_gnutls.c libnm-core/crypto_nss.c \
+	libnm-core/nm-core-enum-types.c.template \
+	libnm-core/nm-core-enum-types.h.template \
+	libnm-core/meson.build \
 	libnm-core/tests/certs/ca-no-ending-newline.pem \
 	libnm-core/tests/certs/pkcs8-decrypted.der \
 	libnm-core/tests/certs/pkcs8-enc-key.pem \
@@ -3514,17 +3506,23 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	libnm-core/tests/certs/test-key-and-cert.pem \
 	libnm-core/tests/certs/test-key-only-decrypted.der \
 	libnm-core/tests/certs/test-key-only-decrypted.pem \
-	libnm-core/tests/certs/test-key-only.pem libnm/libnm.pc.in \
-	libnm/libnm.ver $(am__append_17) \
+	libnm-core/tests/certs/test-key-only.pem \
+	libnm-core/tests/nm-core-tests-enum-types.c.template \
+	libnm-core/tests/nm-core-tests-enum-types.h.template \
+	libnm-core/tests/meson.build libnm/libnm.pc.in libnm/libnm.ver \
+	libnm/fake-typelib/NetworkManager.gir \
+	libnm/fake-typelib/NMClient.gir \
+	libnm/fake-typelib/typelibs.gresource.xml \
+	libnm/fake-typelib/meson.build $(am__append_18) \
 	libnm/generate-setting-docs.py libnm/generate-plugin-docs.pl \
+	libnm/nm-enum-types.c.template libnm/nm-enum-types.h.template \
+	libnm/meson.build libnm/tests/meson.build \
+	shared/c-list/src/c-list.h src/systemd/meson.build \
 	src/org.freedesktop.NetworkManager.conf \
-	src/nm-test-utils-core.h \
+	src/nm-test-utils-core.h src/meson.build src/dhcp/meson.build \
 	src/dhcp/tests/test-dhclient-duid.leases \
 	src/dhcp/tests/test-dhclient-commented-duid.leases \
-	src/dhcp/tests/leases/basic.leases \
-	src/dhcp/tests/leases/malformed1.leases \
-	src/dhcp/tests/leases/malformed2.leases \
-	src/dhcp/tests/leases/malformed3.leases \
+	src/dhcp/tests/meson.build src/ppp/meson.build \
 	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \
 	src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \
 	src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \
@@ -3562,7 +3560,9 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \
 	src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
 	src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \
-	$(am__append_26) \
+	src/settings/plugins/keyfile/tests/meson.build \
+	$(am__append_26) src/settings/plugins/ibft/meson.build \
+	src/settings/plugins/ibft/tests/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \
@@ -3625,6 +3625,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \
@@ -3752,6 +3754,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \
 	$(NULL) src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \
 	src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \
+	src/settings/plugins/ifcfg-rh/meson.build \
+	src/settings/plugins/ifcfg-rh/tests/meson.build \
 	src/settings/plugins/ifupdown/tests/test1 \
 	src/settings/plugins/ifupdown/tests/test2 \
 	src/settings/plugins/ifupdown/tests/test3 \
@@ -3775,14 +3779,19 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \
 	src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \
 	src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \
-	src/settings/plugins/ifnet/tests/net \
-	src/settings/plugins/ifnet/tests/net.all \
-	src/settings/plugins/ifnet/tests/nm-system-settings.conf \
-	src/settings/plugins/ifnet/tests/wpa_supplicant.conf \
-	src/settings/plugins/ifnet/tests/test_ca_cert.pem \
-	src/devices/wwan/libnm-wwan.ver data/NetworkManager-ovs.conf \
+	src/settings/plugins/ifupdown/meson.build \
+	src/settings/plugins/ifupdown/tests/meson.build \
+	src/devices/meson.build src/devices/adsl/meson.build \
+	src/devices/wwan/libnm-wwan.ver src/devices/wwan/meson.build \
+	src/devices/bluetooth/meson.build src/devices/wifi/meson.build \
+	src/devices/wifi/tests/meson.build \
+	src/devices/team/meson.build data/NetworkManager-ovs.conf \
+	src/devices/ovs/meson.build src/dnsmasq/tests/meson.build \
+	src/platform/tests/meson.build src/devices/tests/meson.build \
+	src/ndisc/tests/meson.build \
 	src/supplicant/tests/certs/test-ca-cert.pem \
 	src/supplicant/tests/certs/test-cert.p12 \
+	src/supplicant/tests/meson.build \
 	src/tests/config/NetworkManager.conf \
 	src/tests/config/NetworkManager.state \
 	src/tests/config/bad.conf \
@@ -3791,9 +3800,10 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	src/tests/config/conf.d/10-more.conf \
 	src/tests/config/conf.d/20-config-enable-1.conf \
 	src/tests/config/conf.d/90-last.conf \
-	src/tests/test-secret-agent.py dispatcher/nm-dispatcher.conf \
+	src/tests/config/meson.build src/tests/test-secret-agent.py \
+	src/tests/meson.build dispatcher/nm-dispatcher.conf \
 	dispatcher/org.freedesktop.nm_dispatcher.service.in \
-	dispatcher/nm-dispatcher.xml \
+	dispatcher/nm-dispatcher.xml dispatcher/meson.build \
 	dispatcher/tests/dispatcher-connectivity-full \
 	dispatcher/tests/dispatcher-connectivity-unknown \
 	dispatcher/tests/dispatcher-down \
@@ -3801,33 +3811,42 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	dispatcher/tests/dispatcher-up \
 	dispatcher/tests/dispatcher-vpn-down \
 	dispatcher/tests/dispatcher-vpn-up \
-	$(clients_common_settings_doc_c) \
-	$(clients_common_settings_doc_c).in \
-	clients/cli/nmcli-completion clients/common/settings-docs.xsl \
-	data/NetworkManager.service.in \
+	dispatcher/tests/meson.build clients/meson.build \
+	$(clients_common_settings_doc_h) \
+	$(clients_common_settings_doc_h).in \
+	clients/cli/nmcli-completion clients/cli/meson.build \
+	clients/common/settings-docs.xsl clients/common/meson.build \
+	clients/common/tests/meson.build clients/tui/meson.build \
+	clients/tui/newt/meson.build data/NetworkManager.service.in \
 	data/NetworkManager-wait-online.service.in \
 	data/NetworkManager-wait-online-systemd-pre200.service.in \
 	data/NetworkManager-dispatcher.service.in \
 	data/org.freedesktop.NetworkManager.service.in \
 	data/84-nm-drivers.rules data/85-nm-unmanaged.rules \
-	data/server.conf.in $(am__append_79) $(am__append_96) \
-	$(am__append_99) man/common.ent.in $(man_nm_settings_xml) \
-	$(addsuffix .xsl,$(basename $(man_nm_settings_xml))) \
-	$(man_pages) $(addsuffix .xml,$(basename $(man_pages))) \
-	$(man_pages_autogen) vapi/NM-1.0.metadata \
+	data/90-nm-thunderbolt.rules data/server.conf.in \
+	data/meson.build $(am__append_76) libnm-glib/tests/meson.build \
+	$(am__append_93) $(am__append_96) man/common.ent.in \
+	$(man_nm_settings_xml) $(addsuffix .xsl,$(basename \
+	$(man_nm_settings_xml))) $(man_pages) $(addsuffix \
+	.xml,$(basename $(man_pages))) $(man_pages_autogen) \
+	man/meson.build vapi/NM-1.0.metadata \
 	vapi/NetworkManager-1.0.metadata vapi/NMClient-1.0.metadata \
 	vapi/libnm.deps vapi/libnm-util.deps vapi/libnm-glib.deps \
-	CONTRIBUTING NetworkManager.pc.in intltool-extract.in \
-	intltool-merge.in intltool-update.in linker-script-binary.ver \
-	linker-script-devices.ver linker-script-settings.ver \
-	src/ppp/nm-ppp-plugin.ver Makefile.glib autogen.sh \
-	valgrind.suppressions shared/nm-common-macros.h \
+	vapi/meson.build CONTRIBUTING NetworkManager.pc.in \
+	intltool-extract.in intltool-merge.in intltool-update.in \
+	linker-script-binary.ver linker-script-devices.ver \
+	linker-script-settings.ver src/ppp/nm-ppp-plugin.ver \
+	Makefile.glib autogen.sh valgrind.suppressions meson.build \
+	meson_options.txt meson_post_install.py config.h.meson \
+	docs/meson.build po/meson.build shared/nm-common-macros.h \
 	shared/nm-dbus-compat.h shared/nm-default.h \
 	shared/nm-dispatcher-api.h shared/nm-test-libnm-utils.h \
-	shared/nm-test-utils-impl.c shared/nm-utils/c-list.h \
-	shared/nm-utils/c-list-util.c shared/nm-utils/c-list-util.h \
+	shared/nm-test-utils-impl.c shared/nm-utils/c-list-util.c \
+	shared/nm-utils/c-list-util.h \
 	shared/nm-utils/gsystem-local-alloc.h \
-	shared/nm-utils/nm-glib.h shared/nm-utils/nm-obj.h \
+	shared/nm-utils/nm-c-list.h shared/nm-utils/nm-compat.c \
+	shared/nm-utils/nm-compat.h shared/nm-utils/nm-glib.h \
+	shared/nm-utils/nm-jansson.h shared/nm-utils/nm-obj.h \
 	shared/nm-utils/nm-macros-internal.h \
 	shared/nm-utils/nm-shared-utils.c \
 	shared/nm-utils/nm-shared-utils.h \
@@ -3836,19 +3855,21 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	shared/nm-utils/nm-vpn-plugin-macros.h \
 	shared/nm-utils/nm-vpn-plugin-utils.c \
 	shared/nm-utils/nm-vpn-plugin-utils.h \
+	shared/nm-utils/siphash24.c shared/nm-utils/siphash24.h \
 	shared/nm-utils/unaligned.h shared/nm-version-macros.h.in \
-	tools/check-exports.sh tools/create-exports-NetworkManager.sh \
-	tools/debug-helper.py tools/run-nm-test.sh \
-	tools/test-networkmanager-service.py \
+	shared/meson.build tools/check-exports.sh \
+	tools/create-exports-NetworkManager.sh tools/debug-helper.py \
+	tools/run-nm-test.sh tools/test-networkmanager-service.py \
 	tools/test-sudo-wrapper.sh tools/enums-to-docbook.pl \
-	src/settings/plugins/README $(NULL) \
+	src/settings/plugins/README src/settings/plugins/meson.build \
+	$(NULL) examples/C/glib/meson.build \
 	examples/C/qt/add-connection-wired.cpp \
 	examples/C/qt/list-connections.cpp \
 	examples/C/qt/change-ipv4-addresses.cpp \
-	examples/C/qt/monitor-nm-running.cpp \
+	examples/C/qt/monitor-nm-running.cpp examples/C/qt/meson.build \
 	examples/dispatcher/10-ifcfg-rh-routes.sh \
 	examples/dispatcher/70-wifi-wired-exclusive.sh \
-	examples/lua/lgi/add-connection.lua \
+	examples/js/get_ips.js examples/lua/lgi/add-connection.lua \
 	examples/lua/lgi/list-connections.lua \
 	examples/lua/lgi/list-devices.lua \
 	examples/lua/lgi/show-wifi-networks.lua \
@@ -3858,7 +3879,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	examples/lua/lgi/deactivate-all.lua \
 	examples/nm-conf.d/30-anon.conf \
 	examples/nm-conf.d/31-mac-addr-change.conf \
-	examples/python/dbus/nm-state.py \
+	examples/python/nmex.py examples/python/dbus/nm-state.py \
 	examples/python/dbus/add-connection.py \
 	examples/python/dbus/add-connection-compat.py \
 	examples/python/dbus/add-wifi-eap-connection.py \
@@ -3893,16 +3914,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	examples/shell/get-hostname.sh examples/shell/list-devices.sh \
 	examples/shell/disconnect-device.sh \
 	examples/shell/active-wifi.sh $(NULL)
-EXTRA_LTLIBRARIES = $(am__append_57)
+EXTRA_LTLIBRARIES = $(am__append_54)
 dist_hook = dist-hook-settings-ifcfg-rh-alias-files
 dist_dependencies = libnm-core/nm-vpn-dbus-types.xml \
-	libnm-core/nm-dbus-types.xml $(am__append_89) $(am__append_97) \
-	$(am__append_100) $(man_pages) $(man_pages_autogen)
+	libnm-core/nm-dbus-types.xml $(am__append_86) $(am__append_94) \
+	$(am__append_97) $(man_pages) $(man_pages_autogen)
 dist_configure_check = $(am__append_3) $(am__append_4)
-install_data_hook = install-data-hook-dispatcher $(am__append_64) \
-	$(am__append_101)
-install_exec_hook = $(am__append_68)
-uninstall_hook = $(am__append_65) $(am__append_69) $(am__append_102)
+install_data_hook = install-data-hook-dispatcher $(am__append_61) \
+	$(am__append_98)
+install_exec_hook = $(am__append_65)
+uninstall_hook = $(am__append_62) $(am__append_66) $(am__append_99)
 BUILT_SOURCES = libnm-core/nm-vpn-dbus-types.xml \
 	libnm-core/nm-dbus-types.xml $(gir_DATA) $(typelib_DATA)
 GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \
@@ -3910,12 +3931,12 @@ GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \
 	libnm-core/tests/nm-core-tests-enum-types.h \
 	libnm-core/tests/nm-core-tests-enum-types.c \
 	$(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums) \
-	$(am__append_72)
+	$(am__append_69)
 man_pages = man/NetworkManager.8 man/NetworkManager.conf.5 \
 	man/nm-online.1 man/nmcli-examples.7 man/nmcli.1 man/nmtui.1 \
-	$(am__append_95)
+	$(am__append_92)
 man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
-	$(am__append_98)
+	$(am__append_95)
 
 ###############################################################################
 
@@ -3947,8 +3968,7 @@ check_programs = libnm-core/tests/test-compare \
 	src/dhcp/tests/test-dhcp-utils \
 	src/settings/plugins/keyfile/tests/test-keyfile \
 	$(am__append_25) $(am__append_32) $(am__append_37) \
-	$(am__append_41) $(am__append_50) \
-	src/dnsmasq/tests/test-dnsmasq-utils \
+	$(am__append_47) src/dnsmasq/tests/test-dnsmasq-utils \
 	src/platform/tests/test-link-fake \
 	src/platform/tests/test-link-linux \
 	src/platform/tests/test-address-fake \
@@ -3959,18 +3979,17 @@ check_programs = libnm-core/tests/test-compare \
 	src/platform/tests/test-route-linux \
 	src/platform/tests/test-cleanup-fake \
 	src/platform/tests/test-cleanup-linux \
-	src/devices/tests/test-lldp src/devices/tests/test-arping \
+	src/devices/tests/test-lldp src/devices/tests/test-acd \
 	src/ndisc/tests/test-ndisc-fake \
 	src/supplicant/tests/test-supplicant-config \
 	src/tests/config/test-config src/tests/test-general \
 	src/tests/test-general-with-expect src/tests/test-ip4-config \
 	src/tests/test-ip6-config src/tests/test-dcb \
-	src/tests/test-systemd src/tests/test-resolvconf-capture \
-	src/tests/test-wired-defname src/tests/test-utils \
-	dispatcher/tests/test-dispatcher-envp $(am__append_58) \
-	$(am__append_59) $(am__append_90)
+	src/tests/test-systemd src/tests/test-wired-defname \
+	src/tests/test-utils dispatcher/tests/test-dispatcher-envp \
+	$(am__append_55) $(am__append_56) $(am__append_87)
 check_programs_norun = src/platform/tests/monitor \
-	src/ndisc/tests/test-ndisc-linux $(am__append_91) \
+	src/ndisc/tests/test-ndisc-linux $(am__append_88) \
 	examples/C/glib/add-connection-gdbus \
 	examples/C/glib/add-connection-libnm \
 	examples/C/glib/get-active-connections-gdbus \
@@ -3978,7 +3997,7 @@ check_programs_norun = src/platform/tests/monitor \
 	examples/C/glib/list-connections-gdbus \
 	examples/C/glib/list-connections-libnm \
 	examples/C/glib/monitor-nm-running-gdbus \
-	examples/C/glib/monitor-nm-state-gdbus $(am__append_113)
+	examples/C/glib/monitor-nm-state-gdbus $(am__append_110)
 
 ###############################################################################
 
@@ -3987,33 +4006,33 @@ check_programs_norun = src/platform/tests/monitor \
 ###############################################################################
 check_ltlibraries = libnm/tests/libnm-vpn-plugin-utils-test.la \
 	src/libNetworkManagerTest.la clients/common/libnmc-base.la \
-	$(am__append_56) $(am__append_80)
+	$(am__append_53) $(am__append_77)
 check_local = check-local-exports-libnm $(am__append_27) \
-	$(am__append_31) $(am__append_36) $(am__append_40) \
-	check-local-devices-adsl $(am__append_44) $(am__append_49) \
-	$(am__append_52) $(am__append_55) $(am__append_88)
-VAPIGEN_VAPIS = $(am__append_105) $(am__append_106)
+	$(am__append_31) $(am__append_36) check-local-devices-adsl \
+	$(am__append_40) $(am__append_46) $(am__append_49) \
+	$(am__append_52) $(am__append_85)
+VAPIGEN_VAPIS = $(am__append_102) $(am__append_103)
 dbusservice_DATA = $(am__append_33) dispatcher/nm-dispatcher.conf \
 	src/org.freedesktop.NetworkManager.conf
 dbusactivation_DATA =  \
 	dispatcher/org.freedesktop.nm_dispatcher.service
-INTROSPECTION_GIRS = $(am__append_15) $(am__append_87)
+INTROSPECTION_GIRS = $(am__append_15) $(am__append_84)
 INTROSPECTION_SCANNER_ARGS = 
 INTROSPECTION_COMPILER_ARGS = 
 # Pass SANITIZER_ENV where a command that uses built libraries is
 # executed, to suppress possible errors
-INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV)
+INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) LDFLAGS="$(SANITIZER_LIB_LDFLAGS)"
 libnmincludedir = $(includedir)/libnm
 libnminclude_HEADERS = $(libnm_core_lib_h_pub_real) \
-	$(libnm_lib_h_pub_real) $(libnm_lib_h_pub_nointrospect)
+	$(libnm_lib_h_pub_real)
 nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \
 	$(libnm_lib_h_pub_mkenums)
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_85)
+pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_82)
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = $(am__append_22)
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(am__append_107)
+vapi_DATA = $(am__append_104)
 examplesdir = $(docdir)/examples
 rundir = $(runstatedir)/NetworkManager
 statedir = $(localstatedir)/lib/NetworkManager
@@ -4027,12 +4046,13 @@ SUBDIRS = . po $(am__append_1) $(am__append_2)
 ###############################################################################
 set_sanitizer_env = \
 	[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
-	if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \
-		export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \
+	if echo $(SANITIZER_LIB_CFLAGS) $(SANITIZER_EXEC_CFLAGS) | grep -e -fsanitize=address > /dev/null; then \
+		[ -n "$(1)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \
+		[ -n "$(2)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(2) | grep libasan\.so\.. -o | head -n 1)"; \
 	fi
 
 check_so_symbols = \
-	$(call set_sanitizer_env,$(1)); \
+	$(call set_sanitizer_env,$(1),$(builddir)/src/NetworkManager); \
 	LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null
 
 
@@ -4046,7 +4066,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-wext=no \
 	--enable-ifcfg-rh \
 	--enable-ifupdown \
-	--enable-ifnet \
 	--disable-dependency-tracking
 
 
@@ -4056,15 +4075,7 @@ dist_polkit_policy_in_in_files = \
 	data/org.freedesktop.NetworkManager.policy.in.in
 
 polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy)
-
-# gdbus-codegen 2.38 will emit code that requires glib 2.38, which
-# will then cause availability warnings if we define
-# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32.
-#
-# This is fixed in GLib 2.40 (it emits code that takes
-# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go
-# away when we depend on that.
-introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS))
+introspection_libnmdbus_la_CPPFLAGS = $(GLIB_CFLAGS)
 introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.AccessPoint.c \
 	introspection/org.freedesktop.NetworkManager.AccessPoint.h \
@@ -4316,45 +4327,59 @@ libnm_core_lib_h_priv = shared/nm-utils/c-list-util.h \
 	libnm-core/nm-property-compare.h \
 	libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \
 	$(am__append_6)
-libnm_core_lib_c_real = shared/nm-utils/c-list-util.c \
-	shared/nm-utils/nm-dedup-multi.c \
-	shared/nm-utils/nm-enum-utils.c \
-	shared/nm-utils/nm-hash-utils.c \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-random-utils.c \
-	shared/nm-utils/nm-udev-utils.c shared/nm-utils/siphash24.c \
-	shared/nm-meta-setting.c libnm-core/crypto.c \
-	libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \
-	libnm-core/nm-errors.c libnm-core/nm-keyfile-reader.c \
-	libnm-core/nm-keyfile-utils.c libnm-core/nm-keyfile-writer.c \
-	libnm-core/nm-property-compare.c libnm-core/nm-setting-8021x.c \
-	libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c \
+libnm_core_lib_c_settings_real = \
+	libnm-core/nm-setting-8021x.c \
+	libnm-core/nm-setting-adsl.c \
+	libnm-core/nm-setting-bluetooth.c \
 	libnm-core/nm-setting-bond.c \
 	libnm-core/nm-setting-bridge-port.c \
-	libnm-core/nm-setting-bridge.c libnm-core/nm-setting-cdma.c \
-	libnm-core/nm-setting-connection.c libnm-core/nm-setting-dcb.c \
-	libnm-core/nm-setting-dummy.c libnm-core/nm-setting-generic.c \
-	libnm-core/nm-setting-gsm.c libnm-core/nm-setting-infiniband.c \
+	libnm-core/nm-setting-bridge.c \
+	libnm-core/nm-setting-cdma.c \
+	libnm-core/nm-setting-connection.c \
+	libnm-core/nm-setting-dcb.c \
+	libnm-core/nm-setting-dummy.c \
+	libnm-core/nm-setting-generic.c \
+	libnm-core/nm-setting-gsm.c \
+	libnm-core/nm-setting-infiniband.c \
 	libnm-core/nm-setting-ip-config.c \
 	libnm-core/nm-setting-ip-tunnel.c \
 	libnm-core/nm-setting-ip4-config.c \
 	libnm-core/nm-setting-ip6-config.c \
-	libnm-core/nm-setting-macsec.c libnm-core/nm-setting-macvlan.c \
+	libnm-core/nm-setting-macsec.c \
+	libnm-core/nm-setting-macvlan.c \
 	libnm-core/nm-setting-olpc-mesh.c \
 	libnm-core/nm-setting-ovs-bridge.c \
 	libnm-core/nm-setting-ovs-interface.c \
 	libnm-core/nm-setting-ovs-patch.c \
-	libnm-core/nm-setting-ovs-port.c libnm-core/nm-setting-ppp.c \
-	libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \
+	libnm-core/nm-setting-ovs-port.c \
+	libnm-core/nm-setting-ppp.c \
+	libnm-core/nm-setting-pppoe.c \
+	libnm-core/nm-setting-proxy.c \
 	libnm-core/nm-setting-serial.c \
 	libnm-core/nm-setting-tc-config.c \
-	libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \
-	libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \
-	libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \
-	libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wimax.c \
+	libnm-core/nm-setting-team-port.c \
+	libnm-core/nm-setting-team.c \
+	libnm-core/nm-setting-tun.c \
+	libnm-core/nm-setting-user.c \
+	libnm-core/nm-setting-vlan.c \
+	libnm-core/nm-setting-vpn.c \
+	libnm-core/nm-setting-vxlan.c \
+	libnm-core/nm-setting-wimax.c \
 	libnm-core/nm-setting-wired.c \
 	libnm-core/nm-setting-wireless-security.c \
-	libnm-core/nm-setting-wireless.c libnm-core/nm-setting.c \
+	libnm-core/nm-setting-wireless.c
+
+libnm_core_lib_c_real = $(libnm_core_lib_c_settings_real) \
+	shared/nm-utils/c-list-util.c shared/nm-utils/nm-dedup-multi.c \
+	shared/nm-utils/nm-enum-utils.c \
+	shared/nm-utils/nm-hash-utils.c \
+	shared/nm-utils/nm-shared-utils.c \
+	shared/nm-utils/nm-random-utils.c \
+	shared/nm-utils/nm-udev-utils.c shared/nm-meta-setting.c \
+	libnm-core/crypto.c libnm-core/nm-connection.c \
+	libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \
+	libnm-core/nm-keyfile.c libnm-core/nm-keyfile-utils.c \
+	libnm-core/nm-property-compare.c libnm-core/nm-setting.c \
 	libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \
 	libnm-core/nm-vpn-editor-plugin.c \
 	libnm-core/nm-vpn-plugin-info.c $(am__append_7) \
@@ -4367,19 +4392,15 @@ libnm_core_lib_c_mkenums = \
 dflt_cppflags_libnm_core = -I$(srcdir)/shared -I$(builddir)/shared \
 	-I$(srcdir)/libnm-core -I$(builddir)/libnm-core \
 	$(CODE_COVERAGE_CFLAGS) $(GLIB_CFLAGS) $(LIBUDEV_CFLAGS) \
-	$(am__append_8) $(am__append_9) $(am__append_10)
+	$(SANITIZER_LIB_CFLAGS) $(am__append_8) $(am__append_9)
 nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real)
 nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
-libnm_core_libnm_core_la_CPPFLAGS = \
-	$(dflt_cppflags_libnm_core) \
+libnm_core_libnm_core_la_CPPFLAGS = $(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DLOCALEDIR=\"$(datadir)/locale\" \
-	-DNMCONFDIR=\"$(nmconfdir)\" \
-	-DNMLIBDIR=\"$(nmlibdir)\" \
-	-DNMPLUGINDIR=\"$(pkglibdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB
-
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
+	-DLOCALEDIR=\"$(datadir)/locale\" -DNMCONFDIR=\"$(nmconfdir)\" \
+	-DNMLIBDIR=\"$(nmlibdir)\" -DNMPLUGINDIR=\"$(pkglibdir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" $(NULL) $(am__append_10)
 libnm_core_libnm_core_la_SOURCES = \
 	$(libnm_core_lib_h_pub_real) \
 	$(libnm_core_lib_h_priv) \
@@ -4392,13 +4413,16 @@ nodist_libnm_core_libnm_core_la_SOURCES = \
 libnm_core_libnm_core_la_LIBADD = $(GLIB_LIBS) $(UUID_LIBS) \
 	$(LIBUDEV_LIBS) $(am__append_12) $(am__append_14)
 libnm_core_libnm_core_la_LDFLAGS = \
-	$(CODE_COVERAGE_LDFLAGS)
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS)
 
 nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h
 libnm_core_tests_cppflags = \
 	$(dflt_cppflags_libnm_core) \
 	-I$(srcdir)/libnm-core/tests \
 	-I$(builddir)/libnm-core/tests \
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
 	-DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\"
 
 libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags)
@@ -4420,6 +4444,9 @@ libnm_core_tests_ldadd = \
 	libnm-core/libnm-core.la \
 	$(GLIB_LIBS)
 
+libnm_core_tests_ldflags = \
+	$(SANITIZER_LIB_LDFLAGS)
+
 libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd)
 libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd)
 libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd)
@@ -4427,6 +4454,13 @@ libnm_core_tests_test_keyfile_LDADD = $(libnm_core_tests_ldadd)
 libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd)
 libnm_core_tests_test_setting_LDADD = $(libnm_core_tests_ldadd)
 libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd)
+libnm_core_tests_test_compare_LDFLAGS = $(libnm_core_tests_ldflags)
+libnm_core_tests_test_crypto_LDFLAGS = $(libnm_core_tests_ldflags)
+libnm_core_tests_test_general_LDFLAGS = $(libnm_core_tests_ldflags)
+libnm_core_tests_test_keyfile_LDFLAGS = $(libnm_core_tests_ldflags)
+libnm_core_tests_test_secrets_LDFLAGS = $(libnm_core_tests_ldflags)
+libnm_core_tests_test_setting_LDFLAGS = $(libnm_core_tests_ldflags)
+libnm_core_tests_test_settings_defaults_LDFLAGS = $(libnm_core_tests_ldflags)
 
 ###############################################################################
 libnm_lib_h_pub_real = \
@@ -4434,6 +4468,8 @@ libnm_lib_h_pub_real = \
 	libnm/NetworkManager.h \
 	libnm/nm-access-point.h \
 	libnm/nm-active-connection.h \
+	libnm/nm-autoptr.h \
+	libnm/nm-checkpoint.h \
 	libnm/nm-client.h \
 	libnm/nm-device-adsl.h \
 	libnm/nm-device-bond.h \
@@ -4463,15 +4499,13 @@ libnm_lib_h_pub_real = \
 	libnm/nm-ip-config.h \
 	libnm/nm-object.h \
 	libnm/nm-remote-connection.h \
+	libnm/nm-secret-agent-old.h \
 	libnm/nm-types.h \
 	libnm/nm-vpn-connection.h \
 	libnm/nm-vpn-editor.h \
-	libnm/nm-wimax-nsp.h
-
-libnm_lib_h_pub_nointrospect = \
-	libnm/nm-secret-agent-old.h \
 	libnm/nm-vpn-plugin-old.h \
-	libnm/nm-vpn-service-plugin.h
+	libnm/nm-vpn-service-plugin.h \
+	libnm/nm-wimax-nsp.h
 
 libnm_lib_h_pub_mkenums = \
 	libnm/nm-enum-types.h
@@ -4493,6 +4527,7 @@ libnm_lib_h_priv = \
 libnm_lib_c_real = \
 	libnm/nm-access-point.c \
 	libnm/nm-active-connection.c \
+	libnm/nm-checkpoint.c \
 	libnm/nm-client.c \
 	libnm/nm-dbus-helpers.c \
 	libnm/nm-device-adsl.c \
@@ -4545,10 +4580,11 @@ libnm_lib_cppflags = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
 	-DNMRUNDIR=\"$(nmrundir)\"
 
 libnm_libnm_utils_la_CPPFLAGS = \
+	$(INTROSPECTION_CFLAGS) \
 	$(libnm_lib_cppflags)
 
 libnm_libnm_utils_la_SOURCES = \
@@ -4561,18 +4597,17 @@ libnm_libnm_utils_la_LIBADD = \
 
 nm_enum_types_sources = \
 	$(libnm_lib_h_pub_mkenums) \
-	$(libnm_lib_h_pub_real) \
-	$(libnm_lib_h_pub_nointrospect)
+	$(libnm_lib_h_pub_real)
 
 nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
 nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
 libnm_libnm_la_CPPFLAGS = \
 	$(libnm_lib_cppflags) \
-	$(LIBUDEV_CFLAGS)
+	$(LIBUDEV_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS)
 
 libnm_libnm_la_SOURCES = \
 	$(libnm_lib_h_pub_real) \
-	$(libnm_lib_h_pub_nointrospect) \
 	$(libnm_lib_h_priv) \
 	$(libnm_lib_c_real)
 
@@ -4593,6 +4628,7 @@ libnm_libnm_la_LIBADD = \
 libnm_libnm_la_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/libnm/libnm.ver" \
 	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
 	-version-info "1:0:1"
 
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_INCLUDES = Gio-2.0
@@ -4607,11 +4643,13 @@ libnm_libnm_la_LDFLAGS = \
 @HAVE_INTROSPECTION_TRUE@	$(libnm_core_lib_c_real) \
 @HAVE_INTROSPECTION_TRUE@	$(libnm_lib_h_pub_mkenums) \
 @HAVE_INTROSPECTION_TRUE@	$(libnm_lib_h_pub_real) \
-@HAVE_INTROSPECTION_TRUE@	$(libnm_lib_h_pub_nointrospect) \
 @HAVE_INTROSPECTION_TRUE@	$(libnm_lib_c_mkenums) \
 @HAVE_INTROSPECTION_TRUE@	$(libnm_lib_c_real)
 
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@nodist_libnm_libnm_utils_la_SOURCES = \
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/typelibs.c
+
 @HAVE_INTROSPECTION_TRUE@libnm_noinst_data = \
 @HAVE_INTROSPECTION_TRUE@	libnm/nm-property-docs.xml \
 @HAVE_INTROSPECTION_TRUE@	libnm/nm-settings-docs-overrides.xml \
@@ -4619,7 +4657,7 @@ libnm_libnm_la_LDFLAGS = \
 @HAVE_INTROSPECTION_TRUE@	libnm/nm-settings-keyfile-docs.xml \
 @HAVE_INTROSPECTION_TRUE@	libnm/nm-settings-ifcfg-rh-docs.xml
 
-@HAVE_INTROSPECTION_TRUE@libnm_docs_sources = $(libnm_core_lib_c_real)
+@HAVE_INTROSPECTION_TRUE@libnm_docs_sources = $(libnm_core_lib_c_settings_real)
 
 ###############################################################################
 libnm_tests_programs = \
@@ -4632,18 +4670,23 @@ libnm_tests_cppflags = \
 	$(dflt_cppflags_libnm_core) \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
 	-DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\"
 
 libnm_tests_ldadd = \
 	libnm/libnm.la \
 	$(GLIB_LIBS)
 
+libnm_tests_ldflags = \
+	$(SANITIZER_LIB_LDFLAGS)
+
 libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_remote_settings_client_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_secret_agent_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_general_SOURCES = \
+	shared/nm-utils/nm-compat.c \
 	libnm/tests/test-general.c
 
 libnm_tests_test_nm_client_SOURCES = \
@@ -4668,6 +4711,10 @@ libnm_tests_test_general_LDADD = \
 libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd)
 libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd)
 libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd)
+libnm_tests_test_general_LDFLAGS = $(libnm_tests_ldflags)
+libnm_tests_test_nm_client_LDFLAGS = $(libnm_tests_ldflags)
+libnm_tests_test_remote_settings_client_LDFLAGS = $(libnm_tests_ldflags)
+libnm_tests_test_secret_agent_LDFLAGS = $(libnm_tests_ldflags)
 libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \
 	shared/nm-utils/nm-vpn-plugin-utils.c \
 	shared/nm-utils/nm-vpn-plugin-utils.h
@@ -4679,7 +4726,10 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
 	-I$(builddir)/libnm-core \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(SANITIZER_EXEC_CFLAGS) \
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT
 
 libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
 	$(GLIB_LIBS)
@@ -4694,8 +4744,7 @@ src_cppflags = \
 	-I$(builddir)/src \
 	\
 	-DPREFIX=\"$(prefix)\" \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 	\
 	-DBINDIR=\"$(bindir)\" \
 	-DDATADIR=\"$(datadir)\" \
@@ -4718,7 +4767,6 @@ src_cppflags = \
 	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
 	\
 	$(LIBUDEV_CFLAGS) \
-	$(LIBNL_CFLAGS) \
 	$(LIBNDP_CFLAGS) \
 	$(LIBPSL_CFLAGS) \
 	$(LIBCURL_CFLAGS) \
@@ -4726,12 +4774,30 @@ src_cppflags = \
 	$(LIBAUDIT_CFLAGS) \
 	$(SYSTEMD_LOGIN_CFLAGS) \
 	$(SYSTEMD_JOURNAL_CFLAGS) \
+	$(SANITIZER_EXEC_CFLAGS) \
 	\
 	$(NULL)
 
 src_ldflags = $(CODE_COVERAGE_LDFLAGS)
 
 ###############################################################################
+shared_libcsiphash_la_CPPFLAGS = $(src_cppflags)
+shared_libcsiphash_la_SOURCES = \
+	shared/c-siphash/src/c-siphash.c \
+	shared/c-siphash/src/c-siphash.h
+
+shared_libnacd_la_CFLAGS = -std=gnu99
+shared_libnacd_la_CPPFLAGS = \
+	$(src_cppflags) \
+	-I $(srcdir)/shared/c-list/src \
+	-I $(srcdir)/shared/c-siphash/src
+
+shared_libnacd_la_SOURCES = \
+	shared/n-acd/src/n-acd.c \
+	shared/n-acd/src/n-acd.h
+
+
+###############################################################################
 src_libsystemd_nm_la_cppflags = \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
@@ -4745,6 +4811,7 @@ src_libsystemd_nm_la_cppflags = \
 	-I$(srcdir)/src/systemd/src/shared \
 	-I$(srcdir)/src/systemd/src/libsystemd-network \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
+	$(LIBSYSTEMD_NM_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(CODE_COVERAGE_CFLAGS)
 
@@ -4764,23 +4831,29 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/sd-adapt/condition.h \
 	src/systemd/sd-adapt/conf-parser.h \
 	src/systemd/sd-adapt/def.h \
+	src/systemd/sd-adapt/device-nodes.h \
 	src/systemd/sd-adapt/dirent-util.h \
 	src/systemd/sd-adapt/env-util.h \
+	src/systemd/sd-adapt/errno-list.h \
 	src/systemd/sd-adapt/format-util.h \
+	src/systemd/sd-adapt/glob-util.h \
 	src/systemd/sd-adapt/gunicode.h \
 	src/systemd/sd-adapt/ioprio.h \
 	src/systemd/sd-adapt/khash.h \
 	src/systemd/sd-adapt/libudev.h \
+	src/systemd/sd-adapt/locale-util.h \
+	src/systemd/sd-adapt/memfd-util.h \
 	src/systemd/sd-adapt/missing.h \
 	src/systemd/sd-adapt/mkdir.h \
+	src/systemd/sd-adapt/procfs-util.h \
 	src/systemd/sd-adapt/raw-clone.h \
 	src/systemd/sd-adapt/sd-daemon.h \
 	src/systemd/sd-adapt/stat-util.h \
+	src/systemd/sd-adapt/terminal-util.h \
 	src/systemd/sd-adapt/udev-util.h \
 	src/systemd/sd-adapt/udev.h \
 	src/systemd/sd-adapt/user-util.h \
 	src/systemd/sd-adapt/virt.h \
-	src/systemd/sd-adapt/glob-util.h \
 	src/systemd/src/basic/alloc-util.c \
 	src/systemd/src/basic/alloc-util.h \
 	src/systemd/src/basic/async.h \
@@ -4898,6 +4971,7 @@ src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags)
 src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \
 	src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \
 	src/NetworkManagerUtils.c src/NetworkManagerUtils.h \
+	src/platform/nm-netlink.c src/platform/nm-netlink.h \
 	src/platform/nmp-netns.c src/platform/nmp-netns.h \
 	src/platform/nmp-object.c src/platform/nmp-object.h \
 	src/platform/nm-platform-utils.c \
@@ -4911,17 +4985,17 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \
 	src/platform/wifi/wifi-utils.c src/platform/wifi/wifi-utils.h \
 	src/ndisc/nm-lndp-ndisc.c src/ndisc/nm-lndp-ndisc.h \
 	src/ndisc/nm-ndisc.c src/ndisc/nm-ndisc.h \
-	src/ndisc/nm-ndisc-private.h src/nm-exported-object.c \
-	src/nm-exported-object.h src/nm-ip4-config.c \
-	src/nm-ip4-config.h src/nm-ip6-config.c src/nm-ip6-config.h \
-	src/dhcp/nm-dhcp-client.c src/dhcp/nm-dhcp-client.h \
-	src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \
-	src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \
-	src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \
-	src/main-utils.c src/main-utils.h $(NULL) $(am__append_18)
+	src/ndisc/nm-ndisc-private.h src/nm-dbus-utils.c \
+	src/nm-dbus-utils.h src/nm-dbus-object.c src/nm-dbus-object.h \
+	src/nm-ip4-config.c src/nm-ip4-config.h src/nm-ip6-config.c \
+	src/nm-ip6-config.h src/dhcp/nm-dhcp-client.c \
+	src/dhcp/nm-dhcp-client.h src/dhcp/nm-dhcp-client-logging.h \
+	src/dhcp/nm-dhcp-utils.c src/dhcp/nm-dhcp-utils.h \
+	src/dhcp/nm-dhcp-systemd.c src/dhcp/nm-dhcp-manager.c \
+	src/dhcp/nm-dhcp-manager.h src/main-utils.c src/main-utils.h \
+	$(NULL) $(am__append_19)
 src_libNetworkManagerBase_la_LIBADD = \
 	libnm-core/libnm-core.la \
-	introspection/libnmdbus.la \
 	$(GLIB_LIBS) \
 	$(SYSTEMD_JOURNAL_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -4930,12 +5004,19 @@ src_libNetworkManagerBase_la_LIBADD = \
 
 ###############################################################################
 src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
-src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \
-	src/nm-checkpoint-manager.h src/nm-checkpoint.c \
-	src/nm-checkpoint.h src/devices/nm-device.c \
-	src/devices/nm-device.h src/devices/nm-lldp-listener.c \
-	src/devices/nm-lldp-listener.h src/devices/nm-arping-manager.c \
-	src/devices/nm-arping-manager.h \
+src_libNetworkManager_la_SOURCES = \
+	\
+	src/nm-checkpoint.c \
+	src/nm-checkpoint.h \
+	src/nm-checkpoint-manager.c \
+	src/nm-checkpoint-manager.h \
+	\
+	src/devices/nm-device.c \
+	src/devices/nm-device.h \
+	src/devices/nm-lldp-listener.c \
+	src/devices/nm-lldp-listener.h \
+	src/devices/nm-acd-manager.c \
+	src/devices/nm-acd-manager.h \
 	src/devices/nm-device-ethernet-utils.c \
 	src/devices/nm-device-ethernet-utils.h \
 	src/devices/nm-device-factory.c \
@@ -4943,45 +5024,79 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \
 	src/devices/nm-device-generic.c \
 	src/devices/nm-device-generic.h \
 	src/devices/nm-device-logging.h \
-	src/devices/nm-device-private.h src/devices/nm-device-bond.c \
-	src/devices/nm-device-bond.h src/devices/nm-device-bridge.c \
-	src/devices/nm-device-bridge.h src/devices/nm-device-dummy.c \
-	src/devices/nm-device-dummy.h src/devices/nm-device-ethernet.c \
+	src/devices/nm-device-private.h \
+	\
+	src/devices/nm-device-bond.c \
+	src/devices/nm-device-bond.h \
+	src/devices/nm-device-bridge.c \
+	src/devices/nm-device-bridge.h \
+	src/devices/nm-device-dummy.c \
+	src/devices/nm-device-dummy.h \
+	src/devices/nm-device-ethernet.c \
 	src/devices/nm-device-ethernet.h \
 	src/devices/nm-device-infiniband.c \
 	src/devices/nm-device-infiniband.h \
 	src/devices/nm-device-ip-tunnel.c \
 	src/devices/nm-device-ip-tunnel.h \
-	src/devices/nm-device-macsec.c src/devices/nm-device-macsec.h \
+	src/devices/nm-device-macsec.c \
+	src/devices/nm-device-macsec.h \
 	src/devices/nm-device-macvlan.c \
-	src/devices/nm-device-macvlan.h src/devices/nm-device-ppp.c \
-	src/devices/nm-device-ppp.h src/devices/nm-device-tun.c \
-	src/devices/nm-device-tun.h src/devices/nm-device-veth.c \
-	src/devices/nm-device-veth.h src/devices/nm-device-vlan.c \
-	src/devices/nm-device-vlan.h src/devices/nm-device-vxlan.c \
-	src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhcpcanon.c \
-	src/dhcp/nm-dhcp-dhclient.c src/dhcp/nm-dhcp-dhcpcd.c \
-	src/dhcp/nm-dhcp-helper-api.h src/dhcp/nm-dhcp-listener.c \
-	src/dhcp/nm-dhcp-listener.h src/dhcp/nm-dhcp-dhclient-utils.c \
-	src/dhcp/nm-dhcp-dhclient-utils.h src/dns/nm-dns-dnsmasq.c \
-	src/dns/nm-dns-dnsmasq.h src/dns/nm-dns-systemd-resolved.c \
-	src/dns/nm-dns-systemd-resolved.h src/dns/nm-dns-unbound.c \
-	src/dns/nm-dns-unbound.h src/dns/nm-dns-manager.c \
-	src/dns/nm-dns-manager.h src/dns/nm-dns-plugin.c \
-	src/dns/nm-dns-plugin.h src/dnsmasq/nm-dnsmasq-manager.c \
+	src/devices/nm-device-macvlan.h \
+	src/devices/nm-device-ppp.c \
+	src/devices/nm-device-ppp.h \
+	src/devices/nm-device-tun.c \
+	src/devices/nm-device-tun.h \
+	src/devices/nm-device-veth.c \
+	src/devices/nm-device-veth.h \
+	src/devices/nm-device-vlan.c \
+	src/devices/nm-device-vlan.h \
+	src/devices/nm-device-vxlan.c \
+	src/devices/nm-device-vxlan.h \
+	\
+	src/dhcp/nm-dhcp-dhcpcanon.c \
+	src/dhcp/nm-dhcp-dhclient.c \
+	src/dhcp/nm-dhcp-dhcpcd.c \
+	src/dhcp/nm-dhcp-helper-api.h \
+	src/dhcp/nm-dhcp-listener.c \
+	src/dhcp/nm-dhcp-listener.h \
+	src/dhcp/nm-dhcp-dhclient-utils.c \
+	src/dhcp/nm-dhcp-dhclient-utils.h \
+	\
+	src/dns/nm-dns-manager.c \
+	src/dns/nm-dns-manager.h \
+	src/dns/nm-dns-plugin.c \
+	src/dns/nm-dns-plugin.h \
+	src/dns/nm-dns-dnsmasq.c \
+	src/dns/nm-dns-dnsmasq.h \
+	src/dns/nm-dns-systemd-resolved.c \
+	src/dns/nm-dns-systemd-resolved.h \
+	src/dns/nm-dns-unbound.c \
+	src/dns/nm-dns-unbound.h \
+	\
+	src/dnsmasq/nm-dnsmasq-manager.c \
 	src/dnsmasq/nm-dnsmasq-manager.h \
-	src/dnsmasq/nm-dnsmasq-utils.c src/dnsmasq/nm-dnsmasq-utils.h \
-	src/ppp/nm-ppp-manager-call.c src/ppp/nm-ppp-manager-call.h \
-	src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \
-	src/nm-hostname-manager.c src/nm-hostname-manager.h \
+	src/dnsmasq/nm-dnsmasq-utils.c \
+	src/dnsmasq/nm-dnsmasq-utils.h \
+	\
+	src/ppp/nm-ppp-manager-call.c \
+	src/ppp/nm-ppp-manager-call.h \
+	src/ppp/nm-ppp-manager.h \
+	src/ppp/nm-ppp-status.h \
+	\
+	src/nm-hostname-manager.c \
+	src/nm-hostname-manager.h \
+	\
 	src/settings/nm-agent-manager.c \
-	src/settings/nm-agent-manager.h src/settings/nm-secret-agent.c \
+	src/settings/nm-agent-manager.h \
+	src/settings/nm-secret-agent.c \
 	src/settings/nm-secret-agent.h \
 	src/settings/nm-settings-connection.c \
 	src/settings/nm-settings-connection.h \
 	src/settings/nm-settings-plugin.c \
-	src/settings/nm-settings-plugin.h src/settings/nm-settings.c \
+	src/settings/nm-settings-plugin.h \
+	src/settings/nm-settings.c \
 	src/settings/nm-settings.h \
+	\
 	src/settings/plugins/keyfile/nms-keyfile-connection.c \
 	src/settings/plugins/keyfile/nms-keyfile-connection.h \
 	src/settings/plugins/keyfile/nms-keyfile-plugin.c \
@@ -4992,6 +5107,7 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \
 	src/settings/plugins/keyfile/nms-keyfile-utils.h \
 	src/settings/plugins/keyfile/nms-keyfile-writer.c \
 	src/settings/plugins/keyfile/nms-keyfile-writer.h \
+	\
 	src/supplicant/nm-supplicant-config.c \
 	src/supplicant/nm-supplicant-config.h \
 	src/supplicant/nm-supplicant-interface.c \
@@ -5001,34 +5117,69 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \
 	src/supplicant/nm-supplicant-settings-verify.c \
 	src/supplicant/nm-supplicant-settings-verify.h \
 	src/supplicant/nm-supplicant-types.h \
-	src/vpn/nm-vpn-connection.c src/vpn/nm-vpn-connection.h \
-	src/vpn/nm-vpn-manager.c src/vpn/nm-vpn-manager.h \
-	src/nm-act-request.c src/nm-act-request.h \
-	src/nm-active-connection.c src/nm-active-connection.h \
-	src/nm-audit-manager.c src/nm-audit-manager.h \
-	src/nm-bus-manager.c src/nm-bus-manager.h src/nm-config.c \
-	src/nm-config.h src/nm-config-data.c src/nm-config-data.h \
-	src/nm-connectivity.h src/nm-dcb.c src/nm-dcb.h src/nm-netns.c \
-	src/nm-netns.h src/nm-dhcp4-config.c src/nm-dhcp4-config.h \
-	src/nm-dhcp6-config.c src/nm-dhcp6-config.h \
-	src/nm-dispatcher.c src/nm-dispatcher.h \
-	src/nm-firewall-manager.c src/nm-firewall-manager.h \
-	src/nm-proxy-config.c src/nm-proxy-config.h \
-	src/nm-auth-manager.c src/nm-auth-manager.h \
-	src/nm-auth-subject.c src/nm-auth-subject.h \
-	src/nm-auth-utils.c src/nm-auth-utils.h src/nm-manager.c \
-	src/nm-manager.h src/nm-pacrunner-manager.c \
-	src/nm-pacrunner-manager.h src/nm-policy.c src/nm-policy.h \
-	src/nm-rfkill-manager.c src/nm-rfkill-manager.h \
-	src/nm-session-monitor.h src/nm-session-monitor.c \
-	src/nm-sleep-monitor.c src/nm-sleep-monitor.h src/nm-types.h \
-	$(NULL) $(am__append_19)
+	\
+	src/vpn/nm-vpn-connection.c \
+	src/vpn/nm-vpn-connection.h \
+	src/vpn/nm-vpn-manager.c \
+	src/vpn/nm-vpn-manager.h \
+	\
+	src/nm-act-request.c \
+	src/nm-act-request.h \
+	src/nm-active-connection.c \
+	src/nm-active-connection.h \
+	src/nm-audit-manager.c \
+	src/nm-audit-manager.h \
+	src/nm-dbus-manager.c \
+	src/nm-dbus-manager.h \
+	src/nm-config.c \
+	src/nm-config.h \
+	src/nm-config-data.c \
+	src/nm-config-data.h \
+	src/nm-connectivity.c \
+	src/nm-connectivity.h \
+	src/nm-dcb.c \
+	src/nm-dcb.h \
+	src/nm-netns.c \
+	src/nm-netns.h \
+	src/nm-dhcp4-config.c \
+	src/nm-dhcp4-config.h \
+	src/nm-dhcp6-config.c \
+	src/nm-dhcp6-config.h \
+	src/nm-dispatcher.c \
+	src/nm-dispatcher.h \
+	src/nm-firewall-manager.c \
+	src/nm-firewall-manager.h \
+	src/nm-proxy-config.c \
+	src/nm-proxy-config.h \
+	src/nm-auth-manager.c \
+	src/nm-auth-manager.h \
+	src/nm-auth-subject.c \
+	src/nm-auth-subject.h \
+	src/nm-auth-utils.c \
+	src/nm-auth-utils.h \
+	src/nm-manager.c \
+	src/nm-manager.h \
+	src/nm-pacrunner-manager.c \
+	src/nm-pacrunner-manager.h \
+	src/nm-policy.c \
+	src/nm-policy.h \
+	src/nm-rfkill-manager.c \
+	src/nm-rfkill-manager.h \
+	src/nm-session-monitor.h \
+	src/nm-session-monitor.c \
+	src/nm-sleep-monitor.c \
+	src/nm-sleep-monitor.h \
+	src/nm-types.h \
+	\
+	$(NULL)
+
 src_libNetworkManager_la_LIBADD = \
 	src/libNetworkManagerBase.la \
 	src/libsystemd-nm.la \
+	shared/libcsiphash.la \
+	shared/libnacd.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
-	$(LIBNL_LIBS) \
 	$(SYSTEMD_LOGIN_LIBS) \
 	$(LIBNDP_LIBS) \
 	$(DL_LIBS) \
@@ -5037,7 +5188,8 @@ src_libNetworkManager_la_LIBADD = \
 	$(LIBPSL_LIBS) \
 	$(LIBCURL_LIBS)
 
-src_tests_cppflags = $(src_cppflags) $(am__append_20)
+src_tests_cppflags = $(src_cppflags) $(SANITIZER_EXEC_CFLAGS) \
+	-DNETWORKMANAGER_COMPILATION_TEST $(am__append_20)
 src_tests_cppflags_fake = $(src_tests_cppflags) -DSETUP=nm_fake_platform_setup
 src_tests_cppflags_linux = $(src_tests_cppflags) -DSETUP=nm_linux_platform_setup
 src_libNetworkManagerTest_la_CPPFLAGS = $(src_tests_cppflags)
@@ -5053,8 +5205,7 @@ src_libNetworkManagerTest_la_LIBADD = \
 	src/libNetworkManager.la \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(GLIB_LIBS) \
-	$(LIBUDEV_LIBS) \
-	$(LIBNL_LIBS)
+	$(LIBUDEV_LIBS)
 
 EXTRA_src_NetworkManager_DEPENDENCIES = \
 	src/NetworkManager.ver
@@ -5068,7 +5219,8 @@ src_NetworkManager_LDADD = \
 
 src_NetworkManager_LDFLAGS = \
 	-rdynamic \
-	-Wl,--version-script="src/NetworkManager.ver"
+	-Wl,--version-script="src/NetworkManager.ver" \
+	$(SANITIZER_EXEC_LDFLAGS)
 
 
 ###############################################################################
@@ -5081,20 +5233,19 @@ src_nm_iface_helper_LDADD = \
 	src/libsystemd-nm.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
-	$(LIBNL_LIBS) \
 	$(LIBNDP_LIBS) \
 	$(DL_LIBS)
 
 src_nm_iface_helper_LDFLAGS = \
-	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
+	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
+	$(SANITIZER_EXEC_LDFLAGS)
 
 src_dhcp_nm_dhcp_helper_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
 	-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
 	-DNMRUNDIR=\"$(nmrundir)\"
 
 src_dhcp_nm_dhcp_helper_SOURCES = \
@@ -5121,14 +5272,14 @@ src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_tests_cppflags)
 src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags)
 src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd)
 src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd)
+src_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_tests_ldflags)
+src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags)
 @WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_CPPFLAGS = \
 @WITH_PPP_TRUE@	-I$(srcdir)/shared \
 @WITH_PPP_TRUE@	-I$(builddir)/shared \
 @WITH_PPP_TRUE@	-I$(srcdir)/libnm-core \
-@WITH_PPP_TRUE@	-I$(srcdir)/src \
-@WITH_PPP_TRUE@	-I$(builddir)/libnm-core \
 @WITH_PPP_TRUE@	-DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \
-@WITH_PPP_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@WITH_PPP_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
 @WITH_PPP_TRUE@	$(GLIB_CFLAGS)
 
 @WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_SOURCES = \
@@ -5161,8 +5312,7 @@ src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd)
 @WITH_PPP_TRUE@	-I$(builddir)/libnm-core \
 @WITH_PPP_TRUE@	-I$(srcdir)/libnm-core \
 @WITH_PPP_TRUE@	-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
-@WITH_PPP_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@WITH_PPP_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@WITH_PPP_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @WITH_PPP_TRUE@	$(GLIB_CFLAGS)
 
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LDFLAGS = \
@@ -5170,7 +5320,6 @@ src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd)
 @WITH_PPP_TRUE@	-Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver"
 
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LIBADD = \
-@WITH_PPP_TRUE@	introspection/libnmdbus.la \
 @WITH_PPP_TRUE@	$(GLIB_LIBS)
 
 src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
@@ -5180,7 +5329,8 @@ src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
 
 src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
 	$(GLIB_LIBS) \
-	$(CODE_COVERAGE_LDFLAGS)
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_EXEC_LDFLAGS)
 
 src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 	src/libNetworkManagerTest.la
@@ -5191,9 +5341,8 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IBFT_TRUE@	-I$(builddir)/shared \
 @CONFIG_PLUGIN_IBFT_TRUE@	-I$(srcdir)/libnm-core \
 @CONFIG_PLUGIN_IBFT_TRUE@	-I$(builddir)/libnm-core \
-@CONFIG_PLUGIN_IBFT_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
 @CONFIG_PLUGIN_IBFT_TRUE@	$(GLIB_CFLAGS) \
-@CONFIG_PLUGIN_IBFT_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+@CONFIG_PLUGIN_IBFT_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @CONFIG_PLUGIN_IBFT_TRUE@	-DSYSCONFDIR=\"$(sysconfdir)\" \
 @CONFIG_PLUGIN_IBFT_TRUE@	-DSBINDIR=\"$(sbindir)\"
 
@@ -5224,14 +5373,15 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IBFT_TRUE@	-I$(srcdir)/libnm-core \
 @CONFIG_PLUGIN_IBFT_TRUE@	-I$(builddir)/libnm-core \
 @CONFIG_PLUGIN_IBFT_TRUE@	-I$(srcdir)/src \
-@CONFIG_PLUGIN_IBFT_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@CONFIG_PLUGIN_IBFT_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@CONFIG_PLUGIN_IBFT_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
+@CONFIG_PLUGIN_IBFT_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @CONFIG_PLUGIN_IBFT_TRUE@	-DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \
 @CONFIG_PLUGIN_IBFT_TRUE@	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ibft/tests\"
 
 @CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \
 @CONFIG_PLUGIN_IBFT_TRUE@	$(GLIB_LIBS) \
-@CONFIG_PLUGIN_IBFT_TRUE@	$(CODE_COVERAGE_LDFLAGS)
+@CONFIG_PLUGIN_IBFT_TRUE@	$(CODE_COVERAGE_LDFLAGS) \
+@CONFIG_PLUGIN_IBFT_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
 @CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_LDADD = \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/libnms-ibft-core.la \
@@ -5244,10 +5394,10 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	-I$(builddir)/shared \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	-I$(srcdir)/libnm-core \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	-I$(builddir)/libnm-core \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(GLIB_CFLAGS) \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(NSS_CFLAGS) \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(SANITIZER_EXEC_CFLAGS) \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	-DSYSCONFDIR=\"$(sysconfdir)\" \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	-DSBINDIR=\"$(sbindir)\"
 
@@ -5285,11 +5435,11 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags)
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	-module -avoid-version \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-settings.ver"
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-settings.ver" \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -5301,7 +5451,8 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(GLIB_LIBS) \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(CODE_COVERAGE_LDFLAGS)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(CODE_COVERAGE_LDFLAGS) \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
@@ -5329,8 +5480,7 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-I$(builddir)/shared \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-I$(srcdir)/libnm-core \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-I$(builddir)/libnm-core \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(GLIB_CFLAGS) \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(LIBUDEV_CFLAGS) \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DSYSCONFDIR=\"$(sysconfdir)\"
@@ -5366,78 +5516,20 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-I$(srcdir)/libnm-core \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-I$(builddir)/libnm-core \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-I$(srcdir)/src \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(GLIB_CFLAGS) \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\"
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(GLIB_LDFLAGS) \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(CODE_COVERAGE_LDFLAGS)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(CODE_COVERAGE_LDFLAGS) \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/libNetworkManagerTest.la
 
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_cppflags = \
-@CONFIG_PLUGIN_IFNET_TRUE@	-I$(srcdir)/src \
-@CONFIG_PLUGIN_IFNET_TRUE@	-I$(srcdir)/shared \
-@CONFIG_PLUGIN_IFNET_TRUE@	-I$(builddir)/shared \
-@CONFIG_PLUGIN_IFNET_TRUE@	-I$(srcdir)/libnm-core \
-@CONFIG_PLUGIN_IFNET_TRUE@	-I$(builddir)/libnm-core \
-@CONFIG_PLUGIN_IFNET_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@CONFIG_PLUGIN_IFNET_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-@CONFIG_PLUGIN_IFNET_TRUE@	$(GLIB_CFLAGS) \
-@CONFIG_PLUGIN_IFNET_TRUE@	-DSYSCONFDIR=\"$(sysconfdir)\" \
-@CONFIG_PLUGIN_IFNET_TRUE@	-DSBINDIR=\"$(sbindir)\"
-
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES = \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-net-parser.c\
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-net-parser.h\
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-connection-parser.c \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-connection-parser.h \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-net-utils.h\
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-net-utils.c\
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h\
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
-
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags)
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES = \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-connection.c \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-connection.h \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-plugin.c \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/nms-ifnet-plugin.h
-
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags)
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LDFLAGS = \
-@CONFIG_PLUGIN_IFNET_TRUE@	-module -avoid-version \
-@CONFIG_PLUGIN_IFNET_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-settings.ver"
-
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LIBADD = \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/libnms-ifnet-core.la
-
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \
-@CONFIG_PLUGIN_IFNET_TRUE@	-I$(srcdir)/shared \
-@CONFIG_PLUGIN_IFNET_TRUE@	-I$(builddir)/shared \
-@CONFIG_PLUGIN_IFNET_TRUE@	-I$(srcdir)/libnm-core \
-@CONFIG_PLUGIN_IFNET_TRUE@	-I$(builddir)/libnm-core \
-@CONFIG_PLUGIN_IFNET_TRUE@	-I$(srcdir)/src \
-@CONFIG_PLUGIN_IFNET_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@CONFIG_PLUGIN_IFNET_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-@CONFIG_PLUGIN_IFNET_TRUE@	$(GLIB_CFLAGS) \
-@CONFIG_PLUGIN_IFNET_TRUE@	$(CODE_COVERAGE_CFLAGS) \
-@CONFIG_PLUGIN_IFNET_TRUE@	-DTEST_IFNET_DIR=\"$(abs_srcdir)/src/settings/plugins/ifnet/tests\" \
-@CONFIG_PLUGIN_IFNET_TRUE@	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifnet/tests/\" \
-@CONFIG_PLUGIN_IFNET_TRUE@	-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/src/settings/plugins/ifnet/tests/wpa_supplicant.conf"' \
-@CONFIG_PLUGIN_IFNET_TRUE@	-DSYSCONFDIR=\"nonexistent\"
-
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS = \
-@CONFIG_PLUGIN_IFNET_TRUE@	$(GLIB_LDFLAGS)
-
-@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_LDADD = \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/settings/plugins/ifnet/libnms-ifnet-core.la \
-@CONFIG_PLUGIN_IFNET_TRUE@	src/libNetworkManagerTest.la
-
 src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
 	src/devices/adsl/nm-atm-manager.c \
 	src/devices/adsl/nm-device-adsl.c \
@@ -5450,8 +5542,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \
 	-I$(builddir)/shared \
 	-I$(builddir)/libnm-core \
 	-I$(srcdir)/libnm-core \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 	$(GLIB_CFLAGS) \
 	$(LIBUDEV_CFLAGS)
 
@@ -5460,7 +5551,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
 src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
-	introspection/libnmdbus.la \
 	$(LIBUDEV_LIBS)
 
 
@@ -5474,8 +5564,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	-I$(builddir)/shared \
 @WITH_MODEM_MANAGER_1_TRUE@	-I$(srcdir)/libnm-core \
 @WITH_MODEM_MANAGER_1_TRUE@	-I$(builddir)/libnm-core \
-@WITH_MODEM_MANAGER_1_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@WITH_MODEM_MANAGER_1_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@WITH_MODEM_MANAGER_1_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_CFLAGS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(LIBSYSTEMD_CFLAGS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(MM_GLIB_CFLAGS)
@@ -5486,7 +5575,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem-manager.h \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem.h \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_43)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_39)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_LDFLAGS = \
 @WITH_MODEM_MANAGER_1_TRUE@	-avoid-version \
@@ -5511,7 +5600,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \
-@WITH_MODEM_MANAGER_1_TRUE@	introspection/libnmdbus.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS)
 
@@ -5529,25 +5617,23 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bt-error.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-device-bt.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-device-bt.h \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_46)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_42)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS =  \
 @WITH_MODEM_MANAGER_1_TRUE@	-I$(srcdir)/src -I$(builddir)/src \
 @WITH_MODEM_MANAGER_1_TRUE@	-I$(srcdir)/shared \
 @WITH_MODEM_MANAGER_1_TRUE@	-I$(builddir)/shared \
 @WITH_MODEM_MANAGER_1_TRUE@	-I$(builddir)/libnm-core \
 @WITH_MODEM_MANAGER_1_TRUE@	-I$(srcdir)/libnm-core \
-@WITH_MODEM_MANAGER_1_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@WITH_MODEM_MANAGER_1_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_CFLAGS) $(am__append_45)
+@WITH_MODEM_MANAGER_1_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_CFLAGS) $(am__append_41)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \
 @WITH_MODEM_MANAGER_1_TRUE@	-module -avoid-version \
 @WITH_MODEM_MANAGER_1_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD =  \
-@WITH_MODEM_MANAGER_1_TRUE@	introspection/libnmdbus.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
-@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) $(am__append_47)
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
+@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) $(am__append_43)
+@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES =  \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-factory.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi.h \
@@ -5555,9 +5641,11 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-ap.h \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.h \
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-common.c \
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-common.h \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.h
-
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.h \
+@WITH_WIFI_TRUE@	$(am__append_45)
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
 @WITH_WIFI_TRUE@	-I$(srcdir)/src \
 @WITH_WIFI_TRUE@	-I$(builddir)/src \
@@ -5565,8 +5653,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_WIFI_TRUE@	-I$(builddir)/shared \
 @WITH_WIFI_TRUE@	-I$(builddir)/libnm-core \
 @WITH_WIFI_TRUE@	-I$(srcdir)/libnm-core \
-@WITH_WIFI_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@WITH_WIFI_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@WITH_WIFI_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @WITH_WIFI_TRUE@	$(GLIB_CFLAGS)
 
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
@@ -5574,7 +5661,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_WIFI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \
-@WITH_WIFI_TRUE@	introspection/libnmdbus.la \
 @WITH_WIFI_TRUE@	$(GLIB_LIBS)
 
 @WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_SOURCES = \
@@ -5591,11 +5677,12 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_WIFI_TRUE@	-I$(builddir)/libnm-core \
 @WITH_WIFI_TRUE@	-I$(srcdir)/src \
 @WITH_WIFI_TRUE@	-I$(builddir)/src \
-@WITH_WIFI_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@WITH_WIFI_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@WITH_WIFI_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
+@WITH_WIFI_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @WITH_WIFI_TRUE@	$(GLIB_CFLAGS)
 
 @WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la
+@WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_SOURCES = \
 @WITH_TEAMDCTL_TRUE@	src/devices/team/nm-team-factory.c \
 @WITH_TEAMDCTL_TRUE@	src/devices/team/nm-device-team.c \
@@ -5608,8 +5695,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_TEAMDCTL_TRUE@	-I$(builddir)/shared \
 @WITH_TEAMDCTL_TRUE@	-I$(builddir)/libnm-core \
 @WITH_TEAMDCTL_TRUE@	-I$(srcdir)/libnm-core \
-@WITH_TEAMDCTL_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@WITH_TEAMDCTL_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@WITH_TEAMDCTL_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @WITH_TEAMDCTL_TRUE@	$(LIBTEAMDCTL_CFLAGS) \
 @WITH_TEAMDCTL_TRUE@	$(JANSSON_CFLAGS) \
 @WITH_TEAMDCTL_TRUE@	$(GLIB_CFLAGS)
@@ -5619,7 +5705,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_TEAMDCTL_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_LIBADD = \
-@WITH_TEAMDCTL_TRUE@	introspection/libnmdbus.la \
 @WITH_TEAMDCTL_TRUE@	$(LIBTEAMDCTL_LIBS) \
 @WITH_TEAMDCTL_TRUE@	$(JANSSON_LIBS) \
 @WITH_TEAMDCTL_TRUE@	$(GLIB_LIBS)
@@ -5651,8 +5736,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_OPENVSWITCH_TRUE@	-I$(builddir)/libnm-core \
 @WITH_OPENVSWITCH_TRUE@	-I$(srcdir)/libnm-core \
 @WITH_OPENVSWITCH_TRUE@	\
-@WITH_OPENVSWITCH_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-@WITH_OPENVSWITCH_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@WITH_OPENVSWITCH_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @WITH_OPENVSWITCH_TRUE@	-DRUNSTATEDIR=\"$(runstatedir)\" \
 @WITH_OPENVSWITCH_TRUE@	\
 @WITH_OPENVSWITCH_TRUE@	$(JANSSON_CFLAGS) \
@@ -5663,7 +5747,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_OPENVSWITCH_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
 @WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \
-@WITH_OPENVSWITCH_TRUE@	introspection/libnmdbus.la \
 @WITH_OPENVSWITCH_TRUE@	$(JANSSON_LIBS) \
 @WITH_OPENVSWITCH_TRUE@	$(GLIB_LIBS)
 
@@ -5674,18 +5757,21 @@ src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \
 src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
 	src/libNetworkManagerTest.la
 
+src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \
+       $(SANITIZER_EXEC_LDFLAGS)
+
 
 ###############################################################################
 # src/platform/tests
 ###############################################################################
 src_platform_tests_ldflags = \
-	$(CODE_COVERAGE_LDFLAGS)
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_EXEC_LDFLAGS)
 
 src_platform_tests_libadd = \
 	src/libNetworkManagerTest.la \
 	$(GLIB_LIBS) \
-	$(LIBUDEV_LIBS) \
-	$(LIBNL_LIBS)
+	$(LIBUDEV_LIBS)
 
 src_platform_tests_monitor_CPPFLAGS = $(src_tests_cppflags)
 src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags)
@@ -5733,16 +5819,17 @@ src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la
 # src/devices/tests
 ###############################################################################
 src_devices_tests_ldflags = \
-	$(CODE_COVERAGE_LDFLAGS)
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_EXEC_LDFLAGS)
 
 src_devices_tests_test_lldp_CPPFLAGS = $(src_tests_cppflags)
 src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags)
 src_devices_tests_test_lldp_LDADD = \
 	src/libNetworkManagerTest.la
 
-src_devices_tests_test_arping_CPPFLAGS = $(src_tests_cppflags)
-src_devices_tests_test_arping_LDFLAGS = $(src_devices_tests_ldflags)
-src_devices_tests_test_arping_LDADD = \
+src_devices_tests_test_acd_CPPFLAGS = $(src_tests_cppflags)
+src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags)
+src_devices_tests_test_acd_LDADD = \
 	src/libNetworkManagerTest.la
 
 
@@ -5750,17 +5837,18 @@ src_devices_tests_test_arping_LDADD = \
 # src/ndisc/tests
 ###############################################################################
 src_ndisc_tests_ldflags = \
-	$(CODE_COVERAGE_LDFLAGS)
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_EXEC_LDFLAGS)
 
 src_ndisc_tests_ldadd = \
 	src/libNetworkManagerTest.la \
 	$(GLIB_LIBS)
 
 src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_tests_cppflags)
-src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_flags)
+src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags)
 src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd)
 src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_tests_cppflags)
-src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_flags)
+src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags)
 src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd)
 src_supplicant_tests_test_supplicant_config_CPPFLAGS = \
 	$(src_tests_cppflags) \
@@ -5769,6 +5857,9 @@ src_supplicant_tests_test_supplicant_config_CPPFLAGS = \
 src_supplicant_tests_test_supplicant_config_LDADD = \
 	src/libNetworkManagerTest.la
 
+src_supplicant_tests_test_supplicant_config_LDFLAGS = \
+	$(SANITIZER_EXEC_LDFLAGS)
+
 src_tests_config_test_config_SOURCES = \
 	src/tests/config/nm-test-device.c \
 	src/tests/config/nm-test-device.h \
@@ -5782,12 +5873,16 @@ src_tests_config_test_config_CPPFLAGS = \
 src_tests_config_test_config_LDADD = \
 	src/libNetworkManagerTest.la
 
+src_tests_config_test_config_LDFLAGS = \
+	$(SANITIZER_EXEC_LDFLAGS)
+
 
 ###############################################################################
 # src/tests
 ###############################################################################
 src_tests_ldflags = \
-	$(CODE_COVERAGE_LDFLAGS)
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_EXEC_LDFLAGS)
 
 src_tests_ldadd = \
 	src/libNetworkManagerTest.la
@@ -5801,9 +5896,6 @@ src_tests_test_ip6_config_LDADD = $(src_tests_ldadd)
 src_tests_test_dcb_CPPFLAGS = $(src_tests_cppflags)
 src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_dcb_LDADD = $(src_tests_ldadd)
-src_tests_test_resolvconf_capture_CPPFLAGS = $(src_tests_cppflags)
-src_tests_test_resolvconf_capture_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_resolvconf_capture_LDADD = $(src_tests_ldadd)
 src_tests_test_general_CPPFLAGS = $(src_tests_cppflags)
 src_tests_test_general_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_general_LDADD = $(src_tests_ldadd)
@@ -5816,7 +5908,10 @@ src_tests_test_wired_defname_LDADD = $(src_tests_ldadd)
 src_tests_test_utils_CPPFLAGS = $(src_tests_cppflags)
 src_tests_test_utils_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_utils_LDADD = $(src_tests_ldadd)
-src_tests_test_systemd_CPPFLAGS = $(src_libsystemd_nm_la_cppflags)
+src_tests_test_systemd_CPPFLAGS = \
+	$(src_libsystemd_nm_la_cppflags) \
+	-DNETWORKMANAGER_COMPILATION_TEST
+
 src_tests_test_systemd_SOURCES = \
 	shared/nm-utils/siphash24.c \
 	src/tests/test-systemd.c
@@ -5830,9 +5925,13 @@ dispatcher_cppflags = \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
 	-I$(builddir)/libnm-core \
+	-I$(srcdir)/libnm \
+	-I$(builddir)/libnm \
 	-I$(srcdir)/dispatcher \
 	-I$(builddir)/dispatcher \
 	$(GLIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\""nm-dispatcher"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	-DNMCONFDIR=\"$(nmconfdir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\"
@@ -5871,10 +5970,18 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
 	-I$(builddir)/libnm-core \
+	-I$(srcdir)/libnm \
+	-I$(builddir)/libnm \
 	-I$(srcdir)/dispatcher \
 	-I$(builddir)/dispatcher \
 	-DSRCDIR=\"$(abs_srcdir)/dispatcher/tests\" \
-	$(GLIB_CFLAGS)
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	$(GLIB_CFLAGS) \
+	$(SANITIZER_EXEC_CFLAGS)
+
+dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
+	$(SANITIZER_EXEC_LDFLAGS)
 
 dispatcher_tests_test_dispatcher_envp_LDADD = \
 	libnm/libnm.la \
@@ -5890,6 +5997,7 @@ clients_nm_online_CPPFLAGS = \
 	-I$(builddir)/libnm \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nm-online"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	-DNMLOCALEDIR=\"$(datadir)/locale\"
 
 clients_nm_online_LDFLAGS = \
@@ -5913,7 +6021,8 @@ clients_cppflags = \
 	-I$(srcdir)/clients/common \
 	-I$(builddir)/clients/common \
 	$(GLIB_CFLAGS) \
-	-DNMLOCALEDIR=\"$(datadir)/locale\"
+	-DNMLOCALEDIR=\"$(datadir)/locale\" \
+	$(NULL)
 
 clients_common_libnmc_base_la_SOURCES = \
 	shared/nm-utils/nm-enum-utils.c \
@@ -5924,7 +6033,6 @@ clients_common_libnmc_base_la_SOURCES = \
 	shared/nm-utils/nm-random-utils.h \
 	shared/nm-utils/nm-shared-utils.c \
 	shared/nm-utils/nm-shared-utils.h \
-	shared/nm-utils/siphash24.c \
 	shared/nm-utils/siphash24.h \
 	\
 	clients/common/nm-secret-agent-simple.c \
@@ -5936,13 +6044,14 @@ clients_common_libnmc_base_la_SOURCES = \
 
 clients_common_libnmc_base_la_CPPFLAGS = \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""libnmc"\"
+	-DG_LOG_DOMAIN=\""libnmc"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT
 
 clients_common_libnmc_base_la_LIBADD = \
 	libnm/libnm.la \
 	$(GLIB_LIBS)
 
-clients_common_settings_doc_c = clients/common/settings-docs.c
+clients_common_settings_doc_h = clients/common/settings-docs.h
 clients_common_libnmc_la_SOURCES = \
 	shared/nm-meta-setting.c \
 	shared/nm-meta-setting.h \
@@ -5955,7 +6064,8 @@ clients_common_libnmc_la_SOURCES = \
 
 clients_common_libnmc_la_CPPFLAGS = \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""libnmc"\"
+	-DG_LOG_DOMAIN=\""libnmc"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT
 
 clients_common_libnmc_la_LIBADD = \
 	libnm/libnm.la \
@@ -5965,7 +6075,12 @@ clients_common_libnmc_la_LIBADD = \
 clients_common_tests_test_general_CPPFLAGS = \
 	-I$(srcdir)/clients/common/tests \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""libnmc"\"
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	$(SANITIZER_EXEC_CFLAGS)
+
+clients_common_tests_test_general_LDFLAGS = \
+	$(SANITIZER_EXEC_LDFLAGS)
 
 clients_common_tests_test_general_LDADD = \
 	libnm/libnm.la \
@@ -5986,18 +6101,21 @@ clients_common_tests_test_general_LDADD = \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli.h \
 @BUILD_NMCLI_TRUE@	clients/cli/polkit-agent.c \
 @BUILD_NMCLI_TRUE@	clients/cli/polkit-agent.h $(NULL) \
-@BUILD_NMCLI_TRUE@	$(am__append_62)
+@BUILD_NMCLI_TRUE@	$(am__append_59)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS =  \
 @BUILD_NMCLI_TRUE@	-I$(srcdir)/clients/cli $(clients_cppflags) \
+@BUILD_NMCLI_TRUE@	$(SANITIZER_EXEC_CFLAGS) \
 @BUILD_NMCLI_TRUE@	-DG_LOG_DOMAIN=\""nmcli"\" \
+@BUILD_NMCLI_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 @BUILD_NMCLI_TRUE@	-DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \
-@BUILD_NMCLI_TRUE@	$(am__append_61)
+@BUILD_NMCLI_TRUE@	$(am__append_58)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = libnm/libnm.la \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc.la $(GLIB_LIBS) \
-@BUILD_NMCLI_TRUE@	$(READLINE_LIBS) $(am__append_63)
+@BUILD_NMCLI_TRUE@	$(READLINE_LIBS) $(am__append_60)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \
-@BUILD_NMCLI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
+@BUILD_NMCLI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
+@BUILD_NMCLI_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
 @BUILD_NMTUI_TRUE@clients_tui_newt_libnmt_newt_a_SOURCES = \
 @BUILD_NMTUI_TRUE@	clients/tui/newt/nmt-newt.h \
@@ -6049,9 +6167,13 @@ clients_common_tests_test_general_LDADD = \
 @BUILD_NMTUI_TRUE@	-I$(builddir)/shared \
 @BUILD_NMTUI_TRUE@	-I$(srcdir)/libnm-core \
 @BUILD_NMTUI_TRUE@	-I$(builddir)/libnm-core \
+@BUILD_NMTUI_TRUE@	-I$(srcdir)/libnm \
+@BUILD_NMTUI_TRUE@	-I$(builddir)/libnm \
 @BUILD_NMTUI_TRUE@	-DG_LOG_DOMAIN=\""nmtui"\" \
+@BUILD_NMTUI_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 @BUILD_NMTUI_TRUE@	$(GLIB_CFLAGS) \
 @BUILD_NMTUI_TRUE@	$(NEWT_CFLAGS) \
+@BUILD_NMTUI_TRUE@	$(SANITIZER_EXEC_CFLAGS) \
 @BUILD_NMTUI_TRUE@	$(NULL)
 
 @BUILD_NMTUI_TRUE@clients_tui_nmtui_SOURCES = \
@@ -6144,10 +6266,12 @@ clients_common_tests_test_general_LDADD = \
 @BUILD_NMTUI_TRUE@	$(clients_cppflags) \
 @BUILD_NMTUI_TRUE@	$(NEWT_CFLAGS) \
 @BUILD_NMTUI_TRUE@	-DG_LOG_DOMAIN=\""nmtui"\" \
+@BUILD_NMTUI_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 @BUILD_NMTUI_TRUE@	-DLOCALEDIR=\""$(localedir)"\"
 
 @BUILD_NMTUI_TRUE@clients_tui_nmtui_LDFLAGS = \
-@BUILD_NMTUI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
+@BUILD_NMTUI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
+@BUILD_NMTUI_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
 @BUILD_NMTUI_TRUE@clients_tui_nmtui_LDADD = \
 @BUILD_NMTUI_TRUE@	libnm/libnm.la \
@@ -6185,7 +6309,8 @@ data_edit = sed \
 @WITH_UDEV_DIR_TRUE@udevrulesdir = $(UDEV_DIR)/rules.d
 @WITH_UDEV_DIR_TRUE@udevrules_DATA = \
 @WITH_UDEV_DIR_TRUE@	data/84-nm-drivers.rules \
-@WITH_UDEV_DIR_TRUE@	data/85-nm-unmanaged.rules
+@WITH_UDEV_DIR_TRUE@	data/85-nm-unmanaged.rules \
+@WITH_UDEV_DIR_TRUE@	data/90-nm-thunderbolt.rules
 
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_includedir = $(includedir)/NetworkManager
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_cppflags =  \
@@ -6194,11 +6319,11 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/shared \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/shared \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DG_LOG_DOMAIN=\""libnm-util"\" \
+@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DLOCALEDIR=\"$(datadir)/locale\" \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_CFLAGS) $(am__append_73) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_76)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_CFLAGS) $(am__append_70) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_73)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_h_pub_real = \
 @WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-version-macros.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/NetworkManager.h \
@@ -6286,7 +6411,7 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-vpn.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-value-transforms.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_74) $(am__append_77)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_71) $(am__append_74)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_mkenums = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.c
 
@@ -6303,19 +6428,19 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_lib_h_pub_real))
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LIBADD =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(DBUS_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_LIBS) $(am__append_75) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_78)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_LIBS) $(am__append_72) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_75)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LDFLAGS = \
 @WITH_LEGACY_LIBRARIES_TRUE@	-Wl,--version-script=$(srcdir)/libnm-util/libnm-util.ver \
 @WITH_LEGACY_LIBRARIES_TRUE@	-version-info "9:0:7"
 
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_SOURCES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_81) $(am__append_83)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_78) $(am__append_80)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_CPPFLAGS = $(libnm_util_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_LIBADD =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(am__append_82) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_84)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(am__append_79) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_81)
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util
@@ -6346,34 +6471,47 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_CFLAGS) \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\"
+@WITH_LEGACY_LIBRARIES_TRUE@	-DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" \
+@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
+@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(SANITIZER_EXEC_CFLAGS)
 
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_ldadd = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_LIBS)
 
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_ldflags = \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
+
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_CPPFLAGS = $(libnm_util_tests_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_LDADD = $(libnm_util_tests_ldadd)
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_LDFLAGS = $(libnm_util_tests_ldflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_CPPFLAGS = $(libnm_util_tests_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_LDADD = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libtest-crypto.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_tests_ldadd)
 
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_LDFLAGS = $(libnm_util_tests_ldflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_CPPFLAGS = $(libnm_util_tests_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_LDADD = $(libnm_util_tests_ldadd)
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_LDFLAGS = $(libnm_util_tests_ldflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_DEPENDENCIES = libnm-util/tests/test-libnm-linking
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_CPPFLAGS = $(libnm_util_tests_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_LDADD = $(libnm_util_tests_ldadd)
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_LDFLAGS = $(libnm_util_tests_ldflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_CPPFLAGS = $(libnm_util_tests_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_LDADD = $(libnm_util_tests_ldadd)
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_LDFLAGS = $(libnm_util_tests_ldflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_CPPFLAGS = $(libnm_util_tests_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_LDADD = $(libnm_util_tests_ldadd)
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_LDFLAGS = $(libnm_util_tests_ldflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_CPPFLAGS = $(libnm_util_tests_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_LDADD = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm/libnm.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_tests_ldadd)
 
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_LDFLAGS = $(libnm_util_tests_ldflags)
 
 ###############################################################################
 # libnm-glib
@@ -6386,7 +6524,7 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-glib \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-glib \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DG_LOG_DOMAIN=\""libnm-glib"\" \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
+@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_CFLAGS) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS)
 
@@ -6597,7 +6735,8 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-util \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-util \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-glib \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
+@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
+@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_CFLAGS)
@@ -6666,8 +6805,7 @@ examples_C_glib_cppflags = \
 	-I$(top_builddir)/libnm-core \
 	-I$(top_srcdir)/libnm \
 	-I$(top_builddir)/libnm \
-	$(GLIB_CFLAGS) \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
+	$(GLIB_CFLAGS)
 
 examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags)
 examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags)
@@ -7029,9 +7167,6 @@ shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo:  \
 shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo:  \
 	shared/nm-utils/$(am__dirstamp) \
 	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 clients/common/$(am__dirstamp):
 	@$(MKDIR_P) clients/common
 	@: > clients/common/$(am__dirstamp)
@@ -7214,62 +7349,12 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plug
 
 introspection/libnmdbus.la: $(introspection_libnmdbus_la_OBJECTS) $(introspection_libnmdbus_la_DEPENDENCIES) $(EXTRA_introspection_libnmdbus_la_DEPENDENCIES) introspection/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK)  $(introspection_libnmdbus_la_OBJECTS) $(introspection_libnmdbus_la_LIBADD) $(LIBS)
-shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/libnm_core_libnm_core_la-nm-meta-setting.lo:  \
-	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
 libnm-core/$(am__dirstamp):
 	@$(MKDIR_P) libnm-core
 	@: > libnm-core/$(am__dirstamp)
 libnm-core/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) libnm-core/$(DEPDIR)
 	@: > libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-crypto.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-connection.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-errors.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -7390,6 +7475,50 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-wireless-security.lo:  \
 libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/libnm_core_libnm_core_la-nm-meta-setting.lo:  \
+	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-crypto.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-connection.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-errors.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_libnm_core_la-nm-setting.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -7683,6 +7812,15 @@ libnm/$(DEPDIR)/$(am__dirstamp):
 	@: > libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_utils_la-nm-libnm-utils.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/fake-typelib/$(am__dirstamp):
+	@$(MKDIR_P) libnm/fake-typelib
+	@: > libnm/fake-typelib/$(am__dirstamp)
+libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) libnm/fake-typelib/$(DEPDIR)
+	@: > libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp)
+libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo:  \
+	libnm/fake-typelib/$(am__dirstamp) \
+	libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp)
 
 libnm/libnm-utils.la: $(libnm_libnm_utils_la_OBJECTS) $(libnm_libnm_utils_la_DEPENDENCIES) $(EXTRA_libnm_libnm_utils_la_DEPENDENCIES) libnm/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK)  $(libnm_libnm_utils_la_OBJECTS) $(libnm_libnm_utils_la_LIBADD) $(LIBS)
@@ -7690,6 +7828,8 @@ libnm/libnm_libnm_la-nm-access-point.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-active-connection.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/libnm_libnm_la-nm-checkpoint.lo: libnm/$(am__dirstamp) \
+	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-client.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-dbus-helpers.lo: libnm/$(am__dirstamp) \
@@ -7790,6 +7930,30 @@ libnm/tests/$(am__dirstamp):
 
 libnm/tests/libnm-vpn-plugin-utils-test.la: $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_DEPENDENCIES) $(EXTRA_libnm_tests_libnm_vpn_plugin_utils_test_la_DEPENDENCIES) libnm/tests/$(am__dirstamp)
 	$(AM_V_CCLD)$(libnm_tests_libnm_vpn_plugin_utils_test_la_LINK) $(am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath) $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD) $(LIBS)
+shared/c-siphash/src/$(am__dirstamp):
+	@$(MKDIR_P) shared/c-siphash/src
+	@: > shared/c-siphash/src/$(am__dirstamp)
+shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/c-siphash/src/$(DEPDIR)
+	@: > shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp)
+shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo:  \
+	shared/c-siphash/src/$(am__dirstamp) \
+	shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp)
+
+shared/libcsiphash.la: $(shared_libcsiphash_la_OBJECTS) $(shared_libcsiphash_la_DEPENDENCIES) $(EXTRA_shared_libcsiphash_la_DEPENDENCIES) shared/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK)  $(shared_libcsiphash_la_OBJECTS) $(shared_libcsiphash_la_LIBADD) $(LIBS)
+shared/n-acd/src/$(am__dirstamp):
+	@$(MKDIR_P) shared/n-acd/src
+	@: > shared/n-acd/src/$(am__dirstamp)
+shared/n-acd/src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/n-acd/src/$(DEPDIR)
+	@: > shared/n-acd/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-acd/src/shared_libnacd_la-n-acd.lo:  \
+	shared/n-acd/src/$(am__dirstamp) \
+	shared/n-acd/src/$(DEPDIR)/$(am__dirstamp)
+
+shared/libnacd.la: $(shared_libnacd_la_OBJECTS) $(shared_libnacd_la_DEPENDENCIES) $(EXTRA_shared_libnacd_la_DEPENDENCIES) shared/$(am__dirstamp)
+	$(AM_V_CCLD)$(shared_libnacd_la_LINK)  $(shared_libnacd_la_OBJECTS) $(shared_libnacd_la_LIBADD) $(LIBS)
 src/devices/adsl/$(am__dirstamp):
 	@$(MKDIR_P) src/devices/adsl
 	@: > src/devices/adsl/$(am__dirstamp)
@@ -7895,9 +8059,18 @@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-ap.lo:  \
 src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo:  \
+	src/devices/wifi/$(am__dirstamp) \
+	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
 src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo:  \
+	src/devices/wifi/$(am__dirstamp) \
+	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo:  \
+	src/devices/wifi/$(am__dirstamp) \
+	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
 
 src/devices/wifi/libnm-device-plugin-wifi.la: $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) $(EXTRA_src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) src/devices/wifi/$(am__dirstamp)
 	$(AM_V_CCLD)$(src_devices_wifi_libnm_device_plugin_wifi_la_LINK) $(am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath) $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD) $(LIBS)
@@ -7937,10 +8110,10 @@ src/$(am__dirstamp):
 src/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/$(DEPDIR)
 	@: > src/$(DEPDIR)/$(am__dirstamp)
-src/src_libNetworkManager_la-nm-checkpoint-manager.lo:  \
-	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManager_la-nm-checkpoint.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libNetworkManager_la-nm-checkpoint-manager.lo:  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/devices/$(am__dirstamp):
 	@$(MKDIR_P) src/devices
 	@: > src/devices/$(am__dirstamp)
@@ -7953,7 +8126,7 @@ src/devices/src_libNetworkManager_la-nm-device.lo:  \
 src/devices/src_libNetworkManager_la-nm-lldp-listener.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/src_libNetworkManager_la-nm-arping-manager.lo:  \
+src/devices/src_libNetworkManager_la-nm-acd-manager.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
 src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo:  \
@@ -8026,16 +8199,16 @@ src/dns/$(am__dirstamp):
 src/dns/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/dns/$(DEPDIR)
 	@: > src/dns/$(DEPDIR)/$(am__dirstamp)
+src/dns/src_libNetworkManager_la-nm-dns-manager.lo:  \
+	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
+src/dns/src_libNetworkManager_la-nm-dns-plugin.lo:  \
+	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
 src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo:  \
 	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
 src/dns/src_libNetworkManager_la-nm-dns-systemd-resolved.lo:  \
 	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
 src/dns/src_libNetworkManager_la-nm-dns-unbound.lo:  \
 	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
-src/dns/src_libNetworkManager_la-nm-dns-manager.lo:  \
-	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
-src/dns/src_libNetworkManager_la-nm-dns-plugin.lo:  \
-	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
 src/dnsmasq/$(am__dirstamp):
 	@$(MKDIR_P) src/dnsmasq
 	@: > src/dnsmasq/$(am__dirstamp)
@@ -8134,12 +8307,14 @@ src/src_libNetworkManager_la-nm-active-connection.lo:  \
 	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManager_la-nm-audit-manager.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/src_libNetworkManager_la-nm-bus-manager.lo: src/$(am__dirstamp) \
+src/src_libNetworkManager_la-nm-dbus-manager.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManager_la-nm-config.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManager_la-nm-config-data.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/src_libNetworkManager_la-nm-connectivity.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManager_la-nm-dcb.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManager_la-nm-netns.lo: src/$(am__dirstamp) \
@@ -8172,8 +8347,6 @@ src/src_libNetworkManager_la-nm-session-monitor.lo:  \
 	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManager_la-nm-sleep-monitor.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/src_libNetworkManager_la-nm-connectivity.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 
 src/libNetworkManager.la: $(src_libNetworkManager_la_OBJECTS) $(src_libNetworkManager_la_DEPENDENCIES) $(EXTRA_src_libNetworkManager_la_DEPENDENCIES) src/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK)  $(src_libNetworkManager_la_OBJECTS) $(src_libNetworkManager_la_LIBADD) $(LIBS)
@@ -8189,6 +8362,9 @@ src/platform/$(am__dirstamp):
 src/platform/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/platform/$(DEPDIR)
 	@: > src/platform/$(DEPDIR)/$(am__dirstamp)
+src/platform/src_libNetworkManagerBase_la-nm-netlink.lo:  \
+	src/platform/$(am__dirstamp) \
+	src/platform/$(DEPDIR)/$(am__dirstamp)
 src/platform/src_libNetworkManagerBase_la-nmp-netns.lo:  \
 	src/platform/$(am__dirstamp) \
 	src/platform/$(DEPDIR)/$(am__dirstamp)
@@ -8226,7 +8402,9 @@ src/ndisc/src_libNetworkManagerBase_la-nm-lndp-ndisc.lo:  \
 	src/ndisc/$(am__dirstamp) src/ndisc/$(DEPDIR)/$(am__dirstamp)
 src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo:  \
 	src/ndisc/$(am__dirstamp) src/ndisc/$(DEPDIR)/$(am__dirstamp)
-src/src_libNetworkManagerBase_la-nm-exported-object.lo:  \
+src/src_libNetworkManagerBase_la-nm-dbus-utils.lo:  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_libNetworkManagerBase_la-nm-dbus-object.lo:  \
 	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManagerBase_la-nm-ip4-config.lo:  \
 	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -8527,36 +8705,6 @@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core
 
 src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la: $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_DEPENDENCIES) src/settings/plugins/ifcfg-rh/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK) $(am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_rpath) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_LIBADD) $(LIBS)
-src/settings/plugins/ifnet/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ifnet
-	@: > src/settings/plugins/ifnet/$(am__dirstamp)
-src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ifnet/$(DEPDIR)
-	@: > src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo:  \
-	src/settings/plugins/ifnet/$(am__dirstamp) \
-	src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo:  \
-	src/settings/plugins/ifnet/$(am__dirstamp) \
-	src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la: $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_DEPENDENCIES) src/settings/plugins/ifnet/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LINK) $(am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_rpath) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LIBADD) $(LIBS)
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo:  \
-	src/settings/plugins/ifnet/$(am__dirstamp) \
-	src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo:  \
-	src/settings/plugins/ifnet/$(am__dirstamp) \
-	src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo:  \
-	src/settings/plugins/ifnet/$(am__dirstamp) \
-	src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo:  \
-	src/settings/plugins/ifnet/$(am__dirstamp) \
-	src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ifnet/libnms-ifnet-core.la: $(src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifnet_libnms_ifnet_core_la_DEPENDENCIES) src/settings/plugins/ifnet/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK) $(am_src_settings_plugins_ifnet_libnms_ifnet_core_la_rpath) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_LIBADD) $(LIBS)
 src/settings/plugins/ifupdown/$(am__dirstamp):
 	@$(MKDIR_P) src/settings/plugins/ifupdown
 	@: > src/settings/plugins/ifupdown/$(am__dirstamp)
@@ -8798,7 +8946,7 @@ clients/common/tests/clients_common_tests_test_general-test-general.$(OBJEXT):
 
 clients/common/tests/test-general$(EXEEXT): $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_DEPENDENCIES) $(EXTRA_clients_common_tests_test_general_DEPENDENCIES) clients/common/tests/$(am__dirstamp)
 	@rm -f clients/common/tests/test-general$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(clients_common_tests_test_general_LINK) $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_LDADD) $(LIBS)
 clients/$(am__dirstamp):
 	@$(MKDIR_P) clients
 	@: > clients/$(am__dirstamp)
@@ -8963,7 +9111,7 @@ dispatcher/tests/dispatcher_tests_test_dispatcher_envp-test-dispatcher-envp.$(OB
 
 dispatcher/tests/test-dispatcher-envp$(EXEEXT): $(dispatcher_tests_test_dispatcher_envp_OBJECTS) $(dispatcher_tests_test_dispatcher_envp_DEPENDENCIES) $(EXTRA_dispatcher_tests_test_dispatcher_envp_DEPENDENCIES) dispatcher/tests/$(am__dirstamp)
 	@rm -f dispatcher/tests/test-dispatcher-envp$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(dispatcher_tests_test_dispatcher_envp_OBJECTS) $(dispatcher_tests_test_dispatcher_envp_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(dispatcher_tests_test_dispatcher_envp_LINK) $(dispatcher_tests_test_dispatcher_envp_OBJECTS) $(dispatcher_tests_test_dispatcher_envp_LDADD) $(LIBS)
 examples/C/glib/$(am__dirstamp):
 	@$(MKDIR_P) examples/C/glib
 	@: > examples/C/glib/$(am__dirstamp)
@@ -9072,14 +9220,14 @@ libnm-core/tests/libnm_core_tests_test_compare-test-compare.$(OBJEXT):  \
 
 libnm-core/tests/test-compare$(EXEEXT): $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_compare_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-compare$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_core_tests_test_compare_LINK) $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_LDADD) $(LIBS)
 libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-core/tests/test-crypto$(EXEEXT): $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_crypto_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-crypto$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_core_tests_test_crypto_LINK) $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_LDADD) $(LIBS)
 libnm-core/tests/libnm_core_tests_test_general-test-general.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
@@ -9089,35 +9237,35 @@ libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.$(OBJEXT
 
 libnm-core/tests/test-general$(EXEEXT): $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_general_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-general$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_core_tests_test_general_LINK) $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_LDADD) $(LIBS)
 libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-core/tests/test-keyfile$(EXEEXT): $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_keyfile_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-keyfile$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_core_tests_test_keyfile_LINK) $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_LDADD) $(LIBS)
 libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-core/tests/test-secrets$(EXEEXT): $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_secrets_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-secrets$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_core_tests_test_secrets_LINK) $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_LDADD) $(LIBS)
 libnm-core/tests/libnm_core_tests_test_setting-test-setting.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-core/tests/test-setting$(EXEEXT): $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-setting$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_core_tests_test_setting_LINK) $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_LDADD) $(LIBS)
 libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-core/tests/test-settings-defaults$(EXEEXT): $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_settings_defaults_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-settings-defaults$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_core_tests_test_settings_defaults_LINK) $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_LDADD) $(LIBS)
 libnm-glib/libnm_glib_libnm_glib_test-libnm-glib-test.$(OBJEXT):  \
 	libnm-glib/$(am__dirstamp) \
 	libnm-glib/$(DEPDIR)/$(am__dirstamp)
@@ -9161,49 +9309,52 @@ libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.$(OBJEXT):  \
 
 libnm-util/tests/test-crypto$(EXEEXT): $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_crypto_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
 	@rm -f libnm-util/tests/test-crypto$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_util_tests_test_crypto_LINK) $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_LDADD) $(LIBS)
 libnm-util/tests/libnm_util_tests_test_general-test-general.$(OBJEXT):  \
 	libnm-util/tests/$(am__dirstamp) \
 	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-util/tests/test-general$(EXEEXT): $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_general_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
 	@rm -f libnm-util/tests/test-general$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_util_tests_test_general_LINK) $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_LDADD) $(LIBS)
 libnm-util/tests/libnm_util_tests_test_libnm_linking-test-libnm-linking.$(OBJEXT):  \
 	libnm-util/tests/$(am__dirstamp) \
 	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-util/tests/test-libnm-linking$(EXEEXT): $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_libnm_linking_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
 	@rm -f libnm-util/tests/test-libnm-linking$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_util_tests_test_libnm_linking_LINK) $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_LDADD) $(LIBS)
 libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.$(OBJEXT):  \
 	libnm-util/tests/$(am__dirstamp) \
 	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-util/tests/test-secrets$(EXEEXT): $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_secrets_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
 	@rm -f libnm-util/tests/test-secrets$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_util_tests_test_secrets_LINK) $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_LDADD) $(LIBS)
 libnm-util/tests/libnm_util_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT):  \
 	libnm-util/tests/$(am__dirstamp) \
 	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-util/tests/test-setting-8021x$(EXEEXT): $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_setting_8021x_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
 	@rm -f libnm-util/tests/test-setting-8021x$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_util_tests_test_setting_8021x_LINK) $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_LDADD) $(LIBS)
 libnm-util/tests/libnm_util_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT):  \
 	libnm-util/tests/$(am__dirstamp) \
 	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-util/tests/test-setting-dcb$(EXEEXT): $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_setting_dcb_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
 	@rm -f libnm-util/tests/test-setting-dcb$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_util_tests_test_setting_dcb_LINK) $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_LDADD) $(LIBS)
 libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT):  \
 	libnm-util/tests/$(am__dirstamp) \
 	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-util/tests/test-settings-defaults$(EXEEXT): $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_settings_defaults_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
 	@rm -f libnm-util/tests/test-settings-defaults$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_util_tests_test_settings_defaults_LINK) $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_LDADD) $(LIBS)
+shared/nm-utils/libnm_tests_test_general-nm-compat.$(OBJEXT):  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 libnm/tests/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) libnm/tests/$(DEPDIR)
 	@: > libnm/tests/$(DEPDIR)/$(am__dirstamp)
@@ -9213,7 +9364,7 @@ libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT):  \
 
 libnm/tests/test-general$(EXEEXT): $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_tests_test_general_DEPENDENCIES) libnm/tests/$(am__dirstamp)
 	@rm -f libnm/tests/test-general$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_tests_test_general_LINK) $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_LDADD) $(LIBS)
 shared/libnm_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT):  \
 	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
 libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT):  \
@@ -9222,7 +9373,7 @@ libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT):  \
 
 libnm/tests/test-nm-client$(EXEEXT): $(libnm_tests_test_nm_client_OBJECTS) $(libnm_tests_test_nm_client_DEPENDENCIES) $(EXTRA_libnm_tests_test_nm_client_DEPENDENCIES) libnm/tests/$(am__dirstamp)
 	@rm -f libnm/tests/test-nm-client$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_tests_test_nm_client_OBJECTS) $(libnm_tests_test_nm_client_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_tests_test_nm_client_LINK) $(libnm_tests_test_nm_client_OBJECTS) $(libnm_tests_test_nm_client_LDADD) $(LIBS)
 shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT):  \
 	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
 libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT):  \
@@ -9231,7 +9382,7 @@ libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.
 
 libnm/tests/test-remote-settings-client$(EXEEXT): $(libnm_tests_test_remote_settings_client_OBJECTS) $(libnm_tests_test_remote_settings_client_DEPENDENCIES) $(EXTRA_libnm_tests_test_remote_settings_client_DEPENDENCIES) libnm/tests/$(am__dirstamp)
 	@rm -f libnm/tests/test-remote-settings-client$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_tests_test_remote_settings_client_OBJECTS) $(libnm_tests_test_remote_settings_client_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_tests_test_remote_settings_client_LINK) $(libnm_tests_test_remote_settings_client_OBJECTS) $(libnm_tests_test_remote_settings_client_LDADD) $(LIBS)
 shared/libnm_tests_test_secret_agent-nm-test-utils-impl.$(OBJEXT):  \
 	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
 libnm/tests/libnm_tests_test_secret_agent-test-secret-agent.$(OBJEXT):  \
@@ -9240,7 +9391,7 @@ libnm/tests/libnm_tests_test_secret_agent-test-secret-agent.$(OBJEXT):  \
 
 libnm/tests/test-secret-agent$(EXEEXT): $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_DEPENDENCIES) $(EXTRA_libnm_tests_test_secret_agent_DEPENDENCIES) libnm/tests/$(am__dirstamp)
 	@rm -f libnm/tests/test-secret-agent$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(libnm_tests_test_secret_agent_LINK) $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_LDADD) $(LIBS)
 src/src_NetworkManager-main.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 
@@ -9253,13 +9404,13 @@ src/devices/tests/$(am__dirstamp):
 src/devices/tests/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/devices/tests/$(DEPDIR)
 	@: > src/devices/tests/$(DEPDIR)/$(am__dirstamp)
-src/devices/tests/src_devices_tests_test_arping-test-arping.$(OBJEXT):  \
+src/devices/tests/src_devices_tests_test_acd-test-acd.$(OBJEXT):  \
 	src/devices/tests/$(am__dirstamp) \
 	src/devices/tests/$(DEPDIR)/$(am__dirstamp)
 
-src/devices/tests/test-arping$(EXEEXT): $(src_devices_tests_test_arping_OBJECTS) $(src_devices_tests_test_arping_DEPENDENCIES) $(EXTRA_src_devices_tests_test_arping_DEPENDENCIES) src/devices/tests/$(am__dirstamp)
-	@rm -f src/devices/tests/test-arping$(EXEEXT)
-	$(AM_V_CCLD)$(src_devices_tests_test_arping_LINK) $(src_devices_tests_test_arping_OBJECTS) $(src_devices_tests_test_arping_LDADD) $(LIBS)
+src/devices/tests/test-acd$(EXEEXT): $(src_devices_tests_test_acd_OBJECTS) $(src_devices_tests_test_acd_DEPENDENCIES) $(EXTRA_src_devices_tests_test_acd_DEPENDENCIES) src/devices/tests/$(am__dirstamp)
+	@rm -f src/devices/tests/test-acd$(EXEEXT)
+	$(AM_V_CCLD)$(src_devices_tests_test_acd_LINK) $(src_devices_tests_test_acd_OBJECTS) $(src_devices_tests_test_acd_LDADD) $(LIBS)
 src/devices/tests/src_devices_tests_test_lldp-test-lldp.$(OBJEXT):  \
 	src/devices/tests/$(am__dirstamp) \
 	src/devices/tests/$(DEPDIR)/$(am__dirstamp)
@@ -9285,7 +9436,7 @@ src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.$(OBJEXT):  \
 
 src/devices/wifi/tests/test-general$(EXEEXT): $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_DEPENDENCIES) $(EXTRA_src_devices_wifi_tests_test_general_DEPENDENCIES) src/devices/wifi/tests/$(am__dirstamp)
 	@rm -f src/devices/wifi/tests/test-general$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(src_devices_wifi_tests_test_general_LINK) $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_LDADD) $(LIBS)
 src/dhcp/src_dhcp_nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT):  \
 	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
 
@@ -9304,14 +9455,14 @@ src/dhcp/tests/src_dhcp_tests_test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT):
 
 src/dhcp/tests/test-dhcp-dhclient$(EXEEXT): $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES) $(EXTRA_src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES) src/dhcp/tests/$(am__dirstamp)
 	@rm -f src/dhcp/tests/test-dhcp-dhclient$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(src_dhcp_tests_test_dhcp_dhclient_LINK) $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_LDADD) $(LIBS)
 src/dhcp/tests/src_dhcp_tests_test_dhcp_utils-test-dhcp-utils.$(OBJEXT):  \
 	src/dhcp/tests/$(am__dirstamp) \
 	src/dhcp/tests/$(DEPDIR)/$(am__dirstamp)
 
 src/dhcp/tests/test-dhcp-utils$(EXEEXT): $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_DEPENDENCIES) $(EXTRA_src_dhcp_tests_test_dhcp_utils_DEPENDENCIES) src/dhcp/tests/$(am__dirstamp)
 	@rm -f src/dhcp/tests/test-dhcp-utils$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(src_dhcp_tests_test_dhcp_utils_LINK) $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_LDADD) $(LIBS)
 src/dnsmasq/tests/$(am__dirstamp):
 	@$(MKDIR_P) src/dnsmasq/tests
 	@: > src/dnsmasq/tests/$(am__dirstamp)
@@ -9324,7 +9475,7 @@ src/dnsmasq/tests/src_dnsmasq_tests_test_dnsmasq_utils-test-dnsmasq-utils.$(OBJE
 
 src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT): $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES) $(EXTRA_src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES) src/dnsmasq/tests/$(am__dirstamp)
 	@rm -f src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(src_dnsmasq_tests_test_dnsmasq_utils_LINK) $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_LDADD) $(LIBS)
 src/ndisc/tests/$(am__dirstamp):
 	@$(MKDIR_P) src/ndisc/tests
 	@: > src/ndisc/tests/$(am__dirstamp)
@@ -9454,19 +9605,6 @@ src/settings/plugins/ifcfg-rh/tests/src_settings_plugins_ifcfg_rh_tests_test_ifc
 src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT): $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES) src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp)
 	@rm -f src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)
 	$(AM_V_CCLD)$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LINK) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD) $(LIBS)
-src/settings/plugins/ifnet/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ifnet/tests
-	@: > src/settings/plugins/ifnet/tests/$(am__dirstamp)
-src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ifnet/tests/$(DEPDIR)
-	@: > src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.$(OBJEXT):  \
-	src/settings/plugins/ifnet/tests/$(am__dirstamp) \
-	src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT): $(src_settings_plugins_ifnet_tests_test_ifnet_OBJECTS) $(src_settings_plugins_ifnet_tests_test_ifnet_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifnet_tests_test_ifnet_DEPENDENCIES) src/settings/plugins/ifnet/tests/$(am__dirstamp)
-	@rm -f src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT)
-	$(AM_V_CCLD)$(src_settings_plugins_ifnet_tests_test_ifnet_LINK) $(src_settings_plugins_ifnet_tests_test_ifnet_OBJECTS) $(src_settings_plugins_ifnet_tests_test_ifnet_LDADD) $(LIBS)
 src/settings/plugins/ifupdown/tests/$(am__dirstamp):
 	@$(MKDIR_P) src/settings/plugins/ifupdown/tests
 	@: > src/settings/plugins/ifupdown/tests/$(am__dirstamp)
@@ -9505,7 +9643,7 @@ src/supplicant/tests/src_supplicant_tests_test_supplicant_config-test-supplicant
 
 src/supplicant/tests/test-supplicant-config$(EXEEXT): $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_DEPENDENCIES) $(EXTRA_src_supplicant_tests_test_supplicant_config_DEPENDENCIES) src/supplicant/tests/$(am__dirstamp)
 	@rm -f src/supplicant/tests/test-supplicant-config$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(src_supplicant_tests_test_supplicant_config_LINK) $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_LDADD) $(LIBS)
 src/tests/config/$(am__dirstamp):
 	@$(MKDIR_P) src/tests/config
 	@: > src/tests/config/$(am__dirstamp)
@@ -9521,7 +9659,7 @@ src/tests/config/src_tests_config_test_config-test-config.$(OBJEXT):  \
 
 src/tests/config/test-config$(EXEEXT): $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_DEPENDENCIES) $(EXTRA_src_tests_config_test_config_DEPENDENCIES) src/tests/config/$(am__dirstamp)
 	@rm -f src/tests/config/test-config$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(src_tests_config_test_config_LINK) $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_LDADD) $(LIBS)
 src/tests/$(am__dirstamp):
 	@$(MKDIR_P) src/tests
 	@: > src/tests/$(am__dirstamp)
@@ -9558,12 +9696,6 @@ src/tests/src_tests_test_ip6_config-test-ip6-config.$(OBJEXT):  \
 src/tests/test-ip6-config$(EXEEXT): $(src_tests_test_ip6_config_OBJECTS) $(src_tests_test_ip6_config_DEPENDENCIES) $(EXTRA_src_tests_test_ip6_config_DEPENDENCIES) src/tests/$(am__dirstamp)
 	@rm -f src/tests/test-ip6-config$(EXEEXT)
 	$(AM_V_CCLD)$(src_tests_test_ip6_config_LINK) $(src_tests_test_ip6_config_OBJECTS) $(src_tests_test_ip6_config_LDADD) $(LIBS)
-src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.$(OBJEXT):  \
-	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-resolvconf-capture$(EXEEXT): $(src_tests_test_resolvconf_capture_OBJECTS) $(src_tests_test_resolvconf_capture_DEPENDENCIES) $(EXTRA_src_tests_test_resolvconf_capture_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-resolvconf-capture$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_resolvconf_capture_LINK) $(src_tests_test_resolvconf_capture_OBJECTS) $(src_tests_test_resolvconf_capture_LDADD) $(LIBS)
 shared/nm-utils/src_tests_test_systemd-siphash24.$(OBJEXT):  \
 	shared/nm-utils/$(am__dirstamp) \
 	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
@@ -9613,9 +9745,15 @@ mostlyclean-compile:
 	-rm -f libnm-util/tests/*.$(OBJEXT)
 	-rm -f libnm/*.$(OBJEXT)
 	-rm -f libnm/*.lo
+	-rm -f libnm/fake-typelib/*.$(OBJEXT)
+	-rm -f libnm/fake-typelib/*.lo
 	-rm -f libnm/tests/*.$(OBJEXT)
 	-rm -f shared/*.$(OBJEXT)
 	-rm -f shared/*.lo
+	-rm -f shared/c-siphash/src/*.$(OBJEXT)
+	-rm -f shared/c-siphash/src/*.lo
+	-rm -f shared/n-acd/src/*.$(OBJEXT)
+	-rm -f shared/n-acd/src/*.lo
 	-rm -f shared/nm-utils/*.$(OBJEXT)
 	-rm -f shared/nm-utils/*.lo
 	-rm -f src/*.$(OBJEXT)
@@ -9663,9 +9801,6 @@ mostlyclean-compile:
 	-rm -f src/settings/plugins/ifcfg-rh/*.$(OBJEXT)
 	-rm -f src/settings/plugins/ifcfg-rh/*.lo
 	-rm -f src/settings/plugins/ifcfg-rh/tests/*.$(OBJEXT)
-	-rm -f src/settings/plugins/ifnet/*.$(OBJEXT)
-	-rm -f src/settings/plugins/ifnet/*.lo
-	-rm -f src/settings/plugins/ifnet/tests/*.$(OBJEXT)
 	-rm -f src/settings/plugins/ifupdown/*.$(OBJEXT)
 	-rm -f src/settings/plugins/ifupdown/*.lo
 	-rm -f src/settings/plugins/ifupdown/tests/*.$(OBJEXT)
@@ -9840,9 +9975,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-json.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-8021x.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-adsl.Plo@am__quote@
@@ -9983,6 +10117,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-active-connection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-dbus-helpers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-adsl.Plo@am__quote@
@@ -10028,6 +10163,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-vpn-service-plugin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-wimax-nsp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_utils_la-nm-libnm-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po@am__quote@
@@ -10039,11 +10175,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo@am__quote@
@@ -10051,16 +10188,17 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_NetworkManager-main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-NetworkManagerUtils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-main-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip4-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip6-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-logging.Plo@am__quote@
@@ -10070,12 +10208,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-auth-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-auth-subject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-auth-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-config-data.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp4-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp6-config.Plo@am__quote@
@@ -10091,7 +10229,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-session-monitor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-sleep-monitor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_nm_iface_helper-nm-iface-helper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bond.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bridge.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-dummy.Plo@am__quote@
@@ -10127,11 +10265,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-device-team.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-team-factory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/src_devices_tests_test_lldp-test-lldp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-wifi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-ap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-factory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po@am__quote@
@@ -10169,6 +10310,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/tests/$(DEPDIR)/src_ndisc_tests_test_ndisc_fake-test-ndisc-fake.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/tests/$(DEPDIR)/src_ndisc_tests_test_ndisc_linux-test-ndisc-linux.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-linux-platform.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-platform-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-platform.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Plo@am__quote@
@@ -10210,13 +10352,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-shvar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh-test-ifcfg-rh.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo@am__quote@
@@ -10287,7 +10422,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_general_with_expect-test-general-with-expect.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_ip4_config-test-ip4-config.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_ip6_config-test-ip6-config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_systemd-test-systemd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_utils-test-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_wired_defname-test-wired-defname.Po@am__quote@
@@ -10628,13 +10762,6 @@ shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo: shared/nm-util
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
 
-shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo: shared/nm-utils/siphash24.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
-
 clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo: clients/common/nm-secret-agent-simple.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo -MD -MP -MF clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Tpo -c -o clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo `test -f 'clients/common/nm-secret-agent-simple.c' || echo '$(srcdir)/'`clients/common/nm-secret-agent-simple.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Tpo clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Plo
@@ -10978,125 +11105,6 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plug
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.c
 
-shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo: shared/nm-utils/c-list-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/c-list-util.c' object='shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo: shared/nm-utils/nm-dedup-multi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-dedup-multi.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo: shared/nm-utils/nm-enum-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-enum-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: shared/nm-utils/nm-hash-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-hash-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo: shared/nm-utils/nm-random-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-random-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-udev-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo: shared/nm-utils/siphash24.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
-
-shared/libnm_core_libnm_core_la-nm-meta-setting.lo: shared/nm-meta-setting.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/libnm_core_libnm_core_la-nm-meta-setting.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
-
-libnm-core/libnm_core_libnm_core_la-crypto.lo: libnm-core/crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/crypto.c' object='libnm-core/libnm_core_libnm_core_la-crypto.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c
-
-libnm-core/libnm_core_libnm_core_la-nm-connection.lo: libnm-core/nm-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-connection.c' object='libnm-core/libnm_core_libnm_core_la-nm-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c
-
-libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo: libnm-core/nm-dbus-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-dbus-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c
-
-libnm-core/libnm_core_libnm_core_la-nm-errors.lo: libnm-core/nm-errors.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-errors.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-errors.c' object='libnm-core/libnm_core_libnm_core_la-nm-errors.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
-
-libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo: libnm-core/nm-keyfile-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo `test -f 'libnm-core/nm-keyfile-reader.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile-reader.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo `test -f 'libnm-core/nm-keyfile-reader.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-reader.c
-
-libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
-
-libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo: libnm-core/nm-keyfile-writer.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo `test -f 'libnm-core/nm-keyfile-writer.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-writer.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile-writer.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo `test -f 'libnm-core/nm-keyfile-writer.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-writer.c
-
-libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo: libnm-core/nm-property-compare.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-property-compare.c' object='libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c
-
 libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo: libnm-core/nm-setting-8021x.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-8021x.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo `test -f 'libnm-core/nm-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/nm-setting-8021x.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-8021x.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-8021x.Plo
@@ -11377,6 +11385,111 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo: libnm-core/nm-settin
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo `test -f 'libnm-core/nm-setting-wireless.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless.c
 
+shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo: shared/nm-utils/c-list-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/c-list-util.c' object='shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c
+
+shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo: shared/nm-utils/nm-dedup-multi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-dedup-multi.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c
+
+shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo: shared/nm-utils/nm-enum-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-enum-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
+
+shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: shared/nm-utils/nm-hash-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-hash-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
+
+shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
+
+shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo: shared/nm-utils/nm-random-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-random-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
+
+shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-udev-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
+
+shared/libnm_core_libnm_core_la-nm-meta-setting.lo: shared/nm-meta-setting.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/libnm_core_libnm_core_la-nm-meta-setting.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
+
+libnm-core/libnm_core_libnm_core_la-crypto.lo: libnm-core/crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/crypto.c' object='libnm-core/libnm_core_libnm_core_la-crypto.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c
+
+libnm-core/libnm_core_libnm_core_la-nm-connection.lo: libnm-core/nm-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-connection.c' object='libnm-core/libnm_core_libnm_core_la-nm-connection.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c
+
+libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo: libnm-core/nm-dbus-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-dbus-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c
+
+libnm-core/libnm_core_libnm_core_la-nm-errors.lo: libnm-core/nm-errors.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-errors.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-errors.c' object='libnm-core/libnm_core_libnm_core_la-nm-errors.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
+
+libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo: libnm-core/nm-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
+
+libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
+
+libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo: libnm-core/nm-property-compare.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-property-compare.c' object='libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c
+
 libnm-core/libnm_core_libnm_core_la-nm-setting.lo: libnm-core/nm-setting.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting.lo `test -f 'libnm-core/nm-setting.c' || echo '$(srcdir)/'`libnm-core/nm-setting.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting.Plo
@@ -11979,6 +12092,13 @@ libnm/libnm_libnm_utils_la-nm-libnm-utils.lo: libnm/nm-libnm-utils.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_utils_la-nm-libnm-utils.lo `test -f 'libnm/nm-libnm-utils.c' || echo '$(srcdir)/'`libnm/nm-libnm-utils.c
 
+libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo: libnm/fake-typelib/typelibs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo -MD -MP -MF libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Tpo -c -o libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo `test -f 'libnm/fake-typelib/typelibs.c' || echo '$(srcdir)/'`libnm/fake-typelib/typelibs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Tpo libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/fake-typelib/typelibs.c' object='libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo `test -f 'libnm/fake-typelib/typelibs.c' || echo '$(srcdir)/'`libnm/fake-typelib/typelibs.c
+
 libnm/libnm_libnm_la-nm-access-point.lo: libnm/nm-access-point.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-access-point.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Tpo -c -o libnm/libnm_libnm_la-nm-access-point.lo `test -f 'libnm/nm-access-point.c' || echo '$(srcdir)/'`libnm/nm-access-point.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Plo
@@ -11993,6 +12113,13 @@ libnm/libnm_libnm_la-nm-active-connection.lo: libnm/nm-active-connection.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-active-connection.lo `test -f 'libnm/nm-active-connection.c' || echo '$(srcdir)/'`libnm/nm-active-connection.c
 
+libnm/libnm_libnm_la-nm-checkpoint.lo: libnm/nm-checkpoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-checkpoint.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Tpo -c -o libnm/libnm_libnm_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-checkpoint.c' object='libnm/libnm_libnm_la-nm-checkpoint.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.c
+
 libnm/libnm_libnm_la-nm-client.lo: libnm/nm-client.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-client.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Tpo -c -o libnm/libnm_libnm_la-nm-client.lo `test -f 'libnm/nm-client.c' || echo '$(srcdir)/'`libnm/nm-client.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Plo
@@ -12308,6 +12435,20 @@ shared/nm-utils/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.l
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.lo `test -f 'shared/nm-utils/nm-vpn-plugin-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-vpn-plugin-utils.c
 
+shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo: shared/c-siphash/src/c-siphash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo -MD -MP -MF shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Tpo -c -o shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Tpo shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/c-siphash/src/c-siphash.c' object='shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c
+
+shared/n-acd/src/shared_libnacd_la-n-acd.lo: shared/n-acd/src/n-acd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -MT shared/n-acd/src/shared_libnacd_la-n-acd.lo -MD -MP -MF shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Tpo -c -o shared/n-acd/src/shared_libnacd_la-n-acd.lo `test -f 'shared/n-acd/src/n-acd.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Tpo shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-acd/src/n-acd.c' object='shared/n-acd/src/shared_libnacd_la-n-acd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -c -o shared/n-acd/src/shared_libnacd_la-n-acd.lo `test -f 'shared/n-acd/src/n-acd.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd.c
+
 src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo: src/devices/adsl/nm-atm-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo -MD -MP -MF src/devices/adsl/$(DEPDIR)/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.Tpo -c -o src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo `test -f 'src/devices/adsl/nm-atm-manager.c' || echo '$(srcdir)/'`src/devices/adsl/nm-atm-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/adsl/$(DEPDIR)/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.Tpo src/devices/adsl/$(DEPDIR)/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.Plo
@@ -12455,6 +12596,13 @@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
 
+src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo: src/devices/wifi/nm-wifi-common.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-common.c' object='src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c
+
 src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo: src/devices/wifi/nm-device-olpc-mesh.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo
@@ -12462,6 +12610,20 @@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mes
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
 
+src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo: src/devices/wifi/nm-device-iwd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-iwd.c' object='src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c
+
+src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo: src/devices/wifi/nm-iwd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-iwd-manager.c' object='src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c
+
 src/devices/wwan/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.lo: src/devices/wwan/nm-wwan-factory.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo -c -o src/devices/wwan/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.lo `test -f 'src/devices/wwan/nm-wwan-factory.c' || echo '$(srcdir)/'`src/devices/wwan/nm-wwan-factory.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo src/devices/wwan/$(DEPDIR)/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
@@ -12504,13 +12666,6 @@ src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo: src/devices/w
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo `test -f 'src/devices/wwan/nm-modem-ofono.c' || echo '$(srcdir)/'`src/devices/wwan/nm-modem-ofono.c
 
-src/src_libNetworkManager_la-nm-checkpoint-manager.lo: src/nm-checkpoint-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-checkpoint-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Tpo -c -o src/src_libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-checkpoint-manager.c' object='src/src_libNetworkManager_la-nm-checkpoint-manager.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c
-
 src/src_libNetworkManager_la-nm-checkpoint.lo: src/nm-checkpoint.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-checkpoint.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Tpo -c -o src/src_libNetworkManager_la-nm-checkpoint.lo `test -f 'src/nm-checkpoint.c' || echo '$(srcdir)/'`src/nm-checkpoint.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Plo
@@ -12518,6 +12673,13 @@ src/src_libNetworkManager_la-nm-checkpoint.lo: src/nm-checkpoint.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-checkpoint.lo `test -f 'src/nm-checkpoint.c' || echo '$(srcdir)/'`src/nm-checkpoint.c
 
+src/src_libNetworkManager_la-nm-checkpoint-manager.lo: src/nm-checkpoint-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-checkpoint-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Tpo -c -o src/src_libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-checkpoint-manager.c' object='src/src_libNetworkManager_la-nm-checkpoint-manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c
+
 src/devices/src_libNetworkManager_la-nm-device.lo: src/devices/nm-device.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-device.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device.lo `test -f 'src/devices/nm-device.c' || echo '$(srcdir)/'`src/devices/nm-device.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device.Plo
@@ -12532,12 +12694,12 @@ src/devices/src_libNetworkManager_la-nm-lldp-listener.lo: src/devices/nm-lldp-li
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-lldp-listener.lo `test -f 'src/devices/nm-lldp-listener.c' || echo '$(srcdir)/'`src/devices/nm-lldp-listener.c
 
-src/devices/src_libNetworkManager_la-nm-arping-manager.lo: src/devices/nm-arping-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-arping-manager.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Tpo -c -o src/devices/src_libNetworkManager_la-nm-arping-manager.lo `test -f 'src/devices/nm-arping-manager.c' || echo '$(srcdir)/'`src/devices/nm-arping-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-arping-manager.c' object='src/devices/src_libNetworkManager_la-nm-arping-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/src_libNetworkManager_la-nm-acd-manager.lo: src/devices/nm-acd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-acd-manager.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Tpo -c -o src/devices/src_libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-acd-manager.c' object='src/devices/src_libNetworkManager_la-nm-acd-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-arping-manager.lo `test -f 'src/devices/nm-arping-manager.c' || echo '$(srcdir)/'`src/devices/nm-arping-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c
 
 src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo: src/devices/nm-device-ethernet-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ethernet-utils.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo `test -f 'src/devices/nm-device-ethernet-utils.c' || echo '$(srcdir)/'`src/devices/nm-device-ethernet-utils.c
@@ -12686,6 +12848,20 @@ src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient-utils.lo: src/dhcp/nm-dhcp-dh
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient-utils.lo `test -f 'src/dhcp/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhclient-utils.c
 
+src/dns/src_libNetworkManager_la-nm-dns-manager.lo: src/dns/nm-dns-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-manager.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dns/nm-dns-manager.c' object='src/dns/src_libNetworkManager_la-nm-dns-manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c
+
+src/dns/src_libNetworkManager_la-nm-dns-plugin.lo: src/dns/nm-dns-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-plugin.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dns/nm-dns-plugin.c' object='src/dns/src_libNetworkManager_la-nm-dns-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c
+
 src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo: src/dns/nm-dns-dnsmasq.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-dnsmasq.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo `test -f 'src/dns/nm-dns-dnsmasq.c' || echo '$(srcdir)/'`src/dns/nm-dns-dnsmasq.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-dnsmasq.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-dnsmasq.Plo
@@ -12707,20 +12883,6 @@ src/dns/src_libNetworkManager_la-nm-dns-unbound.lo: src/dns/nm-dns-unbound.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-unbound.lo `test -f 'src/dns/nm-dns-unbound.c' || echo '$(srcdir)/'`src/dns/nm-dns-unbound.c
 
-src/dns/src_libNetworkManager_la-nm-dns-manager.lo: src/dns/nm-dns-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-manager.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dns/nm-dns-manager.c' object='src/dns/src_libNetworkManager_la-nm-dns-manager.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c
-
-src/dns/src_libNetworkManager_la-nm-dns-plugin.lo: src/dns/nm-dns-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-plugin.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dns/nm-dns-plugin.c' object='src/dns/src_libNetworkManager_la-nm-dns-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c
-
 src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo: src/dnsmasq/nm-dnsmasq-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo -MD -MP -MF src/dnsmasq/$(DEPDIR)/src_libNetworkManager_la-nm-dnsmasq-manager.Tpo -c -o src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo `test -f 'src/dnsmasq/nm-dnsmasq-manager.c' || echo '$(srcdir)/'`src/dnsmasq/nm-dnsmasq-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dnsmasq/$(DEPDIR)/src_libNetworkManager_la-nm-dnsmasq-manager.Tpo src/dnsmasq/$(DEPDIR)/src_libNetworkManager_la-nm-dnsmasq-manager.Plo
@@ -12882,12 +13044,12 @@ src/src_libNetworkManager_la-nm-audit-manager.lo: src/nm-audit-manager.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-audit-manager.lo `test -f 'src/nm-audit-manager.c' || echo '$(srcdir)/'`src/nm-audit-manager.c
 
-src/src_libNetworkManager_la-nm-bus-manager.lo: src/nm-bus-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-bus-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Tpo -c -o src/src_libNetworkManager_la-nm-bus-manager.lo `test -f 'src/nm-bus-manager.c' || echo '$(srcdir)/'`src/nm-bus-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-bus-manager.c' object='src/src_libNetworkManager_la-nm-bus-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/src_libNetworkManager_la-nm-dbus-manager.lo: src/nm-dbus-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-dbus-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Tpo -c -o src/src_libNetworkManager_la-nm-dbus-manager.lo `test -f 'src/nm-dbus-manager.c' || echo '$(srcdir)/'`src/nm-dbus-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dbus-manager.c' object='src/src_libNetworkManager_la-nm-dbus-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-bus-manager.lo `test -f 'src/nm-bus-manager.c' || echo '$(srcdir)/'`src/nm-bus-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-dbus-manager.lo `test -f 'src/nm-dbus-manager.c' || echo '$(srcdir)/'`src/nm-dbus-manager.c
 
 src/src_libNetworkManager_la-nm-config.lo: src/nm-config.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-config.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-config.Tpo -c -o src/src_libNetworkManager_la-nm-config.lo `test -f 'src/nm-config.c' || echo '$(srcdir)/'`src/nm-config.c
@@ -12903,6 +13065,13 @@ src/src_libNetworkManager_la-nm-config-data.lo: src/nm-config-data.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-config-data.lo `test -f 'src/nm-config-data.c' || echo '$(srcdir)/'`src/nm-config-data.c
 
+src/src_libNetworkManager_la-nm-connectivity.lo: src/nm-connectivity.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-connectivity.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-connectivity.c' object='src/src_libNetworkManager_la-nm-connectivity.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c
+
 src/src_libNetworkManager_la-nm-dcb.lo: src/nm-dcb.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-dcb.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Tpo -c -o src/src_libNetworkManager_la-nm-dcb.lo `test -f 'src/nm-dcb.c' || echo '$(srcdir)/'`src/nm-dcb.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Plo
@@ -13015,13 +13184,6 @@ src/src_libNetworkManager_la-nm-sleep-monitor.lo: src/nm-sleep-monitor.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-sleep-monitor.lo `test -f 'src/nm-sleep-monitor.c' || echo '$(srcdir)/'`src/nm-sleep-monitor.c
 
-src/src_libNetworkManager_la-nm-connectivity.lo: src/nm-connectivity.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-connectivity.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-connectivity.c' object='src/src_libNetworkManager_la-nm-connectivity.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c
-
 src/src_libNetworkManagerBase_la-nm-core-utils.lo: src/nm-core-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-core-utils.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Tpo -c -o src/src_libNetworkManagerBase_la-nm-core-utils.lo `test -f 'src/nm-core-utils.c' || echo '$(srcdir)/'`src/nm-core-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Plo
@@ -13043,6 +13205,13 @@ src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo: src/NetworkManagerUtils
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo `test -f 'src/NetworkManagerUtils.c' || echo '$(srcdir)/'`src/NetworkManagerUtils.c
 
+src/platform/src_libNetworkManagerBase_la-nm-netlink.lo: src/platform/nm-netlink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/src_libNetworkManagerBase_la-nm-netlink.lo -MD -MP -MF src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Tpo -c -o src/platform/src_libNetworkManagerBase_la-nm-netlink.lo `test -f 'src/platform/nm-netlink.c' || echo '$(srcdir)/'`src/platform/nm-netlink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Tpo src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/nm-netlink.c' object='src/platform/src_libNetworkManagerBase_la-nm-netlink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/src_libNetworkManagerBase_la-nm-netlink.lo `test -f 'src/platform/nm-netlink.c' || echo '$(srcdir)/'`src/platform/nm-netlink.c
+
 src/platform/src_libNetworkManagerBase_la-nmp-netns.lo: src/platform/nmp-netns.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/src_libNetworkManagerBase_la-nmp-netns.lo -MD -MP -MF src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Tpo -c -o src/platform/src_libNetworkManagerBase_la-nmp-netns.lo `test -f 'src/platform/nmp-netns.c' || echo '$(srcdir)/'`src/platform/nmp-netns.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Tpo src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Plo
@@ -13106,12 +13275,19 @@ src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo: src/ndisc/nm-ndisc.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo `test -f 'src/ndisc/nm-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-ndisc.c
 
-src/src_libNetworkManagerBase_la-nm-exported-object.lo: src/nm-exported-object.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-exported-object.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Tpo -c -o src/src_libNetworkManagerBase_la-nm-exported-object.lo `test -f 'src/nm-exported-object.c' || echo '$(srcdir)/'`src/nm-exported-object.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-exported-object.c' object='src/src_libNetworkManagerBase_la-nm-exported-object.lo' libtool=yes @AMDEPBACKSLASH@
+src/src_libNetworkManagerBase_la-nm-dbus-utils.lo: src/nm-dbus-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-dbus-utils.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Tpo -c -o src/src_libNetworkManagerBase_la-nm-dbus-utils.lo `test -f 'src/nm-dbus-utils.c' || echo '$(srcdir)/'`src/nm-dbus-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dbus-utils.c' object='src/src_libNetworkManagerBase_la-nm-dbus-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-dbus-utils.lo `test -f 'src/nm-dbus-utils.c' || echo '$(srcdir)/'`src/nm-dbus-utils.c
+
+src/src_libNetworkManagerBase_la-nm-dbus-object.lo: src/nm-dbus-object.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-dbus-object.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Tpo -c -o src/src_libNetworkManagerBase_la-nm-dbus-object.lo `test -f 'src/nm-dbus-object.c' || echo '$(srcdir)/'`src/nm-dbus-object.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dbus-object.c' object='src/src_libNetworkManagerBase_la-nm-dbus-object.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-exported-object.lo `test -f 'src/nm-exported-object.c' || echo '$(srcdir)/'`src/nm-exported-object.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-dbus-object.lo `test -f 'src/nm-dbus-object.c' || echo '$(srcdir)/'`src/nm-dbus-object.c
 
 src/src_libNetworkManagerBase_la-nm-ip4-config.lo: src/nm-ip4-config.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-ip4-config.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip4-config.Tpo -c -o src/src_libNetworkManagerBase_la-nm-ip4-config.lo `test -f 'src/nm-ip4-config.c' || echo '$(srcdir)/'`src/nm-ip4-config.c
@@ -13624,48 +13800,6 @@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
 
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo: src/settings/plugins/ifnet/nms-ifnet-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-connection.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection.c
-
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo: src/settings/plugins/ifnet/nms-ifnet-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-plugin.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-plugin.c
-
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo: src/settings/plugins/ifnet/nms-ifnet-net-parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-net-parser.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-parser.c
-
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo: src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-connection-parser.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
-
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo: src/settings/plugins/ifnet/nms-ifnet-net-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-utils.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-net-utils.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-utils.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-utils.c
-
-src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo: src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
-
 src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo: src/settings/plugins/ifupdown/nms-ifupdown-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo -MD -MP -MF src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Tpo -c -o src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Tpo src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo
@@ -14856,6 +14990,20 @@ libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.obj `if test -f 'libnm-util/tests/test-settings-defaults.c'; then $(CYGPATH_W) 'libnm-util/tests/test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-settings-defaults.c'; fi`
 
+shared/nm-utils/libnm_tests_test_general-nm-compat.o: shared/nm-utils/nm-compat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_tests_test_general-nm-compat.o -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/libnm_tests_test_general-nm-compat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c
+
+shared/nm-utils/libnm_tests_test_general-nm-compat.obj: shared/nm-utils/nm-compat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_tests_test_general-nm-compat.obj -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/libnm_tests_test_general-nm-compat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi`
+
 libnm/tests/libnm_tests_test_general-test-general.o: libnm/tests/test-general.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/libnm_tests_test_general-test-general.o -MD -MP -MF libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Tpo -c -o libnm/tests/libnm_tests_test_general-test-general.o `test -f 'libnm/tests/test-general.c' || echo '$(srcdir)/'`libnm/tests/test-general.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Tpo libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po
@@ -14968,19 +15116,19 @@ src/src_NetworkManager-main.obj: src/main.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_NetworkManager-main.obj `if test -f 'src/main.c'; then $(CYGPATH_W) 'src/main.c'; else $(CYGPATH_W) '$(srcdir)/src/main.c'; fi`
 
-src/devices/tests/src_devices_tests_test_arping-test-arping.o: src/devices/tests/test-arping.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_arping-test-arping.o -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.o `test -f 'src/devices/tests/test-arping.c' || echo '$(srcdir)/'`src/devices/tests/test-arping.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/tests/test-arping.c' object='src/devices/tests/src_devices_tests_test_arping-test-arping.o' libtool=no @AMDEPBACKSLASH@
+src/devices/tests/src_devices_tests_test_acd-test-acd.o: src/devices/tests/test-acd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_acd-test-acd.o -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.o `test -f 'src/devices/tests/test-acd.c' || echo '$(srcdir)/'`src/devices/tests/test-acd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/tests/test-acd.c' object='src/devices/tests/src_devices_tests_test_acd-test-acd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.o `test -f 'src/devices/tests/test-arping.c' || echo '$(srcdir)/'`src/devices/tests/test-arping.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.o `test -f 'src/devices/tests/test-acd.c' || echo '$(srcdir)/'`src/devices/tests/test-acd.c
 
-src/devices/tests/src_devices_tests_test_arping-test-arping.obj: src/devices/tests/test-arping.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_arping-test-arping.obj -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.obj `if test -f 'src/devices/tests/test-arping.c'; then $(CYGPATH_W) 'src/devices/tests/test-arping.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-arping.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/tests/test-arping.c' object='src/devices/tests/src_devices_tests_test_arping-test-arping.obj' libtool=no @AMDEPBACKSLASH@
+src/devices/tests/src_devices_tests_test_acd-test-acd.obj: src/devices/tests/test-acd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_acd-test-acd.obj -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.obj `if test -f 'src/devices/tests/test-acd.c'; then $(CYGPATH_W) 'src/devices/tests/test-acd.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-acd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/tests/test-acd.c' object='src/devices/tests/src_devices_tests_test_acd-test-acd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.obj `if test -f 'src/devices/tests/test-arping.c'; then $(CYGPATH_W) 'src/devices/tests/test-arping.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-arping.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.obj `if test -f 'src/devices/tests/test-acd.c'; then $(CYGPATH_W) 'src/devices/tests/test-acd.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-acd.c'; fi`
 
 src/devices/tests/src_devices_tests_test_lldp-test-lldp.o: src/devices/tests/test-lldp.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_lldp-test-lldp.o -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_lldp-test-lldp.Tpo -c -o src/devices/tests/src_devices_tests_test_lldp-test-lldp.o `test -f 'src/devices/tests/test-lldp.c' || echo '$(srcdir)/'`src/devices/tests/test-lldp.c
@@ -15318,20 +15466,6 @@ src/settings/plugins/ifcfg-rh/tests/src_settings_plugins_ifcfg_rh_tests_test_ifc
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/tests/src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh-test-ifcfg-rh.obj `if test -f 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; then $(CYGPATH_W) 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; fi`
 
-src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o: src/settings/plugins/ifnet/tests/test-ifnet.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o -MD -MP -MF src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o `test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/tests/test-ifnet.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifnet/tests/test-ifnet.c' object='src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o `test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/tests/test-ifnet.c
-
-src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj: src/settings/plugins/ifnet/tests/test-ifnet.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj -MD -MP -MF src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj `if test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c'; then $(CYGPATH_W) 'src/settings/plugins/ifnet/tests/test-ifnet.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifnet/tests/test-ifnet.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifnet/tests/test-ifnet.c' object='src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj `if test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c'; then $(CYGPATH_W) 'src/settings/plugins/ifnet/tests/test-ifnet.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifnet/tests/test-ifnet.c'; fi`
-
 src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.o: src/settings/plugins/ifupdown/tests/test-ifupdown.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.o -MD -MP -MF src/settings/plugins/ifupdown/tests/$(DEPDIR)/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.Tpo -c -o src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.o `test -f 'src/settings/plugins/ifupdown/tests/test-ifupdown.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/tests/test-ifupdown.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/tests/$(DEPDIR)/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.Tpo src/settings/plugins/ifupdown/tests/$(DEPDIR)/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.Po
@@ -15472,20 +15606,6 @@ src/tests/src_tests_test_ip6_config-test-ip6-config.obj: src/tests/test-ip6-conf
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_ip6_config-test-ip6-config.obj `if test -f 'src/tests/test-ip6-config.c'; then $(CYGPATH_W) 'src/tests/test-ip6-config.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-ip6-config.c'; fi`
 
-src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o: src/tests/test-resolvconf-capture.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o `test -f 'src/tests/test-resolvconf-capture.c' || echo '$(srcdir)/'`src/tests/test-resolvconf-capture.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-resolvconf-capture.c' object='src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o `test -f 'src/tests/test-resolvconf-capture.c' || echo '$(srcdir)/'`src/tests/test-resolvconf-capture.c
-
-src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj: src/tests/test-resolvconf-capture.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj `if test -f 'src/tests/test-resolvconf-capture.c'; then $(CYGPATH_W) 'src/tests/test-resolvconf-capture.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-resolvconf-capture.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-resolvconf-capture.c' object='src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj `if test -f 'src/tests/test-resolvconf-capture.c'; then $(CYGPATH_W) 'src/tests/test-resolvconf-capture.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-resolvconf-capture.c'; fi`
-
 shared/nm-utils/src_tests_test_systemd-siphash24.o: shared/nm-utils/siphash24.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/src_tests_test_systemd-siphash24.o -MD -MP -MF shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo -c -o shared/nm-utils/src_tests_test_systemd-siphash24.o `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Po
@@ -15644,8 +15764,11 @@ clean-libtool:
 	-rm -rf libnm-glib/tests/.libs libnm-glib/tests/_libs
 	-rm -rf libnm-util/.libs libnm-util/_libs
 	-rm -rf libnm-util/tests/.libs libnm-util/tests/_libs
+	-rm -rf libnm/fake-typelib/.libs libnm/fake-typelib/_libs
 	-rm -rf libnm/tests/.libs libnm/tests/_libs
 	-rm -rf shared/.libs shared/_libs
+	-rm -rf shared/c-siphash/src/.libs shared/c-siphash/src/_libs
+	-rm -rf shared/n-acd/src/.libs shared/n-acd/src/_libs
 	-rm -rf shared/nm-utils/.libs shared/nm-utils/_libs
 	-rm -rf src/.libs src/_libs
 	-rm -rf src/devices/.libs src/devices/_libs
@@ -15673,8 +15796,6 @@ clean-libtool:
 	-rm -rf src/settings/plugins/ibft/tests/.libs src/settings/plugins/ibft/tests/_libs
 	-rm -rf src/settings/plugins/ifcfg-rh/.libs src/settings/plugins/ifcfg-rh/_libs
 	-rm -rf src/settings/plugins/ifcfg-rh/tests/.libs src/settings/plugins/ifcfg-rh/tests/_libs
-	-rm -rf src/settings/plugins/ifnet/.libs src/settings/plugins/ifnet/_libs
-	-rm -rf src/settings/plugins/ifnet/tests/.libs src/settings/plugins/ifnet/tests/_libs
 	-rm -rf src/settings/plugins/ifupdown/.libs src/settings/plugins/ifupdown/_libs
 	-rm -rf src/settings/plugins/ifupdown/tests/.libs src/settings/plugins/ifupdown/tests/_libs
 	-rm -rf src/settings/plugins/keyfile/.libs src/settings/plugins/keyfile/_libs
@@ -16692,13 +16813,6 @@ src/settings/plugins/ifupdown/tests/test-ifupdown.log: src/settings/plugins/ifup
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/settings/plugins/ifnet/tests/test-ifnet.log: src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT)
-	@p='src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT)'; \
-	b='src/settings/plugins/ifnet/tests/test-ifnet'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 src/devices/wifi/tests/test-general.log: src/devices/wifi/tests/test-general$(EXEEXT)
 	@p='src/devices/wifi/tests/test-general$(EXEEXT)'; \
 	b='src/devices/wifi/tests/test-general'; \
@@ -16790,9 +16904,9 @@ src/devices/tests/test-lldp.log: src/devices/tests/test-lldp$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/devices/tests/test-arping.log: src/devices/tests/test-arping$(EXEEXT)
-	@p='src/devices/tests/test-arping$(EXEEXT)'; \
-	b='src/devices/tests/test-arping'; \
+src/devices/tests/test-acd.log: src/devices/tests/test-acd$(EXEEXT)
+	@p='src/devices/tests/test-acd$(EXEEXT)'; \
+	b='src/devices/tests/test-acd'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -16860,13 +16974,6 @@ src/tests/test-systemd.log: src/tests/test-systemd$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/tests/test-resolvconf-capture.log: src/tests/test-resolvconf-capture$(EXEEXT)
-	@p='src/tests/test-resolvconf-capture$(EXEEXT)'; \
-	b='src/tests/test-resolvconf-capture'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 src/tests/test-wired-defname.log: src/tests/test-wired-defname$(EXEEXT)
 	@p='src/tests/test-wired-defname$(EXEEXT)'; \
 	b='src/tests/test-wired-defname'; \
@@ -17237,10 +17344,16 @@ distclean-generic:
 	-rm -f libnm-util/tests/$(am__dirstamp)
 	-rm -f libnm/$(DEPDIR)/$(am__dirstamp)
 	-rm -f libnm/$(am__dirstamp)
+	-rm -f libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp)
+	-rm -f libnm/fake-typelib/$(am__dirstamp)
 	-rm -f libnm/tests/$(DEPDIR)/$(am__dirstamp)
 	-rm -f libnm/tests/$(am__dirstamp)
 	-rm -f shared/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/$(am__dirstamp)
+	-rm -f shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/c-siphash/src/$(am__dirstamp)
+	-rm -f shared/n-acd/src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/n-acd/src/$(am__dirstamp)
 	-rm -f shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-utils/$(am__dirstamp)
 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
@@ -17295,10 +17408,6 @@ distclean-generic:
 	-rm -f src/settings/plugins/ifcfg-rh/$(am__dirstamp)
 	-rm -f src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp)
-	-rm -f src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/settings/plugins/ifnet/$(am__dirstamp)
-	-rm -f src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/settings/plugins/ifnet/tests/$(am__dirstamp)
 	-rm -f src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/settings/plugins/ifupdown/$(am__dirstamp)
 	-rm -f src/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp)
@@ -17347,7 +17456,7 @@ clean-am: clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifnet/$(DEPDIR) src/settings/plugins/ifnet/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR)
+	-rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/fake-typelib/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/c-siphash/src/$(DEPDIR) shared/n-acd/src/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@@ -17413,7 +17522,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifnet/$(DEPDIR) src/settings/plugins/ifnet/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR)
+	-rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/fake-typelib/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/c-siphash/src/$(DEPDIR) shared/n-acd/src/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -17566,8 +17675,6 @@ docs/api/dbus-%.xml: introspection/%.c
 $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(introspection_sources)
 $(dispatcher_nm_dispatcher_OBJECTS):            $(introspection_sources)
 $(libnm_libnm_la_OBJECTS):                      $(introspection_sources)
-$(src_libNetworkManager_la_OBJECTS):            $(introspection_sources)
-$(src_libNetworkManagerBase_la_OBJECTS):        $(introspection_sources)
 
 libnm-core/nm-core-enum-types.h.stamp:                                      libnm-core/.dirstamp
 libnm-core/nm-core-enum-types.c.stamp:                                      libnm-core/.dirstamp
@@ -17620,8 +17727,17 @@ check-local-exports-libnm: libnm/libnm.la
 @HAVE_INTROSPECTION_TRUE@libnm/libnm.typelib: libnm/libnm.gir
 @HAVE_INTROSPECTION_TRUE@	$(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@
 
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir libnm/fake-typelib/.dirstamp
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	$(AM_V_GEN)  $(INTROSPECTION_COMPILER) $< -o $@
+
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir libnm/fake-typelib/.dirstamp
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	$(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
+
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(builddir)/libnm/fake-typelib --generate-source --manual-register
+
 @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-docs-overrides.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
-@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus "$(srcdir)" $@
+@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus $@ $(filter-out $<,$^)
 
 # When the python scripts loads libnm and the address sanitizers is
 # enabled, we must LD_PRELOAD libasan otherwise it will complain that
@@ -17648,9 +17764,9 @@ check-local-exports-libnm: libnm/libnm.la
 @HAVE_INTROSPECTION_TRUE@		--output $@
 
 @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-keyfile-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
-@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile "$(srcdir)" $@
+@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile $@ $(filter-out $<,$^)
 @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
-@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh "$(srcdir)" $@
+@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh $@ $(filter-out $<,$^)
 
 $(libnm_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -17724,10 +17840,6 @@ dist-hook-settings-ifcfg-rh-alias-files:
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@CONFIG_PLUGIN_IFNET_TRUE@check-local-symbols-settings-ifnet: src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la
-@CONFIG_PLUGIN_IFNET_TRUE@	$(call check_so_symbols,$(builddir)/src/settings/plugins/ifnet/.libs/libnm-settings-plugin-ifnet.so)
-@CONFIG_PLUGIN_IFNET_TRUE@	$(CODE_COVERAGE_LDFLAGS)
-
 check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la
 	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver"
 	$(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so)
@@ -17773,7 +17885,7 @@ $(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_platform_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 $(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_tests_test_arping_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 $(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -17785,7 +17897,6 @@ $(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_resolvconf_capture_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -17825,21 +17936,21 @@ $(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
-@HAVE_INTROSPECTION_TRUE@$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp
+@HAVE_INTROSPECTION_TRUE@$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp
 @HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
-@HAVE_INTROSPECTION_TRUE@check-local-settings-docs: $(clients_common_settings_doc_c)
+@HAVE_INTROSPECTION_TRUE@check-local-settings-docs: $(clients_common_settings_doc_h)
 @HAVE_INTROSPECTION_TRUE@	@if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then  \
-@HAVE_INTROSPECTION_TRUE@		if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \
-@HAVE_INTROSPECTION_TRUE@			echo "The generated file \"$(builddir)/$(clients_common_settings_doc_c)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_c).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \
+@HAVE_INTROSPECTION_TRUE@		if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \
+@HAVE_INTROSPECTION_TRUE@			echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \
 @HAVE_INTROSPECTION_TRUE@			false; \
 @HAVE_INTROSPECTION_TRUE@		fi;\
 @HAVE_INTROSPECTION_TRUE@	fi
-@HAVE_INTROSPECTION_FALSE@$(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp
-@HAVE_INTROSPECTION_FALSE@	$(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)"
+@HAVE_INTROSPECTION_FALSE@$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
+@HAVE_INTROSPECTION_FALSE@	$(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)"
 @HAVE_INTROSPECTION_FALSE@check-local-settings-docs:
 
 $(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_c)
+$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h)
 $(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp
 
 $(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)