summary refs log tree commit diff
path: root/Makefile.in
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2020-04-11 21:28:04 +0200
committerMichael Biebl <biebl@debian.org>2020-04-11 21:28:04 +0200
commit1e5977b62f896e844b548c3007ace9e1dfa7f9ed (patch)
tree7a7416ed410e72b6200f3d860fd315ec11cc106b /Makefile.in
parentb012fa6e1d808e0736c009799c62d835cbfcc1dd (diff)
New upstream version 1.23.90 upstream/1.23.90
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in1190
1 files changed, 707 insertions, 483 deletions
diff --git a/Makefile.in b/Makefile.in
index fba5b556..07a0d4da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -246,7 +246,7 @@ TESTS = $(am__EXEEXT_11)
 ###############################################################################
 # src/devices/wifi
 ###############################################################################
-@WITH_WIFI_TRUE@am__append_41 = src/devices/wifi/libnm-device-plugin-wifi.la
+@WITH_WIFI_TRUE@am__append_41 = src/devices/wifi/libnm-wifi-base.la
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_42 = \
 @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 \
@@ -254,110 +254,105 @@ TESTS = $(am__EXEEXT_11)
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-iwd-manager.h \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	$(NULL)
 
-@WITH_WIFI_TRUE@am__append_43 = check-local-devices-wifi
-@WITH_WIFI_TRUE@am__append_44 = src/devices/wifi/tests/test-devices-wifi
+@WITH_WIFI_TRUE@am__append_43 = src/devices/wifi/libnm-device-plugin-wifi.la
+@WITH_WIFI_TRUE@am__append_44 = check-local-devices-wifi
+@WITH_WIFI_TRUE@am__append_45 = src/devices/wifi/tests/test-devices-wifi
 
 ###############################################################################
 # src/devices/team
 ###############################################################################
-@WITH_TEAMDCTL_TRUE@am__append_45 = src/devices/team/libnm-device-plugin-team.la
-@WITH_TEAMDCTL_TRUE@am__append_46 = check-local-devices-team
-@WITH_OPENVSWITCH_TRUE@am__append_47 = src/devices/ovs/libnm-device-plugin-ovs.la
-@HAVE_INTROSPECTION_TRUE@am__append_48 = $(clients_common_settings_doc_h)
-@HAVE_INTROSPECTION_TRUE@am__append_49 = check-local-settings-docs
-@HAVE_INTROSPECTION_TRUE@am__append_50 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_FALSE@am__append_51 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_TRUE@am__append_52 = clients/common/tests/test-clients-common
-@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_53 = clients/common/tests/test-clients-common
+@WITH_TEAMDCTL_TRUE@am__append_46 = src/devices/team/libnm-device-plugin-team.la
+@WITH_TEAMDCTL_TRUE@am__append_47 = check-local-devices-team
+@WITH_OPENVSWITCH_TRUE@am__append_48 = src/devices/ovs/libnm-device-plugin-ovs.la
+@HAVE_INTROSPECTION_TRUE@am__append_49 = $(clients_common_settings_doc_h)
+@HAVE_INTROSPECTION_TRUE@am__append_50 = check-local-settings-docs
+@HAVE_INTROSPECTION_TRUE@am__append_51 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_FALSE@am__append_52 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_TRUE@am__append_53 = clients/common/tests/test-clients-common
+@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_54 = clients/common/tests/test-clients-common
 
 ###############################################################################
 # clients/cli
 ###############################################################################
-@BUILD_NMCLI_TRUE@am__append_54 = clients/cli/nmcli
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_55 = $(POLKIT_CFLAGS)
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_56 = \
-@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_57 = $(POLKIT_LIBS)
-@BUILD_NMCLI_TRUE@am__append_58 = install-data-hook-nmcli
-@BUILD_NMCLI_TRUE@am__append_59 = uninstall-hook-nmcli
+@BUILD_NMCLI_TRUE@am__append_55 = clients/cli/nmcli
+@BUILD_NMCLI_TRUE@am__append_56 = install-data-hook-nmcli
+@BUILD_NMCLI_TRUE@am__append_57 = uninstall-hook-nmcli
 
 ###############################################################################
 # clients/tui
 ###############################################################################
-@BUILD_NMTUI_TRUE@am__append_60 = clients/tui/newt/libnmt-newt.a
-@BUILD_NMTUI_TRUE@am__append_61 = clients/tui/nmtui
-@BUILD_NMTUI_TRUE@am__append_62 = install-exec-hook-nmtui
-@BUILD_NMTUI_TRUE@am__append_63 = uninstall-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_58 = clients/tui/newt/libnmt-newt.a
+@BUILD_NMTUI_TRUE@am__append_59 = clients/tui/nmtui
+@BUILD_NMTUI_TRUE@am__append_60 = install-exec-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_61 = uninstall-hook-nmtui
 
 ###############################################################################
 # clients/nm-cloud-setup
 ###############################################################################
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_64 = clients/cloud-setup/nm-cloud-setup
-@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_65 = \
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_62 = clients/cloud-setup/nm-cloud-setup
+@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_63 = \
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	clients/cloud-setup/nm-cloud-setup.service \
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	clients/cloud-setup/nm-cloud-setup.timer \
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	$(NULL)
 
-@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_66 = install-data-hook-cloud-setup
-@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_67 = uninstall-hook-cloud-setup
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_68 = \
+@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_64 = install-data-hook-cloud-setup
+@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_65 = uninstall-hook-cloud-setup
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_66 = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/90-nm-cloud-setup.sh \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/meson.build \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm-cloud-setup.service.in \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm-cloud-setup.timer \
 @BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
 
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_69 = \
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_67 = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm-cloud-setup.service
 
 
 ###############################################################################
 # data
 ###############################################################################
-@HAVE_SYSTEMD_TRUE@am__append_70 = \
+@HAVE_SYSTEMD_TRUE@am__append_68 = \
 @HAVE_SYSTEMD_TRUE@	data/NetworkManager.service \
 @HAVE_SYSTEMD_TRUE@	data/NetworkManager-wait-online.service \
 @HAVE_SYSTEMD_TRUE@	data/NetworkManager-dispatcher.service \
 @HAVE_SYSTEMD_TRUE@	$(NULL)
 
-@HAVE_INTROSPECTION_TRUE@am__append_71 = $(man_nm_settings_xml)
-@WITH_OPENVSWITCH_TRUE@am__append_72 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_73 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_74 = man/nm-openvswitch.7
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_75 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_76 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_77 = man/nm-settings-ifcfg-rh.5
-@HAVE_DOCS_TRUE@am__append_78 = install-data-hook-man
-@HAVE_DOCS_TRUE@am__append_79 = uninstall-hook-man
-@HAVE_DOCS_TRUE@am__append_80 = $(man_pages) $(man_pages_autogen)
-@BUILD_DOCS_TRUE@am__append_81 = $(man_pages) $(man_pages_autogen)
+@HAVE_INTROSPECTION_TRUE@am__append_69 = $(man_nm_settings_xml)
+@WITH_OPENVSWITCH_TRUE@am__append_70 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_71 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_72 = man/nm-openvswitch.7
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_73 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_74 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_75 = man/nm-settings-ifcfg-rh.5
+@HAVE_DOCS_TRUE@am__append_76 = install-data-hook-man
+@HAVE_DOCS_TRUE@am__append_77 = uninstall-hook-man
+@HAVE_DOCS_TRUE@am__append_78 = $(man_pages) $(man_pages_autogen)
+@BUILD_DOCS_TRUE@am__append_79 = $(man_pages) $(man_pages_autogen)
 
 ###############################################################################
 # vapi
 ###############################################################################
-@ENABLE_VAPIGEN_TRUE@am__append_82 = \
+@ENABLE_VAPIGEN_TRUE@am__append_80 = \
 @ENABLE_VAPIGEN_TRUE@	vapi/libnm.vapi
 
-@ENABLE_VAPIGEN_TRUE@am__append_83 = \
+@ENABLE_VAPIGEN_TRUE@am__append_81 = \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS) \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS:.vapi=.deps)
 
-@ENABLE_VAPIGEN_TRUE@am__append_84 = $(VAPIGEN_VAPIS)
+@ENABLE_VAPIGEN_TRUE@am__append_82 = $(VAPIGEN_VAPIS)
 
 ###############################################################################
-@ENABLE_TESTS_TRUE@am__append_85 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_TRUE@am__append_86 = $(check_ltlibraries)
-@ENABLE_TESTS_FALSE@am__append_87 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_FALSE@am__append_88 = $(check_ltlibraries)
-@WITH_QT_TRUE@am__append_89 = \
+@ENABLE_TESTS_TRUE@am__append_83 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_TRUE@am__append_84 = $(check_ltlibraries)
+@ENABLE_TESTS_FALSE@am__append_85 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_FALSE@am__append_86 = $(check_ltlibraries)
+@WITH_QT_TRUE@am__append_87 = \
 @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_90 = \
+@WITH_QT_TRUE@am__append_88 = \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running.moc
 
 subdir = .
@@ -414,7 +409,7 @@ am__EXEEXT_3 = libnm/tests/test-nm-client$(EXEEXT) \
 @WITH_WIFI_TRUE@am__EXEEXT_8 = src/devices/wifi/tests/test-devices-wifi$(EXEEXT)
 @HAVE_INTROSPECTION_TRUE@am__EXEEXT_9 = clients/common/tests/test-clients-common$(EXEEXT)
 @BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_10 = clients/common/tests/test-clients-common$(EXEEXT)
-am__EXEEXT_11 = shared/nm-utils/tests/test-shared-general$(EXEEXT) \
+am__EXEEXT_11 = shared/nm-glib-aux/tests/test-shared-general$(EXEEXT) \
 	libnm-core/tests/test-compare$(EXEEXT) \
 	libnm-core/tests/test-crypto$(EXEEXT) \
 	libnm-core/tests/test-general$(EXEEXT) \
@@ -588,7 +583,8 @@ clients_common_libnmc_base_la_DEPENDENCIES = libnm/libnm.la \
 am_clients_common_libnmc_base_la_OBJECTS =  \
 	clients/common/libnmc_base_la-nm-secret-agent-simple.lo \
 	clients/common/libnmc_base_la-nm-vpn-helpers.lo \
-	clients/common/libnmc_base_la-nm-client-utils.lo
+	clients/common/libnmc_base_la-nm-client-utils.lo \
+	clients/common/libnmc_base_la-nm-polkit-listener.lo
 clients_common_libnmc_base_la_OBJECTS =  \
 	$(am_clients_common_libnmc_base_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -643,6 +639,7 @@ am__objects_1 = introspection/libnmdbus_la-org.freedesktop.NetworkManager.Access
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Tun.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Veth.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.lo \
@@ -697,8 +694,9 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	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 \
 	libnm-core/nm-setting-vlan.h libnm-core/nm-setting-vpn.h \
-	libnm-core/nm-setting-vxlan.h libnm-core/nm-setting-wifi-p2p.h \
-	libnm-core/nm-setting-wimax.h libnm-core/nm-setting-wired.h \
+	libnm-core/nm-setting-vrf.h libnm-core/nm-setting-vxlan.h \
+	libnm-core/nm-setting-wifi-p2p.h libnm-core/nm-setting-wimax.h \
+	libnm-core/nm-setting-wired.h \
 	libnm-core/nm-setting-wireguard.h \
 	libnm-core/nm-setting-wireless-security.h \
 	libnm-core/nm-setting-wireless.h libnm-core/nm-setting-wpan.h \
@@ -711,7 +709,6 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-core-internal.h \
 	libnm-core/nm-core-types-internal.h \
 	libnm-core/nm-crypto-impl.h libnm-core/nm-crypto.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-team-utils.h \
 	libnm-core/nm-utils-private.h libnm-core/nm-json.h \
@@ -742,15 +739,15 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \
 	libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \
 	libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \
-	libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wifi-p2p.c \
-	libnm-core/nm-setting-wimax.c libnm-core/nm-setting-wired.c \
+	libnm-core/nm-setting-vrf.c libnm-core/nm-setting-vxlan.c \
+	libnm-core/nm-setting-wifi-p2p.c libnm-core/nm-setting-wimax.c \
+	libnm-core/nm-setting-wired.c \
 	libnm-core/nm-setting-wireguard.c \
 	libnm-core/nm-setting-wireless-security.c \
 	libnm-core/nm-setting-wireless.c libnm-core/nm-setting-wpan.c \
 	shared/nm-meta-setting.c libnm-core/nm-connection.c \
 	libnm-core/nm-crypto.c libnm-core/nm-dbus-utils.c \
-	libnm-core/nm-errors.c libnm-core/nm-keyfile-utils.c \
-	libnm-core/nm-keyfile.c libnm-core/nm-property-compare.c \
+	libnm-core/nm-errors.c libnm-core/nm-property-compare.c \
 	libnm-core/nm-setting.c libnm-core/nm-simple-connection.c \
 	libnm-core/nm-team-utils.c libnm-core/nm-utils.c \
 	libnm-core/nm-vpn-editor-plugin.c \
@@ -797,6 +794,7 @@ am__objects_4 = libnm-core/libnm_core_la-nm-setting-6lowpan.lo \
 	libnm-core/libnm_core_la-nm-setting-user.lo \
 	libnm-core/libnm_core_la-nm-setting-vlan.lo \
 	libnm-core/libnm_core_la-nm-setting-vpn.lo \
+	libnm-core/libnm_core_la-nm-setting-vrf.lo \
 	libnm-core/libnm_core_la-nm-setting-vxlan.lo \
 	libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo \
 	libnm-core/libnm_core_la-nm-setting-wimax.lo \
@@ -812,8 +810,6 @@ am__objects_6 = $(am__objects_4) \
 	libnm-core/libnm_core_la-nm-crypto.lo \
 	libnm-core/libnm_core_la-nm-dbus-utils.lo \
 	libnm-core/libnm_core_la-nm-errors.lo \
-	libnm-core/libnm_core_la-nm-keyfile-utils.lo \
-	libnm-core/libnm_core_la-nm-keyfile.lo \
 	libnm-core/libnm_core_la-nm-property-compare.lo \
 	libnm-core/libnm_core_la-nm-setting.lo \
 	libnm-core/libnm_core_la-nm-simple-connection.lo \
@@ -903,6 +899,7 @@ am__objects_8 = libnm/liblibnm_la-nm-client.lo \
 	libnm/liblibnm_la-nm-device-team.lo \
 	libnm/liblibnm_la-nm-device-tun.lo \
 	libnm/liblibnm_la-nm-device-vlan.lo \
+	libnm/liblibnm_la-nm-device-vrf.lo \
 	libnm/liblibnm_la-nm-device-vxlan.lo \
 	libnm/liblibnm_la-nm-device-wifi-p2p.lo \
 	libnm/liblibnm_la-nm-device-wifi.lo \
@@ -1023,6 +1020,28 @@ shared_nm_glib_aux_libnm_glib_aux_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS) $(LDFLAGS) -o \
 	$@
+shared_nm_keyfile_libnm_keyfile_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1)
+am_shared_nm_keyfile_libnm_keyfile_la_OBJECTS =  \
+	shared/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo \
+	shared/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo
+shared_nm_keyfile_libnm_keyfile_la_OBJECTS =  \
+	$(am_shared_nm_keyfile_libnm_keyfile_la_OBJECTS)
+shared_nm_keyfile_libnm_keyfile_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(shared_nm_keyfile_libnm_keyfile_la_LDFLAGS) $(LDFLAGS) -o $@
+shared_nm_libnm_aux_libnm_libnm_aux_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1) libnm/libnm.la
+am_shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS =  \
+	shared/nm-libnm-aux/libnm_libnm_aux_la-nm-libnm-aux.lo
+shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS =  \
+	$(am_shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS)
+shared_nm_libnm_aux_libnm_libnm_aux_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(shared_nm_libnm_aux_libnm_libnm_aux_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
 shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
 am_shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS = shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo
@@ -1035,7 +1054,8 @@ shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LINK = $(LIBTOOL) \
 shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
 am_shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS = shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo \
-	shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo
+	shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo \
+	shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo
 shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS = $(am_shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS)
 shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LINK =  \
 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -1094,6 +1114,7 @@ am_shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
 	shared/systemd/src/basic/libnm_systemd_shared_la-prioq.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-stat-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-string-table.lo \
@@ -1104,7 +1125,8 @@ am_shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
 	shared/systemd/src/basic/libnm_systemd_shared_la-tmpfile-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-utf8.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-util.lo \
-	shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo
+	shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo \
+	shared/systemd/src/shared/libnm_systemd_shared_la-web-util.lo
 shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
 	$(am_shared_systemd_libnm_systemd_shared_la_OBJECTS)
 src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES =  \
@@ -1198,8 +1220,23 @@ src_devices_team_libnm_device_plugin_team_la_LINK = $(LIBTOOL) \
 @WITH_TEAMDCTL_TRUE@am_src_devices_team_libnm_device_plugin_team_la_rpath =  \
 @WITH_TEAMDCTL_TRUE@	-rpath $(plugindir)
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES =  \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm-wifi-base.la \
 @WITH_WIFI_TRUE@	$(am__DEPENDENCIES_1)
 am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
+	src/devices/wifi/nm-wifi-factory.c
+@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo
+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) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath =  \
+@WITH_WIFI_TRUE@	-rpath $(plugindir)
+@WITH_WIFI_TRUE@src_devices_wifi_libnm_wifi_base_la_DEPENDENCIES =  \
+@WITH_WIFI_TRUE@	$(am__DEPENDENCIES_1)
+am__src_devices_wifi_libnm_wifi_base_la_SOURCES_DIST =  \
 	src/devices/wifi/nm-device-olpc-mesh.c \
 	src/devices/wifi/nm-device-olpc-mesh.h \
 	src/devices/wifi/nm-device-wifi-p2p.c \
@@ -1209,7 +1246,6 @@ am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
 	src/devices/wifi/nm-wifi-ap.c src/devices/wifi/nm-wifi-ap.h \
 	src/devices/wifi/nm-wifi-common.c \
 	src/devices/wifi/nm-wifi-common.h \
-	src/devices/wifi/nm-wifi-factory.c \
 	src/devices/wifi/nm-wifi-p2p-peer.c \
 	src/devices/wifi/nm-wifi-p2p-peer.h \
 	src/devices/wifi/nm-wifi-utils.c \
@@ -1218,26 +1254,19 @@ 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_13 = src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo \
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	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/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__objects_13 = src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo
+@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_wifi_base_la_OBJECTS = src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo \
 @WITH_WIFI_TRUE@	$(am__objects_13)
-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) \
-	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath =  \
-@WITH_WIFI_TRUE@	-rpath $(plugindir)
+src_devices_wifi_libnm_wifi_base_la_OBJECTS =  \
+	$(am_src_devices_wifi_libnm_wifi_base_la_OBJECTS)
+@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_wifi_base_la_rpath =
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_DEPENDENCIES =  \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1)
@@ -1293,7 +1322,8 @@ src_initrd_libnmi_core_la_OBJECTS =  \
 	$(am_src_initrd_libnmi_core_la_OBJECTS)
 src_libNetworkManager_la_DEPENDENCIES = src/libNetworkManagerBase.la \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/libnm-core.la $(libnm_crypto_lib) \
+	shared/nm-keyfile/libnm-keyfile.la libnm-core/libnm-core.la \
+	$(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	shared/nm-udev-aux/libnm-udev-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
@@ -1327,6 +1357,7 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/devices/libNetworkManager_la-nm-device-tun.lo \
 	src/devices/libNetworkManager_la-nm-device-veth.lo \
 	src/devices/libNetworkManager_la-nm-device-vlan.lo \
+	src/devices/libNetworkManager_la-nm-device-vrf.lo \
 	src/devices/libNetworkManager_la-nm-device-vxlan.lo \
 	src/devices/libNetworkManager_la-nm-device-wireguard.lo \
 	src/devices/libNetworkManager_la-nm-device-wpan.lo \
@@ -1371,13 +1402,11 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/libNetworkManager_la-nm-connectivity.lo \
 	src/libNetworkManager_la-nm-dcb.lo \
 	src/libNetworkManager_la-nm-netns.lo \
-	src/libNetworkManager_la-nm-dhcp4-config.lo \
-	src/libNetworkManager_la-nm-dhcp6-config.lo \
+	src/libNetworkManager_la-nm-dhcp-config.lo \
 	src/libNetworkManager_la-nm-dispatcher.lo \
 	src/libNetworkManager_la-nm-firewall-manager.lo \
 	src/libNetworkManager_la-nm-proxy-config.lo \
 	src/libNetworkManager_la-nm-auth-manager.lo \
-	src/libNetworkManager_la-nm-auth-subject.lo \
 	src/libNetworkManager_la-nm-auth-utils.lo \
 	src/libNetworkManager_la-nm-manager.lo \
 	src/libNetworkManager_la-nm-pacrunner-manager.lo \
@@ -1588,15 +1617,12 @@ src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS = $(am_src_setting
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_settings_plugins_ifupdown_libnms_ifupdown_core_la_rpath =
 am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \
 	clients/cli/common.h clients/cli/utils.c clients/cli/utils.h \
-	clients/cli/agent.c clients/cli/agent.h clients/cli/general.c \
-	clients/cli/general.h clients/cli/connections.c \
-	clients/cli/connections.h clients/cli/devices.c \
-	clients/cli/devices.h clients/cli/settings.c \
-	clients/cli/settings.h clients/cli/nmcli.c clients/cli/nmcli.h \
-	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_16 = clients/common/cli_nmcli-nm-polkit-listener.$(OBJEXT)
+	clients/cli/agent.c clients/cli/general.c \
+	clients/cli/connections.c clients/cli/connections.h \
+	clients/cli/devices.c clients/cli/devices.h \
+	clients/cli/settings.c clients/cli/settings.h \
+	clients/cli/nmcli.c clients/cli/nmcli.h \
+	clients/cli/polkit-agent.c clients/cli/polkit-agent.h
 @BUILD_NMCLI_TRUE@am_clients_cli_nmcli_OBJECTS =  \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-common.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-utils.$(OBJEXT) \
@@ -1606,10 +1632,8 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-devices.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-settings.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-nmcli.$(OBJEXT) \
-@BUILD_NMCLI_TRUE@	clients/cli/nmcli-polkit-agent.$(OBJEXT) \
-@BUILD_NMCLI_TRUE@	$(am__objects_16)
+@BUILD_NMCLI_TRUE@	clients/cli/nmcli-polkit-agent.$(OBJEXT)
 clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS)
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES =  \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc.la \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
@@ -1617,9 +1641,10 @@ clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS)
 @BUILD_NMCLI_TRUE@	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 @BUILD_NMCLI_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
 @BUILD_NMCLI_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
-@BUILD_NMCLI_TRUE@	shared/libcsiphash.la libnm/libnm.la \
-@BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_3)
+@BUILD_NMCLI_TRUE@	shared/libcsiphash.la \
+@BUILD_NMCLI_TRUE@	shared/nm-libnm-aux/libnm-libnm-aux.la \
+@BUILD_NMCLI_TRUE@	libnm/libnm.la $(am__DEPENDENCIES_1) \
+@BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_1)
 clients_cli_nmcli_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(clients_cli_nmcli_LDFLAGS) $(LDFLAGS) \
@@ -1641,7 +1666,8 @@ am__clients_cloud_setup_nm_cloud_setup_SOURCES_DIST =  \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.$(OBJEXT)
 clients_cloud_setup_nm_cloud_setup_OBJECTS =  \
 	$(am_clients_cloud_setup_nm_cloud_setup_OBJECTS)
-@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_nm_cloud_setup_DEPENDENCIES = shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_nm_cloud_setup_DEPENDENCIES = shared/nm-libnm-aux/libnm-libnm-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
@@ -1683,7 +1709,9 @@ clients_common_tests_test_libnm_core_aux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	-o $@
 clients_nm_online_SOURCES = clients/nm-online.c
 clients_nm_online_OBJECTS = clients/nm_online-nm-online.$(OBJEXT)
-clients_nm_online_DEPENDENCIES = libnm/libnm.la $(am__DEPENDENCIES_1)
+clients_nm_online_DEPENDENCIES =  \
+	shared/nm-libnm-aux/libnm-libnm-aux.la libnm/libnm.la \
+	$(am__DEPENDENCIES_1)
 clients_nm_online_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(clients_nm_online_LDFLAGS) $(LDFLAGS) \
@@ -1783,6 +1811,7 @@ clients_tui_nmtui_OBJECTS = $(am_clients_tui_nmtui_OBJECTS)
 @BUILD_NMTUI_TRUE@	clients/tui/newt/libnmt-newt.a \
 @BUILD_NMTUI_TRUE@	clients/common/libnmc.la \
 @BUILD_NMTUI_TRUE@	clients/common/libnmc-base.la \
+@BUILD_NMTUI_TRUE@	shared/nm-libnm-aux/libnm-libnm-aux.la \
 @BUILD_NMTUI_TRUE@	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NMTUI_TRUE@	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 @BUILD_NMTUI_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
@@ -1799,15 +1828,17 @@ dispatcher_nm_dispatcher_OBJECTS =  \
 	$(am_dispatcher_nm_dispatcher_OBJECTS)
 dispatcher_nm_dispatcher_DEPENDENCIES =  \
 	dispatcher/libnm-dispatcher-core.la libnm/libnm.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
 	$(am__DEPENDENCIES_1)
 dispatcher_nm_dispatcher_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(dispatcher_nm_dispatcher_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_dispatcher_tests_test_dispatcher_envp_OBJECTS = dispatcher/tests/test_dispatcher_envp-test-dispatcher-envp.$(OBJEXT)
-am__objects_17 = dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.$(OBJEXT)
+am__objects_16 = dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.$(OBJEXT)
 nodist_dispatcher_tests_test_dispatcher_envp_OBJECTS =  \
-	$(am__objects_17)
+	$(am__objects_16)
 dispatcher_tests_test_dispatcher_envp_OBJECTS =  \
 	$(am_dispatcher_tests_test_dispatcher_envp_OBJECTS) \
 	$(nodist_dispatcher_tests_test_dispatcher_envp_OBJECTS)
@@ -1894,15 +1925,16 @@ libnm_core_tests_test_compare_SOURCES =  \
 	libnm-core/tests/test-compare.c
 libnm_core_tests_test_compare_OBJECTS =  \
 	libnm-core/tests/test_compare-test-compare.$(OBJEXT)
-am__DEPENDENCIES_4 = shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/libnm-core.la $(libnm_crypto_lib) \
+am__DEPENDENCIES_3 = shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-keyfile/libnm-keyfile.la libnm-core/libnm-core.la \
+	$(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
 	$(am__DEPENDENCIES_1)
-libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_4)
+libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_3)
 libnm_core_tests_test_compare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -1910,7 +1942,7 @@ libnm_core_tests_test_compare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 libnm_core_tests_test_crypto_SOURCES = libnm-core/tests/test-crypto.c
 libnm_core_tests_test_crypto_OBJECTS =  \
 	libnm-core/tests/test_crypto-test-crypto.$(OBJEXT)
-libnm_core_tests_test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_4)
+libnm_core_tests_test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_3)
 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) \
@@ -1921,7 +1953,7 @@ nodist_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/test_general-nm-
 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_4)
+libnm_core_tests_test_general_DEPENDENCIES = $(am__DEPENDENCIES_3)
 libnm_core_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -1930,7 +1962,7 @@ libnm_core_tests_test_keyfile_SOURCES =  \
 	libnm-core/tests/test-keyfile.c
 libnm_core_tests_test_keyfile_OBJECTS =  \
 	libnm-core/tests/test_keyfile-test-keyfile.$(OBJEXT)
-libnm_core_tests_test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_4)
+libnm_core_tests_test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_3)
 libnm_core_tests_test_keyfile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -1939,7 +1971,7 @@ libnm_core_tests_test_secrets_SOURCES =  \
 	libnm-core/tests/test-secrets.c
 libnm_core_tests_test_secrets_OBJECTS =  \
 	libnm-core/tests/test_secrets-test-secrets.$(OBJEXT)
-libnm_core_tests_test_secrets_DEPENDENCIES = $(am__DEPENDENCIES_4)
+libnm_core_tests_test_secrets_DEPENDENCIES = $(am__DEPENDENCIES_3)
 libnm_core_tests_test_secrets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -1948,7 +1980,7 @@ libnm_core_tests_test_setting_SOURCES =  \
 	libnm-core/tests/test-setting.c
 libnm_core_tests_test_setting_OBJECTS =  \
 	libnm-core/tests/test_setting-test-setting.$(OBJEXT)
-libnm_core_tests_test_setting_DEPENDENCIES = $(am__DEPENDENCIES_4)
+libnm_core_tests_test_setting_DEPENDENCIES = $(am__DEPENDENCIES_3)
 libnm_core_tests_test_setting_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -1957,7 +1989,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/test_settings_defaults-test-settings-defaults.$(OBJEXT)
 libnm_core_tests_test_settings_defaults_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_4)
+	$(am__DEPENDENCIES_3)
 libnm_core_tests_test_settings_defaults_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -1967,8 +1999,8 @@ am_libnm_tests_test_libnm_OBJECTS =  \
 	shared/nm-utils/libnm_tests_test_libnm-nm-compat.$(OBJEXT) \
 	libnm/tests/test_libnm-test-libnm.$(OBJEXT)
 libnm_tests_test_libnm_OBJECTS = $(am_libnm_tests_test_libnm_OBJECTS)
-am__DEPENDENCIES_5 = libnm/liblibnm.la $(am__DEPENDENCIES_1)
-libnm_tests_test_libnm_DEPENDENCIES = $(am__DEPENDENCIES_5)
+am__DEPENDENCIES_4 = libnm/liblibnm.la $(am__DEPENDENCIES_1)
+libnm_tests_test_libnm_DEPENDENCIES = $(am__DEPENDENCIES_4)
 libnm_tests_test_libnm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libnm_tests_test_libnm_LDFLAGS) \
@@ -1977,7 +2009,7 @@ am_libnm_tests_test_nm_client_OBJECTS = shared/libnm_tests_test_nm_client-nm-tes
 	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_5)
+libnm_tests_test_nm_client_DEPENDENCIES = $(am__DEPENDENCIES_4)
 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) \
@@ -1987,7 +2019,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_5)
+	$(am__DEPENDENCIES_4)
 libnm_tests_test_remote_settings_client_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -1997,23 +2029,23 @@ am_libnm_tests_test_secret_agent_OBJECTS = shared/libnm_tests_test_secret_agent-
 	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_5)
+libnm_tests_test_secret_agent_DEPENDENCIES = $(am__DEPENDENCIES_4)
 libnm_tests_test_secret_agent_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
 	$(libnm_tests_test_secret_agent_LDFLAGS) $(LDFLAGS) -o $@
-shared_nm_utils_tests_test_shared_general_SOURCES =  \
-	shared/nm-utils/tests/test-shared-general.c
-shared_nm_utils_tests_test_shared_general_OBJECTS = shared/nm-utils/tests/test_shared_general-test-shared-general.$(OBJEXT)
-shared_nm_utils_tests_test_shared_general_DEPENDENCIES =  \
+shared_nm_glib_aux_tests_test_shared_general_SOURCES =  \
+	shared/nm-glib-aux/tests/test-shared-general.c
+shared_nm_glib_aux_tests_test_shared_general_OBJECTS = shared/nm-glib-aux/tests/test_shared_general-test-shared-general.$(OBJEXT)
+shared_nm_glib_aux_tests_test_shared_general_DEPENDENCIES =  \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
 	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
 	$(am__DEPENDENCIES_1)
-shared_nm_utils_tests_test_shared_general_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(shared_nm_utils_tests_test_shared_general_LDFLAGS) \
+shared_nm_glib_aux_tests_test_shared_general_LINK = $(LIBTOOL) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(shared_nm_glib_aux_tests_test_shared_general_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_src_NetworkManager_OBJECTS = src/NetworkManager-main.$(OBJEXT)
 src_NetworkManager_OBJECTS = $(am_src_NetworkManager_OBJECTS)
@@ -2049,17 +2081,14 @@ src_devices_tests_test_lldp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_CFLAGS) $(CFLAGS) $(src_devices_tests_test_lldp_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am__src_devices_wifi_tests_test_devices_wifi_SOURCES_DIST =  \
-	src/devices/wifi/tests/test-devices-wifi.c \
-	src/devices/wifi/nm-wifi-ap.c src/devices/wifi/nm-wifi-ap.h \
-	src/devices/wifi/nm-wifi-utils.c \
-	src/devices/wifi/nm-wifi-utils.h
-@WITH_WIFI_TRUE@am_src_devices_wifi_tests_test_devices_wifi_OBJECTS = src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.$(OBJEXT) \
-@WITH_WIFI_TRUE@	src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.$(OBJEXT) \
-@WITH_WIFI_TRUE@	src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.$(OBJEXT)
+	src/devices/wifi/tests/test-devices-wifi.c
+@WITH_WIFI_TRUE@am_src_devices_wifi_tests_test_devices_wifi_OBJECTS = src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.$(OBJEXT)
 src_devices_wifi_tests_test_devices_wifi_OBJECTS =  \
 	$(am_src_devices_wifi_tests_test_devices_wifi_OBJECTS)
 @WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_DEPENDENCIES =  \
-@WITH_WIFI_TRUE@	src/libNetworkManagerTest.la
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm-wifi-base.la \
+@WITH_WIFI_TRUE@	src/libNetworkManagerTest.la \
+@WITH_WIFI_TRUE@	src/libNetworkManagerBase.la
 src_devices_wifi_tests_test_devices_wifi_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2125,7 +2154,8 @@ src_initrd_nm_initrd_generator_OBJECTS =  \
 src_initrd_nm_initrd_generator_DEPENDENCIES =  \
 	src/initrd/libnmi-core.la src/libNetworkManagerBase.la \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/libnm-core.la $(libnm_crypto_lib) \
+	shared/nm-keyfile/libnm-keyfile.la libnm-core/libnm-core.la \
+	$(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	shared/nm-udev-aux/libnm-udev-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
@@ -2181,9 +2211,9 @@ src_ndisc_tests_test_ndisc_fake_SOURCES =  \
 	src/ndisc/tests/test-ndisc-fake.c
 src_ndisc_tests_test_ndisc_fake_OBJECTS =  \
 	src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.$(OBJEXT)
-am__DEPENDENCIES_6 = src/libNetworkManagerTest.la \
+am__DEPENDENCIES_5 = src/libNetworkManagerTest.la \
 	$(am__DEPENDENCIES_1)
-src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_6)
+src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_5)
 src_ndisc_tests_test_ndisc_fake_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -2192,7 +2222,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/test_ndisc_linux-test-ndisc-linux.$(OBJEXT)
-src_ndisc_tests_test_ndisc_linux_DEPENDENCIES = $(am__DEPENDENCIES_6)
+src_ndisc_tests_test_ndisc_linux_DEPENDENCIES = $(am__DEPENDENCIES_5)
 src_ndisc_tests_test_ndisc_linux_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -2202,7 +2232,8 @@ am_src_nm_iface_helper_OBJECTS =  \
 src_nm_iface_helper_OBJECTS = $(am_src_nm_iface_helper_OBJECTS)
 src_nm_iface_helper_DEPENDENCIES = src/libNetworkManagerBase.la \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/libnm-core.la $(libnm_crypto_lib) \
+	shared/nm-keyfile/libnm-keyfile.la libnm-core/libnm-core.la \
+	$(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	shared/nm-udev-aux/libnm-udev-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
@@ -2218,9 +2249,9 @@ src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 src_platform_tests_monitor_SOURCES = src/platform/tests/monitor.c
 src_platform_tests_monitor_OBJECTS =  \
 	src/platform/tests/monitor-monitor.$(OBJEXT)
-am__DEPENDENCIES_7 = src/libNetworkManagerTest.la \
+am__DEPENDENCIES_6 = src/libNetworkManagerTest.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_7)
+src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_6)
 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) \
@@ -2230,7 +2261,7 @@ am_src_platform_tests_test_address_fake_OBJECTS =  \
 src_platform_tests_test_address_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_address_fake_OBJECTS)
 src_platform_tests_test_address_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_7)
+	$(am__DEPENDENCIES_6)
 src_platform_tests_test_address_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2241,7 +2272,7 @@ am_src_platform_tests_test_address_linux_OBJECTS =  \
 src_platform_tests_test_address_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_address_linux_OBJECTS)
 src_platform_tests_test_address_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_7)
+	$(am__DEPENDENCIES_6)
 src_platform_tests_test_address_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2252,7 +2283,7 @@ am_src_platform_tests_test_cleanup_fake_OBJECTS =  \
 src_platform_tests_test_cleanup_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_cleanup_fake_OBJECTS)
 src_platform_tests_test_cleanup_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_7)
+	$(am__DEPENDENCIES_6)
 src_platform_tests_test_cleanup_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2263,7 +2294,7 @@ am_src_platform_tests_test_cleanup_linux_OBJECTS =  \
 src_platform_tests_test_cleanup_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_cleanup_linux_OBJECTS)
 src_platform_tests_test_cleanup_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_7)
+	$(am__DEPENDENCIES_6)
 src_platform_tests_test_cleanup_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2274,7 +2305,7 @@ am_src_platform_tests_test_link_fake_OBJECTS =  \
 src_platform_tests_test_link_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_link_fake_OBJECTS)
 src_platform_tests_test_link_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_7)
+	$(am__DEPENDENCIES_6)
 src_platform_tests_test_link_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2284,7 +2315,7 @@ am_src_platform_tests_test_link_linux_OBJECTS =  \
 src_platform_tests_test_link_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_link_linux_OBJECTS)
 src_platform_tests_test_link_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_7)
+	$(am__DEPENDENCIES_6)
 src_platform_tests_test_link_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2314,7 +2345,7 @@ am_src_platform_tests_test_route_fake_OBJECTS =  \
 src_platform_tests_test_route_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_route_fake_OBJECTS)
 src_platform_tests_test_route_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_7)
+	$(am__DEPENDENCIES_6)
 src_platform_tests_test_route_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2324,7 +2355,7 @@ am_src_platform_tests_test_route_linux_OBJECTS =  \
 src_platform_tests_test_route_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_route_linux_OBJECTS)
 src_platform_tests_test_route_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_7)
+	$(am__DEPENDENCIES_6)
 src_platform_tests_test_route_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2480,8 +2511,8 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Po \
 	clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Po \
 	clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Po \
-	clients/common/$(DEPDIR)/cli_nmcli-nm-polkit-listener.Po \
 	clients/common/$(DEPDIR)/libnmc_base_la-nm-client-utils.Plo \
+	clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Plo \
 	clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Plo \
 	clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo \
 	clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo \
@@ -2593,6 +2624,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Tun.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Veth.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.Plo \
+	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Plo \
@@ -2617,8 +2649,6 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-json.Plo \
-	libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo \
-	libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Plo \
@@ -2660,6 +2690,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo \
+	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Plo \
@@ -2710,6 +2741,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm/$(DEPDIR)/liblibnm_la-nm-device-team.Plo \
 	libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Plo \
 	libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-vrf.Plo \
 	libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo \
 	libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo \
 	libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo \
@@ -2774,14 +2806,18 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo \
+	shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po \
+	shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Plo \
+	shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Plo \
+	shared/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Plo \
 	shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo \
+	shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Plo \
 	shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo \
 	shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo \
 	shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo \
 	shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo \
 	shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo \
 	shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Po \
-	shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po \
 	shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo \
 	shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Plo \
@@ -2807,6 +2843,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo \
@@ -2818,6 +2855,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo \
 	shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo \
+	shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Plo \
 	src/$(DEPDIR)/NetworkManager-main.Po \
 	src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo \
 	src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo \
@@ -2831,7 +2869,6 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-auth-subject.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo \
@@ -2840,8 +2877,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-dhcp4-config.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-dhcp6-config.Plo \
+	src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo \
@@ -2872,6 +2908,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo \
 	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo \
 	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo \
+	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo \
 	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo \
 	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo \
 	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo \
@@ -2893,18 +2930,16 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo \
 	src/devices/tests/$(DEPDIR)/test_acd-test-acd.Po \
 	src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po \
-	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Plo \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo \
-	src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po \
-	src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po \
+	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo \
+	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo \
+	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo \
+	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo \
+	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo \
+	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo \
+	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo \
+	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo \
+	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo \
 	src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po \
 	src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo \
 	src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo \
@@ -3096,6 +3131,8 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \
 	$(shared_libndhcp4_la_SOURCES) \
 	$(shared_nm_glib_aux_libnm_glib_aux_la_SOURCES) \
+	$(shared_nm_keyfile_libnm_keyfile_la_SOURCES) \
+	$(shared_nm_libnm_aux_libnm_libnm_aux_la_SOURCES) \
 	$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES) \
 	$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES) \
 	$(shared_nm_std_aux_libnm_std_aux_la_SOURCES) \
@@ -3108,6 +3145,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES) \
 	$(src_devices_team_libnm_device_plugin_team_la_SOURCES) \
 	$(src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES) \
+	$(src_devices_wifi_libnm_wifi_base_la_SOURCES) \
 	$(src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES) \
 	$(src_devices_wwan_libnm_wwan_la_SOURCES) \
 	$(src_initrd_libnmi_core_la_SOURCES) \
@@ -3153,7 +3191,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(libnm_tests_test_nm_client_SOURCES) \
 	$(libnm_tests_test_remote_settings_client_SOURCES) \
 	$(libnm_tests_test_secret_agent_SOURCES) \
-	shared/nm-utils/tests/test-shared-general.c \
+	shared/nm-glib-aux/tests/test-shared-general.c \
 	$(src_NetworkManager_SOURCES) \
 	src/devices/bluetooth/tests/nm-bt-test.c \
 	src/devices/tests/test-acd.c src/devices/tests/test-lldp.c \
@@ -3203,6 +3241,8 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(am__shared_libnacd_la_SOURCES_DIST) \
 	$(shared_libndhcp4_la_SOURCES) \
 	$(shared_nm_glib_aux_libnm_glib_aux_la_SOURCES) \
+	$(shared_nm_keyfile_libnm_keyfile_la_SOURCES) \
+	$(shared_nm_libnm_aux_libnm_libnm_aux_la_SOURCES) \
 	$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES) \
 	$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES) \
 	$(shared_nm_std_aux_libnm_std_aux_la_SOURCES) \
@@ -3215,6 +3255,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST) \
 	$(am__src_devices_team_libnm_device_plugin_team_la_SOURCES_DIST) \
 	$(am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST) \
+	$(am__src_devices_wifi_libnm_wifi_base_la_SOURCES_DIST) \
 	$(am__src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST) \
 	$(am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST) \
 	$(src_initrd_libnmi_core_la_SOURCES) \
@@ -3257,7 +3298,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(libnm_tests_test_nm_client_SOURCES) \
 	$(libnm_tests_test_remote_settings_client_SOURCES) \
 	$(libnm_tests_test_secret_agent_SOURCES) \
-	shared/nm-utils/tests/test-shared-general.c \
+	shared/nm-glib-aux/tests/test-shared-general.c \
 	$(src_NetworkManager_SOURCES) \
 	src/devices/bluetooth/tests/nm-bt-test.c \
 	src/devices/tests/test-acd.c src/devices/tests/test-lldp.c \
@@ -3908,6 +3949,10 @@ AUTOMAKE_OPTIONS = subdir-objects
 ###############################################################################
 
 ###############################################################################
+
+###############################################################################
+
+###############################################################################
 noinst_LTLIBRARIES = shared/libcsiphash.la shared/libcrbtree.la \
 	shared/libnacd.la shared/libndhcp4.la \
 	shared/nm-std-aux/libnm-std-aux.la \
@@ -3915,6 +3960,8 @@ noinst_LTLIBRARIES = shared/libcsiphash.la shared/libcrbtree.la \
 	shared/nm-udev-aux/libnm-udev-aux.la \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-keyfile/libnm-keyfile.la \
+	shared/nm-libnm-aux/libnm-libnm-aux.la \
 	introspection/libnmdbus.la libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) libnm/liblibnm.la \
 	src/libNetworkManagerBase.la src/libNetworkManager.la \
@@ -3922,10 +3969,10 @@ noinst_LTLIBRARIES = shared/libcsiphash.la shared/libcrbtree.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
 	shared/systemd/libnm-systemd-shared.la \
 	src/initrd/libnmi-core.la $(am__append_21) $(am__append_29) \
-	$(am__append_36) dispatcher/libnm-dispatcher-core.la \
-	$(am__append_86)
-check_LTLIBRARIES = $(am__append_88)
-noinst_LIBRARIES = $(am__append_60)
+	$(am__append_36) $(am__append_41) \
+	dispatcher/libnm-dispatcher-core.la $(am__append_84)
+check_LTLIBRARIES = $(am__append_86)
+noinst_LIBRARIES = $(am__append_58)
 noinst_DATA = $(am__append_12)
 dist_libexec_SCRIPTS = $(am__append_25)
 
@@ -3938,27 +3985,27 @@ plugin_LTLIBRARIES = $(core_plugins)
 ###############################################################################
 core_plugins = $(am__append_18) $(am__append_20) $(am__append_28) \
 	src/devices/adsl/libnm-device-plugin-adsl.la $(am__append_32) \
-	$(am__append_41) $(am__append_45) $(am__append_47)
+	$(am__append_43) $(am__append_46) $(am__append_48)
 service_DATA = 
-man_MANS = $(am__append_80)
+man_MANS = $(am__append_78)
 examples_DATA = data/server.conf
 CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \
 	src/NetworkManager.ver $(am__append_22) \
 	$(dispatcher_nmdbus_dispatcher_sources) \
 	dispatcher/org.freedesktop.nm_dispatcher.service \
-	$(am__append_69) clients/tests/test-client.log \
+	$(am__append_67) clients/tests/test-client.log \
 	data/NetworkManager-dispatcher.service \
 	data/NetworkManager-wait-online.service \
 	data/NetworkManager.service data/server.conf $(NULL) \
-	$(am__append_71) man/common.ent $(am__append_81) \
-	$(am__append_84) $(GLIB_GENERATED) $(INTROSPECTION_GIRS) \
+	$(am__append_69) man/common.ent $(am__append_79) \
+	$(am__append_82) $(GLIB_GENERATED) $(INTROSPECTION_GIRS) \
 	$(typelib_DATA) cscope.in.out cscope.out cscope.po.out $(NULL) \
-	$(am__append_90)
+	$(am__append_88)
 
 ###############################################################################
 DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
 	intltool-update $(polkit_policy_DATA) libnm/libnm.pc \
-	$(am__append_48)
+	$(am__append_49)
 
 ###############################################################################
 
@@ -3985,7 +4032,7 @@ DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
 # examples
 ###############################################################################
 EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
-	shared/nm-utils/tests/meson.build $(NULL) \
+	shared/nm-glib-aux/tests/meson.build $(NULL) \
 	$(dbusinterfaces_DATA) introspection/meson.build \
 	libnm-core/nm-crypto-gnutls.c libnm-core/nm-crypto-nss.c \
 	libnm-core/nm-core-enum-types.c.template \
@@ -4378,6 +4425,7 @@ EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
@@ -4545,7 +4593,7 @@ EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
 	clients/cli/nmcli-completion clients/cli/meson.build \
 	clients/common/settings-docs.xsl clients/common/meson.build \
 	clients/common/tests/meson.build clients/tui/meson.build \
-	clients/tui/newt/meson.build $(am__append_68) \
+	clients/tui/newt/meson.build $(am__append_66) \
 	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 \
@@ -4557,7 +4605,7 @@ EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
 	data/NetworkManager-wait-online-systemd-pre200.service.in \
 	data/NetworkManager-wait-online.service.in \
 	data/NetworkManager.service.in data/meson.build \
-	data/server.conf.in $(NULL) $(am__append_73) $(am__append_76) \
+	data/server.conf.in $(NULL) $(am__append_71) $(am__append_74) \
 	man/common.ent.in $(man_nm_settings_xml) $(addsuffix \
 	.xsl,$(basename $(man_nm_settings_xml))) $(man_pages) \
 	$(addsuffix .xml,$(basename $(man_pages))) \
@@ -4639,18 +4687,18 @@ EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
 	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_51)
+EXTRA_LTLIBRARIES = $(am__append_52)
 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_74) $(am__append_77) \
+	libnm-core/nm-dbus-types.xml $(am__append_72) $(am__append_75) \
 	$(man_pages) $(man_pages_autogen)
 dist_configure_check = $(am__append_2)
 install_data_hook = install-data-hook-dirs $(am__append_26) \
-	install-data-hook-dispatcher $(am__append_58) $(am__append_66) \
-	$(am__append_78)
-install_exec_hook = $(am__append_62)
-uninstall_hook = $(am__append_59) $(am__append_63) $(am__append_67) \
-	$(am__append_79)
+	install-data-hook-dispatcher $(am__append_56) $(am__append_64) \
+	$(am__append_76)
+install_exec_hook = $(am__append_60)
+uninstall_hook = $(am__append_57) $(am__append_61) $(am__append_65) \
+	$(am__append_77)
 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) \
@@ -4660,9 +4708,9 @@ GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \
 	$(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums)
 man_pages = man/NetworkManager.8 man/NetworkManager.conf.5 \
 	man/nm-online.1 man/nm-initrd-generator.8 man/nmcli-examples.7 \
-	man/nmcli.1 man/nmtui.1 $(am__append_72)
+	man/nmcli.1 man/nmtui.1 $(am__append_70)
 man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
-	$(am__append_75)
+	$(am__append_73)
 
 ###############################################################################
 
@@ -4691,7 +4739,7 @@ man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
 ###############################################################################
 
 ###############################################################################
-check_programs = shared/nm-utils/tests/test-shared-general \
+check_programs = shared/nm-glib-aux/tests/test-shared-general \
 	libnm-core/tests/test-compare libnm-core/tests/test-crypto \
 	libnm-core/tests/test-general libnm-core/tests/test-keyfile \
 	libnm-core/tests/test-secrets libnm-core/tests/test-setting \
@@ -4703,7 +4751,7 @@ check_programs = shared/nm-utils/tests/test-shared-general \
 	src/dhcp/tests/test-dhcp-utils \
 	src/settings/plugins/keyfile/tests/test-keyfile-settings \
 	$(am__append_24) $(am__append_31) $(am__append_35) \
-	$(am__append_44) src/dnsmasq/tests/test-dnsmasq-utils \
+	$(am__append_45) src/dnsmasq/tests/test-dnsmasq-utils \
 	src/platform/tests/test-address-fake \
 	src/platform/tests/test-address-linux \
 	src/platform/tests/test-cleanup-fake \
@@ -4722,7 +4770,7 @@ check_programs = shared/nm-utils/tests/test-shared-general \
 	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_52) $(am__append_53) \
+	$(am__append_53) $(am__append_54) \
 	clients/common/tests/test-libnm-core-aux
 check_programs_norun = $(am__append_15) $(am__append_40) \
 	src/platform/tests/monitor src/ndisc/tests/test-ndisc-linux \
@@ -4733,7 +4781,7 @@ check_programs_norun = $(am__append_15) $(am__append_40) \
 	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_89)
+	examples/C/glib/monitor-nm-state-gdbus $(am__append_87)
 
 ###############################################################################
 
@@ -4743,18 +4791,18 @@ check_programs_norun = $(am__append_15) $(am__append_40) \
 check_ltlibraries = $(am__append_8) $(am__append_9) \
 	libnm/tests/libnm-vpn-plugin-utils-test.la \
 	src/libNetworkManagerTest.la clients/common/libnmc-base.la \
-	$(am__append_50)
+	$(am__append_51)
 check_local = check-docs check-local-exports-libnm \
 	check-config-options $(am__append_23) $(am__append_30) \
-	check-local-devices-adsl $(am__append_34) $(am__append_43) \
-	$(am__append_46) $(am__append_49) \
+	check-local-devices-adsl $(am__append_34) $(am__append_44) \
+	$(am__append_47) $(am__append_50) \
 	check-local-clients-tests-test-client
-VAPIGEN_VAPIS = $(am__append_82)
+VAPIGEN_VAPIS = $(am__append_80)
 dbusservice_DATA = $(am__append_27) dispatcher/nm-dispatcher.conf \
 	src/org.freedesktop.NetworkManager.conf
 dbusactivation_DATA =  \
 	dispatcher/org.freedesktop.nm_dispatcher.service
-systemdsystemunit_DATA = $(am__append_65) $(am__append_70)
+systemdsystemunit_DATA = $(am__append_63) $(am__append_68)
 INTROSPECTION_GIRS = $(am__append_11)
 INTROSPECTION_SCANNER_ARGS = 
 INTROSPECTION_COMPILER_ARGS = 
@@ -4771,7 +4819,7 @@ pkgconfig_DATA = libnm/libnm.pc
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = $(am__append_19)
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(am__append_83)
+vapi_DATA = $(am__append_81)
 examplesdir = $(docdir)/examples
 rundir = $(runstatedir)/NetworkManager
 statedir = $(localstatedir)/lib/NetworkManager
@@ -5010,6 +5058,7 @@ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
 	shared/nm-glib-aux/nm-secret-utils.h \
 	shared/nm-glib-aux/nm-shared-utils.c \
 	shared/nm-glib-aux/nm-shared-utils.h \
+	shared/nm-glib-aux/nm-str-buf.h \
 	shared/nm-glib-aux/nm-time-utils.c \
 	shared/nm-glib-aux/nm-time-utils.h \
 	shared/nm-glib-aux/nm-value-type.h \
@@ -5063,6 +5112,8 @@ shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \
 	shared/nm-libnm-core-intern/nm-ethtool-utils.h \
 	shared/nm-libnm-core-intern/nm-libnm-core-utils.c \
 	shared/nm-libnm-core-intern/nm-libnm-core-utils.h \
+	shared/nm-libnm-core-intern/nm-auth-subject.c \
+	shared/nm-libnm-core-intern/nm-auth-subject.h \
 	$(NULL)
 
 shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LDFLAGS = \
@@ -5102,7 +5153,66 @@ shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
+shared_nm_keyfile_libnm_keyfile_la_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	-I$(builddir)/shared \
+	-I$(srcdir)/libnm-core \
+	-I$(builddir)/libnm-core \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\""libnm"\" \
+	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
+	$(NULL)
+
+shared_nm_keyfile_libnm_keyfile_la_SOURCES = \
+	shared/nm-keyfile/nm-keyfile-internal.h \
+	shared/nm-keyfile/nm-keyfile-utils.c \
+	shared/nm-keyfile/nm-keyfile-utils.h \
+	shared/nm-keyfile/nm-keyfile.c \
+	$(NULL)
+
+shared_nm_keyfile_libnm_keyfile_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_keyfile_libnm_keyfile_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(NULL)
+
+shared_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	-I$(builddir)/shared \
+	-I$(srcdir)/libnm-core \
+	-I$(builddir)/libnm-core \
+	-I$(srcdir)/libnm \
+	-I$(builddir)/libnm \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\""libnmc"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	$(NULL)
+
+shared_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \
+	shared/nm-libnm-aux/nm-libnm-aux.c \
+	shared/nm-libnm-aux/nm-libnm-aux.h \
+	$(NULL)
+
+shared_nm_libnm_aux_libnm_libnm_aux_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_libnm_aux_libnm_libnm_aux_la_LIBADD = \
+	$(GLIB_LIBS) \
+	libnm/libnm.la \
+	$(NULL)
+
+shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-DNETWORKMANAGER_COMPILATION_TEST \
@@ -5112,12 +5222,12 @@ shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
-shared_nm_utils_tests_test_shared_general_LDFLAGS = \
+shared_nm_glib_aux_tests_test_shared_general_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-shared_nm_utils_tests_test_shared_general_LDADD = \
+shared_nm_glib_aux_tests_test_shared_general_LDADD = \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
 	shared/nm-std-aux/libnm-std-aux.la \
@@ -5183,6 +5293,8 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.Veth.h \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.c \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.h \
+	introspection/org.freedesktop.NetworkManager.Device.Vrf.c \
+	introspection/org.freedesktop.NetworkManager.Device.Vrf.h \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.c \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.h \
 	introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
@@ -5253,6 +5365,7 @@ DBUS_INTERFACE_DOCS = \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vrf.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml \
@@ -5304,6 +5417,7 @@ dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.Device.Tun.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Veth.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Vrf.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
 	introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml \
@@ -5374,6 +5488,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-user.h \
 	libnm-core/nm-setting-vlan.h \
 	libnm-core/nm-setting-vpn.h \
+	libnm-core/nm-setting-vrf.h \
 	libnm-core/nm-setting-vxlan.h \
 	libnm-core/nm-setting-wifi-p2p.h \
 	libnm-core/nm-setting-wimax.h \
@@ -5400,7 +5515,6 @@ libnm_core_lib_h_priv = shared/nm-meta-setting.h \
 	libnm-core/nm-core-internal.h \
 	libnm-core/nm-core-types-internal.h \
 	libnm-core/nm-crypto-impl.h libnm-core/nm-crypto.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-team-utils.h \
 	libnm-core/nm-utils-private.h $(NULL) $(am__append_5)
@@ -5445,6 +5559,7 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-user.c \
 	libnm-core/nm-setting-vlan.c \
 	libnm-core/nm-setting-vpn.c \
+	libnm-core/nm-setting-vrf.c \
 	libnm-core/nm-setting-vxlan.c \
 	libnm-core/nm-setting-wifi-p2p.c \
 	libnm-core/nm-setting-wimax.c \
@@ -5458,8 +5573,7 @@ libnm_core_lib_c_settings_real = \
 libnm_core_lib_c_real = $(libnm_core_lib_c_settings_real) \
 	shared/nm-meta-setting.c libnm-core/nm-connection.c \
 	libnm-core/nm-crypto.c libnm-core/nm-dbus-utils.c \
-	libnm-core/nm-errors.c libnm-core/nm-keyfile-utils.c \
-	libnm-core/nm-keyfile.c libnm-core/nm-property-compare.c \
+	libnm-core/nm-errors.c libnm-core/nm-property-compare.c \
 	libnm-core/nm-setting.c libnm-core/nm-simple-connection.c \
 	libnm-core/nm-team-utils.c libnm-core/nm-utils.c \
 	libnm-core/nm-vpn-editor-plugin.c \
@@ -5563,6 +5677,7 @@ nodist_libnm_core_tests_test_general_SOURCES = \
 
 libnm_core_tests_ldadd = \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
@@ -5623,6 +5738,7 @@ libnm_lib_h_pub_real = \
 	libnm/nm-device-team.h \
 	libnm/nm-device-tun.h \
 	libnm/nm-device-vlan.h \
+	libnm/nm-device-vrf.h \
 	libnm/nm-device-vxlan.h \
 	libnm/nm-device-wifi-p2p.h \
 	libnm/nm-device-wifi.h \
@@ -5689,6 +5805,7 @@ libnm_lib_c_real = \
 	libnm/nm-device-team.c \
 	libnm/nm-device-tun.c \
 	libnm/nm-device-vlan.c \
+	libnm/nm-device-vrf.c \
 	libnm/nm-device-vxlan.c \
 	libnm/nm-device-wifi-p2p.c \
 	libnm/nm-device-wifi.c \
@@ -5963,6 +6080,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/nm-sd-utils-shared.c \
 	shared/systemd/nm-sd-utils-shared.h \
 	shared/systemd/sd-adapt-shared/architecture.h \
+	shared/systemd/sd-adapt-shared/arphrd-list.h \
 	shared/systemd/sd-adapt-shared/build.h \
 	shared/systemd/sd-adapt-shared/copy.h \
 	shared/systemd/sd-adapt-shared/def.h \
@@ -5975,10 +6093,10 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/sd-adapt-shared/locale-util.h \
 	shared/systemd/sd-adapt-shared/memfd-util.h \
 	shared/systemd/sd-adapt-shared/missing_fs.h \
+	shared/systemd/sd-adapt-shared/missing_keyctl.h \
 	shared/systemd/sd-adapt-shared/missing_magic.h \
 	shared/systemd/sd-adapt-shared/missing_network.h \
 	shared/systemd/sd-adapt-shared/missing_sched.h \
-	shared/systemd/sd-adapt-shared/missing_syscall.h \
 	shared/systemd/sd-adapt-shared/missing_timerfd.h \
 	shared/systemd/sd-adapt-shared/mkdir.h \
 	shared/systemd/sd-adapt-shared/namespace-util.h \
@@ -5994,6 +6112,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/alloc-util.c \
 	shared/systemd/src/basic/alloc-util.h \
 	shared/systemd/src/basic/async.h \
+	shared/systemd/src/basic/cgroup-util.h \
 	shared/systemd/src/basic/env-file.c \
 	shared/systemd/src/basic/env-file.h \
 	shared/systemd/src/basic/env-util.c \
@@ -6036,6 +6155,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/missing_random.h \
 	shared/systemd/src/basic/missing_socket.h \
 	shared/systemd/src/basic/missing_stat.h \
+	shared/systemd/src/basic/missing_syscall.h \
 	shared/systemd/src/basic/missing_type.h \
 	shared/systemd/src/basic/parse-util.c \
 	shared/systemd/src/basic/parse-util.h \
@@ -6048,6 +6168,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/random-util.c \
 	shared/systemd/src/basic/random-util.h \
 	shared/systemd/src/basic/set.h \
+	shared/systemd/src/basic/signal-util.c \
 	shared/systemd/src/basic/signal-util.h \
 	shared/systemd/src/basic/siphash24.h \
 	shared/systemd/src/basic/socket-util.c \
@@ -6076,6 +6197,8 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/util.h \
 	shared/systemd/src/shared/dns-domain.c \
 	shared/systemd/src/shared/dns-domain.h \
+	shared/systemd/src/shared/web-util.c \
+	shared/systemd/src/shared/web-util.h \
 	$(NULL)
 
 shared_systemd_libnm_systemd_shared_la_LIBADD = \
@@ -6268,6 +6391,8 @@ src_libNetworkManager_la_SOURCES = \
 	src/devices/nm-device-veth.h \
 	src/devices/nm-device-vlan.c \
 	src/devices/nm-device-vlan.h \
+	src/devices/nm-device-vrf.c \
+	src/devices/nm-device-vrf.h \
 	src/devices/nm-device-vxlan.c \
 	src/devices/nm-device-vxlan.h \
 	src/devices/nm-device-wireguard.c \
@@ -6367,10 +6492,8 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-dcb.h \
 	src/nm-netns.c \
 	src/nm-netns.h \
-	src/nm-dhcp4-config.c \
-	src/nm-dhcp4-config.h \
-	src/nm-dhcp6-config.c \
-	src/nm-dhcp6-config.h \
+	src/nm-dhcp-config.c \
+	src/nm-dhcp-config.h \
 	src/nm-dispatcher.c \
 	src/nm-dispatcher.h \
 	src/nm-firewall-manager.c \
@@ -6379,8 +6502,6 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-proxy-config.h \
 	src/nm-auth-manager.c \
 	src/nm-auth-manager.h \
-	src/nm-auth-subject.c \
-	src/nm-auth-subject.h \
 	src/nm-auth-utils.c \
 	src/nm-auth-utils.h \
 	src/nm-manager.c \
@@ -6404,6 +6525,7 @@ src_libNetworkManager_la_SOURCES = \
 src_libNetworkManager_la_LIBADD = \
 	src/libNetworkManagerBase.la \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
@@ -6472,6 +6594,7 @@ src_nm_iface_helper_SOURCES = \
 src_nm_iface_helper_LDADD = \
 	src/libNetworkManagerBase.la \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
@@ -6512,6 +6635,7 @@ src_initrd_nm_initrd_generator_LDADD = \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerBase.la \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
@@ -6893,7 +7017,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES =  \
+@WITH_WIFI_TRUE@src_devices_wifi_libnm_wifi_base_la_SOURCES =  \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.h \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi-p2p.c \
@@ -6904,29 +7028,39 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-ap.h \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-common.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-common.h \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-factory.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-p2p-peer.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-p2p-peer.h \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.h $(NULL) \
 @WITH_WIFI_TRUE@	$(am__append_42)
+@WITH_WIFI_TRUE@src_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_cppflags_device_plugin)
+@WITH_WIFI_TRUE@src_devices_wifi_libnm_wifi_base_la_LIBADD = \
+@WITH_WIFI_TRUE@	$(GLIB_LIBS)
+
+@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@	$(NULL)
+
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin)
 @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"
 
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm-wifi-base.la \
 @WITH_WIFI_TRUE@	$(GLIB_LIBS)
 
 @WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_SOURCES = \
 @WITH_WIFI_TRUE@	src/devices/wifi/tests/test-devices-wifi.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-ap.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-ap.h \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.h
+@WITH_WIFI_TRUE@	$(NULL)
 
 @WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_cppflags_base_test)
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_LDADD = src/libNetworkManagerTest.la
+@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_LDADD = \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm-wifi-base.la \
+@WITH_WIFI_TRUE@	src/libNetworkManagerTest.la \
+@WITH_WIFI_TRUE@	src/libNetworkManagerBase.la \
+@WITH_WIFI_TRUE@	$(NULL)
+
 @WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_SOURCES = \
 @WITH_TEAMDCTL_TRUE@	src/devices/team/nm-team-factory.c \
@@ -7196,6 +7330,9 @@ dispatcher_nm_dispatcher_LDFLAGS = \
 dispatcher_nm_dispatcher_LDADD = \
 	dispatcher/libnm-dispatcher-core.la \
 	libnm/libnm.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS)
 
 dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
@@ -7249,6 +7386,7 @@ clients_nm_online_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
 
 clients_nm_online_LDADD = \
+	shared/nm-libnm-aux/libnm-libnm-aux.la \
 	libnm/libnm.la \
 	$(GLIB_LIBS)
 
@@ -7277,6 +7415,8 @@ clients_common_libnmc_base_la_SOURCES = \
 	clients/common/nm-vpn-helpers.h \
 	clients/common/nm-client-utils.c \
 	clients/common/nm-client-utils.h \
+	clients/common/nm-polkit-listener.c \
+	clients/common/nm-polkit-listener.h \
 	$(NULL)
 
 clients_common_libnmc_base_la_CPPFLAGS = \
@@ -7360,33 +7500,44 @@ clients_common_tests_test_libnm_core_aux_LDADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-@BUILD_NMCLI_TRUE@clients_cli_nmcli_SOURCES = clients/cli/common.c \
-@BUILD_NMCLI_TRUE@	clients/cli/common.h clients/cli/utils.c \
-@BUILD_NMCLI_TRUE@	clients/cli/utils.h clients/cli/agent.c \
-@BUILD_NMCLI_TRUE@	clients/cli/agent.h clients/cli/general.c \
-@BUILD_NMCLI_TRUE@	clients/cli/general.h \
+@BUILD_NMCLI_TRUE@clients_cli_nmcli_SOURCES = \
+@BUILD_NMCLI_TRUE@	clients/cli/common.c \
+@BUILD_NMCLI_TRUE@	clients/cli/common.h \
+@BUILD_NMCLI_TRUE@	clients/cli/utils.c \
+@BUILD_NMCLI_TRUE@	clients/cli/utils.h \
+@BUILD_NMCLI_TRUE@	clients/cli/agent.c \
+@BUILD_NMCLI_TRUE@	clients/cli/general.c \
 @BUILD_NMCLI_TRUE@	clients/cli/connections.c \
 @BUILD_NMCLI_TRUE@	clients/cli/connections.h \
-@BUILD_NMCLI_TRUE@	clients/cli/devices.c clients/cli/devices.h \
+@BUILD_NMCLI_TRUE@	clients/cli/devices.c \
+@BUILD_NMCLI_TRUE@	clients/cli/devices.h \
 @BUILD_NMCLI_TRUE@	clients/cli/settings.c \
-@BUILD_NMCLI_TRUE@	clients/cli/settings.h clients/cli/nmcli.c \
+@BUILD_NMCLI_TRUE@	clients/cli/settings.h \
+@BUILD_NMCLI_TRUE@	clients/cli/nmcli.c \
 @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_56)
-@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_55)
-@BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = clients/common/libnmc.la \
+@BUILD_NMCLI_TRUE@	clients/cli/polkit-agent.h \
+@BUILD_NMCLI_TRUE@	$(NULL)
+
+@BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS = \
+@BUILD_NMCLI_TRUE@	-I$(srcdir)/clients/cli \
+@BUILD_NMCLI_TRUE@	$(clients_cppflags) \
+@BUILD_NMCLI_TRUE@	-DG_LOG_DOMAIN=\""nmcli"\" \
+@BUILD_NMCLI_TRUE@	$(NULL)
+
+@BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = \
+@BUILD_NMCLI_TRUE@	clients/common/libnmc.la \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
 @BUILD_NMCLI_TRUE@	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NMCLI_TRUE@	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 @BUILD_NMCLI_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
 @BUILD_NMCLI_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
-@BUILD_NMCLI_TRUE@	shared/libcsiphash.la libnm/libnm.la \
-@BUILD_NMCLI_TRUE@	$(GLIB_LIBS) $(READLINE_LIBS) \
-@BUILD_NMCLI_TRUE@	$(am__append_57)
+@BUILD_NMCLI_TRUE@	shared/libcsiphash.la \
+@BUILD_NMCLI_TRUE@	shared/nm-libnm-aux/libnm-libnm-aux.la \
+@BUILD_NMCLI_TRUE@	libnm/libnm.la \
+@BUILD_NMCLI_TRUE@	$(GLIB_LIBS) \
+@BUILD_NMCLI_TRUE@	$(READLINE_LIBS)
+
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \
 @BUILD_NMCLI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 @BUILD_NMCLI_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
@@ -7542,6 +7693,7 @@ clients_common_tests_test_libnm_core_aux_LDADD = \
 @BUILD_NMTUI_TRUE@	clients/tui/newt/libnmt-newt.a \
 @BUILD_NMTUI_TRUE@	clients/common/libnmc.la \
 @BUILD_NMTUI_TRUE@	clients/common/libnmc-base.la \
+@BUILD_NMTUI_TRUE@	shared/nm-libnm-aux/libnm-libnm-aux.la \
 @BUILD_NMTUI_TRUE@	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NMTUI_TRUE@	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 @BUILD_NMTUI_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
@@ -7577,6 +7729,7 @@ clients_common_tests_test_libnm_core_aux_LDADD = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
 
 @BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_nm_cloud_setup_LDADD = \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-libnm-aux/libnm-libnm-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
@@ -8144,6 +8297,9 @@ clients/common/libnmc_base_la-nm-vpn-helpers.lo:  \
 clients/common/libnmc_base_la-nm-client-utils.lo:  \
 	clients/common/$(am__dirstamp) \
 	clients/common/$(DEPDIR)/$(am__dirstamp)
+clients/common/libnmc_base_la-nm-polkit-listener.lo:  \
+	clients/common/$(am__dirstamp) \
+	clients/common/$(DEPDIR)/$(am__dirstamp)
 
 clients/common/libnmc-base.la: $(clients_common_libnmc_base_la_OBJECTS) $(clients_common_libnmc_base_la_DEPENDENCIES) $(EXTRA_clients_common_libnmc_base_la_DEPENDENCIES) clients/common/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK) $(am_clients_common_libnmc_base_la_rpath) $(clients_common_libnmc_base_la_OBJECTS) $(clients_common_libnmc_base_la_LIBADD) $(LIBS)
@@ -8266,6 +8422,9 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Veth.lo:  \
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.lo:  \
+	introspection/$(am__dirstamp) \
+	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
@@ -8452,6 +8611,9 @@ libnm-core/libnm_core_la-nm-setting-vlan.lo:  \
 libnm-core/libnm_core_la-nm-setting-vpn.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-setting-vrf.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-setting-vxlan.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -8486,11 +8648,6 @@ libnm-core/libnm_core_la-nm-dbus-utils.lo: libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-errors.lo: libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_la-nm-keyfile-utils.lo:  \
-	libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_la-nm-keyfile.lo: libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-property-compare.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -8591,6 +8748,8 @@ libnm/liblibnm_la-nm-device-tun.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/liblibnm_la-nm-device-vlan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/liblibnm_la-nm-device-vrf.lo: libnm/$(am__dirstamp) \
+	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/liblibnm_la-nm-device-vxlan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/liblibnm_la-nm-device-wifi-p2p.lo: libnm/$(am__dirstamp) \
@@ -8805,6 +8964,33 @@ shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo:  \
 
 shared/nm-glib-aux/libnm-glib-aux.la: $(shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS) $(shared_nm_glib_aux_libnm_glib_aux_la_DEPENDENCIES) $(EXTRA_shared_nm_glib_aux_libnm_glib_aux_la_DEPENDENCIES) shared/nm-glib-aux/$(am__dirstamp)
 	$(AM_V_CCLD)$(shared_nm_glib_aux_libnm_glib_aux_la_LINK)  $(shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS) $(shared_nm_glib_aux_libnm_glib_aux_la_LIBADD) $(LIBS)
+shared/nm-keyfile/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-keyfile
+	@: > shared/nm-keyfile/$(am__dirstamp)
+shared/nm-keyfile/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-keyfile/$(DEPDIR)
+	@: > shared/nm-keyfile/$(DEPDIR)/$(am__dirstamp)
+shared/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo:  \
+	shared/nm-keyfile/$(am__dirstamp) \
+	shared/nm-keyfile/$(DEPDIR)/$(am__dirstamp)
+shared/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo:  \
+	shared/nm-keyfile/$(am__dirstamp) \
+	shared/nm-keyfile/$(DEPDIR)/$(am__dirstamp)
+
+shared/nm-keyfile/libnm-keyfile.la: $(shared_nm_keyfile_libnm_keyfile_la_OBJECTS) $(shared_nm_keyfile_libnm_keyfile_la_DEPENDENCIES) $(EXTRA_shared_nm_keyfile_libnm_keyfile_la_DEPENDENCIES) shared/nm-keyfile/$(am__dirstamp)
+	$(AM_V_CCLD)$(shared_nm_keyfile_libnm_keyfile_la_LINK)  $(shared_nm_keyfile_libnm_keyfile_la_OBJECTS) $(shared_nm_keyfile_libnm_keyfile_la_LIBADD) $(LIBS)
+shared/nm-libnm-aux/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-libnm-aux
+	@: > shared/nm-libnm-aux/$(am__dirstamp)
+shared/nm-libnm-aux/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-libnm-aux/$(DEPDIR)
+	@: > shared/nm-libnm-aux/$(DEPDIR)/$(am__dirstamp)
+shared/nm-libnm-aux/libnm_libnm_aux_la-nm-libnm-aux.lo:  \
+	shared/nm-libnm-aux/$(am__dirstamp) \
+	shared/nm-libnm-aux/$(DEPDIR)/$(am__dirstamp)
+
+shared/nm-libnm-aux/libnm-libnm-aux.la: $(shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS) $(shared_nm_libnm_aux_libnm_libnm_aux_la_DEPENDENCIES) $(EXTRA_shared_nm_libnm_aux_libnm_libnm_aux_la_DEPENDENCIES) shared/nm-libnm-aux/$(am__dirstamp)
+	$(AM_V_CCLD)$(shared_nm_libnm_aux_libnm_libnm_aux_la_LINK)  $(shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS) $(shared_nm_libnm_aux_libnm_libnm_aux_la_LIBADD) $(LIBS)
 shared/nm-libnm-core-aux/$(am__dirstamp):
 	@$(MKDIR_P) shared/nm-libnm-core-aux
 	@: > shared/nm-libnm-core-aux/$(am__dirstamp)
@@ -8829,6 +9015,9 @@ shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo:  \
 shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo:  \
 	shared/nm-libnm-core-intern/$(am__dirstamp) \
 	shared/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp)
+shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo:  \
+	shared/nm-libnm-core-intern/$(am__dirstamp) \
+	shared/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp)
 
 shared/nm-libnm-core-intern/libnm-libnm-core-intern.la: $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_DEPENDENCIES) $(EXTRA_shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_DEPENDENCIES) shared/nm-libnm-core-intern/$(am__dirstamp)
 	$(AM_V_CCLD)$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LINK)  $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LIBADD) $(LIBS)
@@ -8946,6 +9135,9 @@ shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo:  \
 shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo:  \
 	shared/systemd/src/basic/$(am__dirstamp) \
 	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
 shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo:  \
 	shared/systemd/src/basic/$(am__dirstamp) \
 	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
@@ -8985,6 +9177,9 @@ shared/systemd/src/shared/$(DEPDIR)/$(am__dirstamp):
 shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo:  \
 	shared/systemd/src/shared/$(am__dirstamp) \
 	shared/systemd/src/shared/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/shared/libnm_systemd_shared_la-web-util.lo:  \
+	shared/systemd/src/shared/$(am__dirstamp) \
+	shared/systemd/src/shared/$(DEPDIR)/$(am__dirstamp)
 
 shared/systemd/libnm-systemd-shared.la: $(shared_systemd_libnm_systemd_shared_la_OBJECTS) $(shared_systemd_libnm_systemd_shared_la_DEPENDENCIES) $(EXTRA_shared_systemd_libnm_systemd_shared_la_DEPENDENCIES) shared/systemd/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK)  $(shared_systemd_libnm_systemd_shared_la_OBJECTS) $(shared_systemd_libnm_systemd_shared_la_LIBADD) $(LIBS)
@@ -9072,39 +9267,42 @@ src/devices/wifi/$(am__dirstamp):
 src/devices/wifi/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/devices/wifi/$(DEPDIR)
 	@: > src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo:  \
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo:  \
+
+src/devices/wifi/libnm-device-plugin-wifi.la: $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) $(EXTRA_src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) src/devices/wifi/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_devices_wifi_libnm_device_plugin_wifi_la_LINK) $(am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath) $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD) $(LIBS)
+src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo:  \
+src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo:  \
+src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo:  \
+src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo:  \
+src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo:  \
+src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo:  \
+src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo:  \
+src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-iwd-manager.lo:  \
+src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
 
-src/devices/wifi/libnm-device-plugin-wifi.la: $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) $(EXTRA_src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) src/devices/wifi/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_devices_wifi_libnm_device_plugin_wifi_la_LINK) $(am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath) $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD) $(LIBS)
+src/devices/wifi/libnm-wifi-base.la: $(src_devices_wifi_libnm_wifi_base_la_OBJECTS) $(src_devices_wifi_libnm_wifi_base_la_DEPENDENCIES) $(EXTRA_src_devices_wifi_libnm_wifi_base_la_DEPENDENCIES) src/devices/wifi/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK) $(am_src_devices_wifi_libnm_wifi_base_la_rpath) $(src_devices_wifi_libnm_wifi_base_la_OBJECTS) $(src_devices_wifi_libnm_wifi_base_la_LIBADD) $(LIBS)
 src/devices/wwan/$(am__dirstamp):
 	@$(MKDIR_P) src/devices/wwan
 	@: > src/devices/wwan/$(am__dirstamp)
@@ -9229,6 +9427,9 @@ src/devices/libNetworkManager_la-nm-device-veth.lo:  \
 src/devices/libNetworkManager_la-nm-device-vlan.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
+src/devices/libNetworkManager_la-nm-device-vrf.lo:  \
+	src/devices/$(am__dirstamp) \
+	src/devices/$(DEPDIR)/$(am__dirstamp)
 src/devices/libNetworkManager_la-nm-device-vxlan.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
@@ -9386,9 +9587,7 @@ src/libNetworkManager_la-nm-dcb.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/libNetworkManager_la-nm-netns.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-dhcp4-config.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-dhcp6-config.lo: src/$(am__dirstamp) \
+src/libNetworkManager_la-nm-dhcp-config.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/libNetworkManager_la-nm-dispatcher.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -9398,8 +9597,6 @@ src/libNetworkManager_la-nm-proxy-config.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/libNetworkManager_la-nm-auth-manager.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-auth-subject.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 src/libNetworkManager_la-nm-auth-utils.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/libNetworkManager_la-nm-manager.lo: src/$(am__dirstamp) \
@@ -9727,9 +9924,6 @@ clients/cli/nmcli-nmcli.$(OBJEXT): clients/cli/$(am__dirstamp) \
 	clients/cli/$(DEPDIR)/$(am__dirstamp)
 clients/cli/nmcli-polkit-agent.$(OBJEXT): clients/cli/$(am__dirstamp) \
 	clients/cli/$(DEPDIR)/$(am__dirstamp)
-clients/common/cli_nmcli-nm-polkit-listener.$(OBJEXT):  \
-	clients/common/$(am__dirstamp) \
-	clients/common/$(DEPDIR)/$(am__dirstamp)
 
 clients/cli/nmcli$(EXEEXT): $(clients_cli_nmcli_OBJECTS) $(clients_cli_nmcli_DEPENDENCIES) $(EXTRA_clients_cli_nmcli_DEPENDENCIES) clients/cli/$(am__dirstamp)
 	@rm -f clients/cli/nmcli$(EXEEXT)
@@ -10129,19 +10323,19 @@ libnm/tests/test_secret_agent-test-secret-agent.$(OBJEXT):  \
 libnm/tests/test-secret-agent$(EXEEXT): $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_DEPENDENCIES) $(EXTRA_libnm_tests_test_secret_agent_DEPENDENCIES) libnm/tests/$(am__dirstamp)
 	@rm -f libnm/tests/test-secret-agent$(EXEEXT)
 	$(AM_V_CCLD)$(libnm_tests_test_secret_agent_LINK) $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_LDADD) $(LIBS)
-shared/nm-utils/tests/$(am__dirstamp):
-	@$(MKDIR_P) shared/nm-utils/tests
-	@: > shared/nm-utils/tests/$(am__dirstamp)
-shared/nm-utils/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) shared/nm-utils/tests/$(DEPDIR)
-	@: > shared/nm-utils/tests/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/tests/test_shared_general-test-shared-general.$(OBJEXT):  \
-	shared/nm-utils/tests/$(am__dirstamp) \
-	shared/nm-utils/tests/$(DEPDIR)/$(am__dirstamp)
-
-shared/nm-utils/tests/test-shared-general$(EXEEXT): $(shared_nm_utils_tests_test_shared_general_OBJECTS) $(shared_nm_utils_tests_test_shared_general_DEPENDENCIES) $(EXTRA_shared_nm_utils_tests_test_shared_general_DEPENDENCIES) shared/nm-utils/tests/$(am__dirstamp)
-	@rm -f shared/nm-utils/tests/test-shared-general$(EXEEXT)
-	$(AM_V_CCLD)$(shared_nm_utils_tests_test_shared_general_LINK) $(shared_nm_utils_tests_test_shared_general_OBJECTS) $(shared_nm_utils_tests_test_shared_general_LDADD) $(LIBS)
+shared/nm-glib-aux/tests/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-glib-aux/tests
+	@: > shared/nm-glib-aux/tests/$(am__dirstamp)
+shared/nm-glib-aux/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-glib-aux/tests/$(DEPDIR)
+	@: > shared/nm-glib-aux/tests/$(DEPDIR)/$(am__dirstamp)
+shared/nm-glib-aux/tests/test_shared_general-test-shared-general.$(OBJEXT):  \
+	shared/nm-glib-aux/tests/$(am__dirstamp) \
+	shared/nm-glib-aux/tests/$(DEPDIR)/$(am__dirstamp)
+
+shared/nm-glib-aux/tests/test-shared-general$(EXEEXT): $(shared_nm_glib_aux_tests_test_shared_general_OBJECTS) $(shared_nm_glib_aux_tests_test_shared_general_DEPENDENCIES) $(EXTRA_shared_nm_glib_aux_tests_test_shared_general_DEPENDENCIES) shared/nm-glib-aux/tests/$(am__dirstamp)
+	@rm -f shared/nm-glib-aux/tests/test-shared-general$(EXEEXT)
+	$(AM_V_CCLD)$(shared_nm_glib_aux_tests_test_shared_general_LINK) $(shared_nm_glib_aux_tests_test_shared_general_OBJECTS) $(shared_nm_glib_aux_tests_test_shared_general_LDADD) $(LIBS)
 src/NetworkManager-main.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 
@@ -10190,12 +10384,6 @@ src/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp):
 src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.$(OBJEXT):  \
 	src/devices/wifi/tests/$(am__dirstamp) \
 	src/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.$(OBJEXT):  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.$(OBJEXT):  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
 
 src/devices/wifi/tests/test-devices-wifi$(EXEEXT): $(src_devices_wifi_tests_test_devices_wifi_OBJECTS) $(src_devices_wifi_tests_test_devices_wifi_DEPENDENCIES) $(EXTRA_src_devices_wifi_tests_test_devices_wifi_DEPENDENCIES) src/devices/wifi/tests/$(am__dirstamp)
 	@rm -f src/devices/wifi/tests/test-devices-wifi$(EXEEXT)
@@ -10589,6 +10777,11 @@ mostlyclean-compile:
 	-rm -f shared/n-dhcp4/src/util/*.lo
 	-rm -f shared/nm-glib-aux/*.$(OBJEXT)
 	-rm -f shared/nm-glib-aux/*.lo
+	-rm -f shared/nm-glib-aux/tests/*.$(OBJEXT)
+	-rm -f shared/nm-keyfile/*.$(OBJEXT)
+	-rm -f shared/nm-keyfile/*.lo
+	-rm -f shared/nm-libnm-aux/*.$(OBJEXT)
+	-rm -f shared/nm-libnm-aux/*.lo
 	-rm -f shared/nm-libnm-core-aux/*.$(OBJEXT)
 	-rm -f shared/nm-libnm-core-aux/*.lo
 	-rm -f shared/nm-libnm-core-intern/*.$(OBJEXT)
@@ -10599,7 +10792,6 @@ mostlyclean-compile:
 	-rm -f shared/nm-udev-aux/*.lo
 	-rm -f shared/nm-utils/*.$(OBJEXT)
 	-rm -f shared/nm-utils/*.lo
-	-rm -f shared/nm-utils/tests/*.$(OBJEXT)
 	-rm -f shared/systemd/*.$(OBJEXT)
 	-rm -f shared/systemd/*.lo
 	-rm -f shared/systemd/src/basic/*.$(OBJEXT)
@@ -10697,8 +10889,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/cli_nmcli-nm-polkit-listener.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_base_la-nm-client-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo@am__quote@ # am--include-marker
@@ -10810,6 +11002,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Tun.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Veth.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Plo@am__quote@ # am--include-marker
@@ -10834,8 +11027,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-json.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Plo@am__quote@ # am--include-marker
@@ -10877,6 +11068,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Plo@am__quote@ # am--include-marker
@@ -10927,6 +11119,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-team.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-vrf.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
@@ -10991,14 +11184,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Plo@am__quote@ # am--include-marker
@@ -11024,6 +11221,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo@am__quote@ # am--include-marker
@@ -11035,6 +11233,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/NetworkManager-main.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo@am__quote@ # am--include-marker
@@ -11048,7 +11247,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-auth-subject.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo@am__quote@ # am--include-marker
@@ -11057,8 +11255,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dhcp4-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dhcp6-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo@am__quote@ # am--include-marker
@@ -11089,6 +11286,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo@am__quote@ # am--include-marker
@@ -11110,18 +11308,16 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/test_acd-test-acd.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo@am__quote@ # am--include-marker
@@ -11592,6 +11788,13 @@ clients/common/libnmc_base_la-nm-client-utils.lo: clients/common/nm-client-utils
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/libnmc_base_la-nm-client-utils.lo `test -f 'clients/common/nm-client-utils.c' || echo '$(srcdir)/'`clients/common/nm-client-utils.c
 
+clients/common/libnmc_base_la-nm-polkit-listener.lo: clients/common/nm-polkit-listener.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/libnmc_base_la-nm-polkit-listener.lo -MD -MP -MF clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Tpo -c -o clients/common/libnmc_base_la-nm-polkit-listener.lo `test -f 'clients/common/nm-polkit-listener.c' || echo '$(srcdir)/'`clients/common/nm-polkit-listener.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Tpo clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-polkit-listener.c' object='clients/common/libnmc_base_la-nm-polkit-listener.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/libnmc_base_la-nm-polkit-listener.lo `test -f 'clients/common/nm-polkit-listener.c' || echo '$(srcdir)/'`clients/common/nm-polkit-listener.c
+
 shared/clients_common_libnmc_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) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/clients_common_libnmc_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Tpo -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
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Tpo shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo
@@ -11816,6 +12019,13 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.lo: intros
 @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/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Vlan.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Vlan.c
 
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.lo: introspection/org.freedesktop.NetworkManager.Device.Vrf.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/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Vrf.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Vrf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Vrf.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.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/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Vrf.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Vrf.c
+
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.lo: introspection/org.freedesktop.NetworkManager.Device.Vxlan.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/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Tpo -c -o 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
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Plo
@@ -12229,6 +12439,13 @@ libnm-core/libnm_core_la-nm-setting-vpn.lo: libnm-core/nm-setting-vpn.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_la-nm-setting-vpn.lo `test -f 'libnm-core/nm-setting-vpn.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vpn.c
 
+libnm-core/libnm_core_la-nm-setting-vrf.lo: libnm-core/nm-setting-vrf.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_la-nm-setting-vrf.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Tpo -c -o libnm-core/libnm_core_la-nm-setting-vrf.lo `test -f 'libnm-core/nm-setting-vrf.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vrf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-vrf.c' object='libnm-core/libnm_core_la-nm-setting-vrf.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_la-nm-setting-vrf.lo `test -f 'libnm-core/nm-setting-vrf.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vrf.c
+
 libnm-core/libnm_core_la-nm-setting-vxlan.lo: libnm-core/nm-setting-vxlan.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_la-nm-setting-vxlan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-vxlan.lo `test -f 'libnm-core/nm-setting-vxlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vxlan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Plo
@@ -12320,20 +12537,6 @@ libnm-core/libnm_core_la-nm-errors.lo: libnm-core/nm-errors.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_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
 
-libnm-core/libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile-utils.c' object='libnm-core/libnm_core_la-nm-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
-
-libnm-core/libnm_core_la-nm-keyfile.lo: libnm-core/nm-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile.c' object='libnm-core/libnm_core_la-nm-keyfile.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
-
 libnm-core/libnm_core_la-nm-property-compare.lo: libnm-core/nm-property-compare.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-property-compare.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Tpo -c -o libnm-core/libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo
@@ -12607,6 +12810,13 @@ libnm/liblibnm_la-nm-device-vlan.lo: libnm/nm-device-vlan.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-vlan.lo `test -f 'libnm/nm-device-vlan.c' || echo '$(srcdir)/'`libnm/nm-device-vlan.c
 
+libnm/liblibnm_la-nm-device-vrf.lo: libnm/nm-device-vrf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-vrf.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-vrf.Tpo -c -o libnm/liblibnm_la-nm-device-vrf.lo `test -f 'libnm/nm-device-vrf.c' || echo '$(srcdir)/'`libnm/nm-device-vrf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-vrf.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-vrf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-vrf.c' object='libnm/liblibnm_la-nm-device-vrf.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-vrf.lo `test -f 'libnm/nm-device-vrf.c' || echo '$(srcdir)/'`libnm/nm-device-vrf.c
+
 libnm/liblibnm_la-nm-device-vxlan.lo: libnm/nm-device-vxlan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-vxlan.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Tpo -c -o libnm/liblibnm_la-nm-device-vxlan.lo `test -f 'libnm/nm-device-vxlan.c' || echo '$(srcdir)/'`libnm/nm-device-vxlan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo
@@ -12985,6 +13195,27 @@ shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo: shared/nm-glib-aux/nm-tim
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo `test -f 'shared/nm-glib-aux/nm-time-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-time-utils.c
 
+shared/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo: shared/nm-keyfile/nm-keyfile-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_keyfile_libnm_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo -MD -MP -MF shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Tpo -c -o shared/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo `test -f 'shared/nm-keyfile/nm-keyfile-utils.c' || echo '$(srcdir)/'`shared/nm-keyfile/nm-keyfile-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Tpo shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-keyfile/nm-keyfile-utils.c' object='shared/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_keyfile_libnm_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo `test -f 'shared/nm-keyfile/nm-keyfile-utils.c' || echo '$(srcdir)/'`shared/nm-keyfile/nm-keyfile-utils.c
+
+shared/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo: shared/nm-keyfile/nm-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_keyfile_libnm_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo -MD -MP -MF shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Tpo -c -o shared/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo `test -f 'shared/nm-keyfile/nm-keyfile.c' || echo '$(srcdir)/'`shared/nm-keyfile/nm-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Tpo shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-keyfile/nm-keyfile.c' object='shared/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_keyfile_libnm_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo `test -f 'shared/nm-keyfile/nm-keyfile.c' || echo '$(srcdir)/'`shared/nm-keyfile/nm-keyfile.c
+
+shared/nm-libnm-aux/libnm_libnm_aux_la-nm-libnm-aux.lo: shared/nm-libnm-aux/nm-libnm-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-libnm-aux/libnm_libnm_aux_la-nm-libnm-aux.lo -MD -MP -MF shared/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Tpo -c -o shared/nm-libnm-aux/libnm_libnm_aux_la-nm-libnm-aux.lo `test -f 'shared/nm-libnm-aux/nm-libnm-aux.c' || echo '$(srcdir)/'`shared/nm-libnm-aux/nm-libnm-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Tpo shared/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-libnm-aux/nm-libnm-aux.c' object='shared/nm-libnm-aux/libnm_libnm_aux_la-nm-libnm-aux.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-libnm-aux/libnm_libnm_aux_la-nm-libnm-aux.lo `test -f 'shared/nm-libnm-aux/nm-libnm-aux.c' || echo '$(srcdir)/'`shared/nm-libnm-aux/nm-libnm-aux.c
+
 shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo: shared/nm-libnm-core-aux/nm-libnm-core-aux.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo -MD -MP -MF shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Tpo -c -o shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo `test -f 'shared/nm-libnm-core-aux/nm-libnm-core-aux.c' || echo '$(srcdir)/'`shared/nm-libnm-core-aux/nm-libnm-core-aux.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Tpo shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo
@@ -13006,6 +13237,13 @@ shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo: s
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo `test -f 'shared/nm-libnm-core-intern/nm-libnm-core-utils.c' || echo '$(srcdir)/'`shared/nm-libnm-core-intern/nm-libnm-core-utils.c
 
+shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo: shared/nm-libnm-core-intern/nm-auth-subject.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo -MD -MP -MF shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Tpo -c -o shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo `test -f 'shared/nm-libnm-core-intern/nm-auth-subject.c' || echo '$(srcdir)/'`shared/nm-libnm-core-intern/nm-auth-subject.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Tpo shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-libnm-core-intern/nm-auth-subject.c' object='shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo `test -f 'shared/nm-libnm-core-intern/nm-auth-subject.c' || echo '$(srcdir)/'`shared/nm-libnm-core-intern/nm-auth-subject.c
+
 shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo: shared/nm-std-aux/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) $(shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo -MD -MP -MF shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Tpo -c -o shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo `test -f 'shared/nm-std-aux/c-list-util.c' || echo '$(srcdir)/'`shared/nm-std-aux/c-list-util.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Tpo shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo
@@ -13195,6 +13433,13 @@ shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo: shared/systemd/
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo `test -f 'shared/systemd/src/basic/random-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/random-util.c
 
+shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo: shared/systemd/src/basic/signal-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo `test -f 'shared/systemd/src/basic/signal-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/signal-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/signal-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-signal-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) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo `test -f 'shared/systemd/src/basic/signal-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/signal-util.c
+
 shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo: shared/systemd/src/basic/socket-util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo `test -f 'shared/systemd/src/basic/socket-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/socket-util.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo
@@ -13272,6 +13517,13 @@ shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo: shared/systemd/
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo `test -f 'shared/systemd/src/shared/dns-domain.c' || echo '$(srcdir)/'`shared/systemd/src/shared/dns-domain.c
 
+shared/systemd/src/shared/libnm_systemd_shared_la-web-util.lo: shared/systemd/src/shared/web-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/shared/libnm_systemd_shared_la-web-util.lo -MD -MP -MF shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Tpo -c -o shared/systemd/src/shared/libnm_systemd_shared_la-web-util.lo `test -f 'shared/systemd/src/shared/web-util.c' || echo '$(srcdir)/'`shared/systemd/src/shared/web-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Tpo shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/shared/web-util.c' object='shared/systemd/src/shared/libnm_systemd_shared_la-web-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) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/shared/libnm_systemd_shared_la-web-util.lo `test -f 'shared/systemd/src/shared/web-util.c' || echo '$(srcdir)/'`shared/systemd/src/shared/web-util.c
+
 src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo: src/devices/adsl/nm-atm-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo -MD -MP -MF src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Tpo -c -o src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo `test -f 'src/devices/adsl/nm-atm-manager.c' || echo '$(srcdir)/'`src/devices/adsl/nm-atm-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Tpo src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo
@@ -13363,75 +13615,75 @@ src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo: src/devices/team
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo `test -f 'src/devices/team/nm-device-team.c' || echo '$(srcdir)/'`src/devices/team/nm-device-team.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo: src/devices/wifi/nm-device-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-olpc-mesh.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo: src/devices/wifi/nm-wifi-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-factory.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-factory.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo: src/devices/wifi/nm-device-wifi-p2p.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo `test -f 'src/devices/wifi/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi-p2p.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-wifi-p2p.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo: src/devices/wifi/nm-device-olpc-mesh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-olpc-mesh.c' object='src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo `test -f 'src/devices/wifi/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi-p2p.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_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo: src/devices/wifi/nm-device-wifi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo `test -f 'src/devices/wifi/nm-device-wifi.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-wifi.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo: src/devices/wifi/nm-device-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo `test -f 'src/devices/wifi/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-wifi-p2p.c' object='src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo `test -f 'src/devices/wifi/nm-device-wifi.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi.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_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo `test -f 'src/devices/wifi/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi-p2p.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo: src/devices/wifi/nm-wifi-ap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-ap.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo: src/devices/wifi/nm-device-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo `test -f 'src/devices/wifi/nm-device-wifi.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-wifi.c' object='src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.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_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo `test -f 'src/devices/wifi/nm-device-wifi.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo: src/devices/wifi/nm-wifi-common.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-common.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo: src/devices/wifi/nm-wifi-ap.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-ap.c' object='src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo: src/devices/wifi/nm-wifi-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-factory.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo: src/devices/wifi/nm-wifi-common.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-common.c' object='src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-factory.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_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo: src/devices/wifi/nm-wifi-p2p-peer.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo `test -f 'src/devices/wifi/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-p2p-peer.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-p2p-peer.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo: src/devices/wifi/nm-wifi-p2p-peer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo `test -f 'src/devices/wifi/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-p2p-peer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-p2p-peer.c' object='src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo `test -f 'src/devices/wifi/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-p2p-peer.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_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo `test -f 'src/devices/wifi/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-p2p-peer.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo: src/devices/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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo: src/devices/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_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/libnm_wifi_base_la-nm-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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo: src/devices/wifi/nm-device-iwd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-iwd.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo: src/devices/wifi/nm-device-iwd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-iwd.c' object='src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-iwd-manager.lo: src/devices/wifi/nm-iwd-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-iwd-manager.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-iwd-manager.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-iwd-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo: src/devices/wifi/nm-iwd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-iwd-manager.c' object='src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c
 
 src/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo: src/devices/wwan/nm-wwan-factory.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo -c -o src/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo `test -f 'src/devices/wwan/nm-wwan-factory.c' || echo '$(srcdir)/'`src/devices/wwan/nm-wwan-factory.c
@@ -13650,6 +13902,13 @@ src/devices/libNetworkManager_la-nm-device-vlan.lo: src/devices/nm-device-vlan.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-vlan.lo `test -f 'src/devices/nm-device-vlan.c' || echo '$(srcdir)/'`src/devices/nm-device-vlan.c
 
+src/devices/libNetworkManager_la-nm-device-vrf.lo: src/devices/nm-device-vrf.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/libNetworkManager_la-nm-device-vrf.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Tpo -c -o src/devices/libNetworkManager_la-nm-device-vrf.lo `test -f 'src/devices/nm-device-vrf.c' || echo '$(srcdir)/'`src/devices/nm-device-vrf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-vrf.c' object='src/devices/libNetworkManager_la-nm-device-vrf.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/libNetworkManager_la-nm-device-vrf.lo `test -f 'src/devices/nm-device-vrf.c' || echo '$(srcdir)/'`src/devices/nm-device-vrf.c
+
 src/devices/libNetworkManager_la-nm-device-vxlan.lo: src/devices/nm-device-vxlan.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/libNetworkManager_la-nm-device-vxlan.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Tpo -c -o src/devices/libNetworkManager_la-nm-device-vxlan.lo `test -f 'src/devices/nm-device-vxlan.c' || echo '$(srcdir)/'`src/devices/nm-device-vxlan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo
@@ -13958,19 +14217,12 @@ src/libNetworkManager_la-nm-netns.lo: src/nm-netns.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-netns.lo `test -f 'src/nm-netns.c' || echo '$(srcdir)/'`src/nm-netns.c
 
-src/libNetworkManager_la-nm-dhcp4-config.lo: src/nm-dhcp4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-dhcp4-config.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-dhcp4-config.Tpo -c -o src/libNetworkManager_la-nm-dhcp4-config.lo `test -f 'src/nm-dhcp4-config.c' || echo '$(srcdir)/'`src/nm-dhcp4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-dhcp4-config.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-dhcp4-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dhcp4-config.c' object='src/libNetworkManager_la-nm-dhcp4-config.lo' libtool=yes @AMDEPBACKSLASH@
+src/libNetworkManager_la-nm-dhcp-config.lo: src/nm-dhcp-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-dhcp-config.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Tpo -c -o src/libNetworkManager_la-nm-dhcp-config.lo `test -f 'src/nm-dhcp-config.c' || echo '$(srcdir)/'`src/nm-dhcp-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dhcp-config.c' object='src/libNetworkManager_la-nm-dhcp-config.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/libNetworkManager_la-nm-dhcp4-config.lo `test -f 'src/nm-dhcp4-config.c' || echo '$(srcdir)/'`src/nm-dhcp4-config.c
-
-src/libNetworkManager_la-nm-dhcp6-config.lo: src/nm-dhcp6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-dhcp6-config.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-dhcp6-config.Tpo -c -o src/libNetworkManager_la-nm-dhcp6-config.lo `test -f 'src/nm-dhcp6-config.c' || echo '$(srcdir)/'`src/nm-dhcp6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-dhcp6-config.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-dhcp6-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dhcp6-config.c' object='src/libNetworkManager_la-nm-dhcp6-config.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/libNetworkManager_la-nm-dhcp6-config.lo `test -f 'src/nm-dhcp6-config.c' || echo '$(srcdir)/'`src/nm-dhcp6-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-dhcp-config.lo `test -f 'src/nm-dhcp-config.c' || echo '$(srcdir)/'`src/nm-dhcp-config.c
 
 src/libNetworkManager_la-nm-dispatcher.lo: src/nm-dispatcher.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/libNetworkManager_la-nm-dispatcher.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Tpo -c -o src/libNetworkManager_la-nm-dispatcher.lo `test -f 'src/nm-dispatcher.c' || echo '$(srcdir)/'`src/nm-dispatcher.c
@@ -14000,13 +14252,6 @@ src/libNetworkManager_la-nm-auth-manager.lo: src/nm-auth-manager.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-auth-manager.lo `test -f 'src/nm-auth-manager.c' || echo '$(srcdir)/'`src/nm-auth-manager.c
 
-src/libNetworkManager_la-nm-auth-subject.lo: src/nm-auth-subject.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/libNetworkManager_la-nm-auth-subject.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-auth-subject.Tpo -c -o src/libNetworkManager_la-nm-auth-subject.lo `test -f 'src/nm-auth-subject.c' || echo '$(srcdir)/'`src/nm-auth-subject.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-auth-subject.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-auth-subject.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-auth-subject.c' object='src/libNetworkManager_la-nm-auth-subject.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/libNetworkManager_la-nm-auth-subject.lo `test -f 'src/nm-auth-subject.c' || echo '$(srcdir)/'`src/nm-auth-subject.c
-
 src/libNetworkManager_la-nm-auth-utils.lo: src/nm-auth-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-auth-utils.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Tpo -c -o src/libNetworkManager_la-nm-auth-utils.lo `test -f 'src/nm-auth-utils.c' || echo '$(srcdir)/'`src/nm-auth-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo
@@ -14658,20 +14903,6 @@ clients/cli/nmcli-polkit-agent.obj: clients/cli/polkit-agent.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cli/nmcli-polkit-agent.obj `if test -f 'clients/cli/polkit-agent.c'; then $(CYGPATH_W) 'clients/cli/polkit-agent.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/polkit-agent.c'; fi`
 
-clients/common/cli_nmcli-nm-polkit-listener.o: clients/common/nm-polkit-listener.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/cli_nmcli-nm-polkit-listener.o -MD -MP -MF clients/common/$(DEPDIR)/cli_nmcli-nm-polkit-listener.Tpo -c -o clients/common/cli_nmcli-nm-polkit-listener.o `test -f 'clients/common/nm-polkit-listener.c' || echo '$(srcdir)/'`clients/common/nm-polkit-listener.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/cli_nmcli-nm-polkit-listener.Tpo clients/common/$(DEPDIR)/cli_nmcli-nm-polkit-listener.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-polkit-listener.c' object='clients/common/cli_nmcli-nm-polkit-listener.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/cli_nmcli-nm-polkit-listener.o `test -f 'clients/common/nm-polkit-listener.c' || echo '$(srcdir)/'`clients/common/nm-polkit-listener.c
-
-clients/common/cli_nmcli-nm-polkit-listener.obj: clients/common/nm-polkit-listener.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/cli_nmcli-nm-polkit-listener.obj -MD -MP -MF clients/common/$(DEPDIR)/cli_nmcli-nm-polkit-listener.Tpo -c -o clients/common/cli_nmcli-nm-polkit-listener.obj `if test -f 'clients/common/nm-polkit-listener.c'; then $(CYGPATH_W) 'clients/common/nm-polkit-listener.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-polkit-listener.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/cli_nmcli-nm-polkit-listener.Tpo clients/common/$(DEPDIR)/cli_nmcli-nm-polkit-listener.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-polkit-listener.c' object='clients/common/cli_nmcli-nm-polkit-listener.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/cli_nmcli-nm-polkit-listener.obj `if test -f 'clients/common/nm-polkit-listener.c'; then $(CYGPATH_W) 'clients/common/nm-polkit-listener.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-polkit-listener.c'; fi`
-
 clients/cloud-setup/nm_cloud_setup-main.o: clients/cloud-setup/main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-main.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-main.Tpo -c -o clients/cloud-setup/nm_cloud_setup-main.o `test -f 'clients/cloud-setup/main.c' || echo '$(srcdir)/'`clients/cloud-setup/main.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-main.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-main.Po
@@ -15722,19 +15953,19 @@ libnm/tests/test_secret_agent-test-secret-agent.obj: libnm/tests/test-secret-age
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_secret_agent_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/test_secret_agent-test-secret-agent.obj `if test -f 'libnm/tests/test-secret-agent.c'; then $(CYGPATH_W) 'libnm/tests/test-secret-agent.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-secret-agent.c'; fi`
 
-shared/nm-utils/tests/test_shared_general-test-shared-general.o: shared/nm-utils/tests/test-shared-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/tests/test_shared_general-test-shared-general.o -MD -MP -MF shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo -c -o shared/nm-utils/tests/test_shared_general-test-shared-general.o `test -f 'shared/nm-utils/tests/test-shared-general.c' || echo '$(srcdir)/'`shared/nm-utils/tests/test-shared-general.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/tests/test-shared-general.c' object='shared/nm-utils/tests/test_shared_general-test-shared-general.o' libtool=no @AMDEPBACKSLASH@
+shared/nm-glib-aux/tests/test_shared_general-test-shared-general.o: shared/nm-glib-aux/tests/test-shared-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/tests/test_shared_general-test-shared-general.o -MD -MP -MF shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo -c -o shared/nm-glib-aux/tests/test_shared_general-test-shared-general.o `test -f 'shared/nm-glib-aux/tests/test-shared-general.c' || echo '$(srcdir)/'`shared/nm-glib-aux/tests/test-shared-general.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-glib-aux/tests/test-shared-general.c' object='shared/nm-glib-aux/tests/test_shared_general-test-shared-general.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/tests/test_shared_general-test-shared-general.o `test -f 'shared/nm-utils/tests/test-shared-general.c' || echo '$(srcdir)/'`shared/nm-utils/tests/test-shared-general.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/tests/test_shared_general-test-shared-general.o `test -f 'shared/nm-glib-aux/tests/test-shared-general.c' || echo '$(srcdir)/'`shared/nm-glib-aux/tests/test-shared-general.c
 
-shared/nm-utils/tests/test_shared_general-test-shared-general.obj: shared/nm-utils/tests/test-shared-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/tests/test_shared_general-test-shared-general.obj -MD -MP -MF shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo -c -o shared/nm-utils/tests/test_shared_general-test-shared-general.obj `if test -f 'shared/nm-utils/tests/test-shared-general.c'; then $(CYGPATH_W) 'shared/nm-utils/tests/test-shared-general.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/tests/test-shared-general.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/tests/test-shared-general.c' object='shared/nm-utils/tests/test_shared_general-test-shared-general.obj' libtool=no @AMDEPBACKSLASH@
+shared/nm-glib-aux/tests/test_shared_general-test-shared-general.obj: shared/nm-glib-aux/tests/test-shared-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/tests/test_shared_general-test-shared-general.obj -MD -MP -MF shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo -c -o shared/nm-glib-aux/tests/test_shared_general-test-shared-general.obj `if test -f 'shared/nm-glib-aux/tests/test-shared-general.c'; then $(CYGPATH_W) 'shared/nm-glib-aux/tests/test-shared-general.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-glib-aux/tests/test-shared-general.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-glib-aux/tests/test-shared-general.c' object='shared/nm-glib-aux/tests/test_shared_general-test-shared-general.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/tests/test_shared_general-test-shared-general.obj `if test -f 'shared/nm-utils/tests/test-shared-general.c'; then $(CYGPATH_W) 'shared/nm-utils/tests/test-shared-general.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/tests/test-shared-general.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/tests/test_shared_general-test-shared-general.obj `if test -f 'shared/nm-glib-aux/tests/test-shared-general.c'; then $(CYGPATH_W) 'shared/nm-glib-aux/tests/test-shared-general.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-glib-aux/tests/test-shared-general.c'; fi`
 
 src/NetworkManager-main.o: src/main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/NetworkManager-main.o -MD -MP -MF src/$(DEPDIR)/NetworkManager-main.Tpo -c -o src/NetworkManager-main.o `test -f 'src/main.c' || echo '$(srcdir)/'`src/main.c
@@ -15806,34 +16037,6 @@ src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj: src/devices/wifi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj `if test -f 'src/devices/wifi/tests/test-devices-wifi.c'; then $(CYGPATH_W) 'src/devices/wifi/tests/test-devices-wifi.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/tests/test-devices-wifi.c'; fi`
 
-src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.o: src/devices/wifi/nm-wifi-ap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.o -MD -MP -MF src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Tpo -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.o `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Tpo src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-ap.c' object='src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.o `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
-
-src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.obj: src/devices/wifi/nm-wifi-ap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.obj -MD -MP -MF src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Tpo -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.obj `if test -f 'src/devices/wifi/nm-wifi-ap.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-ap.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-ap.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Tpo src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-ap.c' object='src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.obj `if test -f 'src/devices/wifi/nm-wifi-ap.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-ap.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-ap.c'; fi`
-
-src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.o: src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.o -MD -MP -MF src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Tpo -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.o `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.o `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
-
-src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.obj: src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.obj -MD -MP -MF src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Tpo -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.obj `if test -f 'src/devices/wifi/nm-wifi-utils.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.obj `if test -f 'src/devices/wifi/nm-wifi-utils.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-utils.c'; fi`
-
 src/devices/wwan/tests/test_service_providers-test-service-providers.o: src/devices/wwan/tests/test-service-providers.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/tests/test_service_providers-test-service-providers.o -MD -MP -MF src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Tpo -c -o src/devices/wwan/tests/test_service_providers-test-service-providers.o `test -f 'src/devices/wwan/tests/test-service-providers.c' || echo '$(srcdir)/'`src/devices/wwan/tests/test-service-providers.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Tpo src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po
@@ -16474,12 +16677,14 @@ clean-libtool:
 	-rm -rf shared/n-dhcp4/src/.libs shared/n-dhcp4/src/_libs
 	-rm -rf shared/n-dhcp4/src/util/.libs shared/n-dhcp4/src/util/_libs
 	-rm -rf shared/nm-glib-aux/.libs shared/nm-glib-aux/_libs
+	-rm -rf shared/nm-glib-aux/tests/.libs shared/nm-glib-aux/tests/_libs
+	-rm -rf shared/nm-keyfile/.libs shared/nm-keyfile/_libs
+	-rm -rf shared/nm-libnm-aux/.libs shared/nm-libnm-aux/_libs
 	-rm -rf shared/nm-libnm-core-aux/.libs shared/nm-libnm-core-aux/_libs
 	-rm -rf shared/nm-libnm-core-intern/.libs shared/nm-libnm-core-intern/_libs
 	-rm -rf shared/nm-std-aux/.libs shared/nm-std-aux/_libs
 	-rm -rf shared/nm-udev-aux/.libs shared/nm-udev-aux/_libs
 	-rm -rf shared/nm-utils/.libs shared/nm-utils/_libs
-	-rm -rf shared/nm-utils/tests/.libs shared/nm-utils/tests/_libs
 	-rm -rf shared/systemd/.libs shared/systemd/_libs
 	-rm -rf shared/systemd/src/basic/.libs shared/systemd/src/basic/_libs
 	-rm -rf shared/systemd/src/shared/.libs shared/systemd/src/shared/_libs
@@ -17261,9 +17466,9 @@ recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES)
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
-shared/nm-utils/tests/test-shared-general.log: shared/nm-utils/tests/test-shared-general$(EXEEXT)
-	@p='shared/nm-utils/tests/test-shared-general$(EXEEXT)'; \
-	b='shared/nm-utils/tests/test-shared-general'; \
+shared/nm-glib-aux/tests/test-shared-general.log: shared/nm-glib-aux/tests/test-shared-general$(EXEEXT)
+	@p='shared/nm-glib-aux/tests/test-shared-general$(EXEEXT)'; \
+	b='shared/nm-glib-aux/tests/test-shared-general'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -17905,6 +18110,12 @@ distclean-generic:
 	-rm -f shared/n-dhcp4/src/util/$(am__dirstamp)
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-glib-aux/$(am__dirstamp)
+	-rm -f shared/nm-glib-aux/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/nm-glib-aux/tests/$(am__dirstamp)
+	-rm -f shared/nm-keyfile/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/nm-keyfile/$(am__dirstamp)
+	-rm -f shared/nm-libnm-aux/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/nm-libnm-aux/$(am__dirstamp)
 	-rm -f shared/nm-libnm-core-aux/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-libnm-core-aux/$(am__dirstamp)
 	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp)
@@ -17915,8 +18126,6 @@ distclean-generic:
 	-rm -f shared/nm-udev-aux/$(am__dirstamp)
 	-rm -f shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-utils/$(am__dirstamp)
-	-rm -f shared/nm-utils/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f shared/nm-utils/tests/$(am__dirstamp)
 	-rm -f shared/systemd/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/systemd/$(am__dirstamp)
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
@@ -18040,8 +18249,8 @@ distclean: distclean-recursive
 	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Po
 	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Po
 	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Po
-	-rm -f clients/common/$(DEPDIR)/cli_nmcli-nm-polkit-listener.Po
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-client-utils.Plo
+	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo
@@ -18153,6 +18362,7 @@ distclean: distclean-recursive
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Tun.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Veth.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.Plo
+	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Plo
@@ -18177,8 +18387,6 @@ distclean: distclean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-json.Plo
-	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo
-	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Plo
@@ -18220,6 +18428,7 @@ distclean: distclean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Plo
@@ -18270,6 +18479,7 @@ distclean: distclean-recursive
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-team.Plo
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Plo
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vrf.Plo
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo
@@ -18334,14 +18544,18 @@ distclean: distclean-recursive
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo
+	-rm -f shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
+	-rm -f shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Plo
+	-rm -f shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Plo
+	-rm -f shared/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Plo
 	-rm -f shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo
+	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Plo
 	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo
 	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo
 	-rm -f shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo
 	-rm -f shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo
 	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo
 	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Po
-	-rm -f shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
 	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo
 	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Plo
@@ -18367,6 +18581,7 @@ distclean: distclean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo
@@ -18378,6 +18593,7 @@ distclean: distclean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo
 	-rm -f shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo
+	-rm -f shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Plo
 	-rm -f src/$(DEPDIR)/NetworkManager-main.Po
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
@@ -18391,7 +18607,6 @@ distclean: distclean-recursive
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-auth-subject.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo
@@ -18400,8 +18615,7 @@ distclean: distclean-recursive
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dhcp4-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dhcp6-config.Plo
+	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo
@@ -18432,6 +18646,7 @@ distclean: distclean-recursive
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo
+	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo
@@ -18453,18 +18668,16 @@ distclean: distclean-recursive
 	-rm -f src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo
 	-rm -f src/devices/tests/$(DEPDIR)/test_acd-test-acd.Po
 	-rm -f src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po
-	-rm -f src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo
 	-rm -f src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
@@ -18676,8 +18889,8 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Po
 	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Po
 	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Po
-	-rm -f clients/common/$(DEPDIR)/cli_nmcli-nm-polkit-listener.Po
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-client-utils.Plo
+	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo
@@ -18789,6 +19002,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Tun.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Veth.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.Plo
+	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vrf.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Plo
@@ -18813,8 +19027,6 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-json.Plo
-	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo
-	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Plo
@@ -18856,6 +19068,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Plo
@@ -18906,6 +19119,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-team.Plo
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Plo
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vrf.Plo
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo
 	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo
@@ -18970,14 +19184,18 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo
+	-rm -f shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
+	-rm -f shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Plo
+	-rm -f shared/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Plo
+	-rm -f shared/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Plo
 	-rm -f shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo
+	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Plo
 	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo
 	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo
 	-rm -f shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo
 	-rm -f shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo
 	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo
 	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Po
-	-rm -f shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
 	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo
 	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Plo
@@ -19003,6 +19221,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo
@@ -19014,6 +19233,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo
 	-rm -f shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo
+	-rm -f shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Plo
 	-rm -f src/$(DEPDIR)/NetworkManager-main.Po
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
@@ -19027,7 +19247,6 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-auth-subject.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo
@@ -19036,8 +19255,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dhcp4-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dhcp6-config.Plo
+	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo
@@ -19068,6 +19286,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo
+	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo
 	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo
@@ -19089,18 +19308,16 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo
 	-rm -f src/devices/tests/$(DEPDIR)/test_acd-test-acd.Po
 	-rm -f src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po
-	-rm -f src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo
 	-rm -f src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
@@ -19412,6 +19629,11 @@ $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS): $(libnm_core_
 
 $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
+$(shared_nm_keyfile_libnm_keyfile_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+
+$(shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
+
 introspection/%.c: introspection/%.xml
 	@$(MKDIR_P) introspection/
 	$(AM_V_GEN) gdbus-codegen \
@@ -19626,6 +19848,8 @@ check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la
 @WITH_MODEM_MANAGER_1_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(srcdir)/linker-script-devices.ver"
 @WITH_MODEM_MANAGER_1_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so)
 
+@WITH_WIFI_TRUE@$(src_devices_wifi_libnm_wifi_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+
 @WITH_WIFI_TRUE@check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la
 @WITH_WIFI_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver"
 @WITH_WIFI_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so)