summary refs log tree commit diff
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in2038
1 files changed, 1078 insertions, 960 deletions
diff --git a/Makefile.in b/Makefile.in
index b5d76338..77127448 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,6 +52,9 @@
 #
 #       The files which should be used to generate the VAPI.
 
+# generated with `NM_TEST_REGENERATE=1 make check`
+# See howto in "clients/tests/test-client.py"
+
 ###############################################################################
 # examples/C/glib
 ###############################################################################
@@ -163,39 +166,43 @@ TESTS = $(am__EXEEXT_14)
 @WITH_JSON_VALIDATION_TRUE@am__append_7 = \
 @WITH_JSON_VALIDATION_TRUE@	libnm-core/nm-json.c
 
-@WITH_JSON_VALIDATION_TRUE@am__append_8 = $(JANSSON_CFLAGS)
-@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am__append_9 = libnm-core/libnm-crypto-gnutls.la
-@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am__append_10 = libnm-core/libnm-crypto-nss.la
-@HAVE_INTROSPECTION_TRUE@am__append_11 = libnm/NM-1.0.typelib
-@HAVE_INTROSPECTION_TRUE@am__append_12 = libnm/NM-1.0.gir
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@am__append_13 = \
+@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.typelib
+@HAVE_INTROSPECTION_TRUE@am__append_16 = libnm/NM-1.0.gir
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@am__append_17 = \
 @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_14 = $(libnm_noinst_data)
-@HAVE_INTROSPECTION_TRUE@am__append_15 = $(libnm_noinst_data)
-@HAVE_INTROSPECTION_TRUE@am__append_16 = $(libnm_tests_programs_req_introspection)
-@HAVE_INTROSPECTION_FALSE@am__append_17 = $(libnm_tests_programs_req_introspection)
-@REQUIRE_ROOT_TESTS_TRUE@am__append_18 = -DREQUIRE_ROOT_TESTS=1
-@WITH_WEXT_TRUE@am__append_19 = \
-@WITH_WEXT_TRUE@	src/platform/wifi/nm-wifi-utils-wext.c \
-@WITH_WEXT_TRUE@	src/platform/wifi/nm-wifi-utils-wext.h
+@HAVE_INTROSPECTION_TRUE@am__append_18 = $(libnm_noinst_data)
+@HAVE_INTROSPECTION_TRUE@am__append_19 = $(libnm_noinst_data)
+@HAVE_INTROSPECTION_TRUE@am__append_20 = $(libnm_tests_programs_req_introspection)
+@HAVE_INTROSPECTION_FALSE@am__append_21 = $(libnm_tests_programs_req_introspection)
+@WITH_WEXT_TRUE@am__append_22 = \
+@WITH_WEXT_TRUE@	src/platform/wifi/wifi-utils-wext.c \
+@WITH_WEXT_TRUE@	src/platform/wifi/wifi-utils-wext.h
 
+@REQUIRE_ROOT_TESTS_TRUE@am__append_23 = -DREQUIRE_ROOT_TESTS=1
 
 ###############################################################################
 # src/ppp
 ###############################################################################
-@WITH_PPP_TRUE@am__append_20 = src/ppp/libnm-ppp-plugin.la
-@WITH_PPP_TRUE@am__append_21 = src/ppp/nm-pppd-plugin.la
+@WITH_PPP_TRUE@am__append_24 = src/ppp/libnm-ppp-plugin.la
+@WITH_PPP_TRUE@am__append_25 = src/ppp/nm-pppd-plugin.la
 
 ###############################################################################
 # src/settings/plugins/ibft
 ###############################################################################
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_22 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_23 = src/settings/plugins/ibft/libnms-ibft-core.la
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_24 = src/settings/plugins/ibft/tests/test-ibft
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_25 = \
+@CONFIG_PLUGIN_IBFT_TRUE@am__append_26 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
+@CONFIG_PLUGIN_IBFT_TRUE@am__append_27 = src/settings/plugins/ibft/libnms-ibft-core.la
+@CONFIG_PLUGIN_IBFT_TRUE@am__append_28 = src/settings/plugins/ibft/tests/test-ibft
+@CONFIG_PLUGIN_IBFT_TRUE@am__append_29 = \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/tests/iscsiadm-test-static \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr \
@@ -206,130 +213,130 @@ TESTS = $(am__EXEEXT_14)
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/tests/iscsiadm-test-vlan
 
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_26 = check-local-symbols-settings-ibft
+@CONFIG_PLUGIN_IBFT_TRUE@am__append_30 = check-local-symbols-settings-ibft
 
 ###############################################################################
 # src/settings/plugins/ifcfg-rh
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_32 = \
 @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@am__append_29 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = check-local-symbols-settings-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_33 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_34 = check-local-symbols-settings-ifcfg-rh
 
 ###############################################################################
 # src/settings/plugins/ifcfg-rh/tests
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_32 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_35 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_36 = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nm-ifup \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nm-ifdown
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_33 = install-data-hook-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_37 = install-data-hook-ifcfg-rh
 
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_34 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_38 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
 
 ###############################################################################
 # src/settings/plugins/ifupdown
 ###############################################################################
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_35 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_36 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_37 = check-local-symbols-settings-ifupdown
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_39 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_40 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_41 = check-local-symbols-settings-ifupdown
 
 ###############################################################################
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_38 = src/settings/plugins/ifupdown/tests/test-ifupdown
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_42 = src/settings/plugins/ifupdown/tests/test-ifupdown
 
 ###############################################################################
 # src/devices/bluetooth
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@am__append_39 =  \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_43 =  \
 @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_40 = \
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_44 = \
 @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_41 = check-local-devices-wwan \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_45 = check-local-devices-wwan \
 @WITH_MODEM_MANAGER_1_TRUE@	check-local-devices-bluetooth
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = $(BLUEZ5_CFLAGS)
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = \
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_46 = $(BLUEZ5_CFLAGS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_47 = \
 @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_44 = $(BLUEZ5_LIBS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_48 = $(BLUEZ5_LIBS)
 
 ###############################################################################
 # src/devices/wifi
 ###############################################################################
-@WITH_WIFI_TRUE@am__append_45 = src/devices/wifi/libnm-device-plugin-wifi.la
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_46 = \
+@WITH_WIFI_TRUE@am__append_49 = src/devices/wifi/libnm-device-plugin-wifi.la
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_50 = \
 @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_47 = check-local-devices-wifi
-@WITH_WIFI_TRUE@am__append_48 = src/devices/wifi/tests/test-general
+@WITH_WIFI_TRUE@am__append_51 = check-local-devices-wifi
+@WITH_WIFI_TRUE@am__append_52 = src/devices/wifi/tests/test-general
 
 ###############################################################################
 # src/devices/team
 ###############################################################################
-@WITH_TEAMDCTL_TRUE@am__append_49 = src/devices/team/libnm-device-plugin-team.la
-@WITH_TEAMDCTL_TRUE@am__append_50 = check-local-devices-team
-@WITH_OPENVSWITCH_TRUE@am__append_51 = src/devices/ovs/libnm-device-plugin-ovs.la
-@HAVE_INTROSPECTION_TRUE@am__append_52 = $(clients_common_settings_doc_h)
-@HAVE_INTROSPECTION_TRUE@am__append_53 = check-local-settings-docs
-@HAVE_INTROSPECTION_TRUE@am__append_54 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_FALSE@am__append_55 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_TRUE@am__append_56 = clients/common/tests/test-general
-@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_57 = clients/common/tests/test-general
+@WITH_TEAMDCTL_TRUE@am__append_53 = src/devices/team/libnm-device-plugin-team.la
+@WITH_TEAMDCTL_TRUE@am__append_54 = check-local-devices-team
+@WITH_OPENVSWITCH_TRUE@am__append_55 = src/devices/ovs/libnm-device-plugin-ovs.la
+@HAVE_INTROSPECTION_TRUE@am__append_56 = $(clients_common_settings_doc_h)
+@HAVE_INTROSPECTION_TRUE@am__append_57 = check-local-settings-docs
+@HAVE_INTROSPECTION_TRUE@am__append_58 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_FALSE@am__append_59 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_TRUE@am__append_60 = clients/common/tests/test-general
+@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_61 = clients/common/tests/test-general
 
 ###############################################################################
 # clients/cli
 ###############################################################################
-@BUILD_NMCLI_TRUE@am__append_58 = clients/cli/nmcli
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_59 = $(POLKIT_CFLAGS)
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_60 = \
+@BUILD_NMCLI_TRUE@am__append_62 = clients/cli/nmcli
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_63 = $(POLKIT_CFLAGS)
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_64 = \
 @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_61 = $(POLKIT_LIBS)
-@BUILD_NMCLI_TRUE@am__append_62 = install-data-hook-nmcli
-@BUILD_NMCLI_TRUE@am__append_63 = uninstall-hook-nmcli
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_65 = $(POLKIT_LIBS)
+@BUILD_NMCLI_TRUE@am__append_66 = install-data-hook-nmcli
+@BUILD_NMCLI_TRUE@am__append_67 = uninstall-hook-nmcli
 
 ###############################################################################
 # clients/tui
 ###############################################################################
-@BUILD_NMTUI_TRUE@am__append_64 = clients/tui/newt/libnmt-newt.a
-@BUILD_NMTUI_TRUE@am__append_65 = clients/tui/nmtui
-@BUILD_NMTUI_TRUE@am__append_66 = install-exec-hook-nmtui
-@BUILD_NMTUI_TRUE@am__append_67 = uninstall-hook-nmtui
-@HAVE_SYSTEMD_TRUE@am__append_68 = data/org.freedesktop.NetworkManager.service
+@BUILD_NMTUI_TRUE@am__append_68 = clients/tui/newt/libnmt-newt.a
+@BUILD_NMTUI_TRUE@am__append_69 = clients/tui/nmtui
+@BUILD_NMTUI_TRUE@am__append_70 = install-exec-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_71 = uninstall-hook-nmtui
+@HAVE_SYSTEMD_TRUE@am__append_72 = data/org.freedesktop.NetworkManager.service
 
 ###############################################################################
 # libnm-util
 ###############################################################################
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_69 = libnm-util/libnm-util.la \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = 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_70 =  \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_74 =  \
 @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_71 = $(GNUTLS_CFLAGS)
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = libnm-util/crypto_gnutls.c
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = $(GNUTLS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_74 = $(NSS_CFLAGS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_75 = libnm-util/crypto_nss.c
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_76 = $(NSS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 =  \
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_75 = $(GNUTLS_CFLAGS)
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_76 = libnm-util/crypto_gnutls.c
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 = $(GNUTLS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_78 = $(NSS_CFLAGS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_79 = libnm-util/crypto_nss.c
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_80 = $(NSS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_81 =  \
 @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 \
@@ -348,26 +355,26 @@ TESTS = $(am__EXEEXT_14)
 @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_78 = libnm-util/libtest-crypto.la
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = libnm-util/crypto_gnutls.c
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 = $(GNUTLS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_81 = libnm-util/crypto_nss.c
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_82 = $(NSS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/libnm-util.pc \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = libnm-util/libtest-crypto.la
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/crypto_gnutls.c
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = $(GNUTLS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_85 = libnm-util/crypto_nss.c
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_86 = $(NSS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = 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_84 = libnm-util/libnm-util.pc \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = 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_85 = libnm-util/NetworkManager-1.0.gir \
+@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = 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_86 =  \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	check-local-exports-libnm-util \
 @WITH_LEGACY_LIBRARIES_TRUE@	check-local-exports-libnm-glib
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/libnm-util.la \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = 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_88 = \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-settings-defaults \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-crypto \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-secrets \
@@ -375,57 +382,57 @@ TESTS = $(am__EXEEXT_14)
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-8021x \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-dcb
 
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-util/tests/test-libnm-linking \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = libnm-util/tests/test-libnm-linking \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-test \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-nm-client
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = libnm-glib/libdeprecated-nm-glib.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_94 = libnm-glib/libdeprecated-nm-glib.la
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_95 = \
 @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@@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = check-local-libnm-glib-nm-client
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = libnm-glib/tests/test-remote-settings-client
-@HAVE_INTROSPECTION_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_94 = libnm-glib/tests/test-remote-settings-client
-@HAVE_INTROSPECTION_TRUE@am__append_95 = $(man_nm_settings_xml)
-@WITH_OPENVSWITCH_TRUE@am__append_96 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_97 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_98 = man/nm-openvswitch.7
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_99 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_100 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_101 = man/nm-settings-ifcfg-rh.5
-@HAVE_DOCS_TRUE@am__append_102 = install-data-hook-man
-@HAVE_DOCS_TRUE@am__append_103 = uninstall-hook-man
-@HAVE_DOCS_TRUE@am__append_104 = $(man_pages) $(man_pages_autogen)
-@BUILD_DOCS_TRUE@am__append_105 = $(man_pages) $(man_pages_autogen)
+@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_96 = check-local-libnm-glib-nm-client
+@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_97 = libnm-glib/tests/test-remote-settings-client
+@HAVE_INTROSPECTION_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_98 = libnm-glib/tests/test-remote-settings-client
+@HAVE_INTROSPECTION_TRUE@am__append_99 = $(man_nm_settings_xml)
+@WITH_OPENVSWITCH_TRUE@am__append_100 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_101 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_102 = man/nm-openvswitch.7
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_103 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_104 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_105 = man/nm-settings-ifcfg-rh.5
+@HAVE_DOCS_TRUE@am__append_106 = install-data-hook-man
+@HAVE_DOCS_TRUE@am__append_107 = uninstall-hook-man
+@HAVE_DOCS_TRUE@am__append_108 = $(man_pages) $(man_pages_autogen)
+@BUILD_DOCS_TRUE@am__append_109 = $(man_pages) $(man_pages_autogen)
 
 ###############################################################################
 # vapi
 ###############################################################################
-@ENABLE_VAPIGEN_TRUE@am__append_106 = \
+@ENABLE_VAPIGEN_TRUE@am__append_110 = \
 @ENABLE_VAPIGEN_TRUE@	vapi/libnm.vapi
 
-@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_107 = \
+@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_111 = \
 @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_108 = \
+@ENABLE_VAPIGEN_TRUE@am__append_112 = \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS) \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS:.vapi=.deps)
 
-@ENABLE_VAPIGEN_TRUE@am__append_109 = $(VAPIGEN_VAPIS)
+@ENABLE_VAPIGEN_TRUE@am__append_113 = $(VAPIGEN_VAPIS)
 
 ###############################################################################
-@ENABLE_TESTS_TRUE@am__append_110 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_TRUE@am__append_111 = $(check_ltlibraries)
-@ENABLE_TESTS_FALSE@am__append_112 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_FALSE@am__append_113 = $(check_ltlibraries)
-@WITH_QT_TRUE@am__append_114 = \
+@ENABLE_TESTS_TRUE@am__append_114 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_TRUE@am__append_115 = $(check_ltlibraries)
+@ENABLE_TESTS_FALSE@am__append_116 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_FALSE@am__append_117 = $(check_ltlibraries)
+@WITH_QT_TRUE@am__append_118 = \
 @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_115 = \
+@WITH_QT_TRUE@am__append_119 = \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running.moc
 
 subdir = .
@@ -608,7 +615,6 @@ clients_common_libnmc_la_DEPENDENCIES = libnm/libnm.la \
 	clients/common/libnmc-base.la $(am__DEPENDENCIES_1)
 am_clients_common_libnmc_la_OBJECTS =  \
 	shared/clients_common_libnmc_la-nm-meta-setting.lo \
-	shared/clients_common_libnmc_la-nm-ethtool-utils.lo \
 	clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo \
 	clients/common/clients_common_libnmc_la-nm-meta-setting-access.lo
 clients_common_libnmc_la_OBJECTS =  \
@@ -635,7 +641,6 @@ am__objects_1 = introspection/introspection_libnmdbus_la-org.freedesktop.Network
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.lo \
-	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macsec.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macvlan.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Modem.lo \
@@ -650,10 +655,8 @@ am__objects_1 = introspection/introspection_libnmdbus_la-org.freedesktop.Network
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Veth.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.lo \
-	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo \
-	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo \
@@ -670,33 +673,35 @@ am__objects_1 = introspection/introspection_libnmdbus_la-org.freedesktop.Network
 nodist_introspection_libnmdbus_la_OBJECTS = $(am__objects_1)
 introspection_libnmdbus_la_OBJECTS =  \
 	$(nodist_introspection_libnmdbus_la_OBJECTS)
-libnm_core_libnm_core_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@WITH_GNUTLS_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+@WITH_NSS_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+libnm_core_libnm_core_la_DEPENDENCIES = shared/libcsiphash.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_3)
 am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	shared/nm-version-macros.h libnm-core/nm-connection.h \
 	libnm-core/nm-core-types.h libnm-core/nm-dbus-interface.h \
-	libnm-core/nm-errors.h libnm-core/nm-setting-6lowpan.h \
-	libnm-core/nm-setting-8021x.h libnm-core/nm-setting-adsl.h \
-	libnm-core/nm-setting-bluetooth.h libnm-core/nm-setting-bond.h \
+	libnm-core/nm-errors.h libnm-core/nm-setting-8021x.h \
+	libnm-core/nm-setting-adsl.h libnm-core/nm-setting-bluetooth.h \
+	libnm-core/nm-setting-bond.h \
 	libnm-core/nm-setting-bridge-port.h \
 	libnm-core/nm-setting-bridge.h libnm-core/nm-setting-cdma.h \
 	libnm-core/nm-setting-connection.h libnm-core/nm-setting-dcb.h \
-	libnm-core/nm-setting-dummy.h libnm-core/nm-setting-ethtool.h \
-	libnm-core/nm-setting-generic.h libnm-core/nm-setting-gsm.h \
-	libnm-core/nm-setting-infiniband.h \
+	libnm-core/nm-setting-dummy.h libnm-core/nm-setting-generic.h \
+	libnm-core/nm-setting-gsm.h libnm-core/nm-setting-infiniband.h \
 	libnm-core/nm-setting-ip-config.h \
 	libnm-core/nm-setting-ip-tunnel.h \
 	libnm-core/nm-setting-ip4-config.h \
 	libnm-core/nm-setting-ip6-config.h \
 	libnm-core/nm-setting-macsec.h libnm-core/nm-setting-macvlan.h \
-	libnm-core/nm-setting-match.h \
 	libnm-core/nm-setting-olpc-mesh.h \
 	libnm-core/nm-setting-ovs-bridge.h \
 	libnm-core/nm-setting-ovs-interface.h \
 	libnm-core/nm-setting-ovs-patch.h \
 	libnm-core/nm-setting-ovs-port.h libnm-core/nm-setting-ppp.h \
 	libnm-core/nm-setting-pppoe.h libnm-core/nm-setting-proxy.h \
-	libnm-core/nm-setting-serial.h libnm-core/nm-setting-sriov.h \
+	libnm-core/nm-setting-serial.h \
 	libnm-core/nm-setting-tc-config.h \
 	libnm-core/nm-setting-team-port.h libnm-core/nm-setting-team.h \
 	libnm-core/nm-setting-tun.h libnm-core/nm-setting-user.h \
@@ -704,48 +709,43 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-vxlan.h libnm-core/nm-setting-wimax.h \
 	libnm-core/nm-setting-wired.h \
 	libnm-core/nm-setting-wireless-security.h \
-	libnm-core/nm-setting-wireless.h libnm-core/nm-setting-wpan.h \
-	libnm-core/nm-setting.h libnm-core/nm-simple-connection.h \
-	libnm-core/nm-utils.h libnm-core/nm-version.h \
-	libnm-core/nm-vpn-dbus-interface.h \
+	libnm-core/nm-setting-wireless.h libnm-core/nm-setting.h \
+	libnm-core/nm-simple-connection.h libnm-core/nm-utils.h \
+	libnm-core/nm-version.h libnm-core/nm-vpn-dbus-interface.h \
 	libnm-core/nm-vpn-editor-plugin.h \
 	libnm-core/nm-vpn-plugin-info.h shared/nm-utils/c-list-util.h \
 	shared/nm-utils/nm-dedup-multi.h \
 	shared/nm-utils/nm-enum-utils.h \
-	shared/nm-utils/nm-hash-utils.h shared/nm-utils/nm-io-utils.h \
-	shared/nm-utils/nm-secret-utils.h \
+	shared/nm-utils/nm-hash-utils.h \
 	shared/nm-utils/nm-shared-utils.h \
 	shared/nm-utils/nm-random-utils.h \
-	shared/nm-utils/nm-udev-utils.h shared/nm-ethtool-utils.h \
-	shared/nm-meta-setting.h libnm-core/nm-crypto.h \
-	libnm-core/nm-crypto-impl.h libnm-core/nm-connection-private.h \
+	shared/nm-utils/nm-udev-utils.h shared/nm-meta-setting.h \
+	libnm-core/crypto.h libnm-core/nm-connection-private.h \
 	libnm-core/nm-core-internal.h \
 	libnm-core/nm-core-types-internal.h \
 	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 libnm-core/nm-setting-6lowpan.c \
-	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-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 \
 	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-ethtool.c \
-	libnm-core/nm-setting-generic.c libnm-core/nm-setting-gsm.c \
-	libnm-core/nm-setting-infiniband.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-match.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-serial.c libnm-core/nm-setting-sriov.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 \
@@ -753,25 +753,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-wpan.c \
-	shared/nm-utils/c-list-util.c shared/nm-utils/nm-dedup-multi.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-io-utils.c \
-	shared/nm-utils/nm-secret-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-ethtool-utils.c \
-	shared/nm-meta-setting.c libnm-core/nm-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
+	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)
 am__objects_4 =  \
-	libnm-core/libnm_core_libnm_core_la-nm-setting-6lowpan.lo \
 	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 \
@@ -782,7 +781,6 @@ am__objects_4 =  \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-connection.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-dcb.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-dummy.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-setting-ethtool.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-generic.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-gsm.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-infiniband.lo \
@@ -792,7 +790,6 @@ am__objects_4 =  \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-ip6-config.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-macsec.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-macvlan.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-setting-match.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-olpc-mesh.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-bridge.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-interface.lo \
@@ -802,7 +799,6 @@ am__objects_4 =  \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-pppoe.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-proxy.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-serial.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-setting-sriov.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-team.lo \
@@ -814,22 +810,20 @@ am__objects_4 =  \
 	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-wpan.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
-am__objects_6 = $(am__objects_4) \
+@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-io-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-secret-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-ethtool-utils.lo \
 	shared/libnm_core_libnm_core_la-nm-meta-setting.lo \
-	libnm-core/libnm_core_libnm_core_la-nm-crypto.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 \
@@ -841,13 +835,13 @@ am__objects_6 = $(am__objects_4) \
 	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_5)
+	$(am__objects_5) $(am__objects_6) $(am__objects_7)
 am_libnm_core_libnm_core_la_OBJECTS = $(am__objects_2) \
-	$(am__objects_3) $(am__objects_6)
-am__objects_7 =  \
+	$(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_7)
+	$(am__objects_9)
 libnm_core_libnm_core_la_OBJECTS =  \
 	$(am_libnm_core_libnm_core_la_OBJECTS) \
 	$(nodist_libnm_core_libnm_core_la_OBJECTS)
@@ -855,38 +849,6 @@ libnm_core_libnm_core_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libnm_core_libnm_core_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-@HAVE_CRYPTO_GNUTLS_TRUE@libnm_core_libnm_crypto_gnutls_la_DEPENDENCIES =  \
-@HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_2) \
-@HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_1)
-am__libnm_core_libnm_crypto_gnutls_la_SOURCES_DIST =  \
-	libnm-core/nm-crypto-gnutls.c
-@HAVE_CRYPTO_GNUTLS_TRUE@am_libnm_core_libnm_crypto_gnutls_la_OBJECTS = libnm-core/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.lo
-libnm_core_libnm_crypto_gnutls_la_OBJECTS =  \
-	$(am_libnm_core_libnm_crypto_gnutls_la_OBJECTS)
-libnm_core_libnm_crypto_gnutls_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libnm_core_libnm_crypto_gnutls_la_LDFLAGS) $(LDFLAGS) -o $@
-@ENABLE_TESTS_FALSE@@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am_libnm_core_libnm_crypto_gnutls_la_rpath =
-@ENABLE_TESTS_TRUE@@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am_libnm_core_libnm_crypto_gnutls_la_rpath =
-@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_TRUE@am_libnm_core_libnm_crypto_gnutls_la_rpath =
-@HAVE_CRYPTO_NSS_TRUE@libnm_core_libnm_crypto_nss_la_DEPENDENCIES =  \
-@HAVE_CRYPTO_NSS_TRUE@	$(am__DEPENDENCIES_2) \
-@HAVE_CRYPTO_NSS_TRUE@	$(am__DEPENDENCIES_1)
-am__libnm_core_libnm_crypto_nss_la_SOURCES_DIST =  \
-	libnm-core/nm-crypto-nss.c
-@HAVE_CRYPTO_NSS_TRUE@am_libnm_core_libnm_crypto_nss_la_OBJECTS = libnm-core/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.lo
-libnm_core_libnm_crypto_nss_la_OBJECTS =  \
-	$(am_libnm_core_libnm_crypto_nss_la_OBJECTS)
-libnm_core_libnm_crypto_nss_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(libnm_core_libnm_crypto_nss_la_LDFLAGS) $(LDFLAGS) -o $@
-@ENABLE_TESTS_FALSE@@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am_libnm_core_libnm_crypto_nss_la_rpath =
-@ENABLE_TESTS_TRUE@@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am_libnm_core_libnm_crypto_nss_la_rpath =
-@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_TRUE@am_libnm_core_libnm_crypto_nss_la_rpath =
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libdeprecated_nm_glib_la_DEPENDENCIES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
@@ -904,14 +866,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_8 = 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_8)
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_9 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo
+@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_9)
+@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)
@@ -963,7 +925,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_10 = 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 \
@@ -995,11 +957,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_10) $(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_11 = 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_11) $(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)
@@ -1009,14 +971,14 @@ libnm_glib_libnm_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(LDFLAGS) -o $@
 @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_la_rpath =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	-rpath $(libdir)
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_DEPENDENCIES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_3) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_4)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_4) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_5)
 am__libnm_util_libnm_util_la_SOURCES_DIST =  \
 	shared/nm-utils/nm-shared-utils.c libnm-util/crypto.c \
 	libnm-util/nm-connection.c \
@@ -1064,9 +1026,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_12 = libnm-util/libnm_util_libnm_util_la-crypto_gnutls.lo
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_13 = libnm-util/libnm_util_libnm_util_la-crypto_nss.lo
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_14 = 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 \
@@ -1099,14 +1061,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_12) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_13)
+@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_14) $(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_15 = 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_15)
+@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)
@@ -1118,21 +1080,20 @@ libnm_util_libnm_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @WITH_LEGACY_LIBRARIES_TRUE@	-rpath $(libdir)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_DEPENDENCIES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_3) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_4)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_4) \
+@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_16 = libnm-util/libnm_util_libtest_crypto_la-crypto_gnutls.lo
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_17 = 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_16) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_17)
+@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 =
 @ENABLE_TESTS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_rpath =
 libnm_libnm_utils_la_DEPENDENCIES = libnm-core/libnm-core.la \
-	shared/libcsiphash.la $(libnm_crypto_lib) \
 	introspection/libnmdbus.la $(am__DEPENDENCIES_1)
 am_libnm_libnm_utils_la_OBJECTS =  \
 	libnm/libnm_libnm_utils_la-nm-libnm-utils.lo
@@ -1142,12 +1103,11 @@ libnm_libnm_utils_la_OBJECTS = $(am_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_18 = 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-6lowpan.lo \
 	libnm/libnm_libnm_la-nm-device-adsl.lo \
 	libnm/libnm_libnm_la-nm-device-bond.lo \
 	libnm/libnm_libnm_la-nm-device-bridge.lo \
@@ -1171,8 +1131,6 @@ am__objects_18 = libnm/libnm_libnm_la-nm-access-point.lo \
 	libnm/libnm_libnm_la-nm-device-vxlan.lo \
 	libnm/libnm_libnm_la-nm-device-wifi.lo \
 	libnm/libnm_libnm_la-nm-device-wimax.lo \
-	libnm/libnm_libnm_la-nm-device-wireguard.lo \
-	libnm/libnm_libnm_la-nm-device-wpan.lo \
 	libnm/libnm_libnm_la-nm-device.lo \
 	libnm/libnm_libnm_la-nm-dhcp-config.lo \
 	libnm/libnm_libnm_la-nm-dhcp4-config.lo \
@@ -1192,9 +1150,9 @@ am__objects_18 = 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_18)
-am__objects_19 = libnm/libnm_libnm_la-nm-enum-types.lo
-nodist_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_19)
+	$(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 \
@@ -1236,11 +1194,11 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LINK = $(LIBTOOL) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
+@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@	src/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_5)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_6)
 am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST =  \
 	src/devices/bluetooth/nm-bluez-manager.c \
 	src/devices/bluetooth/nm-bluez-common.h \
@@ -1258,7 +1216,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_20 = 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 \
@@ -1266,7 +1224,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_20)
+@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) \
@@ -1337,7 +1295,7 @@ am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
 	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_21 = src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo \
+@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 \
@@ -1345,7 +1303,7 @@ am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
 @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-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_21)
+@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) \
@@ -1385,11 +1343,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 \
@@ -1413,7 +1371,6 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	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 \
-	src/devices/src_libNetworkManager_la-nm-device-6lowpan.lo \
 	src/devices/src_libNetworkManager_la-nm-device-bond.lo \
 	src/devices/src_libNetworkManager_la-nm-device-bridge.lo \
 	src/devices/src_libNetworkManager_la-nm-device-dummy.lo \
@@ -1427,8 +1384,6 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/devices/src_libNetworkManager_la-nm-device-veth.lo \
 	src/devices/src_libNetworkManager_la-nm-device-vlan.lo \
 	src/devices/src_libNetworkManager_la-nm-device-vxlan.lo \
-	src/devices/src_libNetworkManager_la-nm-device-wireguard.lo \
-	src/devices/src_libNetworkManager_la-nm-device-wpan.lo \
 	src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.lo \
 	src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient.lo \
 	src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcd.lo \
@@ -1485,7 +1440,6 @@ am_src_libNetworkManager_la_OBJECTS =  \
 src_libNetworkManager_la_OBJECTS =  \
 	$(am_src_libNetworkManager_la_OBJECTS)
 src_libNetworkManagerBase_la_DEPENDENCIES = libnm-core/libnm-core.la \
-	shared/libcsiphash.la $(libnm_crypto_lib) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
@@ -1499,26 +1453,23 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
 	src/platform/nm-platform.h src/platform/nm-platform-private.h \
 	src/platform/nm-linux-platform.c \
 	src/platform/nm-linux-platform.h \
-	src/platform/wifi/nm-wifi-utils-nl80211.c \
-	src/platform/wifi/nm-wifi-utils-nl80211.h \
-	src/platform/wifi/nm-wifi-utils-private.h \
-	src/platform/wifi/nm-wifi-utils.c \
-	src/platform/wifi/nm-wifi-utils.h \
-	src/platform/wpan/nm-wpan-utils.c \
-	src/platform/wpan/nm-wpan-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-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/nm-wifi-utils-wext.c \
-	src/platform/wifi/nm-wifi-utils-wext.h
-@WITH_WEXT_TRUE@am__objects_23 = src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-wext.lo
+	src/platform/wifi/wifi-utils-nl80211.c \
+	src/platform/wifi/wifi-utils-nl80211.h \
+	src/platform/wifi/wifi-utils-private.h \
+	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-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_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 \
@@ -1529,9 +1480,8 @@ am_src_libNetworkManagerBase_la_OBJECTS =  \
 	src/platform/src_libNetworkManagerBase_la-nm-platform-utils.lo \
 	src/platform/src_libNetworkManagerBase_la-nm-platform.lo \
 	src/platform/src_libNetworkManagerBase_la-nm-linux-platform.lo \
-	src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo \
-	src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils.lo \
-	src/platform/wpan/src_libNetworkManagerBase_la-nm-wpan-utils.lo \
+	src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-nl80211.lo \
+	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-dbus-utils.lo \
@@ -1543,7 +1493,7 @@ 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_23)
+	$(am__objects_25)
 src_libNetworkManagerBase_la_OBJECTS =  \
 	$(am_src_libNetworkManagerBase_la_OBJECTS)
 src_libNetworkManagerTest_la_DEPENDENCIES = src/libNetworkManager.la \
@@ -1557,13 +1507,12 @@ src_libNetworkManagerTest_la_OBJECTS =  \
 	$(am_src_libNetworkManagerTest_la_OBJECTS)
 @ENABLE_TESTS_FALSE@am_src_libNetworkManagerTest_la_rpath =
 @ENABLE_TESTS_TRUE@am_src_libNetworkManagerTest_la_rpath =
-am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-src_libsystemd_nm_la_DEPENDENCIES = $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+src_libsystemd_nm_la_DEPENDENCIES = $(am__DEPENDENCIES_7)
 am_src_libsystemd_nm_la_OBJECTS =  \
 	src/systemd/src_libsystemd_nm_la-nm-sd.lo \
 	src/systemd/sd-adapt/src_libsystemd_nm_la-nm-sd-adapt.lo \
 	src/systemd/src/basic/src_libsystemd_nm_la-alloc-util.lo \
-	src/systemd/src/basic/src_libsystemd_nm_la-env-util.lo \
 	src/systemd/src/basic/src_libsystemd_nm_la-escape.lo \
 	src/systemd/src/basic/src_libsystemd_nm_la-ether-addr-util.lo \
 	src/systemd/src/basic/src_libsystemd_nm_la-extract-word.lo \
@@ -1826,7 +1775,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_24 = 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) \
@@ -1836,14 +1785,14 @@ 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_24)
+@BUILD_NMCLI_TRUE@	$(am__objects_26)
 clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS)
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES = libnm/libnm.la \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc.la \
 @BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_7)
+@BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_8)
 clients_cli_nmcli_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(clients_cli_nmcli_LDFLAGS) $(LDFLAGS) \
@@ -1966,8 +1915,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_25 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT)
-nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_25)
+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)
@@ -2058,16 +2007,15 @@ examples_C_qt_monitor_nm_running_OBJECTS =  \
 libnm_core_tests_test_compare_SOURCES =  \
 	libnm-core/tests/test-compare.c
 libnm_core_tests_test_compare_OBJECTS = libnm-core/tests/libnm_core_tests_test_compare-test-compare.$(OBJEXT)
-am__DEPENDENCIES_8 = libnm-core/libnm-core.la shared/libcsiphash.la \
-	$(libnm_crypto_lib) $(am__DEPENDENCIES_1)
-libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_8)
+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_8)
+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) \
@@ -2077,7 +2025,7 @@ nodist_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests
 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_8)
+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) \
@@ -2085,7 +2033,7 @@ libnm_core_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 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_8)
+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) \
@@ -2093,7 +2041,7 @@ libnm_core_tests_test_keyfile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 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_8)
+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) \
@@ -2101,7 +2049,7 @@ libnm_core_tests_test_secrets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 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_8)
+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) \
@@ -2110,7 +2058,7 @@ 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_8)
+	$(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) \
@@ -2153,13 +2101,13 @@ libnm_glib_tests_test_remote_settings_client_OBJECTS =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
 libnm_util_tests_test_crypto_SOURCES = libnm-util/tests/test-crypto.c
 libnm_util_tests_test_crypto_OBJECTS = libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.$(OBJEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_9 =  \
+@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_10 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
 @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_9)
+@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) \
@@ -2176,7 +2124,7 @@ libnm_util_tests_test_libnm_linking_SOURCES =  \
 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_9)
+@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) \
@@ -2186,7 +2134,7 @@ 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_9)
+@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) \
@@ -2195,7 +2143,7 @@ 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_9)
+@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) \
@@ -2205,7 +2153,7 @@ 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_9)
+@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) \
@@ -2214,7 +2162,7 @@ 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_9)
+@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) \
@@ -2225,9 +2173,9 @@ am_libnm_tests_test_general_OBJECTS =  \
 	libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT)
 libnm_tests_test_general_OBJECTS =  \
 	$(am_libnm_tests_test_general_OBJECTS)
-am__DEPENDENCIES_10 = libnm/libnm.la $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_11 = libnm/libnm.la $(am__DEPENDENCIES_1)
 libnm_tests_test_general_DEPENDENCIES = libnm/libnm-utils.la \
-	$(am__DEPENDENCIES_10)
+	$(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) \
@@ -2236,7 +2184,7 @@ am_libnm_tests_test_nm_client_OBJECTS = shared/libnm_tests_test_nm_client-nm-tes
 	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_10)
+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) \
@@ -2246,7 +2194,7 @@ am_libnm_tests_test_remote_settings_client_OBJECTS = shared/libnm_tests_test_rem
 libnm_tests_test_remote_settings_client_OBJECTS =  \
 	$(am_libnm_tests_test_remote_settings_client_OBJECTS)
 libnm_tests_test_remote_settings_client_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_10)
+	$(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) \
@@ -2256,7 +2204,7 @@ am_libnm_tests_test_secret_agent_OBJECTS = shared/libnm_tests_test_secret_agent-
 	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_10)
+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) \
@@ -2340,9 +2288,9 @@ src_dnsmasq_tests_test_dnsmasq_utils_LINK = $(LIBTOOL) $(AM_V_lt) \
 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)
-am__DEPENDENCIES_11 = src/libNetworkManagerTest.la \
+am__DEPENDENCIES_12 = src/libNetworkManagerTest.la \
 	$(am__DEPENDENCIES_1)
-src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_11)
+src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_12)
 src_ndisc_tests_test_ndisc_fake_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -2351,7 +2299,7 @@ src_ndisc_tests_test_ndisc_linux_SOURCES =  \
 	src/ndisc/tests/test-ndisc-linux.c
 src_ndisc_tests_test_ndisc_linux_OBJECTS = src/ndisc/tests/src_ndisc_tests_test_ndisc_linux-test-ndisc-linux.$(OBJEXT)
 src_ndisc_tests_test_ndisc_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_11)
+	$(am__DEPENDENCIES_12)
 src_ndisc_tests_test_ndisc_linux_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -2369,9 +2317,9 @@ src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(LDFLAGS) -o $@
 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_12 = src/libNetworkManagerTest.la \
+am__DEPENDENCIES_13 = src/libNetworkManagerTest.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_12)
+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) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_platform_tests_monitor_LDFLAGS) \
@@ -2380,7 +2328,7 @@ am_src_platform_tests_test_address_fake_OBJECTS = src/platform/tests/src_platfor
 src_platform_tests_test_address_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_address_fake_OBJECTS)
 src_platform_tests_test_address_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_13)
 src_platform_tests_test_address_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2390,7 +2338,7 @@ am_src_platform_tests_test_address_linux_OBJECTS = src/platform/tests/src_platfo
 src_platform_tests_test_address_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_address_linux_OBJECTS)
 src_platform_tests_test_address_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_13)
 src_platform_tests_test_address_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2400,7 +2348,7 @@ am_src_platform_tests_test_cleanup_fake_OBJECTS = src/platform/tests/src_platfor
 src_platform_tests_test_cleanup_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_cleanup_fake_OBJECTS)
 src_platform_tests_test_cleanup_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_13)
 src_platform_tests_test_cleanup_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2410,7 +2358,7 @@ am_src_platform_tests_test_cleanup_linux_OBJECTS = src/platform/tests/src_platfo
 src_platform_tests_test_cleanup_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_cleanup_linux_OBJECTS)
 src_platform_tests_test_cleanup_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_13)
 src_platform_tests_test_cleanup_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2429,7 +2377,7 @@ am_src_platform_tests_test_link_fake_OBJECTS = src/platform/tests/src_platform_t
 src_platform_tests_test_link_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_link_fake_OBJECTS)
 src_platform_tests_test_link_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_13)
 src_platform_tests_test_link_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2438,7 +2386,7 @@ am_src_platform_tests_test_link_linux_OBJECTS = src/platform/tests/src_platform_
 src_platform_tests_test_link_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_link_linux_OBJECTS)
 src_platform_tests_test_link_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_13)
 src_platform_tests_test_link_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2456,7 +2404,7 @@ am_src_platform_tests_test_route_fake_OBJECTS = src/platform/tests/src_platform_
 src_platform_tests_test_route_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_route_fake_OBJECTS)
 src_platform_tests_test_route_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_13)
 src_platform_tests_test_route_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2465,7 +2413,7 @@ am_src_platform_tests_test_route_linux_OBJECTS = src/platform/tests/src_platform
 src_platform_tests_test_route_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_route_linux_OBJECTS)
 src_platform_tests_test_route_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_13)
 src_platform_tests_test_route_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2576,7 +2524,7 @@ am_src_tests_test_systemd_OBJECTS =  \
 	src/tests/src_tests_test_systemd-test-systemd.$(OBJEXT)
 src_tests_test_systemd_OBJECTS = $(am_src_tests_test_systemd_OBJECTS)
 src_tests_test_systemd_DEPENDENCIES = src/libsystemd-nm.la \
-	shared/libcsiphash.la $(am__DEPENDENCIES_6)
+	shared/libcsiphash.la $(am__DEPENDENCIES_7)
 src_tests_test_utils_SOURCES = src/tests/test-utils.c
 src_tests_test_utils_OBJECTS =  \
 	src/tests/src_tests_test_utils-test-utils.$(OBJEXT)
@@ -2654,8 +2602,6 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(nodist_introspection_libnmdbus_la_SOURCES) \
 	$(libnm_core_libnm_core_la_SOURCES) \
 	$(nodist_libnm_core_libnm_core_la_SOURCES) \
-	$(libnm_core_libnm_crypto_gnutls_la_SOURCES) \
-	$(libnm_core_libnm_crypto_nss_la_SOURCES) \
 	$(libnm_glib_libdeprecated_nm_glib_la_SOURCES) \
 	$(libnm_glib_libnm_glib_vpn_la_SOURCES) \
 	$(nodist_libnm_glib_libnm_glib_vpn_la_SOURCES) \
@@ -2762,8 +2708,6 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(clients_common_libnmc_la_SOURCES) \
 	$(dispatcher_libnm_dispatcher_core_la_SOURCES) \
 	$(am__libnm_core_libnm_core_la_SOURCES_DIST) \
-	$(am__libnm_core_libnm_crypto_gnutls_la_SOURCES_DIST) \
-	$(am__libnm_core_libnm_crypto_nss_la_SOURCES_DIST) \
 	$(am__libnm_glib_libdeprecated_nm_glib_la_SOURCES_DIST) \
 	$(am__libnm_glib_libnm_glib_vpn_la_SOURCES_DIST) \
 	$(am__libnm_glib_libnm_glib_la_SOURCES_DIST) \
@@ -3139,6 +3083,7 @@ DIST_SUBDIRS = . po docs/libnm docs/api docs/libnm-util \
 	docs/libnm-glib
 am__DIST_COMMON = $(srcdir)/Makefile.examples $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.vapigen $(srcdir)/NetworkManager.pc.in \
+	$(srcdir)/clients/tests/test-client.check-on-disk/Makefile.am \
 	$(srcdir)/config.h.in $(top_srcdir)/build-aux/compile \
 	$(top_srcdir)/build-aux/config.guess \
 	$(top_srcdir)/build-aux/config.rpath \
@@ -3231,11 +3176,14 @@ DBUS_LIBS = @DBUS_LIBS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DHCLIENT_PATH = @DHCLIENT_PATH@
+DHCPCANON_PATH = @DHCPCANON_PATH@
+DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
-DNSSEC_TRIGGER_PATH = @DNSSEC_TRIGGER_PATH@
+DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -3509,47 +3457,46 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 ###############################################################################
 noinst_LTLIBRARIES = introspection/libnmdbus.la \
-	libnm-core/libnm-core.la $(libnm_crypto_lib) \
-	libnm/libnm-utils.la src/libNetworkManagerBase.la \
-	src/libNetworkManager.la src/libsystemd-nm.la \
-	shared/libcsiphash.la shared/libnacd.la $(am__append_23) \
-	$(am__append_28) $(am__append_36) \
-	dispatcher/libnm-dispatcher-core.la $(am__append_90) \
-	$(am__append_111)
-check_LTLIBRARIES = $(am__append_113)
-noinst_LIBRARIES = $(am__append_64)
-noinst_DATA = $(am__append_14)
-dist_libexec_SCRIPTS = $(am__append_32)
+	libnm-core/libnm-core.la libnm/libnm-utils.la \
+	src/libNetworkManagerBase.la src/libNetworkManager.la \
+	src/libsystemd-nm.la shared/libcsiphash.la shared/libnacd.la \
+	$(am__append_27) $(am__append_32) $(am__append_40) \
+	dispatcher/libnm-dispatcher-core.la $(am__append_94) \
+	$(am__append_115)
+check_LTLIBRARIES = $(am__append_117)
+noinst_LIBRARIES = $(am__append_68)
+noinst_DATA = $(am__append_18)
+dist_libexec_SCRIPTS = $(am__append_36)
 
 ###############################################################################
-lib_LTLIBRARIES = libnm/libnm.la $(am__append_69)
+lib_LTLIBRARIES = libnm/libnm.la $(am__append_73)
 plugin_LTLIBRARIES = $(core_plugins)
 
 ###############################################################################
 # src/devices/adsl
 ###############################################################################
-core_plugins = $(am__append_20) $(am__append_22) $(am__append_27) \
-	$(am__append_35) src/devices/adsl/libnm-device-plugin-adsl.la \
-	$(am__append_39) $(am__append_45) $(am__append_49) \
-	$(am__append_51)
-service_DATA = $(am__append_68)
-man_MANS = $(am__append_104)
+core_plugins = $(am__append_24) $(am__append_26) $(am__append_31) \
+	$(am__append_39) src/devices/adsl/libnm-device-plugin-adsl.la \
+	$(am__append_43) $(am__append_49) $(am__append_53) \
+	$(am__append_55)
+service_DATA = $(am__append_72)
+man_MANS = $(am__append_108)
 examples_DATA = data/server.conf
 CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \
-	$(am__append_13) src/NetworkManager.ver $(am__append_29) \
+	$(am__append_17) src/NetworkManager.ver $(am__append_33) \
 	$(dispatcher_nmdbus_dispatcher_sources) \
 	dispatcher/org.freedesktop.nm_dispatcher.service \
 	clients/tests/test-client.log data/NetworkManager.service \
 	data/NetworkManager-wait-online.service \
 	data/NetworkManager-dispatcher.service \
 	data/org.freedesktop.NetworkManager.service data/server.conf \
-	$(am__append_91) $(am__append_95) man/common.ent \
-	$(am__append_105) $(am__append_109) $(GLIB_GENERATED) \
+	$(am__append_95) $(am__append_99) man/common.ent \
+	$(am__append_109) $(am__append_113) $(GLIB_GENERATED) \
 	$(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \
-	cscope.po.out $(NULL) $(am__append_115)
-DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
-	intltool-update $(polkit_policy_DATA) libnm/libnm.pc \
-	$(am__append_52) $(am__append_84)
+	cscope.po.out $(NULL) $(am__append_119)
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
+	$(polkit_policy_DATA) libnm/libnm.pc $(am__append_56) \
+	$(am__append_88)
 
 # test-cert.p12 created with:
 #
@@ -3570,7 +3517,7 @@ DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
 # examples
 ###############################################################################
 EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
-	libnm-core/nm-crypto-gnutls.c libnm-core/nm-crypto-nss.c \
+	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 \
@@ -3598,12 +3545,11 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	libnm/fake-typelib/NetworkManager.gir \
 	libnm/fake-typelib/NMClient.gir \
 	libnm/fake-typelib/typelibs.gresource.xml \
-	libnm/fake-typelib/meson.build $(am__append_15) \
+	libnm/fake-typelib/meson.build $(am__append_19) \
 	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/platform/linux/nl802154.h \
 	src/org.freedesktop.NetworkManager.conf \
 	src/nm-test-utils-core.h src/meson.build src/dhcp/meson.build \
 	src/dhcp/tests/test-dhclient-duid.leases \
@@ -3647,7 +3593,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
 	src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \
 	src/settings/plugins/keyfile/tests/meson.build \
-	$(am__append_25) src/settings/plugins/ibft/meson.build \
+	$(am__append_29) 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 \
@@ -3671,7 +3617,6 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \
@@ -3710,8 +3655,6 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected \
 	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 \
@@ -3814,7 +3757,6 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
@@ -3908,19 +3850,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/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 clients/tests/test-client.py \
-	clients/tests/test-client.check-on-disk/test_001.expected \
-	clients/tests/test-client.check-on-disk/test_002.expected \
-	clients/tests/test-client.check-on-disk/test_003.expected \
-	clients/tests/test-client.check-on-disk/test_004.expected \
-	$(NULL) data/NetworkManager.service.in \
+	clients/tests/test-client.check-on-disk/Makefile.am \
+	$(clients_tests_expected_files) 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/90-nm-thunderbolt.rules data/server.conf.in \
-	data/meson.build $(am__append_77) libnm-glib/tests/meson.build \
-	$(am__append_97) $(am__append_100) man/common.ent.in \
+	data/meson.build $(am__append_81) libnm-glib/tests/meson.build \
+	$(am__append_101) $(am__append_104) 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) \
@@ -3933,18 +3872,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	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 \
-	config-extra.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-util.c shared/nm-utils/c-list-util.h \
+	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-util.c \
+	shared/nm-utils/c-list-util.h \
+	shared/nm-utils/gsystem-local-alloc.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-io-utils.c shared/nm-utils/nm-io-utils.h \
 	shared/nm-utils/nm-jansson.h shared/nm-utils/nm-obj.h \
 	shared/nm-utils/nm-macros-internal.h \
-	shared/nm-utils/nm-secret-utils.c \
-	shared/nm-utils/nm-secret-utils.h \
 	shared/nm-utils/nm-shared-utils.c \
 	shared/nm-utils/nm-shared-utils.h \
 	shared/nm-utils/nm-test-utils.h \
@@ -3975,7 +3912,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	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 \
@@ -4010,16 +3947,17 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	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_55)
+EXTRA_LTLIBRARIES = $(am__append_59)
 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_87) $(am__append_98) \
-	$(am__append_101) $(man_pages) $(man_pages_autogen)
+	libnm-core/nm-dbus-types.xml $(am__append_91) \
+	$(am__append_102) $(am__append_105) $(man_pages) \
+	$(man_pages_autogen)
 dist_configure_check = $(am__append_3) $(am__append_4)
-install_data_hook = $(am__append_33) install-data-hook-dispatcher \
-	$(am__append_62) $(am__append_102)
-install_exec_hook = $(am__append_66)
-uninstall_hook = $(am__append_63) $(am__append_67) $(am__append_103)
+install_data_hook = $(am__append_37) install-data-hook-dispatcher \
+	$(am__append_66) $(am__append_106)
+install_exec_hook = $(am__append_70)
+uninstall_hook = $(am__append_67) $(am__append_71) $(am__append_107)
 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) \
@@ -4027,12 +3965,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_70)
+	$(am__append_74)
 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_96)
+	$(am__append_100)
 man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
-	$(am__append_99)
+	$(am__append_103)
 
 ###############################################################################
 
@@ -4060,12 +3998,12 @@ check_programs = libnm-core/tests/test-compare \
 	libnm-core/tests/test-keyfile libnm-core/tests/test-secrets \
 	libnm-core/tests/test-setting \
 	libnm-core/tests/test-settings-defaults \
-	$(libnm_tests_programs) $(am__append_16) \
+	$(libnm_tests_programs) $(am__append_20) \
 	src/dhcp/tests/test-dhcp-dhclient \
 	src/dhcp/tests/test-dhcp-utils \
 	src/settings/plugins/keyfile/tests/test-keyfile \
-	$(am__append_24) $(am__append_31) $(am__append_38) \
-	$(am__append_48) src/dnsmasq/tests/test-dnsmasq-utils \
+	$(am__append_28) $(am__append_35) $(am__append_42) \
+	$(am__append_52) src/dnsmasq/tests/test-dnsmasq-utils \
 	src/platform/tests/test-link-fake \
 	src/platform/tests/test-link-linux \
 	src/platform/tests/test-address-fake \
@@ -4084,39 +4022,38 @@ check_programs = libnm-core/tests/test-compare \
 	src/tests/test-ip6-config src/tests/test-dcb \
 	src/tests/test-systemd src/tests/test-wired-defname \
 	src/tests/test-utils dispatcher/tests/test-dispatcher-envp \
-	$(am__append_56) $(am__append_57) $(am__append_88) \
-	$(am__append_93)
-check_programs_norun = $(am__append_17) src/platform/tests/monitor \
-	src/ndisc/tests/test-ndisc-linux $(am__append_89) \
-	$(am__append_94) examples/C/glib/add-connection-gdbus \
+	$(am__append_60) $(am__append_61) $(am__append_92) \
+	$(am__append_97)
+check_programs_norun = $(am__append_21) src/platform/tests/monitor \
+	src/ndisc/tests/test-ndisc-linux $(am__append_93) \
+	$(am__append_98) examples/C/glib/add-connection-gdbus \
 	examples/C/glib/add-connection-libnm \
 	examples/C/glib/get-active-connections-gdbus \
 	examples/C/glib/get-ap-info-libnm \
 	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_114)
+	examples/C/glib/monitor-nm-state-gdbus $(am__append_118)
 
 ###############################################################################
 
 # just test, that we can build "nm-vpn-plugin-utils.c"
 
 ###############################################################################
-check_ltlibraries = $(am__append_9) $(am__append_10) \
-	libnm/tests/libnm-vpn-plugin-utils-test.la \
+check_ltlibraries = libnm/tests/libnm-vpn-plugin-utils-test.la \
 	src/libNetworkManagerTest.la clients/common/libnmc-base.la \
-	$(am__append_54) $(am__append_78)
-check_local = check-docs check-local-exports-libnm $(am__append_26) \
-	$(am__append_30) $(am__append_37) check-local-devices-adsl \
-	$(am__append_41) $(am__append_47) $(am__append_50) \
-	$(am__append_53) check-local-clients-tests-test-client \
-	$(am__append_86) $(am__append_92)
-VAPIGEN_VAPIS = $(am__append_106) $(am__append_107)
-dbusservice_DATA = $(am__append_34) dispatcher/nm-dispatcher.conf \
+	$(am__append_58) $(am__append_82)
+check_local = check-docs check-local-exports-libnm $(am__append_30) \
+	$(am__append_34) $(am__append_41) check-local-devices-adsl \
+	$(am__append_45) $(am__append_51) $(am__append_54) \
+	$(am__append_57) check-local-clients-tests-test-client \
+	$(am__append_90) $(am__append_96)
+VAPIGEN_VAPIS = $(am__append_110) $(am__append_111)
+dbusservice_DATA = $(am__append_38) dispatcher/nm-dispatcher.conf \
 	src/org.freedesktop.NetworkManager.conf
 dbusactivation_DATA =  \
 	dispatcher/org.freedesktop.nm_dispatcher.service
-INTROSPECTION_GIRS = $(am__append_12) $(am__append_85)
+INTROSPECTION_GIRS = $(am__append_16) $(am__append_89)
 INTROSPECTION_SCANNER_ARGS = 
 INTROSPECTION_COMPILER_ARGS = 
 # Pass SANITIZER_ENV where a command that uses built libraries is
@@ -4128,11 +4065,11 @@ libnminclude_HEADERS = $(libnm_core_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_83)
+pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_87)
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
-pppd_plugin_LTLIBRARIES = $(am__append_21)
+pppd_plugin_LTLIBRARIES = $(am__append_25)
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(am__append_108)
+vapi_DATA = $(am__append_112)
 examplesdir = $(docdir)/examples
 rundir = $(runstatedir)/NetworkManager
 statedir = $(localstatedir)/lib/NetworkManager
@@ -4144,9 +4081,13 @@ nmlocaledir = $(datadir)/locale
 GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
 GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
 SUBDIRS = . po $(am__append_1) $(am__append_2)
-dflt_cppflags = -std=gnu99
 
 ###############################################################################
+nm_build_cflags = \
+	-DNM_BUILD_SRCDIR=\"$(abs_srcdir)\" \
+	-DNM_BUILD_BUILDDIR=\"$(abs_builddir)\" \
+	$(NULL)
+
 set_sanitizer_env = \
 	[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
 	if echo $(SANITIZER_LIB_CFLAGS) $(SANITIZER_EXEC_CFLAGS) | grep -e -fsanitize=address > /dev/null; then \
@@ -4207,8 +4148,6 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h \
-	introspection/org.freedesktop.NetworkManager.Device.Lowpan.c \
-	introspection/org.freedesktop.NetworkManager.Device.Lowpan.h \
 	introspection/org.freedesktop.NetworkManager.Device.Macsec.c \
 	introspection/org.freedesktop.NetworkManager.Device.Macsec.h \
 	introspection/org.freedesktop.NetworkManager.Device.Macvlan.c \
@@ -4237,14 +4176,10 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.h \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.c \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.h \
-	introspection/org.freedesktop.NetworkManager.Device.WireGuard.c \
-	introspection/org.freedesktop.NetworkManager.Device.WireGuard.h \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.c \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.h \
 	introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
 	introspection/org.freedesktop.NetworkManager.Device.WiMax.h \
-	introspection/org.freedesktop.NetworkManager.Device.Wpan.c \
-	introspection/org.freedesktop.NetworkManager.Device.Wpan.h \
 	introspection/org.freedesktop.NetworkManager.Device.c \
 	introspection/org.freedesktop.NetworkManager.Device.h \
 	introspection/org.freedesktop.NetworkManager.DHCP4Config.c \
@@ -4297,7 +4232,6 @@ DBUS_INTERFACE_DOCS = \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wpan.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
@@ -4314,11 +4248,9 @@ DBUS_INTERFACE_DOCS = \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml
+	docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml
 
 dbusinterfacesdir = $(datadir)/dbus-1/interfaces
 dbusinterfaces_DATA = \
@@ -4335,7 +4267,6 @@ dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.Device.Generic.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \
-	introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
@@ -4350,10 +4281,8 @@ dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.Device.Veth.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \
-	introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \
 	introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
-	introspection/org.freedesktop.NetworkManager.Device.Wpan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.xml \
 	introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
 	introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
@@ -4377,7 +4306,6 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-core-types.h \
 	libnm-core/nm-dbus-interface.h \
 	libnm-core/nm-errors.h \
-	libnm-core/nm-setting-6lowpan.h \
 	libnm-core/nm-setting-8021x.h \
 	libnm-core/nm-setting-adsl.h \
 	libnm-core/nm-setting-bluetooth.h \
@@ -4388,7 +4316,6 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-connection.h \
 	libnm-core/nm-setting-dcb.h \
 	libnm-core/nm-setting-dummy.h \
-	libnm-core/nm-setting-ethtool.h \
 	libnm-core/nm-setting-generic.h \
 	libnm-core/nm-setting-gsm.h \
 	libnm-core/nm-setting-infiniband.h \
@@ -4398,7 +4325,6 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-ip6-config.h \
 	libnm-core/nm-setting-macsec.h \
 	libnm-core/nm-setting-macvlan.h \
-	libnm-core/nm-setting-match.h \
 	libnm-core/nm-setting-olpc-mesh.h \
 	libnm-core/nm-setting-ovs-bridge.h \
 	libnm-core/nm-setting-ovs-interface.h \
@@ -4408,7 +4334,6 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-pppoe.h \
 	libnm-core/nm-setting-proxy.h \
 	libnm-core/nm-setting-serial.h \
-	libnm-core/nm-setting-sriov.h \
 	libnm-core/nm-setting-tc-config.h \
 	libnm-core/nm-setting-team-port.h \
 	libnm-core/nm-setting-team.h \
@@ -4421,7 +4346,6 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-wired.h \
 	libnm-core/nm-setting-wireless-security.h \
 	libnm-core/nm-setting-wireless.h \
-	libnm-core/nm-setting-wpan.h \
 	libnm-core/nm-setting.h \
 	libnm-core/nm-simple-connection.h \
 	libnm-core/nm-utils.h \
@@ -4436,13 +4360,11 @@ libnm_core_lib_h_pub_mkenums = \
 libnm_core_lib_h_priv = shared/nm-utils/c-list-util.h \
 	shared/nm-utils/nm-dedup-multi.h \
 	shared/nm-utils/nm-enum-utils.h \
-	shared/nm-utils/nm-hash-utils.h shared/nm-utils/nm-io-utils.h \
-	shared/nm-utils/nm-secret-utils.h \
+	shared/nm-utils/nm-hash-utils.h \
 	shared/nm-utils/nm-shared-utils.h \
 	shared/nm-utils/nm-random-utils.h \
-	shared/nm-utils/nm-udev-utils.h shared/nm-ethtool-utils.h \
-	shared/nm-meta-setting.h libnm-core/nm-crypto.h \
-	libnm-core/nm-crypto-impl.h libnm-core/nm-connection-private.h \
+	shared/nm-utils/nm-udev-utils.h shared/nm-meta-setting.h \
+	libnm-core/crypto.h libnm-core/nm-connection-private.h \
 	libnm-core/nm-core-internal.h \
 	libnm-core/nm-core-types-internal.h \
 	libnm-core/nm-keyfile-internal.h libnm-core/nm-keyfile-utils.h \
@@ -4450,7 +4372,6 @@ libnm_core_lib_h_priv = shared/nm-utils/c-list-util.h \
 	libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \
 	$(am__append_6)
 libnm_core_lib_c_settings_real = \
-	libnm-core/nm-setting-6lowpan.c \
 	libnm-core/nm-setting-8021x.c \
 	libnm-core/nm-setting-adsl.c \
 	libnm-core/nm-setting-bluetooth.c \
@@ -4461,7 +4382,6 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-connection.c \
 	libnm-core/nm-setting-dcb.c \
 	libnm-core/nm-setting-dummy.c \
-	libnm-core/nm-setting-ethtool.c \
 	libnm-core/nm-setting-generic.c \
 	libnm-core/nm-setting-gsm.c \
 	libnm-core/nm-setting-infiniband.c \
@@ -4471,7 +4391,6 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-ip6-config.c \
 	libnm-core/nm-setting-macsec.c \
 	libnm-core/nm-setting-macvlan.c \
-	libnm-core/nm-setting-match.c \
 	libnm-core/nm-setting-olpc-mesh.c \
 	libnm-core/nm-setting-ovs-bridge.c \
 	libnm-core/nm-setting-ovs-interface.c \
@@ -4481,7 +4400,6 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-pppoe.c \
 	libnm-core/nm-setting-proxy.c \
 	libnm-core/nm-setting-serial.c \
-	libnm-core/nm-setting-sriov.c \
 	libnm-core/nm-setting-tc-config.c \
 	libnm-core/nm-setting-team-port.c \
 	libnm-core/nm-setting-team.c \
@@ -4493,47 +4411,41 @@ libnm_core_lib_c_settings_real = \
 	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-wpan.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-io-utils.c \
-	shared/nm-utils/nm-secret-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-ethtool-utils.c \
-	shared/nm-meta-setting.c libnm-core/nm-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)
+	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) \
+	$(am__append_11) $(am__append_13)
 libnm_core_lib_c_mkenums = \
 	libnm-core/nm-core-enum-types.c
 
 
 ###############################################################################
-dflt_cppflags_libnm_core = \
-	$(dflt_cppflags) \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
-	$(CODE_COVERAGE_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(LIBUDEV_CFLAGS) \
-	$(SANITIZER_LIB_CFLAGS) \
-	$(NULL)
-
+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) \
+	$(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) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
-	$(NULL) $(am__append_8)
+	-DNMLOCALEDIR=\"$(nmlocaledir)\" -DNMCONFDIR=\"$(nmconfdir)\" \
+	-DNMLIBDIR=\"$(nmlibdir)\" -DNMVPNDIR=\"$(pkglibdir)\" \
+	-DNMPLUGINDIR=\"$(plugindir)\" -DLIBEXECDIR=\"$(libexecdir)\" \
+	$(NULL) $(am__append_10)
 libnm_core_libnm_core_la_SOURCES = \
 	$(libnm_core_lib_h_pub_real) \
 	$(libnm_core_lib_h_priv) \
@@ -4543,52 +4455,21 @@ nodist_libnm_core_libnm_core_la_SOURCES = \
 	$(libnm_core_lib_h_pub_mkenums) \
 	$(libnm_core_lib_c_mkenums)
 
-libnm_core_libnm_core_la_LIBADD = \
-	$(GLIB_LIBS) \
-	$(UUID_LIBS) \
-	$(LIBUDEV_LIBS) \
-	$(NULL)
-
+libnm_core_libnm_core_la_LIBADD = shared/libcsiphash.la $(GLIB_LIBS) \
+	$(UUID_LIBS) $(LIBUDEV_LIBS) $(NULL) $(am__append_12) \
+	$(am__append_14)
 libnm_core_libnm_core_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS)
 
-
-###############################################################################
-@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_TRUE@libnm_crypto_lib = libnm-core/libnm-crypto-gnutls.la
-@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_TRUE@libnm_crypto_lib = libnm-core/libnm-crypto-nss.la
-@HAVE_CRYPTO_GNUTLS_TRUE@libnm_core_libnm_crypto_gnutls_la_SOURCES = libnm-core/nm-crypto-gnutls.c
-@HAVE_CRYPTO_GNUTLS_TRUE@libnm_core_libnm_crypto_gnutls_la_CPPFLAGS = \
-@HAVE_CRYPTO_GNUTLS_TRUE@	$(libnm_core_libnm_core_la_CPPFLAGS) \
-@HAVE_CRYPTO_GNUTLS_TRUE@	$(GNUTLS_CFLAGS)
-
-@HAVE_CRYPTO_GNUTLS_TRUE@libnm_core_libnm_crypto_gnutls_la_LDFLAGS = \
-@HAVE_CRYPTO_GNUTLS_TRUE@	$(libnm_core_libnm_core_la_LDFLAGS)
-
-@HAVE_CRYPTO_GNUTLS_TRUE@libnm_core_libnm_crypto_gnutls_la_LIBADD = \
-@HAVE_CRYPTO_GNUTLS_TRUE@	$(libnm_core_libnm_core_la_LIBADD) \
-@HAVE_CRYPTO_GNUTLS_TRUE@	$(GNUTLS_LIBS)
-
-@HAVE_CRYPTO_NSS_TRUE@libnm_core_libnm_crypto_nss_la_SOURCES = libnm-core/nm-crypto-nss.c
-@HAVE_CRYPTO_NSS_TRUE@libnm_core_libnm_crypto_nss_la_CPPFLAGS = \
-@HAVE_CRYPTO_NSS_TRUE@	$(libnm_core_libnm_core_la_CPPFLAGS) \
-@HAVE_CRYPTO_NSS_TRUE@	$(NSS_CFLAGS)
-
-@HAVE_CRYPTO_NSS_TRUE@libnm_core_libnm_crypto_nss_la_LDFLAGS = \
-@HAVE_CRYPTO_NSS_TRUE@	$(libnm_core_libnm_core_la_LDFLAGS)
-
-@HAVE_CRYPTO_NSS_TRUE@libnm_core_libnm_crypto_nss_la_LIBADD = \
-@HAVE_CRYPTO_NSS_TRUE@	$(libnm_core_libnm_core_la_LIBADD) \
-@HAVE_CRYPTO_NSS_TRUE@	$(NSS_LIBS)
-
 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 \
-	$(dflt_cppflags_libnm_core) \
+	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
-	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
 libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags)
@@ -4608,8 +4489,6 @@ nodist_libnm_core_tests_test_general_SOURCES = \
 
 libnm_core_tests_ldadd = \
 	libnm-core/libnm-core.la \
-	shared/libcsiphash.la \
-	$(libnm_crypto_lib) \
 	$(GLIB_LIBS)
 
 libnm_core_tests_ldflags = \
@@ -4639,7 +4518,6 @@ libnm_lib_h_pub_real = \
 	libnm/nm-autoptr.h \
 	libnm/nm-checkpoint.h \
 	libnm/nm-client.h \
-	libnm/nm-device-6lowpan.h \
 	libnm/nm-device-adsl.h \
 	libnm/nm-device-bond.h \
 	libnm/nm-device-bridge.h \
@@ -4663,8 +4541,6 @@ libnm_lib_h_pub_real = \
 	libnm/nm-device-vxlan.h \
 	libnm/nm-device-wifi.h \
 	libnm/nm-device-wimax.h \
-	libnm/nm-device-wireguard.h \
-	libnm/nm-device-wpan.h \
 	libnm/nm-device.h \
 	libnm/nm-dhcp-config.h \
 	libnm/nm-ip-config.h \
@@ -4701,7 +4577,6 @@ libnm_lib_c_real = \
 	libnm/nm-checkpoint.c \
 	libnm/nm-client.c \
 	libnm/nm-dbus-helpers.c \
-	libnm/nm-device-6lowpan.c \
 	libnm/nm-device-adsl.c \
 	libnm/nm-device-bond.c \
 	libnm/nm-device-bridge.c \
@@ -4725,8 +4600,6 @@ libnm_lib_c_real = \
 	libnm/nm-device-vxlan.c \
 	libnm/nm-device-wifi.c \
 	libnm/nm-device-wimax.c \
-	libnm/nm-device-wireguard.c \
-	libnm/nm-device-wpan.c \
 	libnm/nm-device.c \
 	libnm/nm-dhcp-config.c \
 	libnm/nm-dhcp4-config.c \
@@ -4750,9 +4623,9 @@ libnm_lib_c_mkenums = \
 	libnm/nm-enum-types.c
 
 libnm_lib_cppflags = \
+	$(dflt_cppflags_libnm_core) \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
-	$(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
 	$(NULL)
@@ -4766,8 +4639,6 @@ libnm_libnm_utils_la_SOURCES = \
 
 libnm_libnm_utils_la_LIBADD = \
 	libnm-core/libnm-core.la \
-	shared/libcsiphash.la \
-	$(libnm_crypto_lib) \
 	introspection/libnmdbus.la \
 	$(GLIB_LIBS)
 
@@ -4807,7 +4678,7 @@ libnm_libnm_la_LDFLAGS = \
 	$(SANITIZER_LIB_LDFLAGS) \
 	-version-info "1:0:1"
 
-libnm_NM_1_0_typelib = $(am__append_11)
+libnm_NM_1_0_typelib = $(am__append_15)
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_INCLUDES = Gio-2.0
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_PACKAGES = gio-2.0
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm
@@ -4846,12 +4717,12 @@ libnm_tests_programs_req_introspection = \
 	libnm/tests/test-secret-agent
 
 libnm_tests_cppflags = \
+	$(dflt_cppflags_libnm_core) \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
-	$(dflt_cppflags_libnm_core) \
+	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
-	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
 libnm_tests_ldadd = \
@@ -4900,7 +4771,6 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \
 	shared/nm-utils/nm-vpn-plugin-utils.h
 
 libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
-	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -4919,24 +4789,35 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
 ###############################################################################
 # src/
 ###############################################################################
-src_cppflags_base = \
-	-I$(srcdir)/src \
+src_cppflags = \
 	$(dflt_cppflags_libnm_core) \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
+	\
+	-DPREFIX=\"$(prefix)\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(SANITIZER_EXEC_CFLAGS) \
-	$(NULL)
-
-src_cppflags_base_test = \
-	$(src_cppflags_base) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	$(NULL)
-
-src_cppflags_device_plugin = \
-	$(src_cppflags_base)
-
-src_cppflags = \
-	$(src_cppflags_base) \
 	\
+	-DBINDIR=\"$(bindir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-DLOCALSTATEDIR=\"$(localstatedir)\" \
+	-DRUNSTATEDIR=\"$(runstatedir)\" \
+	-DSBINDIR=\"$(sbindir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DRUNDIR=\"$(rundir)\" \
+	\
+	-DNMCONFDIR=\"$(nmconfdir)\" \
+	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
+	-DNMPLUGINDIR=\"$(plugindir)\" \
+	-DNMRUNDIR=\"$(nmrundir)\" \
+	-DNMSTATEDIR=\"$(nmstatedir)\" \
+	-DNMLIBDIR=\"$(nmlibdir)\" \
+	\
+	-DDHCPCANON_PATH=\"$(DHCPCANON_PATH)\" \
+	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
+	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
+	\
+	$(LIBUDEV_CFLAGS) \
 	$(LIBNDP_CFLAGS) \
 	$(LIBPSL_CFLAGS) \
 	$(LIBCURL_CFLAGS) \
@@ -4944,11 +4825,10 @@ src_cppflags = \
 	$(LIBAUDIT_CFLAGS) \
 	$(SYSTEMD_LOGIN_CFLAGS) \
 	$(SYSTEMD_JOURNAL_CFLAGS) \
+	$(SANITIZER_EXEC_CFLAGS) \
 	\
 	$(NULL)
 
-src_cppflags_test = $(src_cppflags) -DNETWORKMANAGER_COMPILATION_TEST \
-	$(NULL) $(am__append_18)
 src_ldflags = $(CODE_COVERAGE_LDFLAGS)
 shared_libcsiphash_la_CPPFLAGS = \
 	$(CODE_COVERAGE_CFLAGS) \
@@ -4974,7 +4854,6 @@ shared_libnacd_la_SOURCES = \
 
 ###############################################################################
 src_libsystemd_nm_la_cppflags = \
-	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -5009,12 +4888,14 @@ src_libsystemd_nm_la_SOURCES = \
 	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 \
@@ -5022,17 +4903,16 @@ src_libsystemd_nm_la_SOURCES = \
 	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/sd-device.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/unaligned.h \
 	src/systemd/sd-adapt/user-util.h \
 	src/systemd/sd-adapt/virt.h \
 	src/systemd/src/basic/alloc-util.c \
 	src/systemd/src/basic/alloc-util.h \
 	src/systemd/src/basic/async.h \
-	src/systemd/src/basic/env-util.c \
-	src/systemd/src/basic/env-util.h \
 	src/systemd/src/basic/escape.c \
 	src/systemd/src/basic/escape.h \
 	src/systemd/src/basic/ether-addr-util.c \
@@ -5158,27 +5038,23 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \
 	src/platform/nm-platform.h src/platform/nm-platform-private.h \
 	src/platform/nm-linux-platform.c \
 	src/platform/nm-linux-platform.h \
-	src/platform/wifi/nm-wifi-utils-nl80211.c \
-	src/platform/wifi/nm-wifi-utils-nl80211.h \
-	src/platform/wifi/nm-wifi-utils-private.h \
-	src/platform/wifi/nm-wifi-utils.c \
-	src/platform/wifi/nm-wifi-utils.h \
-	src/platform/wpan/nm-wpan-utils.c \
-	src/platform/wpan/nm-wpan-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-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/platform/wifi/wifi-utils-nl80211.c \
+	src/platform/wifi/wifi-utils-nl80211.h \
+	src/platform/wifi/wifi-utils-private.h \
+	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-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_22)
 src_libNetworkManagerBase_la_LIBADD = \
 	libnm-core/libnm-core.la \
-	shared/libcsiphash.la \
-	$(libnm_crypto_lib) \
 	$(GLIB_LIBS) \
 	$(SYSTEMD_JOURNAL_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -5209,8 +5085,6 @@ src_libNetworkManager_la_SOURCES = \
 	src/devices/nm-device-logging.h \
 	src/devices/nm-device-private.h \
 	\
-	src/devices/nm-device-6lowpan.c \
-	src/devices/nm-device-6lowpan.h \
 	src/devices/nm-device-bond.c \
 	src/devices/nm-device-bond.h \
 	src/devices/nm-device-bridge.c \
@@ -5237,10 +5111,6 @@ src_libNetworkManager_la_SOURCES = \
 	src/devices/nm-device-vlan.h \
 	src/devices/nm-device-vxlan.c \
 	src/devices/nm-device-vxlan.h \
-	src/devices/nm-device-wireguard.c \
-	src/devices/nm-device-wireguard.h \
-	src/devices/nm-device-wpan.c \
-	src/devices/nm-device-wpan.h \
 	\
 	src/dhcp/nm-dhcp-dhcpcanon.c \
 	src/dhcp/nm-dhcp-dhclient.c \
@@ -5376,9 +5246,11 @@ src_libNetworkManager_la_LIBADD = \
 	$(LIBPSL_LIBS) \
 	$(LIBCURL_LIBS)
 
-src_tests_cppflags_fake = $(src_cppflags_test) -DSETUP=nm_fake_platform_setup
-src_tests_cppflags_linux = $(src_cppflags_test) -DSETUP=nm_linux_platform_setup
-src_libNetworkManagerTest_la_CPPFLAGS = $(src_cppflags_test)
+src_tests_cppflags = $(src_cppflags) $(SANITIZER_EXEC_CFLAGS) \
+	-DNETWORKMANAGER_COMPILATION_TEST $(am__append_23)
+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)
 src_libNetworkManagerTest_la_SOURCES = \
 	src/ndisc/nm-fake-ndisc.c \
 	src/ndisc/nm-fake-ndisc.h \
@@ -5427,13 +5299,12 @@ src_nm_iface_helper_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
 src_dhcp_nm_dhcp_helper_CPPFLAGS = \
-	$(dflt_cppflags) \
+	$(GLIB_CFLAGS) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
-	$(GLIB_CFLAGS) \
-	$(NULL)
+	-DNMRUNDIR=\"$(nmrundir)\"
 
 src_dhcp_nm_dhcp_helper_SOURCES = \
 	src/dhcp/nm-dhcp-helper.c \
@@ -5448,7 +5319,11 @@ src_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS)
 ###############################################################################
 # src/dhcp/tests
 ###############################################################################
-src_dhcp_tests_cppflags = $(src_cppflags_test)
+src_dhcp_tests_cppflags = \
+	$(src_tests_cppflags) \
+	$(nm_build_cflags) \
+	$(NULL)
+
 src_dhcp_tests_ldadd = \
 	src/libNetworkManagerTest.la
 
@@ -5459,7 +5334,6 @@ 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@	$(dflt_cppflags) \
 @WITH_PPP_TRUE@	-I$(srcdir)/shared \
 @WITH_PPP_TRUE@	-I$(builddir)/shared \
 @WITH_PPP_TRUE@	-I$(srcdir)/libnm-core \
@@ -5489,7 +5363,17 @@ src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags)
 @WITH_PPP_TRUE@EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \
 @WITH_PPP_TRUE@	src/ppp/nm-ppp-plugin.ver
 
-@WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_cppflags_base)
+@WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \
+@WITH_PPP_TRUE@	-I$(srcdir)/src \
+@WITH_PPP_TRUE@	-I$(builddir)/src \
+@WITH_PPP_TRUE@	-I$(srcdir)/shared \
+@WITH_PPP_TRUE@	-I$(builddir)/shared \
+@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@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+@WITH_PPP_TRUE@	$(GLIB_CFLAGS)
+
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LDFLAGS = \
 @WITH_PPP_TRUE@	-module -avoid-version \
 @WITH_PPP_TRUE@	-Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver"
@@ -5497,7 +5381,11 @@ src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags)
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LIBADD = \
 @WITH_PPP_TRUE@	$(GLIB_LIBS)
 
-src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = $(src_cppflags_test)
+src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
+	$(src_tests_cppflags) \
+	$(nm_build_cflags) \
+	$(NULL)
+
 src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
@@ -5506,7 +5394,18 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
 src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 	src/libNetworkManagerTest.la
 
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnms_ibft_core_la_CPPFLAGS = $(src_cppflags_base)
+@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_cppflags = \
+@CONFIG_PLUGIN_IBFT_TRUE@	-I$(srcdir)/src \
+@CONFIG_PLUGIN_IBFT_TRUE@	-I$(srcdir)/shared \
+@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@	$(GLIB_CFLAGS) \
+@CONFIG_PLUGIN_IBFT_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+@CONFIG_PLUGIN_IBFT_TRUE@	-DSYSCONFDIR=\"$(sysconfdir)\" \
+@CONFIG_PLUGIN_IBFT_TRUE@	-DSBINDIR=\"$(sbindir)\"
+
+@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnms_ibft_core_la_CPPFLAGS = $(src_settings_plugins_ibft_cppflags)
 @CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES = \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/nms-ibft-reader.c \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/nms-ibft-reader.h
@@ -5517,7 +5416,7 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/nms-ibft-connection.c \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/nms-ibft-connection.h
 
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS = $(src_cppflags_base)
+@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS = $(src_settings_plugins_ibft_cppflags)
 @CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LDFLAGS = \
 @CONFIG_PLUGIN_IBFT_TRUE@	-module -avoid-version \
 @CONFIG_PLUGIN_IBFT_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-settings.ver"
@@ -5525,7 +5424,19 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LIBADD = \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/libnms-ibft-core.la
 
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = $(src_cppflags_base_test)
+@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \
+@CONFIG_PLUGIN_IBFT_TRUE@	$(GLIB_CFLAGS) \
+@CONFIG_PLUGIN_IBFT_TRUE@	$(CODE_COVERAGE_CFLAGS) \
+@CONFIG_PLUGIN_IBFT_TRUE@	-I$(srcdir)/shared \
+@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@	-I$(srcdir)/src \
+@CONFIG_PLUGIN_IBFT_TRUE@	$(nm_build_cflags) \
+@CONFIG_PLUGIN_IBFT_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
+@CONFIG_PLUGIN_IBFT_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+@CONFIG_PLUGIN_IBFT_TRUE@	$(NULL)
+
 @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) \
@@ -5535,13 +5446,27 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/libnms-ibft-core.la \
 @CONFIG_PLUGIN_IBFT_TRUE@	src/libNetworkManagerTest.la
 
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_cppflags = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	-I$(srcdir)/src \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	-I$(builddir)/src \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	-I$(srcdir)/shared \
+@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@	$(GLIB_CFLAGS) \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(NSS_CFLAGS) \
+@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)\"
+
 
 ###############################################################################
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags_base))
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_settings_plugins_ifcfg_rh_cppflags))
 
 ###############################################################################
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
@@ -5557,7 +5482,7 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_cppflags_base)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags)
 
 ###############################################################################
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
@@ -5566,7 +5491,7 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_cppflags_base)
+@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" \
@@ -5578,7 +5503,11 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @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
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_cppflags_base_test)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(src_tests_cppflags) \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(nm_build_cflags) \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(NULL)
+
 @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) \
@@ -5604,13 +5533,24 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
 
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_cppflags = \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-I$(srcdir)/src \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-I$(srcdir)/shared \
+@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@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(GLIB_CFLAGS) \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(LIBUDEV_CFLAGS) \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DSYSCONFDIR=\"$(sysconfdir)\"
+
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-parser.c \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-parser.h
 
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_cppflags_base)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags)
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(LIBUDEV_LIBS)
 
@@ -5620,7 +5560,7 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
 
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_cppflags_base)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags)
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-module -avoid-version \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-settings.ver"
@@ -5629,7 +5569,18 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(LIBUDEV_LIBS)
 
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_cppflags_base_test)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-I$(srcdir)/shared \
+@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@	-I$(srcdir)/src \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(GLIB_CFLAGS) \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(nm_build_cflags) \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(NULL)
+
 @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) \
@@ -5644,7 +5595,17 @@ src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
 	src/devices/adsl/nm-device-adsl.c \
 	src/devices/adsl/nm-device-adsl.h
 
-src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_cppflags_device_plugin)
+src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
+	-I$(srcdir)/shared \
+	-I$(builddir)/shared \
+	-I$(builddir)/libnm-core \
+	-I$(srcdir)/libnm-core \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+	$(GLIB_CFLAGS) \
+	$(LIBUDEV_CFLAGS)
+
 src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \
 	-module -avoid-version \
 	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
@@ -5657,9 +5618,16 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 # src/devices/wwan
 ###############################################################################
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_cppflags = \
-@WITH_MODEM_MANAGER_1_TRUE@	$(src_cppflags_device_plugin) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(MM_GLIB_CFLAGS) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
+@WITH_MODEM_MANAGER_1_TRUE@	-I$(srcdir)/src \
+@WITH_MODEM_MANAGER_1_TRUE@	-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$(srcdir)/libnm-core \
+@WITH_MODEM_MANAGER_1_TRUE@	-I$(builddir)/libnm-core \
+@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)
 
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_SOURCES = src/devices/wwan/nm-modem-broadband.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem-broadband.h \
@@ -5667,7 +5635,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_40)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_44)
 @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 \
@@ -5709,17 +5677,22 @@ 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_43)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_47)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS =  \
-@WITH_MODEM_MANAGER_1_TRUE@	$(src_cppflags_device_plugin) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_42)
+@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@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_CFLAGS) $(am__append_46)
 @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@	src/devices/wwan/libnm-wwan.la \
-@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) $(am__append_44)
+@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) $(am__append_48)
 @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 \
@@ -5732,8 +5705,17 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @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@	$(am__append_46)
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin)
+@WITH_WIFI_TRUE@	$(am__append_50)
+@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
+@WITH_WIFI_TRUE@	-I$(srcdir)/src \
+@WITH_WIFI_TRUE@	-I$(builddir)/src \
+@WITH_WIFI_TRUE@	-I$(srcdir)/shared \
+@WITH_WIFI_TRUE@	-I$(builddir)/shared \
+@WITH_WIFI_TRUE@	-I$(builddir)/libnm-core \
+@WITH_WIFI_TRUE@	-I$(srcdir)/libnm-core \
+@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 = \
 @WITH_WIFI_TRUE@	-module -avoid-version \
 @WITH_WIFI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
@@ -5748,7 +5730,17 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @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_tests_test_general_CPPFLAGS = $(src_cppflags_base_test)
+@WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_CPPFLAGS = \
+@WITH_WIFI_TRUE@	-I$(srcdir)/shared \
+@WITH_WIFI_TRUE@	-I$(builddir)/shared \
+@WITH_WIFI_TRUE@	-I$(srcdir)/libnm-core \
+@WITH_WIFI_TRUE@	-I$(builddir)/libnm-core \
+@WITH_WIFI_TRUE@	-I$(srcdir)/src \
+@WITH_WIFI_TRUE@	-I$(builddir)/src \
+@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 = \
@@ -5757,10 +5749,16 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_TEAMDCTL_TRUE@	src/devices/team/nm-device-team.h
 
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
-@WITH_TEAMDCTL_TRUE@	$(src_cppflags_device_plugin) \
+@WITH_TEAMDCTL_TRUE@	-I$(srcdir)/src \
+@WITH_TEAMDCTL_TRUE@	-I$(builddir)/src \
+@WITH_TEAMDCTL_TRUE@	-I$(srcdir)/shared \
+@WITH_TEAMDCTL_TRUE@	-I$(builddir)/shared \
+@WITH_TEAMDCTL_TRUE@	-I$(builddir)/libnm-core \
+@WITH_TEAMDCTL_TRUE@	-I$(srcdir)/libnm-core \
+@WITH_TEAMDCTL_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
 @WITH_TEAMDCTL_TRUE@	$(LIBTEAMDCTL_CFLAGS) \
 @WITH_TEAMDCTL_TRUE@	$(JANSSON_CFLAGS) \
-@WITH_TEAMDCTL_TRUE@	$(NULL)
+@WITH_TEAMDCTL_TRUE@	$(GLIB_CFLAGS)
 
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \
 @WITH_TEAMDCTL_TRUE@	-module -avoid-version \
@@ -5791,9 +5789,18 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-bridge.h
 
 @WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \
-@WITH_OPENVSWITCH_TRUE@	$(src_cppflags_device_plugin) \
+@WITH_OPENVSWITCH_TRUE@	-I$(srcdir)/src \
+@WITH_OPENVSWITCH_TRUE@	-I$(builddir)/src \
+@WITH_OPENVSWITCH_TRUE@	-I$(srcdir)/shared \
+@WITH_OPENVSWITCH_TRUE@	-I$(builddir)/shared \
+@WITH_OPENVSWITCH_TRUE@	-I$(builddir)/libnm-core \
+@WITH_OPENVSWITCH_TRUE@	-I$(srcdir)/libnm-core \
+@WITH_OPENVSWITCH_TRUE@	\
+@WITH_OPENVSWITCH_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+@WITH_OPENVSWITCH_TRUE@	-DRUNSTATEDIR=\"$(runstatedir)\" \
+@WITH_OPENVSWITCH_TRUE@	\
 @WITH_OPENVSWITCH_TRUE@	$(JANSSON_CFLAGS) \
-@WITH_OPENVSWITCH_TRUE@	$(NULL)
+@WITH_OPENVSWITCH_TRUE@	$(GLIB_CFLAGS)
 
 @WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \
 @WITH_OPENVSWITCH_TRUE@	-module -avoid-version \
@@ -5803,7 +5810,10 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_OPENVSWITCH_TRUE@	$(JANSSON_LIBS) \
 @WITH_OPENVSWITCH_TRUE@	$(GLIB_LIBS)
 
-src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_cppflags_test)
+src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \
+	$(src_tests_cppflags) \
+	$(NULL)
+
 src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
 	src/libNetworkManagerTest.la
 
@@ -5823,7 +5833,7 @@ src_platform_tests_libadd = \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS)
 
-src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test)
+src_platform_tests_monitor_CPPFLAGS = $(src_tests_cppflags)
 src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd)
 src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c
@@ -5858,10 +5868,10 @@ src_platform_tests_test_cleanup_linux_SOURCES = src/platform/tests/test-cleanup.
 src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux)
 src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd)
-src_platform_tests_test_nmp_object_CPPFLAGS = $(src_cppflags_test)
+src_platform_tests_test_nmp_object_CPPFLAGS = $(src_tests_cppflags)
 src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la
-src_platform_tests_test_general_CPPFLAGS = $(src_cppflags_test)
+src_platform_tests_test_general_CPPFLAGS = $(src_tests_cppflags)
 src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la
 
@@ -5872,12 +5882,12 @@ src_devices_tests_ldflags = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_devices_tests_test_lldp_CPPFLAGS = $(src_cppflags_test)
+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_acd_CPPFLAGS = $(src_cppflags_test)
+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
@@ -5894,13 +5904,17 @@ src_ndisc_tests_ldadd = \
 	src/libNetworkManagerTest.la \
 	$(GLIB_LIBS)
 
-src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_cppflags_test)
+src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_tests_cppflags)
 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_cppflags_test)
+src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_tests_cppflags)
 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_cppflags_test)
+src_supplicant_tests_test_supplicant_config_CPPFLAGS = \
+	$(src_tests_cppflags) \
+	$(nm_build_cflags) \
+	$(NULL)
+
 src_supplicant_tests_test_supplicant_config_LDADD = \
 	src/libNetworkManagerTest.la
 
@@ -5912,7 +5926,11 @@ src_tests_config_test_config_SOURCES = \
 	src/tests/config/nm-test-device.h \
 	src/tests/config/test-config.c
 
-src_tests_config_test_config_CPPFLAGS = $(src_cppflags_test)
+src_tests_config_test_config_CPPFLAGS = \
+	$(src_tests_cppflags) \
+	$(nm_build_cflags) \
+	$(NULL)
+
 src_tests_config_test_config_LDADD = \
 	src/libNetworkManagerTest.la
 
@@ -5930,25 +5948,25 @@ src_tests_ldflags = \
 src_tests_ldadd = \
 	src/libNetworkManagerTest.la
 
-src_tests_test_ip4_config_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_ip4_config_CPPFLAGS = $(src_tests_cppflags)
 src_tests_test_ip4_config_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_ip4_config_LDADD = $(src_tests_ldadd)
-src_tests_test_ip6_config_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_ip6_config_CPPFLAGS = $(src_tests_cppflags)
 src_tests_test_ip6_config_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_ip6_config_LDADD = $(src_tests_ldadd)
-src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test)
+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_general_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_general_CPPFLAGS = $(src_tests_cppflags)
 src_tests_test_general_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_general_LDADD = $(src_tests_ldadd)
-src_tests_test_general_with_expect_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_general_with_expect_CPPFLAGS = $(src_tests_cppflags)
 src_tests_test_general_with_expect_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_general_with_expect_LDADD = $(src_tests_ldadd)
-src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_wired_defname_CPPFLAGS = $(src_tests_cppflags)
 src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_wired_defname_LDADD = $(src_tests_ldadd)
-src_tests_test_utils_CPPFLAGS = $(src_cppflags_test)
+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 = \
@@ -5965,7 +5983,6 @@ src_tests_test_systemd_LDADD = \
 	$(NULL)
 
 dispatcher_cppflags = \
-	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -5977,7 +5994,9 @@ dispatcher_cppflags = \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nm-dispatcher"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	$(NULL)
+	-DNMCONFDIR=\"$(nmconfdir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\"
 
 dispatcher_nmdbus_dispatcher_sources = \
 	dispatcher/nmdbus-dispatcher.h \
@@ -6009,7 +6028,6 @@ dispatcher_nm_dispatcher_LDADD = \
 
 dispatcherdir = $(sysconfdir)/NetworkManager/dispatcher.d
 dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
-	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -6017,6 +6035,8 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/dispatcher \
+	-I$(builddir)/dispatcher \
+	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(GLIB_CFLAGS) \
@@ -6032,7 +6052,6 @@ dispatcher_tests_test_dispatcher_envp_LDADD = \
 	$(GLIB_LIBS)
 
 clients_nm_online_CPPFLAGS = \
-	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -6042,7 +6061,7 @@ clients_nm_online_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nm-online"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	$(NULL)
+	-DNMLOCALEDIR=\"$(nmlocaledir)\"
 
 clients_nm_online_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
@@ -6056,7 +6075,6 @@ clients_nm_online_LDADD = \
 # clients/common
 ###############################################################################
 clients_cppflags = \
-	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -6065,9 +6083,8 @@ clients_cppflags = \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/clients/common \
 	-I$(builddir)/clients/common \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(GLIB_CFLAGS) \
-	$(SANITIZER_EXEC_CFLAGS) \
+	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
 	$(NULL)
 
 clients_common_libnmc_base_la_SOURCES = \
@@ -6090,7 +6107,7 @@ clients_common_libnmc_base_la_SOURCES = \
 clients_common_libnmc_base_la_CPPFLAGS = \
 	$(clients_cppflags) \
 	-DG_LOG_DOMAIN=\""libnmc"\" \
-	$(NULL)
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT
 
 clients_common_libnmc_base_la_LIBADD = \
 	libnm/libnm.la \
@@ -6103,9 +6120,6 @@ clients_common_libnmc_la_SOURCES = \
 	shared/nm-meta-setting.c \
 	shared/nm-meta-setting.h \
 	\
-	shared/nm-ethtool-utils.c \
-	shared/nm-ethtool-utils.h \
-	\
 	clients/common/nm-meta-setting-desc.c \
 	clients/common/nm-meta-setting-desc.h \
 	clients/common/nm-meta-setting-access.c \
@@ -6115,7 +6129,7 @@ clients_common_libnmc_la_SOURCES = \
 clients_common_libnmc_la_CPPFLAGS = \
 	$(clients_cppflags) \
 	-DG_LOG_DOMAIN=\""libnmc"\" \
-	$(NULL)
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT
 
 clients_common_libnmc_la_LIBADD = \
 	libnm/libnm.la \
@@ -6126,7 +6140,8 @@ clients_common_tests_test_general_CPPFLAGS = \
 	-I$(srcdir)/clients/common/tests \
 	$(clients_cppflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
-	$(NULL)
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	$(SANITIZER_EXEC_CFLAGS)
 
 clients_common_tests_test_general_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
@@ -6150,15 +6165,19 @@ 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_60)
+@BUILD_NMCLI_TRUE@	$(am__append_64)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS =  \
 @BUILD_NMCLI_TRUE@	-I$(srcdir)/clients/cli $(clients_cppflags) \
-@BUILD_NMCLI_TRUE@	-DG_LOG_DOMAIN=\""nmcli"\" $(NULL) \
-@BUILD_NMCLI_TRUE@	$(am__append_59)
+@BUILD_NMCLI_TRUE@	$(SANITIZER_EXEC_CFLAGS) \
+@BUILD_NMCLI_TRUE@	-DSYSCONFDIR=\"$(sysconfdir)\" \
+@BUILD_NMCLI_TRUE@	-DG_LOG_DOMAIN=\""nmcli"\" \
+@BUILD_NMCLI_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+@BUILD_NMCLI_TRUE@	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
+@BUILD_NMCLI_TRUE@	$(am__append_63)
 @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_61)
+@BUILD_NMCLI_TRUE@	$(READLINE_LIBS) $(am__append_65)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \
 @BUILD_NMCLI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 @BUILD_NMCLI_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
@@ -6209,9 +6228,17 @@ clients_common_tests_test_general_LDADD = \
 @BUILD_NMTUI_TRUE@	$(NULL)
 
 @BUILD_NMTUI_TRUE@clients_tui_newt_libnmt_newt_a_CPPFLAGS = \
-@BUILD_NMTUI_TRUE@	$(clients_cppflags) \
+@BUILD_NMTUI_TRUE@	-I$(srcdir)/shared \
+@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 = \
@@ -6302,9 +6329,10 @@ clients_common_tests_test_general_LDADD = \
 @BUILD_NMTUI_TRUE@clients_tui_nmtui_CPPFLAGS = \
 @BUILD_NMTUI_TRUE@	-I$(srcdir)/clients/tui/newt \
 @BUILD_NMTUI_TRUE@	$(clients_cppflags) \
-@BUILD_NMTUI_TRUE@	-DG_LOG_DOMAIN=\""nmtui"\" \
 @BUILD_NMTUI_TRUE@	$(NEWT_CFLAGS) \
-@BUILD_NMTUI_TRUE@	$(NULL)
+@BUILD_NMTUI_TRUE@	-DG_LOG_DOMAIN=\""nmtui"\" \
+@BUILD_NMTUI_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+@BUILD_NMTUI_TRUE@	-DNMLOCALEDIR=\""$(nmlocaledir)"\"
 
 @BUILD_NMTUI_TRUE@clients_tui_nmtui_LDFLAGS = \
 @BUILD_NMTUI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
@@ -6319,6 +6347,363 @@ clients_common_tests_test_general_LDADD = \
 @BUILD_NMTUI_TRUE@	$(NULL)
 
 @BUILD_NMTUI_TRUE@nmtui_links = nmtui-edit nmtui-connect nmtui-hostname
+clients_tests_expected_files = \
+	clients/tests/test-client.check-on-disk/test_001-001.expected \
+	clients/tests/test-client.check-on-disk/test_001-002.expected \
+	clients/tests/test-client.check-on-disk/test_001-003.expected \
+	clients/tests/test-client.check-on-disk/test_001-004.expected \
+	clients/tests/test-client.check-on-disk/test_001-005.expected \
+	clients/tests/test-client.check-on-disk/test_001-006.expected \
+	clients/tests/test-client.check-on-disk/test_001-007.expected \
+	clients/tests/test-client.check-on-disk/test_001-008.expected \
+	clients/tests/test-client.check-on-disk/test_001-009.expected \
+	clients/tests/test-client.check-on-disk/test_001-010.expected \
+	clients/tests/test-client.check-on-disk/test_001-011.expected \
+	clients/tests/test-client.check-on-disk/test_001-012.expected \
+	clients/tests/test-client.check-on-disk/test_001-013.expected \
+	clients/tests/test-client.check-on-disk/test_001-014.expected \
+	clients/tests/test-client.check-on-disk/test_001-015.expected \
+	clients/tests/test-client.check-on-disk/test_001-016.expected \
+	clients/tests/test-client.check-on-disk/test_001-017.expected \
+	clients/tests/test-client.check-on-disk/test_001-018.expected \
+	clients/tests/test-client.check-on-disk/test_001-019.expected \
+	clients/tests/test-client.check-on-disk/test_001-020.expected \
+	clients/tests/test-client.check-on-disk/test_001-021.expected \
+	clients/tests/test-client.check-on-disk/test_001-022.expected \
+	clients/tests/test-client.check-on-disk/test_001-023.expected \
+	clients/tests/test-client.check-on-disk/test_001-024.expected \
+	clients/tests/test-client.check-on-disk/test_001-025.expected \
+	clients/tests/test-client.check-on-disk/test_001-026.expected \
+	clients/tests/test-client.check-on-disk/test_002-001.expected \
+	clients/tests/test-client.check-on-disk/test_002-002.expected \
+	clients/tests/test-client.check-on-disk/test_002-003.expected \
+	clients/tests/test-client.check-on-disk/test_002-004.expected \
+	clients/tests/test-client.check-on-disk/test_002-005.expected \
+	clients/tests/test-client.check-on-disk/test_002-006.expected \
+	clients/tests/test-client.check-on-disk/test_002-007.expected \
+	clients/tests/test-client.check-on-disk/test_002-008.expected \
+	clients/tests/test-client.check-on-disk/test_002-009.expected \
+	clients/tests/test-client.check-on-disk/test_002-010.expected \
+	clients/tests/test-client.check-on-disk/test_002-011.expected \
+	clients/tests/test-client.check-on-disk/test_002-012.expected \
+	clients/tests/test-client.check-on-disk/test_002-013.expected \
+	clients/tests/test-client.check-on-disk/test_002-014.expected \
+	clients/tests/test-client.check-on-disk/test_002-015.expected \
+	clients/tests/test-client.check-on-disk/test_002-016.expected \
+	clients/tests/test-client.check-on-disk/test_002-017.expected \
+	clients/tests/test-client.check-on-disk/test_002-018.expected \
+	clients/tests/test-client.check-on-disk/test_002-019.expected \
+	clients/tests/test-client.check-on-disk/test_002-020.expected \
+	clients/tests/test-client.check-on-disk/test_002-021.expected \
+	clients/tests/test-client.check-on-disk/test_002-022.expected \
+	clients/tests/test-client.check-on-disk/test_002-023.expected \
+	clients/tests/test-client.check-on-disk/test_002-024.expected \
+	clients/tests/test-client.check-on-disk/test_003-001.expected \
+	clients/tests/test-client.check-on-disk/test_003-002.expected \
+	clients/tests/test-client.check-on-disk/test_003-003.expected \
+	clients/tests/test-client.check-on-disk/test_003-004.expected \
+	clients/tests/test-client.check-on-disk/test_003-005.expected \
+	clients/tests/test-client.check-on-disk/test_003-006.expected \
+	clients/tests/test-client.check-on-disk/test_003-007.expected \
+	clients/tests/test-client.check-on-disk/test_003-008.expected \
+	clients/tests/test-client.check-on-disk/test_003-009.expected \
+	clients/tests/test-client.check-on-disk/test_003-010.expected \
+	clients/tests/test-client.check-on-disk/test_003-011.expected \
+	clients/tests/test-client.check-on-disk/test_003-012.expected \
+	clients/tests/test-client.check-on-disk/test_003-013.expected \
+	clients/tests/test-client.check-on-disk/test_003-014.expected \
+	clients/tests/test-client.check-on-disk/test_003-015.expected \
+	clients/tests/test-client.check-on-disk/test_003-016.expected \
+	clients/tests/test-client.check-on-disk/test_003-017.expected \
+	clients/tests/test-client.check-on-disk/test_003-018.expected \
+	clients/tests/test-client.check-on-disk/test_003-019.expected \
+	clients/tests/test-client.check-on-disk/test_003-020.expected \
+	clients/tests/test-client.check-on-disk/test_003-021.expected \
+	clients/tests/test-client.check-on-disk/test_003-022.expected \
+	clients/tests/test-client.check-on-disk/test_003-023.expected \
+	clients/tests/test-client.check-on-disk/test_003-024.expected \
+	clients/tests/test-client.check-on-disk/test_003-025.expected \
+	clients/tests/test-client.check-on-disk/test_003-026.expected \
+	clients/tests/test-client.check-on-disk/test_003-027.expected \
+	clients/tests/test-client.check-on-disk/test_003-028.expected \
+	clients/tests/test-client.check-on-disk/test_003-029.expected \
+	clients/tests/test-client.check-on-disk/test_003-030.expected \
+	clients/tests/test-client.check-on-disk/test_003-031.expected \
+	clients/tests/test-client.check-on-disk/test_003-032.expected \
+	clients/tests/test-client.check-on-disk/test_003-033.expected \
+	clients/tests/test-client.check-on-disk/test_003-034.expected \
+	clients/tests/test-client.check-on-disk/test_003-035.expected \
+	clients/tests/test-client.check-on-disk/test_003-036.expected \
+	clients/tests/test-client.check-on-disk/test_003-037.expected \
+	clients/tests/test-client.check-on-disk/test_003-038.expected \
+	clients/tests/test-client.check-on-disk/test_003-039.expected \
+	clients/tests/test-client.check-on-disk/test_003-040.expected \
+	clients/tests/test-client.check-on-disk/test_003-041.expected \
+	clients/tests/test-client.check-on-disk/test_003-042.expected \
+	clients/tests/test-client.check-on-disk/test_003-043.expected \
+	clients/tests/test-client.check-on-disk/test_003-044.expected \
+	clients/tests/test-client.check-on-disk/test_003-045.expected \
+	clients/tests/test-client.check-on-disk/test_003-046.expected \
+	clients/tests/test-client.check-on-disk/test_003-047.expected \
+	clients/tests/test-client.check-on-disk/test_003-048.expected \
+	clients/tests/test-client.check-on-disk/test_003-049.expected \
+	clients/tests/test-client.check-on-disk/test_003-050.expected \
+	clients/tests/test-client.check-on-disk/test_003-051.expected \
+	clients/tests/test-client.check-on-disk/test_003-052.expected \
+	clients/tests/test-client.check-on-disk/test_003-053.expected \
+	clients/tests/test-client.check-on-disk/test_003-054.expected \
+	clients/tests/test-client.check-on-disk/test_003-055.expected \
+	clients/tests/test-client.check-on-disk/test_003-056.expected \
+	clients/tests/test-client.check-on-disk/test_003-057.expected \
+	clients/tests/test-client.check-on-disk/test_003-058.expected \
+	clients/tests/test-client.check-on-disk/test_003-059.expected \
+	clients/tests/test-client.check-on-disk/test_003-060.expected \
+	clients/tests/test-client.check-on-disk/test_003-061.expected \
+	clients/tests/test-client.check-on-disk/test_003-062.expected \
+	clients/tests/test-client.check-on-disk/test_003-063.expected \
+	clients/tests/test-client.check-on-disk/test_003-064.expected \
+	clients/tests/test-client.check-on-disk/test_003-065.expected \
+	clients/tests/test-client.check-on-disk/test_003-066.expected \
+	clients/tests/test-client.check-on-disk/test_003-067.expected \
+	clients/tests/test-client.check-on-disk/test_003-068.expected \
+	clients/tests/test-client.check-on-disk/test_003-069.expected \
+	clients/tests/test-client.check-on-disk/test_003-070.expected \
+	clients/tests/test-client.check-on-disk/test_003-071.expected \
+	clients/tests/test-client.check-on-disk/test_003-072.expected \
+	clients/tests/test-client.check-on-disk/test_003-073.expected \
+	clients/tests/test-client.check-on-disk/test_003-074.expected \
+	clients/tests/test-client.check-on-disk/test_003-075.expected \
+	clients/tests/test-client.check-on-disk/test_003-076.expected \
+	clients/tests/test-client.check-on-disk/test_003-077.expected \
+	clients/tests/test-client.check-on-disk/test_003-078.expected \
+	clients/tests/test-client.check-on-disk/test_003-079.expected \
+	clients/tests/test-client.check-on-disk/test_003-080.expected \
+	clients/tests/test-client.check-on-disk/test_003-081.expected \
+	clients/tests/test-client.check-on-disk/test_003-082.expected \
+	clients/tests/test-client.check-on-disk/test_003-083.expected \
+	clients/tests/test-client.check-on-disk/test_003-084.expected \
+	clients/tests/test-client.check-on-disk/test_003-085.expected \
+	clients/tests/test-client.check-on-disk/test_003-086.expected \
+	clients/tests/test-client.check-on-disk/test_003-087.expected \
+	clients/tests/test-client.check-on-disk/test_003-088.expected \
+	clients/tests/test-client.check-on-disk/test_003-089.expected \
+	clients/tests/test-client.check-on-disk/test_003-090.expected \
+	clients/tests/test-client.check-on-disk/test_003-091.expected \
+	clients/tests/test-client.check-on-disk/test_003-092.expected \
+	clients/tests/test-client.check-on-disk/test_003-093.expected \
+	clients/tests/test-client.check-on-disk/test_003-094.expected \
+	clients/tests/test-client.check-on-disk/test_003-095.expected \
+	clients/tests/test-client.check-on-disk/test_003-096.expected \
+	clients/tests/test-client.check-on-disk/test_003-097.expected \
+	clients/tests/test-client.check-on-disk/test_003-098.expected \
+	clients/tests/test-client.check-on-disk/test_003-099.expected \
+	clients/tests/test-client.check-on-disk/test_003-100.expected \
+	clients/tests/test-client.check-on-disk/test_004-001.expected \
+	clients/tests/test-client.check-on-disk/test_004-002.expected \
+	clients/tests/test-client.check-on-disk/test_004-003.expected \
+	clients/tests/test-client.check-on-disk/test_004-004.expected \
+	clients/tests/test-client.check-on-disk/test_004-005.expected \
+	clients/tests/test-client.check-on-disk/test_004-006.expected \
+	clients/tests/test-client.check-on-disk/test_004-007.expected \
+	clients/tests/test-client.check-on-disk/test_004-008.expected \
+	clients/tests/test-client.check-on-disk/test_004-009.expected \
+	clients/tests/test-client.check-on-disk/test_004-010.expected \
+	clients/tests/test-client.check-on-disk/test_004-011.expected \
+	clients/tests/test-client.check-on-disk/test_004-012.expected \
+	clients/tests/test-client.check-on-disk/test_004-013.expected \
+	clients/tests/test-client.check-on-disk/test_004-014.expected \
+	clients/tests/test-client.check-on-disk/test_004-015.expected \
+	clients/tests/test-client.check-on-disk/test_004-016.expected \
+	clients/tests/test-client.check-on-disk/test_004-017.expected \
+	clients/tests/test-client.check-on-disk/test_004-018.expected \
+	clients/tests/test-client.check-on-disk/test_004-019.expected \
+	clients/tests/test-client.check-on-disk/test_004-020.expected \
+	clients/tests/test-client.check-on-disk/test_004-021.expected \
+	clients/tests/test-client.check-on-disk/test_004-022.expected \
+	clients/tests/test-client.check-on-disk/test_004-023.expected \
+	clients/tests/test-client.check-on-disk/test_004-024.expected \
+	clients/tests/test-client.check-on-disk/test_004-025.expected \
+	clients/tests/test-client.check-on-disk/test_004-026.expected \
+	clients/tests/test-client.check-on-disk/test_004-027.expected \
+	clients/tests/test-client.check-on-disk/test_004-028.expected \
+	clients/tests/test-client.check-on-disk/test_004-029.expected \
+	clients/tests/test-client.check-on-disk/test_004-030.expected \
+	clients/tests/test-client.check-on-disk/test_004-031.expected \
+	clients/tests/test-client.check-on-disk/test_004-032.expected \
+	clients/tests/test-client.check-on-disk/test_004-033.expected \
+	clients/tests/test-client.check-on-disk/test_004-034.expected \
+	clients/tests/test-client.check-on-disk/test_004-035.expected \
+	clients/tests/test-client.check-on-disk/test_004-036.expected \
+	clients/tests/test-client.check-on-disk/test_004-037.expected \
+	clients/tests/test-client.check-on-disk/test_004-038.expected \
+	clients/tests/test-client.check-on-disk/test_004-039.expected \
+	clients/tests/test-client.check-on-disk/test_004-040.expected \
+	clients/tests/test-client.check-on-disk/test_004-041.expected \
+	clients/tests/test-client.check-on-disk/test_004-042.expected \
+	clients/tests/test-client.check-on-disk/test_004-043.expected \
+	clients/tests/test-client.check-on-disk/test_004-044.expected \
+	clients/tests/test-client.check-on-disk/test_004-045.expected \
+	clients/tests/test-client.check-on-disk/test_004-046.expected \
+	clients/tests/test-client.check-on-disk/test_004-047.expected \
+	clients/tests/test-client.check-on-disk/test_004-048.expected \
+	clients/tests/test-client.check-on-disk/test_004-049.expected \
+	clients/tests/test-client.check-on-disk/test_004-050.expected \
+	clients/tests/test-client.check-on-disk/test_004-051.expected \
+	clients/tests/test-client.check-on-disk/test_004-052.expected \
+	clients/tests/test-client.check-on-disk/test_004-053.expected \
+	clients/tests/test-client.check-on-disk/test_004-054.expected \
+	clients/tests/test-client.check-on-disk/test_004-055.expected \
+	clients/tests/test-client.check-on-disk/test_004-056.expected \
+	clients/tests/test-client.check-on-disk/test_004-057.expected \
+	clients/tests/test-client.check-on-disk/test_004-058.expected \
+	clients/tests/test-client.check-on-disk/test_004-059.expected \
+	clients/tests/test-client.check-on-disk/test_004-060.expected \
+	clients/tests/test-client.check-on-disk/test_004-061.expected \
+	clients/tests/test-client.check-on-disk/test_004-062.expected \
+	clients/tests/test-client.check-on-disk/test_004-063.expected \
+	clients/tests/test-client.check-on-disk/test_004-064.expected \
+	clients/tests/test-client.check-on-disk/test_004-065.expected \
+	clients/tests/test-client.check-on-disk/test_004-066.expected \
+	clients/tests/test-client.check-on-disk/test_004-067.expected \
+	clients/tests/test-client.check-on-disk/test_004-068.expected \
+	clients/tests/test-client.check-on-disk/test_004-069.expected \
+	clients/tests/test-client.check-on-disk/test_004-070.expected \
+	clients/tests/test-client.check-on-disk/test_004-071.expected \
+	clients/tests/test-client.check-on-disk/test_004-072.expected \
+	clients/tests/test-client.check-on-disk/test_004-073.expected \
+	clients/tests/test-client.check-on-disk/test_004-074.expected \
+	clients/tests/test-client.check-on-disk/test_004-075.expected \
+	clients/tests/test-client.check-on-disk/test_004-076.expected \
+	clients/tests/test-client.check-on-disk/test_004-077.expected \
+	clients/tests/test-client.check-on-disk/test_004-078.expected \
+	clients/tests/test-client.check-on-disk/test_004-079.expected \
+	clients/tests/test-client.check-on-disk/test_004-080.expected \
+	clients/tests/test-client.check-on-disk/test_004-081.expected \
+	clients/tests/test-client.check-on-disk/test_004-082.expected \
+	clients/tests/test-client.check-on-disk/test_004-083.expected \
+	clients/tests/test-client.check-on-disk/test_004-084.expected \
+	clients/tests/test-client.check-on-disk/test_004-085.expected \
+	clients/tests/test-client.check-on-disk/test_004-086.expected \
+	clients/tests/test-client.check-on-disk/test_004-087.expected \
+	clients/tests/test-client.check-on-disk/test_004-088.expected \
+	clients/tests/test-client.check-on-disk/test_004-089.expected \
+	clients/tests/test-client.check-on-disk/test_004-090.expected \
+	clients/tests/test-client.check-on-disk/test_004-091.expected \
+	clients/tests/test-client.check-on-disk/test_004-092.expected \
+	clients/tests/test-client.check-on-disk/test_004-093.expected \
+	clients/tests/test-client.check-on-disk/test_004-094.expected \
+	clients/tests/test-client.check-on-disk/test_004-095.expected \
+	clients/tests/test-client.check-on-disk/test_004-096.expected \
+	clients/tests/test-client.check-on-disk/test_004-097.expected \
+	clients/tests/test-client.check-on-disk/test_004-098.expected \
+	clients/tests/test-client.check-on-disk/test_004-099.expected \
+	clients/tests/test-client.check-on-disk/test_004-100.expected \
+	clients/tests/test-client.check-on-disk/test_004-101.expected \
+	clients/tests/test-client.check-on-disk/test_004-102.expected \
+	clients/tests/test-client.check-on-disk/test_004-103.expected \
+	clients/tests/test-client.check-on-disk/test_004-104.expected \
+	clients/tests/test-client.check-on-disk/test_004-105.expected \
+	clients/tests/test-client.check-on-disk/test_004-106.expected \
+	clients/tests/test-client.check-on-disk/test_004-107.expected \
+	clients/tests/test-client.check-on-disk/test_004-108.expected \
+	clients/tests/test-client.check-on-disk/test_004-109.expected \
+	clients/tests/test-client.check-on-disk/test_004-110.expected \
+	clients/tests/test-client.check-on-disk/test_004-111.expected \
+	clients/tests/test-client.check-on-disk/test_004-112.expected \
+	clients/tests/test-client.check-on-disk/test_004-113.expected \
+	clients/tests/test-client.check-on-disk/test_004-114.expected \
+	clients/tests/test-client.check-on-disk/test_004-115.expected \
+	clients/tests/test-client.check-on-disk/test_004-116.expected \
+	clients/tests/test-client.check-on-disk/test_004-117.expected \
+	clients/tests/test-client.check-on-disk/test_004-118.expected \
+	clients/tests/test-client.check-on-disk/test_004-119.expected \
+	clients/tests/test-client.check-on-disk/test_004-120.expected \
+	clients/tests/test-client.check-on-disk/test_004-121.expected \
+	clients/tests/test-client.check-on-disk/test_004-122.expected \
+	clients/tests/test-client.check-on-disk/test_004-123.expected \
+	clients/tests/test-client.check-on-disk/test_004-124.expected \
+	clients/tests/test-client.check-on-disk/test_004-125.expected \
+	clients/tests/test-client.check-on-disk/test_004-126.expected \
+	clients/tests/test-client.check-on-disk/test_004-127.expected \
+	clients/tests/test-client.check-on-disk/test_004-128.expected \
+	clients/tests/test-client.check-on-disk/test_004-129.expected \
+	clients/tests/test-client.check-on-disk/test_004-130.expected \
+	clients/tests/test-client.check-on-disk/test_004-131.expected \
+	clients/tests/test-client.check-on-disk/test_004-132.expected \
+	clients/tests/test-client.check-on-disk/test_004-133.expected \
+	clients/tests/test-client.check-on-disk/test_004-134.expected \
+	clients/tests/test-client.check-on-disk/test_004-135.expected \
+	clients/tests/test-client.check-on-disk/test_004-136.expected \
+	clients/tests/test-client.check-on-disk/test_004-137.expected \
+	clients/tests/test-client.check-on-disk/test_004-138.expected \
+	clients/tests/test-client.check-on-disk/test_004-139.expected \
+	clients/tests/test-client.check-on-disk/test_004-140.expected \
+	clients/tests/test-client.check-on-disk/test_004-141.expected \
+	clients/tests/test-client.check-on-disk/test_004-142.expected \
+	clients/tests/test-client.check-on-disk/test_004-143.expected \
+	clients/tests/test-client.check-on-disk/test_004-144.expected \
+	clients/tests/test-client.check-on-disk/test_004-145.expected \
+	clients/tests/test-client.check-on-disk/test_004-146.expected \
+	clients/tests/test-client.check-on-disk/test_004-147.expected \
+	clients/tests/test-client.check-on-disk/test_004-148.expected \
+	clients/tests/test-client.check-on-disk/test_004-149.expected \
+	clients/tests/test-client.check-on-disk/test_004-150.expected \
+	clients/tests/test-client.check-on-disk/test_004-151.expected \
+	clients/tests/test-client.check-on-disk/test_004-152.expected \
+	clients/tests/test-client.check-on-disk/test_004-153.expected \
+	clients/tests/test-client.check-on-disk/test_004-154.expected \
+	clients/tests/test-client.check-on-disk/test_004-155.expected \
+	clients/tests/test-client.check-on-disk/test_004-156.expected \
+	clients/tests/test-client.check-on-disk/test_004-157.expected \
+	clients/tests/test-client.check-on-disk/test_004-158.expected \
+	clients/tests/test-client.check-on-disk/test_004-159.expected \
+	clients/tests/test-client.check-on-disk/test_004-160.expected \
+	clients/tests/test-client.check-on-disk/test_004-161.expected \
+	clients/tests/test-client.check-on-disk/test_004-162.expected \
+	clients/tests/test-client.check-on-disk/test_004-163.expected \
+	clients/tests/test-client.check-on-disk/test_004-164.expected \
+	clients/tests/test-client.check-on-disk/test_004-165.expected \
+	clients/tests/test-client.check-on-disk/test_004-166.expected \
+	clients/tests/test-client.check-on-disk/test_004-167.expected \
+	clients/tests/test-client.check-on-disk/test_004-168.expected \
+	clients/tests/test-client.check-on-disk/test_004-169.expected \
+	clients/tests/test-client.check-on-disk/test_004-170.expected \
+	clients/tests/test-client.check-on-disk/test_004-171.expected \
+	clients/tests/test-client.check-on-disk/test_004-172.expected \
+	clients/tests/test-client.check-on-disk/test_004-173.expected \
+	clients/tests/test-client.check-on-disk/test_004-174.expected \
+	clients/tests/test-client.check-on-disk/test_004-175.expected \
+	clients/tests/test-client.check-on-disk/test_004-176.expected \
+	clients/tests/test-client.check-on-disk/test_004-177.expected \
+	clients/tests/test-client.check-on-disk/test_004-178.expected \
+	clients/tests/test-client.check-on-disk/test_004-179.expected \
+	clients/tests/test-client.check-on-disk/test_004-180.expected \
+	clients/tests/test-client.check-on-disk/test_004-181.expected \
+	clients/tests/test-client.check-on-disk/test_004-182.expected \
+	clients/tests/test-client.check-on-disk/test_004-183.expected \
+	clients/tests/test-client.check-on-disk/test_004-184.expected \
+	clients/tests/test-client.check-on-disk/test_004-185.expected \
+	clients/tests/test-client.check-on-disk/test_004-186.expected \
+	clients/tests/test-client.check-on-disk/test_004-187.expected \
+	clients/tests/test-client.check-on-disk/test_004-188.expected \
+	clients/tests/test-client.check-on-disk/test_004-189.expected \
+	clients/tests/test-client.check-on-disk/test_004-190.expected \
+	clients/tests/test-client.check-on-disk/test_004-191.expected \
+	clients/tests/test-client.check-on-disk/test_004-192.expected \
+	clients/tests/test-client.check-on-disk/test_004-193.expected \
+	clients/tests/test-client.check-on-disk/test_004-194.expected \
+	clients/tests/test-client.check-on-disk/test_004-195.expected \
+	clients/tests/test-client.check-on-disk/test_004-196.expected \
+	clients/tests/test-client.check-on-disk/test_004-197.expected \
+	clients/tests/test-client.check-on-disk/test_004-198.expected \
+	clients/tests/test-client.check-on-disk/test_004-199.expected \
+	clients/tests/test-client.check-on-disk/test_004-200.expected \
+	clients/tests/test-client.check-on-disk/test_004-201.expected \
+	clients/tests/test-client.check-on-disk/test_004-202.expected \
+	clients/tests/test-client.check-on-disk/test_004-203.expected \
+	clients/tests/test-client.check-on-disk/test_004-204.expected \
+	$(NULL)
+
 
 ###############################################################################
 # data
@@ -6350,16 +6735,17 @@ data_edit = sed \
 @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 = $(dflt_cppflags) \
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_cppflags =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-util \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-util \
 @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@	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_CFLAGS) $(am__append_71) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_74)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_CFLAGS) $(am__append_75) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_78)
 @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 \
@@ -6447,7 +6833,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_72) $(am__append_75)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_76) $(am__append_79)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_mkenums = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.c
 
@@ -6464,19 +6850,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_73) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_76)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_LIBS) $(am__append_77) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_80)
 @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_79) $(am__append_81)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_83) $(am__append_85)
 @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_80) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_82)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(am__append_84) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_86)
 @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
@@ -6500,13 +6886,13 @@ data_edit = sed \
 # libnm-util/tests
 ###############################################################################
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_cppflags = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(dflt_cppflags) \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/shared \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/shared \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-util \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-util \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_CFLAGS) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(nm_build_cflags) \
 @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) \
@@ -6553,7 +6939,6 @@ data_edit = sed \
 # libnm-glib
 ###############################################################################
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_cppflags = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(dflt_cppflags) \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/shared \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/shared \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-util \
@@ -6767,12 +7152,12 @@ data_edit = sed \
 # libnm-glib/tests
 ###############################################################################
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_cppflags = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(dflt_cppflags) \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/shared \
 @WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/shared \
 @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@	$(nm_build_cflags) \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) \
@@ -6925,7 +7310,7 @@ all: $(BUILT_SOURCES) config.h
 .SUFFIXES: .c .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.vapigen $(srcdir)/Makefile.examples $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.vapigen $(srcdir)/clients/tests/test-client.check-on-disk/Makefile.am $(srcdir)/Makefile.examples $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -6947,7 +7332,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/Makefile.vapigen $(srcdir)/Makefile.examples $(am__empty):
+$(srcdir)/Makefile.vapigen $(srcdir)/clients/tests/test-client.check-on-disk/Makefile.am $(srcdir)/Makefile.examples $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -7231,8 +7616,6 @@ shared/$(DEPDIR)/$(am__dirstamp):
 	@: > shared/$(DEPDIR)/$(am__dirstamp)
 shared/clients_common_libnmc_la-nm-meta-setting.lo:  \
 	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
-shared/clients_common_libnmc_la-nm-ethtool-utils.lo:  \
-	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
 clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo:  \
 	clients/common/$(am__dirstamp) \
 	clients/common/$(DEPDIR)/$(am__dirstamp)
@@ -7299,9 +7682,6 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.I
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo:  \
-	introspection/$(am__dirstamp) \
-	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macsec.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
@@ -7344,18 +7724,12 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.V
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo:  \
-	introspection/$(am__dirstamp) \
-	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo:  \
-	introspection/$(am__dirstamp) \
-	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
@@ -7404,9 +7778,6 @@ 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-nm-setting-6lowpan.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)
@@ -7437,9 +7808,6 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-dcb.lo:  \
 libnm-core/libnm_core_libnm_core_la-nm-setting-dummy.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-setting-ethtool.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_libnm_core_la-nm-setting-generic.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -7467,9 +7835,6 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-macsec.lo:  \
 libnm-core/libnm_core_libnm_core_la-nm-setting-macvlan.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-setting-match.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_libnm_core_la-nm-setting-olpc-mesh.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -7497,9 +7862,6 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-proxy.lo:  \
 libnm-core/libnm_core_libnm_core_la-nm-setting-serial.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-setting-sriov.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -7536,9 +7898,6 @@ 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)
-libnm-core/libnm_core_libnm_core_la-nm-setting-wpan.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)
@@ -7551,12 +7910,6 @@ 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/$(am__dirstamp) \
 	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-io-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-secret-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)
@@ -7566,11 +7919,9 @@ 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/$(am__dirstamp) \
 	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo:  \
-	shared/$(am__dirstamp) shared/$(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-nm-crypto.lo:  \
+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:  \
@@ -7609,24 +7960,18 @@ libnm-core/libnm_core_libnm_core_la-nm-vpn-plugin-info.lo:  \
 libnm-core/libnm_core_libnm_core_la-nm-json.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_libnm_core_la-nm-core-enum-types.lo:  \
+libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
-
-libnm-core/libnm-core.la: $(libnm_core_libnm_core_la_OBJECTS) $(libnm_core_libnm_core_la_DEPENDENCIES) $(EXTRA_libnm_core_libnm_core_la_DEPENDENCIES) libnm-core/$(am__dirstamp)
-	$(AM_V_CCLD)$(libnm_core_libnm_core_la_LINK)  $(libnm_core_libnm_core_la_OBJECTS) $(libnm_core_libnm_core_la_LIBADD) $(LIBS)
-libnm-core/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.lo:  \
+libnm-core/libnm_core_libnm_core_la-crypto_nss.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
-
-libnm-core/libnm-crypto-gnutls.la: $(libnm_core_libnm_crypto_gnutls_la_OBJECTS) $(libnm_core_libnm_crypto_gnutls_la_DEPENDENCIES) $(EXTRA_libnm_core_libnm_crypto_gnutls_la_DEPENDENCIES) libnm-core/$(am__dirstamp)
-	$(AM_V_CCLD)$(libnm_core_libnm_crypto_gnutls_la_LINK) $(am_libnm_core_libnm_crypto_gnutls_la_rpath) $(libnm_core_libnm_crypto_gnutls_la_OBJECTS) $(libnm_core_libnm_crypto_gnutls_la_LIBADD) $(LIBS)
-libnm-core/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.lo:  \
+libnm-core/libnm_core_libnm_core_la-nm-core-enum-types.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
 
-libnm-core/libnm-crypto-nss.la: $(libnm_core_libnm_crypto_nss_la_OBJECTS) $(libnm_core_libnm_crypto_nss_la_DEPENDENCIES) $(EXTRA_libnm_core_libnm_crypto_nss_la_DEPENDENCIES) libnm-core/$(am__dirstamp)
-	$(AM_V_CCLD)$(libnm_core_libnm_crypto_nss_la_LINK) $(am_libnm_core_libnm_crypto_nss_la_rpath) $(libnm_core_libnm_crypto_nss_la_OBJECTS) $(libnm_core_libnm_crypto_nss_la_LIBADD) $(LIBS)
+libnm-core/libnm-core.la: $(libnm_core_libnm_core_la_OBJECTS) $(libnm_core_libnm_core_la_DEPENDENCIES) $(EXTRA_libnm_core_libnm_core_la_DEPENDENCIES) libnm-core/$(am__dirstamp)
+	$(AM_V_CCLD)$(libnm_core_libnm_core_la_LINK)  $(libnm_core_libnm_core_la_OBJECTS) $(libnm_core_libnm_core_la_LIBADD) $(LIBS)
 libnm-glib/$(am__dirstamp):
 	@$(MKDIR_P) libnm-glib
 	@: > libnm-glib/$(am__dirstamp)
@@ -7912,8 +8257,6 @@ 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) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_libnm_la-nm-device-6lowpan.lo: libnm/$(am__dirstamp) \
-	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-device-adsl.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-device-bond.lo: libnm/$(am__dirstamp) \
@@ -7960,10 +8303,6 @@ libnm/libnm_libnm_la-nm-device-wifi.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-device-wimax.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_libnm_la-nm-device-wireguard.lo: libnm/$(am__dirstamp) \
-	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_libnm_la-nm-device-wpan.lo: libnm/$(am__dirstamp) \
-	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-device.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-dhcp-config.lo: libnm/$(am__dirstamp) \
@@ -8222,9 +8561,6 @@ src/devices/src_libNetworkManager_la-nm-device-factory.lo:  \
 src/devices/src_libNetworkManager_la-nm-device-generic.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/src_libNetworkManager_la-nm-device-6lowpan.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
 src/devices/src_libNetworkManager_la-nm-device-bond.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
@@ -8264,12 +8600,6 @@ src/devices/src_libNetworkManager_la-nm-device-vlan.lo:  \
 src/devices/src_libNetworkManager_la-nm-device-vxlan.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/src_libNetworkManager_la-nm-device-wireguard.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/src_libNetworkManager_la-nm-device-wpan.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
 src/dhcp/$(am__dirstamp):
 	@$(MKDIR_P) src/dhcp
 	@: > src/dhcp/$(am__dirstamp)
@@ -8479,21 +8809,12 @@ src/platform/wifi/$(am__dirstamp):
 src/platform/wifi/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/platform/wifi/$(DEPDIR)
 	@: > src/platform/wifi/$(DEPDIR)/$(am__dirstamp)
-src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo:  \
+src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-nl80211.lo:  \
 	src/platform/wifi/$(am__dirstamp) \
 	src/platform/wifi/$(DEPDIR)/$(am__dirstamp)
-src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils.lo:  \
+src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils.lo:  \
 	src/platform/wifi/$(am__dirstamp) \
 	src/platform/wifi/$(DEPDIR)/$(am__dirstamp)
-src/platform/wpan/$(am__dirstamp):
-	@$(MKDIR_P) src/platform/wpan
-	@: > src/platform/wpan/$(am__dirstamp)
-src/platform/wpan/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/platform/wpan/$(DEPDIR)
-	@: > src/platform/wpan/$(DEPDIR)/$(am__dirstamp)
-src/platform/wpan/src_libNetworkManagerBase_la-nm-wpan-utils.lo:  \
-	src/platform/wpan/$(am__dirstamp) \
-	src/platform/wpan/$(DEPDIR)/$(am__dirstamp)
 src/ndisc/$(am__dirstamp):
 	@$(MKDIR_P) src/ndisc
 	@: > src/ndisc/$(am__dirstamp)
@@ -8522,7 +8843,7 @@ src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-manager.lo:  \
 	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManagerBase_la-main-utils.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-wext.lo:  \
+src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo:  \
 	src/platform/wifi/$(am__dirstamp) \
 	src/platform/wifi/$(DEPDIR)/$(am__dirstamp)
 
@@ -8572,9 +8893,6 @@ src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp):
 src/systemd/src/basic/src_libsystemd_nm_la-alloc-util.lo:  \
 	src/systemd/src/basic/$(am__dirstamp) \
 	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/src_libsystemd_nm_la-env-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
 src/systemd/src/basic/src_libsystemd_nm_la-escape.lo:  \
 	src/systemd/src/basic/$(am__dirstamp) \
 	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
@@ -9931,8 +10249,6 @@ mostlyclean-compile:
 	-rm -f src/platform/tests/*.lo
 	-rm -f src/platform/wifi/*.$(OBJEXT)
 	-rm -f src/platform/wifi/*.lo
-	-rm -f src/platform/wpan/*.$(OBJEXT)
-	-rm -f src/platform/wpan/*.lo
 	-rm -f src/ppp/*.$(OBJEXT)
 	-rm -f src/ppp/*.lo
 	-rm -f src/settings/*.$(OBJEXT)
@@ -10081,7 +10397,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macsec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macvlan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Modem.Plo@am__quote@
@@ -10098,10 +10413,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.DnsManager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.IP4Config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.IP6Config.Plo@am__quote@
@@ -10112,16 +10425,17 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_gnutls.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_nss.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-core-enum-types.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-crypto.Plo@am__quote@
 @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-utils.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-6lowpan.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@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-bluetooth.Plo@am__quote@
@@ -10132,7 +10446,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-dcb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-dummy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ethtool.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-generic.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-gsm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-infiniband.Plo@am__quote@
@@ -10142,7 +10455,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ip6-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-macsec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-macvlan.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-match.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-olpc-mesh.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-bridge.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-interface.Plo@am__quote@
@@ -10152,7 +10464,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-pppoe.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-proxy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-serial.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-sriov.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team-port.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team.Plo@am__quote@
@@ -10165,14 +10476,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-wired.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-wireless-security.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-wireless.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-wpan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-simple-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-vpn-editor-plugin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-vpn-plugin-info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_compare-test-compare.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Po@am__quote@
@@ -10270,7 +10578,6 @@ distclean-compile:
 @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-6lowpan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-adsl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-bond.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-bridge.Plo@am__quote@
@@ -10294,8 +10601,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-vxlan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-wifi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-wimax.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-wireguard.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-wpan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-dhcp-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-dhcp4-config.Plo@am__quote@
@@ -10321,9 +10626,7 @@ distclean-compile:
 @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@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_secret_agent-test-secret-agent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@
@@ -10340,9 +10643,7 @@ distclean-compile:
 @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@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Plo@am__quote@
 @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-secret-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_glib_libnm_glib_la-nm-udev-utils.Plo@am__quote@
@@ -10386,7 +10687,6 @@ distclean-compile:
 @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-acd-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-6lowpan.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@
@@ -10403,8 +10703,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-veth.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-vlan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-vxlan.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-wireguard.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-wpan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-lldp-listener.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/adsl/$(DEPDIR)/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.Plo@am__quote@
@@ -10487,10 +10785,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/src_platform_tests_test_nmp_object-test-nmp-object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/src_platform_tests_test_route_fake-test-route.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/src_platform_tests_test_route_linux-test-route.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils-wext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/wpan/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wpan-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils-nl80211.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils-wext.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/ppp/$(DEPDIR)/src_libNetworkManager_la-nm-ppp-manager-call.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/ppp/$(DEPDIR)/src_ppp_libnm_ppp_plugin_la-nm-ppp-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/ppp/$(DEPDIR)/src_ppp_nm_pppd_plugin_la-nm-pppd-plugin.Plo@am__quote@
@@ -10531,7 +10828,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/$(DEPDIR)/src_libsystemd_nm_la-nm-sd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/sd-adapt/$(DEPDIR)/src_libsystemd_nm_la-nm-sd-adapt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-alloc-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-env-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-escape.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-ether-addr-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-extract-word.Plo@am__quote@
@@ -10952,13 +11248,6 @@ shared/clients_common_libnmc_la-nm-meta-setting.lo: shared/nm-meta-setting.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) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/clients_common_libnmc_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
 
-shared/clients_common_libnmc_la-nm-ethtool-utils.lo: shared/nm-ethtool-utils.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_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/clients_common_libnmc_la-nm-ethtool-utils.lo -MD -MP -MF shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Tpo -c -o shared/clients_common_libnmc_la-nm-ethtool-utils.lo `test -f 'shared/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-ethtool-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Tpo shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-ethtool-utils.c' object='shared/clients_common_libnmc_la-nm-ethtool-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) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/clients_common_libnmc_la-nm-ethtool-utils.lo `test -f 'shared/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-ethtool-utils.c
-
 clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo: clients/common/nm-meta-setting-desc.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_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo -MD -MP -MF clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-desc.Tpo -c -o clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo `test -f 'clients/common/nm-meta-setting-desc.c' || echo '$(srcdir)/'`clients/common/nm-meta-setting-desc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-desc.Tpo clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-desc.Plo
@@ -11071,13 +11360,6 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.I
 @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.Device.IPTunnel.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c
 
-introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo: introspection/org.freedesktop.NetworkManager.Device.Lowpan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Lowpan.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Lowpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Lowpan.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Lowpan.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Lowpan.c
-
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macsec.lo: introspection/org.freedesktop.NetworkManager.Device.Macsec.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macsec.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macsec.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macsec.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Macsec.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Macsec.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macsec.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macsec.Plo
@@ -11176,13 +11458,6 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.V
 @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.Device.Vxlan.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Vxlan.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Vxlan.c
 
-introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo: introspection/org.freedesktop.NetworkManager.Device.WireGuard.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WireGuard.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WireGuard.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.WireGuard.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WireGuard.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WireGuard.c
-
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo: introspection/org.freedesktop.NetworkManager.Device.Wireless.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wireless.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wireless.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Plo
@@ -11197,13 +11472,6 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WiMax.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WiMax.c
 
-introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo: introspection/org.freedesktop.NetworkManager.Device.Wpan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wpan.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Wpan.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wpan.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wpan.c
-
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.lo: introspection/org.freedesktop.NetworkManager.Device.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Plo
@@ -11295,13 +11563,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
 
-libnm-core/libnm_core_libnm_core_la-nm-setting-6lowpan.lo: libnm-core/nm-setting-6lowpan.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-6lowpan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-6lowpan.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-6lowpan.lo `test -f 'libnm-core/nm-setting-6lowpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-6lowpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-6lowpan.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-6lowpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-6lowpan.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-6lowpan.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-setting-6lowpan.lo `test -f 'libnm-core/nm-setting-6lowpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-6lowpan.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
@@ -11372,13 +11633,6 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-dummy.lo: libnm-core/nm-setting-d
 @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-dummy.lo `test -f 'libnm-core/nm-setting-dummy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dummy.c
 
-libnm-core/libnm_core_libnm_core_la-nm-setting-ethtool.lo: libnm-core/nm-setting-ethtool.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-ethtool.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ethtool.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-ethtool.lo `test -f 'libnm-core/nm-setting-ethtool.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ethtool.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ethtool.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ethtool.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ethtool.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-ethtool.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-setting-ethtool.lo `test -f 'libnm-core/nm-setting-ethtool.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ethtool.c
-
 libnm-core/libnm_core_libnm_core_la-nm-setting-generic.lo: libnm-core/nm-setting-generic.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-generic.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-generic.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-generic.lo `test -f 'libnm-core/nm-setting-generic.c' || echo '$(srcdir)/'`libnm-core/nm-setting-generic.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-generic.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-generic.Plo
@@ -11442,13 +11696,6 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-macvlan.lo: libnm-core/nm-setting
 @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-macvlan.lo `test -f 'libnm-core/nm-setting-macvlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-macvlan.c
 
-libnm-core/libnm_core_libnm_core_la-nm-setting-match.lo: libnm-core/nm-setting-match.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-match.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-match.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-match.lo `test -f 'libnm-core/nm-setting-match.c' || echo '$(srcdir)/'`libnm-core/nm-setting-match.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-match.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-match.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-match.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-match.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-setting-match.lo `test -f 'libnm-core/nm-setting-match.c' || echo '$(srcdir)/'`libnm-core/nm-setting-match.c
-
 libnm-core/libnm_core_libnm_core_la-nm-setting-olpc-mesh.lo: libnm-core/nm-setting-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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-olpc-mesh.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-olpc-mesh.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-olpc-mesh.lo `test -f 'libnm-core/nm-setting-olpc-mesh.c' || echo '$(srcdir)/'`libnm-core/nm-setting-olpc-mesh.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-olpc-mesh.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-olpc-mesh.Plo
@@ -11512,13 +11759,6 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-serial.lo: libnm-core/nm-setting-
 @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-serial.lo `test -f 'libnm-core/nm-setting-serial.c' || echo '$(srcdir)/'`libnm-core/nm-setting-serial.c
 
-libnm-core/libnm_core_libnm_core_la-nm-setting-sriov.lo: libnm-core/nm-setting-sriov.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-sriov.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-sriov.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-sriov.lo `test -f 'libnm-core/nm-setting-sriov.c' || echo '$(srcdir)/'`libnm-core/nm-setting-sriov.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-sriov.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-sriov.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-sriov.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-sriov.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-setting-sriov.lo `test -f 'libnm-core/nm-setting-sriov.c' || echo '$(srcdir)/'`libnm-core/nm-setting-sriov.c
-
 libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo: libnm-core/nm-setting-tc-config.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-tc-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo `test -f 'libnm-core/nm-setting-tc-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tc-config.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Plo
@@ -11603,13 +11843,6 @@ 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
 
-libnm-core/libnm_core_libnm_core_la-nm-setting-wpan.lo: libnm-core/nm-setting-wpan.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-wpan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-wpan.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-wpan.lo `test -f 'libnm-core/nm-setting-wpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-wpan.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-wpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-wpan.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-wpan.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-setting-wpan.lo `test -f 'libnm-core/nm-setting-wpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wpan.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
@@ -11638,20 +11871,6 @@ shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: shared/nm-utils/nm-ha
 @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-io-utils.lo: shared/nm-utils/nm-io-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-io-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-io-utils.lo `test -f 'shared/nm-utils/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-io-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-io-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-io-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-io-utils.lo `test -f 'shared/nm-utils/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-io-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-secret-utils.lo: shared/nm-utils/nm-secret-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-secret-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-secret-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-secret-utils.lo `test -f 'shared/nm-utils/nm-secret-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-secret-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-secret-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-secret-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-secret-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-secret-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-secret-utils.lo `test -f 'shared/nm-utils/nm-secret-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-secret-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
@@ -11673,13 +11892,6 @@ shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: shared/nm-utils/nm-ud
 @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-ethtool-utils.lo: shared/nm-ethtool-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/libnm_core_libnm_core_la-nm-ethtool-utils.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Tpo -c -o shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo `test -f 'shared/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-ethtool-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-ethtool-utils.c' object='shared/libnm_core_libnm_core_la-nm-ethtool-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/libnm_core_libnm_core_la-nm-ethtool-utils.lo `test -f 'shared/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-ethtool-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
@@ -11687,12 +11899,12 @@ shared/libnm_core_libnm_core_la-nm-meta-setting.lo: shared/nm-meta-setting.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_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-nm-crypto.lo: libnm-core/nm-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-nm-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-crypto.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-crypto.lo `test -f 'libnm-core/nm-crypto.c' || echo '$(srcdir)/'`libnm-core/nm-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-crypto.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-crypto.c' object='libnm-core/libnm_core_libnm_core_la-nm-crypto.lo' libtool=yes @AMDEPBACKSLASH@
+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-nm-crypto.lo `test -f 'libnm-core/nm-crypto.c' || echo '$(srcdir)/'`libnm-core/nm-crypto.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) $(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
@@ -11778,6 +11990,20 @@ libnm-core/libnm_core_libnm_core_la-nm-json.lo: libnm-core/nm-json.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_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-json.lo `test -f 'libnm-core/nm-json.c' || echo '$(srcdir)/'`libnm-core/nm-json.c
 
+libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo: libnm-core/crypto_gnutls.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_gnutls.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_gnutls.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo `test -f 'libnm-core/crypto_gnutls.c' || echo '$(srcdir)/'`libnm-core/crypto_gnutls.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_gnutls.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_gnutls.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/crypto_gnutls.c' object='libnm-core/libnm_core_libnm_core_la-crypto_gnutls.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_gnutls.lo `test -f 'libnm-core/crypto_gnutls.c' || echo '$(srcdir)/'`libnm-core/crypto_gnutls.c
+
+libnm-core/libnm_core_libnm_core_la-crypto_nss.lo: libnm-core/crypto_nss.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_nss.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_nss.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto_nss.lo `test -f 'libnm-core/crypto_nss.c' || echo '$(srcdir)/'`libnm-core/crypto_nss.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_nss.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_nss.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/crypto_nss.c' object='libnm-core/libnm_core_libnm_core_la-crypto_nss.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_nss.lo `test -f 'libnm-core/crypto_nss.c' || echo '$(srcdir)/'`libnm-core/crypto_nss.c
+
 libnm-core/libnm_core_libnm_core_la-nm-core-enum-types.lo: libnm-core/nm-core-enum-types.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-core-enum-types.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-core-enum-types.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-core-enum-types.lo `test -f 'libnm-core/nm-core-enum-types.c' || echo '$(srcdir)/'`libnm-core/nm-core-enum-types.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-core-enum-types.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-core-enum-types.Plo
@@ -11785,20 +12011,6 @@ libnm-core/libnm_core_libnm_core_la-nm-core-enum-types.lo: libnm-core/nm-core-en
 @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-core-enum-types.lo `test -f 'libnm-core/nm-core-enum-types.c' || echo '$(srcdir)/'`libnm-core/nm-core-enum-types.c
 
-libnm-core/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.lo: libnm-core/nm-crypto-gnutls.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_crypto_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.Tpo -c -o libnm-core/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.lo `test -f 'libnm-core/nm-crypto-gnutls.c' || echo '$(srcdir)/'`libnm-core/nm-crypto-gnutls.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-crypto-gnutls.c' object='libnm-core/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.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_crypto_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_crypto_gnutls_la-nm-crypto-gnutls.lo `test -f 'libnm-core/nm-crypto-gnutls.c' || echo '$(srcdir)/'`libnm-core/nm-crypto-gnutls.c
-
-libnm-core/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.lo: libnm-core/nm-crypto-nss.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_crypto_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.Tpo -c -o libnm-core/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.lo `test -f 'libnm-core/nm-crypto-nss.c' || echo '$(srcdir)/'`libnm-core/nm-crypto-nss.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-crypto-nss.c' object='libnm-core/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.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_crypto_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_crypto_nss_la-nm-crypto-nss.lo `test -f 'libnm-core/nm-crypto-nss.c' || echo '$(srcdir)/'`libnm-core/nm-crypto-nss.c
-
 libnm-glib/libnm_glib_libdeprecated_nm_glib_la-libnm_glib.lo: libnm-glib/libnm_glib.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libdeprecated_nm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_libdeprecated_nm_glib_la-libnm_glib.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_libdeprecated_nm_glib_la-libnm_glib.Tpo -c -o libnm-glib/libnm_glib_libdeprecated_nm_glib_la-libnm_glib.lo `test -f 'libnm-glib/libnm_glib.c' || echo '$(srcdir)/'`libnm-glib/libnm_glib.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_libdeprecated_nm_glib_la-libnm_glib.Tpo libnm-glib/$(DEPDIR)/libnm_glib_libdeprecated_nm_glib_la-libnm_glib.Plo
@@ -12380,13 +12592,6 @@ libnm/libnm_libnm_la-nm-dbus-helpers.lo: libnm/nm-dbus-helpers.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-dbus-helpers.lo `test -f 'libnm/nm-dbus-helpers.c' || echo '$(srcdir)/'`libnm/nm-dbus-helpers.c
 
-libnm/libnm_libnm_la-nm-device-6lowpan.lo: libnm/nm-device-6lowpan.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-device-6lowpan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-6lowpan.Tpo -c -o libnm/libnm_libnm_la-nm-device-6lowpan.lo `test -f 'libnm/nm-device-6lowpan.c' || echo '$(srcdir)/'`libnm/nm-device-6lowpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-6lowpan.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-6lowpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-6lowpan.c' object='libnm/libnm_libnm_la-nm-device-6lowpan.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-device-6lowpan.lo `test -f 'libnm/nm-device-6lowpan.c' || echo '$(srcdir)/'`libnm/nm-device-6lowpan.c
-
 libnm/libnm_libnm_la-nm-device-adsl.lo: libnm/nm-device-adsl.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-device-adsl.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-adsl.Tpo -c -o libnm/libnm_libnm_la-nm-device-adsl.lo `test -f 'libnm/nm-device-adsl.c' || echo '$(srcdir)/'`libnm/nm-device-adsl.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-adsl.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-adsl.Plo
@@ -12548,20 +12753,6 @@ libnm/libnm_libnm_la-nm-device-wimax.lo: libnm/nm-device-wimax.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-device-wimax.lo `test -f 'libnm/nm-device-wimax.c' || echo '$(srcdir)/'`libnm/nm-device-wimax.c
 
-libnm/libnm_libnm_la-nm-device-wireguard.lo: libnm/nm-device-wireguard.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-device-wireguard.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-wireguard.Tpo -c -o libnm/libnm_libnm_la-nm-device-wireguard.lo `test -f 'libnm/nm-device-wireguard.c' || echo '$(srcdir)/'`libnm/nm-device-wireguard.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-wireguard.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-wireguard.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wireguard.c' object='libnm/libnm_libnm_la-nm-device-wireguard.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-device-wireguard.lo `test -f 'libnm/nm-device-wireguard.c' || echo '$(srcdir)/'`libnm/nm-device-wireguard.c
-
-libnm/libnm_libnm_la-nm-device-wpan.lo: libnm/nm-device-wpan.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-device-wpan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-wpan.Tpo -c -o libnm/libnm_libnm_la-nm-device-wpan.lo `test -f 'libnm/nm-device-wpan.c' || echo '$(srcdir)/'`libnm/nm-device-wpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-wpan.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-wpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wpan.c' object='libnm/libnm_libnm_la-nm-device-wpan.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-device-wpan.lo `test -f 'libnm/nm-device-wpan.c' || echo '$(srcdir)/'`libnm/nm-device-wpan.c
-
 libnm/libnm_libnm_la-nm-device.lo: libnm/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) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-device.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device.Tpo -c -o libnm/libnm_libnm_la-nm-device.lo `test -f 'libnm/nm-device.c' || echo '$(srcdir)/'`libnm/nm-device.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device.Plo
@@ -12989,13 +13180,6 @@ src/devices/src_libNetworkManager_la-nm-device-generic.lo: src/devices/nm-device
 @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-device-generic.lo `test -f 'src/devices/nm-device-generic.c' || echo '$(srcdir)/'`src/devices/nm-device-generic.c
 
-src/devices/src_libNetworkManager_la-nm-device-6lowpan.lo: src/devices/nm-device-6lowpan.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-6lowpan.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-6lowpan.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-6lowpan.lo `test -f 'src/devices/nm-device-6lowpan.c' || echo '$(srcdir)/'`src/devices/nm-device-6lowpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-6lowpan.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-6lowpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-6lowpan.c' object='src/devices/src_libNetworkManager_la-nm-device-6lowpan.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-device-6lowpan.lo `test -f 'src/devices/nm-device-6lowpan.c' || echo '$(srcdir)/'`src/devices/nm-device-6lowpan.c
-
 src/devices/src_libNetworkManager_la-nm-device-bond.lo: src/devices/nm-device-bond.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-bond.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bond.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-bond.lo `test -f 'src/devices/nm-device-bond.c' || echo '$(srcdir)/'`src/devices/nm-device-bond.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bond.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bond.Plo
@@ -13087,20 +13271,6 @@ src/devices/src_libNetworkManager_la-nm-device-vxlan.lo: src/devices/nm-device-v
 @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-device-vxlan.lo `test -f 'src/devices/nm-device-vxlan.c' || echo '$(srcdir)/'`src/devices/nm-device-vxlan.c
 
-src/devices/src_libNetworkManager_la-nm-device-wireguard.lo: src/devices/nm-device-wireguard.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-wireguard.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-wireguard.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-wireguard.lo `test -f 'src/devices/nm-device-wireguard.c' || echo '$(srcdir)/'`src/devices/nm-device-wireguard.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-wireguard.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-wireguard.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-wireguard.c' object='src/devices/src_libNetworkManager_la-nm-device-wireguard.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-device-wireguard.lo `test -f 'src/devices/nm-device-wireguard.c' || echo '$(srcdir)/'`src/devices/nm-device-wireguard.c
-
-src/devices/src_libNetworkManager_la-nm-device-wpan.lo: src/devices/nm-device-wpan.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-wpan.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-wpan.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-wpan.lo `test -f 'src/devices/nm-device-wpan.c' || echo '$(srcdir)/'`src/devices/nm-device-wpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-wpan.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-wpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-wpan.c' object='src/devices/src_libNetworkManager_la-nm-device-wpan.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-device-wpan.lo `test -f 'src/devices/nm-device-wpan.c' || echo '$(srcdir)/'`src/devices/nm-device-wpan.c
-
 src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.lo: src/dhcp/nm-dhcp-dhcpcanon.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/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.lo -MD -MP -MF src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhcpcanon.Tpo -c -o src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.lo `test -f 'src/dhcp/nm-dhcp-dhcpcanon.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhcpcanon.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhcpcanon.Tpo src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhcpcanon.Plo
@@ -13535,26 +13705,19 @@ src/platform/src_libNetworkManagerBase_la-nm-linux-platform.lo: src/platform/nm-
 @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-linux-platform.lo `test -f 'src/platform/nm-linux-platform.c' || echo '$(srcdir)/'`src/platform/nm-linux-platform.c
 
-src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo: src/platform/wifi/nm-wifi-utils-nl80211.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/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo -MD -MP -MF src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.Tpo -c -o src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo `test -f 'src/platform/wifi/nm-wifi-utils-nl80211.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils-nl80211.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.Tpo src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wifi/nm-wifi-utils-nl80211.c' object='src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo' libtool=yes @AMDEPBACKSLASH@
+src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-nl80211.lo: src/platform/wifi/wifi-utils-nl80211.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/wifi/src_libNetworkManagerBase_la-wifi-utils-nl80211.lo -MD -MP -MF src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils-nl80211.Tpo -c -o src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-nl80211.lo `test -f 'src/platform/wifi/wifi-utils-nl80211.c' || echo '$(srcdir)/'`src/platform/wifi/wifi-utils-nl80211.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils-nl80211.Tpo src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils-nl80211.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wifi/wifi-utils-nl80211.c' object='src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-nl80211.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/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo `test -f 'src/platform/wifi/nm-wifi-utils-nl80211.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils-nl80211.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/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-nl80211.lo `test -f 'src/platform/wifi/wifi-utils-nl80211.c' || echo '$(srcdir)/'`src/platform/wifi/wifi-utils-nl80211.c
 
-src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils.lo: src/platform/wifi/nm-wifi-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/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils.lo -MD -MP -MF src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils.Tpo -c -o src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils.lo `test -f 'src/platform/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils.Tpo src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wifi/nm-wifi-utils.c' object='src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils.lo: src/platform/wifi/wifi-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/platform/wifi/src_libNetworkManagerBase_la-wifi-utils.lo -MD -MP -MF src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils.Tpo -c -o src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils.lo `test -f 'src/platform/wifi/wifi-utils.c' || echo '$(srcdir)/'`src/platform/wifi/wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils.Tpo src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wifi/wifi-utils.c' object='src/platform/wifi/src_libNetworkManagerBase_la-wifi-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/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils.lo `test -f 'src/platform/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils.c
-
-src/platform/wpan/src_libNetworkManagerBase_la-nm-wpan-utils.lo: src/platform/wpan/nm-wpan-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/platform/wpan/src_libNetworkManagerBase_la-nm-wpan-utils.lo -MD -MP -MF src/platform/wpan/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wpan-utils.Tpo -c -o src/platform/wpan/src_libNetworkManagerBase_la-nm-wpan-utils.lo `test -f 'src/platform/wpan/nm-wpan-utils.c' || echo '$(srcdir)/'`src/platform/wpan/nm-wpan-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wpan/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wpan-utils.Tpo src/platform/wpan/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wpan-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wpan/nm-wpan-utils.c' object='src/platform/wpan/src_libNetworkManagerBase_la-nm-wpan-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/platform/wpan/src_libNetworkManagerBase_la-nm-wpan-utils.lo `test -f 'src/platform/wpan/nm-wpan-utils.c' || echo '$(srcdir)/'`src/platform/wpan/nm-wpan-utils.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/platform/wifi/src_libNetworkManagerBase_la-wifi-utils.lo `test -f 'src/platform/wifi/wifi-utils.c' || echo '$(srcdir)/'`src/platform/wifi/wifi-utils.c
 
 src/ndisc/src_libNetworkManagerBase_la-nm-lndp-ndisc.lo: src/ndisc/nm-lndp-ndisc.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/ndisc/src_libNetworkManagerBase_la-nm-lndp-ndisc.lo -MD -MP -MF src/ndisc/$(DEPDIR)/src_libNetworkManagerBase_la-nm-lndp-ndisc.Tpo -c -o src/ndisc/src_libNetworkManagerBase_la-nm-lndp-ndisc.lo `test -f 'src/ndisc/nm-lndp-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-lndp-ndisc.c
@@ -13633,12 +13796,12 @@ src/src_libNetworkManagerBase_la-main-utils.lo: src/main-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) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-main-utils.lo `test -f 'src/main-utils.c' || echo '$(srcdir)/'`src/main-utils.c
 
-src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-wext.lo: src/platform/wifi/nm-wifi-utils-wext.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/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-wext.lo -MD -MP -MF src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils-wext.Tpo -c -o src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-wext.lo `test -f 'src/platform/wifi/nm-wifi-utils-wext.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils-wext.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils-wext.Tpo src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-nm-wifi-utils-wext.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wifi/nm-wifi-utils-wext.c' object='src/platform/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-wext.lo' libtool=yes @AMDEPBACKSLASH@
+src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo: src/platform/wifi/wifi-utils-wext.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/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo -MD -MP -MF src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils-wext.Tpo -c -o src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo `test -f 'src/platform/wifi/wifi-utils-wext.c' || echo '$(srcdir)/'`src/platform/wifi/wifi-utils-wext.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils-wext.Tpo src/platform/wifi/$(DEPDIR)/src_libNetworkManagerBase_la-wifi-utils-wext.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wifi/wifi-utils-wext.c' object='src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.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/wifi/src_libNetworkManagerBase_la-nm-wifi-utils-wext.lo `test -f 'src/platform/wifi/nm-wifi-utils-wext.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils-wext.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/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo `test -f 'src/platform/wifi/wifi-utils-wext.c' || echo '$(srcdir)/'`src/platform/wifi/wifi-utils-wext.c
 
 src/ndisc/src_libNetworkManagerTest_la-nm-fake-ndisc.lo: src/ndisc/nm-fake-ndisc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ndisc/src_libNetworkManagerTest_la-nm-fake-ndisc.lo -MD -MP -MF src/ndisc/$(DEPDIR)/src_libNetworkManagerTest_la-nm-fake-ndisc.Tpo -c -o src/ndisc/src_libNetworkManagerTest_la-nm-fake-ndisc.lo `test -f 'src/ndisc/nm-fake-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-fake-ndisc.c
@@ -13682,13 +13845,6 @@ src/systemd/src/basic/src_libsystemd_nm_la-alloc-util.lo: src/systemd/src/basic/
 @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_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/src_libsystemd_nm_la-alloc-util.lo `test -f 'src/systemd/src/basic/alloc-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/alloc-util.c
 
-src/systemd/src/basic/src_libsystemd_nm_la-env-util.lo: src/systemd/src/basic/env-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/src_libsystemd_nm_la-env-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-env-util.Tpo -c -o src/systemd/src/basic/src_libsystemd_nm_la-env-util.lo `test -f 'src/systemd/src/basic/env-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/env-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-env-util.Tpo src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-env-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/env-util.c' object='src/systemd/src/basic/src_libsystemd_nm_la-env-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) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/src_libsystemd_nm_la-env-util.lo `test -f 'src/systemd/src/basic/env-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/env-util.c
-
 src/systemd/src/basic/src_libsystemd_nm_la-escape.lo: src/systemd/src/basic/escape.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/src_libsystemd_nm_la-escape.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-escape.Tpo -c -o src/systemd/src/basic/src_libsystemd_nm_la-escape.lo `test -f 'src/systemd/src/basic/escape.c' || echo '$(srcdir)/'`src/systemd/src/basic/escape.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-escape.Tpo src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-escape.Plo
@@ -16085,7 +16241,6 @@ clean-libtool:
 	-rm -rf src/platform/.libs src/platform/_libs
 	-rm -rf src/platform/tests/.libs src/platform/tests/_libs
 	-rm -rf src/platform/wifi/.libs src/platform/wifi/_libs
-	-rm -rf src/platform/wpan/.libs src/platform/wpan/_libs
 	-rm -rf src/ppp/.libs src/ppp/_libs
 	-rm -rf src/settings/.libs src/settings/_libs
 	-rm -rf src/settings/plugins/ibft/.libs src/settings/plugins/ibft/_libs
@@ -17685,8 +17840,6 @@ distclean-generic:
 	-rm -f src/platform/tests/$(am__dirstamp)
 	-rm -f src/platform/wifi/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/platform/wifi/$(am__dirstamp)
-	-rm -f src/platform/wpan/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/platform/wpan/$(am__dirstamp)
 	-rm -f src/ppp/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/ppp/$(am__dirstamp)
 	-rm -f src/settings/$(DEPDIR)/$(am__dirstamp)
@@ -17747,7 +17900,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/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/platform/wpan/$(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 -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
@@ -17813,7 +17966,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/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/platform/wpan/$(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 -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
 
@@ -17941,39 +18094,6 @@ $(foreach vapi,$(VAPIGEN_VAPIS),$(eval $(call vapigen,$(vapi))))
 
 @NM_LOG_COMPILER@
 
-###############################################################################
-
-# with autotools, it is not easily possible to generate these defines
-# from configure.ac.
-#
-# See https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
-#
-# With meson-only, they could just be set via config.h.meson
-config-extra.h: Makefile
-	$(AM_V_GEN) \
-	echo "/* Generated by Makefile.am */"                    >$@ && \
-	echo "#define BINDIR            \"$(bindir)\""          >>$@ && \
-	echo "#define DATADIR           \"$(datadir)\""         >>$@ && \
-	echo "#define LIBEXECDIR        \"$(libexecdir)\""      >>$@ && \
-	echo "#define LOCALSTATEDIR     \"$(localstatedir)\""   >>$@ && \
-	echo "#define NMCONFDIR         \"$(nmconfdir)\""       >>$@ && \
-	echo "#define NMLIBDIR          \"$(nmlibdir)\""        >>$@ && \
-	echo "#define NMLOCALEDIR       \"$(nmlocaledir)\""     >>$@ && \
-	echo "#define NMPLUGINDIR       \"$(plugindir)\""       >>$@ && \
-	echo "#define NMRUNDIR          \"$(nmrundir)\""        >>$@ && \
-	echo "#define NMSTATEDIR        \"$(nmstatedir)\""      >>$@ && \
-	echo "#define NMVPNDIR          \"$(pkglibdir)\""       >>$@ && \
-	echo "#define NM_BUILD_BUILDDIR \"$(abs_builddir)\""    >>$@ && \
-	echo "#define NM_BUILD_SRCDIR   \"$(abs_srcdir)\""      >>$@ && \
-	echo "#define PPPD_PLUGIN_DIR   \"$(PPPD_PLUGIN_DIR)\"" >>$@ && \
-	echo "#define PREFIX            \"$(prefix)\""          >>$@ && \
-	echo "#define RUNDIR            \"$(rundir)\""          >>$@ && \
-	echo "#define RUNSTATEDIR       \"$(runstatedir)\""     >>$@ && \
-	echo "#define SYSCONFDIR        \"$(sysconfdir)\""      >>$@ && \
-	true
-
-libnm-core/.dirstamp: config-extra.h
-
 dist-configure-check:
 	@echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection --with-libnm-glib'. ***"
 	@false
@@ -18018,7 +18138,6 @@ $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS):          $(li
 $(src_devices_team_libnm_device_plugin_team_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
 $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
 $(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS):                      $(libnm_core_lib_h_pub_mkenums)
 
 libnm-core/nm-vpn-dbus-types.xml: libnm-core/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl
 	@$(MKDIR_P) libnm-core/
@@ -18057,7 +18176,7 @@ check-local-exports-libnm: libnm/libnm.la
 @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@	$(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 $@
@@ -18118,7 +18237,7 @@ $(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 ###############################################################################
 
 src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins)
-	$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-build "$(srcdir)"
+	$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-make "$(srcdir)"
 
 $(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
@@ -18153,7 +18272,7 @@ $(src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_p
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	@true
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS):           $(libnm_core_lib_h_pub_mkenums)
 
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -18172,7 +18291,6 @@ dist-hook-settings-ifcfg-rh-alias-files:
 	done
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so)