about summary refs log tree commit diff
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in1698
1 files changed, 1140 insertions, 558 deletions
diff --git a/Makefile.in b/Makefile.in
index 3b849c93..41c4f0b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,15 +134,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = $(am__EXEEXT_15)
-check_PROGRAMS = $(am__EXEEXT_14)
+noinst_PROGRAMS = $(am__EXEEXT_17)
+check_PROGRAMS = $(am__EXEEXT_16)
 sbin_PROGRAMS = src/NetworkManager$(EXEEXT)
 bin_PROGRAMS = clients/nm-online$(EXEEXT) $(am__EXEEXT_1) \
 	$(am__EXEEXT_2)
 libexec_PROGRAMS = src/nm-iface-helper$(EXEEXT) \
 	src/dhcp/nm-dhcp-helper$(EXEEXT) \
 	dispatcher/nm-dispatcher$(EXEEXT)
-TESTS = $(am__EXEEXT_10)
+TESTS = $(am__EXEEXT_12)
 @HAVE_DOCS_TRUE@am__append_1 = \
 @HAVE_DOCS_TRUE@	docs/libnm \
 @HAVE_DOCS_TRUE@	docs/api
@@ -269,50 +269,56 @@ TESTS = $(am__EXEEXT_10)
 ###############################################################################
 @WITH_TEAMDCTL_TRUE@am__append_49 = src/devices/team/libnm-device-plugin-team.la
 @WITH_TEAMDCTL_TRUE@am__append_50 = check-local-devices-team
+@WITH_OPENVSWITCH_TRUE@am__append_51 = src/devices/ovs/libnm-device-plugin-ovs.la
+@HAVE_INTROSPECTION_TRUE@am__append_52 = $(clients_common_settings_doc_c)
+@HAVE_INTROSPECTION_TRUE@am__append_53 = check-local-settings-docs
+@HAVE_INTROSPECTION_TRUE@am__append_54 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_FALSE@am__append_55 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_TRUE@am__append_56 = clients/common/tests/test-general
+@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_57 = clients/common/tests/test-general
 
 ###############################################################################
 # clients/cli
 ###############################################################################
-@BUILD_NMCLI_TRUE@am__append_51 = clients/cli/nmcli
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_52 = $(POLKIT_CFLAGS)
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_53 = \
+@BUILD_NMCLI_TRUE@am__append_58 = clients/cli/nmcli
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_59 = $(POLKIT_CFLAGS)
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_60 = \
 @BUILD_NMCLI_TRUE@@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_54 = $(POLKIT_LIBS)
-@BUILD_NMCLI_TRUE@am__append_55 = install-data-hook-nmcli
-@BUILD_NMCLI_TRUE@am__append_56 = uninstall-hook-nmcli
-@HAVE_INTROSPECTION_TRUE@am__append_57 = $(clients_cli_settings_doc_c)
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_61 = $(POLKIT_LIBS)
+@BUILD_NMCLI_TRUE@am__append_62 = install-data-hook-nmcli
+@BUILD_NMCLI_TRUE@am__append_63 = uninstall-hook-nmcli
 
 ###############################################################################
 # clients/tui
 ###############################################################################
-@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
-@HAVE_SYSTEMD_TRUE@am__append_62 = data/org.freedesktop.NetworkManager.service
+@BUILD_NMTUI_TRUE@am__append_64 = clients/tui/newt/libnmt-newt.a
+@BUILD_NMTUI_TRUE@am__append_65 = clients/tui/nmtui
+@BUILD_NMTUI_TRUE@am__append_66 = install-exec-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_67 = uninstall-hook-nmtui
+@HAVE_SYSTEMD_TRUE@am__append_68 = data/org.freedesktop.NetworkManager.service
 
 ###############################################################################
 # libnm-util
 ###############################################################################
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_63 = libnm-util/libnm-util.la \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_69 = libnm-util/libnm-util.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_64 =  \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_70 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_pub_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_c_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_h_pub_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_c_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_h_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_c_mkenums)
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_65 = $(GNUTLS_CFLAGS)
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_66 = libnm-util/crypto_gnutls.c
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_67 = $(GNUTLS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_68 = $(NSS_CFLAGS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_69 = libnm-util/crypto_nss.c
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_70 = $(NSS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 =  \
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = $(GNUTLS_CFLAGS)
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = libnm-util/crypto_gnutls.c
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = $(GNUTLS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_74 = $(NSS_CFLAGS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_75 = libnm-util/crypto_nss.c
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_76 = $(NSS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto_gnutls.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto_nss.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/COPYING \
@@ -322,26 +328,26 @@ TESTS = $(am__EXEEXT_10)
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.pc.in \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.ver \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.ver
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = libnm-util/libtest-crypto.la
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = libnm-util/crypto_gnutls.c
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_74 = $(GNUTLS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_75 = libnm-util/crypto_nss.c
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_76 = $(NSS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 = libnm-util/libnm-util.pc \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_78 = libnm-util/libtest-crypto.la
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = libnm-util/crypto_gnutls.c
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 = $(GNUTLS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_81 = libnm-util/crypto_nss.c
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_82 = $(NSS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/libnm-util.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.pc
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_78 = libnm-util/libnm-util.pc \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = libnm-util/libnm-util.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = libnm-util/NetworkManager-1.0.gir \
+@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 = libnm-util/NetworkManager-1.0.gir \
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/NMClient-1.0.gir
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 =  \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	check-local-exports-libnm-util \
 @WITH_LEGACY_LIBRARIES_TRUE@	check-local-exports-libnm-glib
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_81 = libnm-util/libnm-util.la \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/libnm-util.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = libnm-util/tests/test-settings-defaults \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = libnm-util/tests/test-settings-defaults \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-crypto \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-secrets \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-general \
@@ -349,50 +355,53 @@ TESTS = $(am__EXEEXT_10)
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-dcb \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-nm-client \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-remote-settings-client
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/tests/test-libnm-linking \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-util/tests/test-libnm-linking \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-test
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = libnm-glib/libdeprecated-nm-glib.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 = \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = libnm-glib/libdeprecated-nm-glib.la
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-plugin-glue.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-secret-agent-glue.h
 
-@HAVE_INTROSPECTION_TRUE@am__append_86 = $(man_nm_settings_xml)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_87 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_88 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_89 = man/nm-settings-ifcfg-rh.5
-@HAVE_DOCS_TRUE@am__append_90 = install-data-hook-man
-@HAVE_DOCS_TRUE@am__append_91 = uninstall-hook-man
-@HAVE_DOCS_TRUE@am__append_92 = $(man_pages) $(man_pages_autogen)
-@BUILD_DOCS_TRUE@am__append_93 = $(man_pages) $(man_pages_autogen)
+@HAVE_INTROSPECTION_TRUE@am__append_92 = $(man_nm_settings_xml)
+@WITH_OPENVSWITCH_TRUE@am__append_93 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_94 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_95 = man/nm-openvswitch.7
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_96 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_97 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_98 = man/nm-settings-ifcfg-rh.5
+@HAVE_DOCS_TRUE@am__append_99 = install-data-hook-man
+@HAVE_DOCS_TRUE@am__append_100 = uninstall-hook-man
+@HAVE_DOCS_TRUE@am__append_101 = $(man_pages) $(man_pages_autogen)
+@BUILD_DOCS_TRUE@am__append_102 = $(man_pages) $(man_pages_autogen)
 
 ###############################################################################
 # vapi
 ###############################################################################
-@ENABLE_VAPIGEN_TRUE@am__append_94 = \
+@ENABLE_VAPIGEN_TRUE@am__append_103 = \
 @ENABLE_VAPIGEN_TRUE@	vapi/libnm.vapi
 
-@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_95 = \
+@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_104 = \
 @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	vapi/libnm-util.vapi \
 @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	vapi/libnm-glib.vapi
 
-@ENABLE_VAPIGEN_TRUE@am__append_96 = \
+@ENABLE_VAPIGEN_TRUE@am__append_105 = \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS) \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS:.vapi=.deps)
 
-@ENABLE_VAPIGEN_TRUE@am__append_97 = $(VAPIGEN_VAPIS)
+@ENABLE_VAPIGEN_TRUE@am__append_106 = $(VAPIGEN_VAPIS)
 
 ###############################################################################
-@ENABLE_TESTS_TRUE@am__append_98 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_TRUE@am__append_99 = $(check_ltlibraries)
-@ENABLE_TESTS_FALSE@am__append_100 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_FALSE@am__append_101 = $(check_ltlibraries)
-@WITH_QT_TRUE@am__append_102 = \
+@ENABLE_TESTS_TRUE@am__append_107 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_TRUE@am__append_108 = $(check_ltlibraries)
+@ENABLE_TESTS_FALSE@am__append_109 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_FALSE@am__append_110 = $(check_ltlibraries)
+@WITH_QT_TRUE@am__append_111 = \
 @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_103 = \
+@WITH_QT_TRUE@am__append_112 = \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running.moc
 
 subdir = .
@@ -538,9 +547,10 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" \
 	"$(DESTDIR)$(dbusinterfacesdir)" "$(DESTDIR)$(dbusservicedir)" \
 	"$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(girdir)" \
 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(polkit_policydir)" \
-	"$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdsystemunitdir)" \
-	"$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(udevrulesdir)" \
-	"$(DESTDIR)$(vapidir)" "$(DESTDIR)$(libdeprecateddir)" \
+	"$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdnmunitdir)" \
+	"$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(typelibdir)" \
+	"$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(vapidir)" \
+	"$(DESTDIR)$(libdeprecateddir)" \
 	"$(DESTDIR)$(libnm_glib_libnmincludedir)" \
 	"$(DESTDIR)$(libnm_glib_libnmvpndir)" \
 	"$(DESTDIR)$(libnm_util_libnm_util_includedir)" \
@@ -552,15 +562,40 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" \
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
 	$(pkglib_LTLIBRARIES) $(pppd_plugin_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-dispatcher_libnm_dispatcher_core_la_DEPENDENCIES = libnm/libnm.la \
+clients_common_libnmc_base_la_DEPENDENCIES = libnm/libnm.la \
 	$(am__DEPENDENCIES_1)
-am_dispatcher_libnm_dispatcher_core_la_OBJECTS = dispatcher/dispatcher_libnm_dispatcher_core_la-nm-dispatcher-utils.lo
-dispatcher_libnm_dispatcher_core_la_OBJECTS =  \
-	$(am_dispatcher_libnm_dispatcher_core_la_OBJECTS)
+am_clients_common_libnmc_base_la_OBJECTS = shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo \
+	shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo \
+	shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo \
+	shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo \
+	shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo \
+	clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo \
+	clients/common/clients_common_libnmc_base_la-nm-vpn-helpers.lo \
+	clients/common/clients_common_libnmc_base_la-nm-client-utils.lo
+clients_common_libnmc_base_la_OBJECTS =  \
+	$(am_clients_common_libnmc_base_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+@ENABLE_TESTS_FALSE@am_clients_common_libnmc_base_la_rpath =
+@ENABLE_TESTS_TRUE@am_clients_common_libnmc_base_la_rpath =
+clients_common_libnmc_la_DEPENDENCIES = libnm/libnm.la \
+	clients/common/libnmc-base.la $(am__DEPENDENCIES_1)
+am_clients_common_libnmc_la_OBJECTS =  \
+	shared/clients_common_libnmc_la-nm-meta-setting.lo \
+	clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo \
+	clients/common/clients_common_libnmc_la-nm-meta-setting-access.lo
+clients_common_libnmc_la_OBJECTS =  \
+	$(am_clients_common_libnmc_la_OBJECTS)
+@ENABLE_TESTS_FALSE@@HAVE_INTROSPECTION_TRUE@am_clients_common_libnmc_la_rpath =
+@ENABLE_TESTS_TRUE@@HAVE_INTROSPECTION_TRUE@am_clients_common_libnmc_la_rpath =
+@HAVE_INTROSPECTION_FALSE@am_clients_common_libnmc_la_rpath =
+dispatcher_libnm_dispatcher_core_la_DEPENDENCIES = libnm/libnm.la \
+	$(am__DEPENDENCIES_1)
+am_dispatcher_libnm_dispatcher_core_la_OBJECTS = dispatcher/dispatcher_libnm_dispatcher_core_la-nm-dispatcher-utils.lo
+dispatcher_libnm_dispatcher_core_la_OBJECTS =  \
+	$(am_dispatcher_libnm_dispatcher_core_la_OBJECTS)
 introspection_libnmdbus_la_LIBADD =
 am__objects_1 = introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.AccessPoint.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo \
@@ -579,6 +614,10 @@ am__objects_1 = introspection/introspection_libnmdbus_la-org.freedesktop.Network
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macvlan.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Modem.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OlpcMesh.lo \
+	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo \
+	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo \
+	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo \
+	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Statistics.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Team.lo \
 	introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Tun.lo \
@@ -626,7 +665,11 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-ip4-config.h \
 	libnm-core/nm-setting-ip6-config.h \
 	libnm-core/nm-setting-macsec.h libnm-core/nm-setting-macvlan.h \
-	libnm-core/nm-setting-olpc-mesh.h libnm-core/nm-setting-ppp.h \
+	libnm-core/nm-setting-olpc-mesh.h \
+	libnm-core/nm-setting-ovs-bridge.h \
+	libnm-core/nm-setting-ovs-interface.h \
+	libnm-core/nm-setting-ovs-patch.h \
+	libnm-core/nm-setting-ovs-port.h libnm-core/nm-setting-ppp.h \
 	libnm-core/nm-setting-pppoe.h libnm-core/nm-setting-proxy.h \
 	libnm-core/nm-setting-serial.h \
 	libnm-core/nm-setting-team-port.h libnm-core/nm-setting-team.h \
@@ -639,21 +682,30 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-simple-connection.h libnm-core/nm-utils.h \
 	libnm-core/nm-version.h libnm-core/nm-vpn-dbus-interface.h \
 	libnm-core/nm-vpn-editor-plugin.h \
-	libnm-core/nm-vpn-plugin-info.h \
+	libnm-core/nm-vpn-plugin-info.h shared/nm-utils/c-list-util.h \
+	shared/nm-utils/nm-dedup-multi.h \
+	shared/nm-utils/nm-enum-utils.h \
+	shared/nm-utils/nm-hash-utils.h \
 	shared/nm-utils/nm-shared-utils.h \
-	shared/nm-utils/nm-udev-utils.h shared/nm-setting-metadata.h \
-	libnm-core/crypto.h libnm-core/nm-connection-private.h \
+	shared/nm-utils/nm-random-utils.h \
+	shared/nm-utils/nm-udev-utils.h shared/nm-utils/siphash24.h \
+	shared/nm-meta-setting.h libnm-core/crypto.h \
+	libnm-core/nm-connection-private.h \
 	libnm-core/nm-core-internal.h \
 	libnm-core/nm-core-types-internal.h \
 	libnm-core/nm-keyfile-internal.h libnm-core/nm-keyfile-utils.h \
 	libnm-core/nm-property-compare.h \
 	libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \
+	shared/nm-utils/c-list-util.c shared/nm-utils/nm-dedup-multi.c \
+	shared/nm-utils/nm-enum-utils.c \
+	shared/nm-utils/nm-hash-utils.c \
 	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-udev-utils.c shared/nm-setting-metadata.c \
-	libnm-core/crypto.c libnm-core/nm-connection.c \
-	libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \
-	libnm-core/nm-keyfile-reader.c libnm-core/nm-keyfile-utils.c \
-	libnm-core/nm-keyfile-writer.c \
+	shared/nm-utils/nm-random-utils.c \
+	shared/nm-utils/nm-udev-utils.c shared/nm-utils/siphash24.c \
+	shared/nm-meta-setting.c libnm-core/crypto.c \
+	libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \
+	libnm-core/nm-errors.c libnm-core/nm-keyfile-reader.c \
+	libnm-core/nm-keyfile-utils.c libnm-core/nm-keyfile-writer.c \
 	libnm-core/nm-property-compare.c libnm-core/nm-setting-8021x.c \
 	libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c \
 	libnm-core/nm-setting-bond.c \
@@ -667,7 +719,11 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-ip4-config.c \
 	libnm-core/nm-setting-ip6-config.c \
 	libnm-core/nm-setting-macsec.c libnm-core/nm-setting-macvlan.c \
-	libnm-core/nm-setting-olpc-mesh.c libnm-core/nm-setting-ppp.c \
+	libnm-core/nm-setting-olpc-mesh.c \
+	libnm-core/nm-setting-ovs-bridge.c \
+	libnm-core/nm-setting-ovs-interface.c \
+	libnm-core/nm-setting-ovs-patch.c \
+	libnm-core/nm-setting-ovs-port.c libnm-core/nm-setting-ppp.c \
 	libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \
 	libnm-core/nm-setting-serial.c \
 	libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \
@@ -685,9 +741,15 @@ am__objects_2 =
 @WITH_GNUTLS_TRUE@am__objects_3 = libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo
 @WITH_NSS_TRUE@am__objects_4 = libnm-core/libnm_core_libnm_core_la-crypto_nss.lo
 am__objects_5 =  \
+	shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo \
 	shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo \
 	shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo \
-	shared/libnm_core_libnm_core_la-nm-setting-metadata.lo \
+	shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo \
+	shared/libnm_core_libnm_core_la-nm-meta-setting.lo \
 	libnm-core/libnm_core_libnm_core_la-crypto.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-connection.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo \
@@ -716,6 +778,10 @@ am__objects_5 =  \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-macsec.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-macvlan.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-olpc-mesh.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-bridge.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-interface.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-patch.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-port.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-ppp.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-pppoe.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-proxy.lo \
@@ -1019,6 +1085,10 @@ am__objects_17 = libnm/libnm_libnm_la-nm-access-point.lo \
 	libnm/libnm_libnm_la-nm-device-macvlan.lo \
 	libnm/libnm_libnm_la-nm-device-modem.lo \
 	libnm/libnm_libnm_la-nm-device-olpc-mesh.lo \
+	libnm/libnm_libnm_la-nm-device-ovs-interface.lo \
+	libnm/libnm_libnm_la-nm-device-ovs-port.lo \
+	libnm/libnm_libnm_la-nm-device-ovs-bridge.lo \
+	libnm/libnm_libnm_la-nm-device-ppp.lo \
 	libnm/libnm_libnm_la-nm-device-team.lo \
 	libnm/libnm_libnm_la-nm-device-tun.lo \
 	libnm/libnm_libnm_la-nm-device-vlan.lo \
@@ -1116,6 +1186,33 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK =  \
 	$(LDFLAGS) -o $@
 @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_rpath =  \
 @WITH_MODEM_MANAGER_1_TRUE@	-rpath $(pkglibdir)
+@WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES =  \
+@WITH_OPENVSWITCH_TRUE@	introspection/libnmdbus.la \
+@WITH_OPENVSWITCH_TRUE@	$(am__DEPENDENCIES_1) \
+@WITH_OPENVSWITCH_TRUE@	$(am__DEPENDENCIES_1)
+am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST =  \
+	src/devices/ovs/nm-ovsdb.c src/devices/ovs/nm-ovsdb.h \
+	src/devices/ovs/nm-ovs-factory.c \
+	src/devices/ovs/nm-device-ovs-interface.c \
+	src/devices/ovs/nm-device-ovs-interface.h \
+	src/devices/ovs/nm-device-ovs-port.c \
+	src/devices/ovs/nm-device-ovs-port.h \
+	src/devices/ovs/nm-device-ovs-bridge.c \
+	src/devices/ovs/nm-device-ovs-bridge.h
+@WITH_OPENVSWITCH_TRUE@am_src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS = src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.lo \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-factory.lo \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.lo \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo
+src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS =  \
+	$(am_src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS)
+src_devices_ovs_libnm_device_plugin_ovs_la_LINK = $(LIBTOOL) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@WITH_OPENVSWITCH_TRUE@am_src_devices_ovs_libnm_device_plugin_ovs_la_rpath =  \
+@WITH_OPENVSWITCH_TRUE@	-rpath $(pkglibdir)
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_DEPENDENCIES =  \
 @WITH_TEAMDCTL_TRUE@	introspection/libnmdbus.la \
 @WITH_TEAMDCTL_TRUE@	$(am__DEPENDENCIES_1) \
@@ -1238,14 +1335,15 @@ am__src_libNetworkManager_la_SOURCES_DIST =  \
 	src/devices/nm-device-ip-tunnel.h \
 	src/devices/nm-device-macsec.c src/devices/nm-device-macsec.h \
 	src/devices/nm-device-macvlan.c \
-	src/devices/nm-device-macvlan.h src/devices/nm-device-tun.c \
+	src/devices/nm-device-macvlan.h src/devices/nm-device-ppp.c \
+	src/devices/nm-device-ppp.h src/devices/nm-device-tun.c \
 	src/devices/nm-device-tun.h src/devices/nm-device-veth.c \
 	src/devices/nm-device-veth.h src/devices/nm-device-vlan.c \
 	src/devices/nm-device-vlan.h src/devices/nm-device-vxlan.c \
-	src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhclient.c \
-	src/dhcp/nm-dhcp-dhcpcd.c src/dhcp/nm-dhcp-helper-api.h \
-	src/dhcp/nm-dhcp-listener.c src/dhcp/nm-dhcp-listener.h \
-	src/dhcp/nm-dhcp-dhclient-utils.c \
+	src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhcpcanon.c \
+	src/dhcp/nm-dhcp-dhclient.c src/dhcp/nm-dhcp-dhcpcd.c \
+	src/dhcp/nm-dhcp-helper-api.h src/dhcp/nm-dhcp-listener.c \
+	src/dhcp/nm-dhcp-listener.h src/dhcp/nm-dhcp-dhclient-utils.c \
 	src/dhcp/nm-dhcp-dhclient-utils.h src/dns/nm-dns-dnsmasq.c \
 	src/dns/nm-dns-dnsmasq.h src/dns/nm-dns-systemd-resolved.c \
 	src/dns/nm-dns-systemd-resolved.h src/dns/nm-dns-unbound.c \
@@ -1256,6 +1354,7 @@ am__src_libNetworkManager_la_SOURCES_DIST =  \
 	src/dnsmasq/nm-dnsmasq-utils.c src/dnsmasq/nm-dnsmasq-utils.h \
 	src/ppp/nm-ppp-manager-call.c src/ppp/nm-ppp-manager-call.h \
 	src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \
+	src/nm-hostname-manager.c src/nm-hostname-manager.h \
 	src/settings/nm-agent-manager.c \
 	src/settings/nm-agent-manager.h \
 	src/settings/nm-inotify-helper.c \
@@ -1293,10 +1392,9 @@ am__src_libNetworkManager_la_SOURCES_DIST =  \
 	src/nm-bus-manager.c src/nm-bus-manager.h src/nm-config.c \
 	src/nm-config.h src/nm-config-data.c src/nm-config-data.h \
 	src/nm-connectivity.h src/nm-dcb.c src/nm-dcb.h src/nm-netns.c \
-	src/nm-netns.h src/nm-default-route-manager.c \
-	src/nm-default-route-manager.h src/nm-dhcp4-config.c \
-	src/nm-dhcp4-config.h src/nm-dhcp6-config.c \
-	src/nm-dhcp6-config.h src/nm-dispatcher.c src/nm-dispatcher.h \
+	src/nm-netns.h src/nm-dhcp4-config.c src/nm-dhcp4-config.h \
+	src/nm-dhcp6-config.c src/nm-dhcp6-config.h \
+	src/nm-dispatcher.c src/nm-dispatcher.h \
 	src/nm-firewall-manager.c src/nm-firewall-manager.h \
 	src/nm-proxy-config.c src/nm-proxy-config.h \
 	src/nm-auth-manager.c src/nm-auth-manager.h \
@@ -1326,10 +1424,12 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/devices/src_libNetworkManager_la-nm-device-ip-tunnel.lo \
 	src/devices/src_libNetworkManager_la-nm-device-macsec.lo \
 	src/devices/src_libNetworkManager_la-nm-device-macvlan.lo \
+	src/devices/src_libNetworkManager_la-nm-device-ppp.lo \
 	src/devices/src_libNetworkManager_la-nm-device-tun.lo \
 	src/devices/src_libNetworkManager_la-nm-device-veth.lo \
 	src/devices/src_libNetworkManager_la-nm-device-vlan.lo \
 	src/devices/src_libNetworkManager_la-nm-device-vxlan.lo \
+	src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.lo \
 	src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient.lo \
 	src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcd.lo \
 	src/dhcp/src_libNetworkManager_la-nm-dhcp-listener.lo \
@@ -1342,6 +1442,7 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo \
 	src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-utils.lo \
 	src/ppp/src_libNetworkManager_la-nm-ppp-manager-call.lo \
+	src/src_libNetworkManager_la-nm-hostname-manager.lo \
 	src/settings/src_libNetworkManager_la-nm-agent-manager.lo \
 	src/settings/src_libNetworkManager_la-nm-inotify-helper.lo \
 	src/settings/src_libNetworkManager_la-nm-secret-agent.lo \
@@ -1367,7 +1468,6 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/src_libNetworkManager_la-nm-config-data.lo \
 	src/src_libNetworkManager_la-nm-dcb.lo \
 	src/src_libNetworkManager_la-nm-netns.lo \
-	src/src_libNetworkManager_la-nm-default-route-manager.lo \
 	src/src_libNetworkManager_la-nm-dhcp4-config.lo \
 	src/src_libNetworkManager_la-nm-dhcp6-config.lo \
 	src/src_libNetworkManager_la-nm-dispatcher.lo \
@@ -1390,13 +1490,13 @@ src_libNetworkManagerBase_la_DEPENDENCIES = libnm-core/libnm-core.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
 	src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \
-	src/nm-multi-index.c src/nm-multi-index.h \
 	src/NetworkManagerUtils.c src/NetworkManagerUtils.h \
 	src/platform/nmp-netns.c src/platform/nmp-netns.h \
 	src/platform/nmp-object.c src/platform/nmp-object.h \
 	src/platform/nm-platform-utils.c \
 	src/platform/nm-platform-utils.h src/platform/nm-platform.c \
-	src/platform/nm-platform.h src/platform/nm-linux-platform.c \
+	src/platform/nm-platform.h src/platform/nm-platform-private.h \
+	src/platform/nm-linux-platform.c \
 	src/platform/nm-linux-platform.h \
 	src/platform/wifi/wifi-utils-nl80211.c \
 	src/platform/wifi/wifi-utils-nl80211.h \
@@ -1407,7 +1507,6 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
 	src/ndisc/nm-ndisc-private.h src/nm-exported-object.c \
 	src/nm-exported-object.h src/nm-ip4-config.c \
 	src/nm-ip4-config.h src/nm-ip6-config.c src/nm-ip6-config.h \
-	src/nm-route-manager.c src/nm-route-manager.h \
 	src/dhcp/nm-dhcp-client.c src/dhcp/nm-dhcp-client.h \
 	src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \
 	src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \
@@ -1419,7 +1518,6 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
 am_src_libNetworkManagerBase_la_OBJECTS =  \
 	src/src_libNetworkManagerBase_la-nm-core-utils.lo \
 	src/src_libNetworkManagerBase_la-nm-logging.lo \
-	src/src_libNetworkManagerBase_la-nm-multi-index.lo \
 	src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo \
 	src/platform/src_libNetworkManagerBase_la-nmp-netns.lo \
 	src/platform/src_libNetworkManagerBase_la-nmp-object.lo \
@@ -1433,7 +1531,6 @@ am_src_libNetworkManagerBase_la_OBJECTS =  \
 	src/src_libNetworkManagerBase_la-nm-exported-object.lo \
 	src/src_libNetworkManagerBase_la-nm-ip4-config.lo \
 	src/src_libNetworkManagerBase_la-nm-ip6-config.lo \
-	src/src_libNetworkManagerBase_la-nm-route-manager.lo \
 	src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-client.lo \
 	src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-utils.lo \
 	src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-systemd.lo \
@@ -1475,8 +1572,8 @@ am_src_libsystemd_nm_la_OBJECTS =  \
 	src/systemd/src/basic/src_libsystemd_nm_la-parse-util.lo \
 	src/systemd/src/basic/src_libsystemd_nm_la-path-util.lo \
 	src/systemd/src/basic/src_libsystemd_nm_la-prioq.lo \
+	src/systemd/src/basic/src_libsystemd_nm_la-process-util.lo \
 	src/systemd/src/basic/src_libsystemd_nm_la-random-util.lo \
-	src/systemd/src/basic/src_libsystemd_nm_la-siphash24.lo \
 	src/systemd/src/basic/src_libsystemd_nm_la-socket-util.lo \
 	src/systemd/src/basic/src_libsystemd_nm_la-string-table.lo \
 	src/systemd/src/basic/src_libsystemd_nm_la-string-util.lo \
@@ -1670,7 +1767,9 @@ am__EXEEXT_3 = libnm/tests/test-general$(EXEEXT) \
 @CONFIG_PLUGIN_IFNET_TRUE@am__EXEEXT_7 = src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT)
 @WITH_WIFI_TRUE@am__EXEEXT_8 =  \
 @WITH_WIFI_TRUE@	src/devices/wifi/tests/test-general$(EXEEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_9 = libnm-util/tests/test-settings-defaults$(EXEEXT) \
+@HAVE_INTROSPECTION_TRUE@am__EXEEXT_9 = clients/common/tests/test-general$(EXEEXT)
+@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_10 = clients/common/tests/test-general$(EXEEXT)
+@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_11 = libnm-util/tests/test-settings-defaults$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-crypto$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-secrets$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-general$(EXEEXT) \
@@ -1678,7 +1777,7 @@ am__EXEEXT_3 = libnm/tests/test-general$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-dcb$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-nm-client$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-remote-settings-client$(EXEEXT)
-am__EXEEXT_10 = libnm-core/tests/test-compare$(EXEEXT) \
+am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \
 	libnm-core/tests/test-crypto$(EXEEXT) \
 	libnm-core/tests/test-general$(EXEEXT) \
 	libnm-core/tests/test-keyfile$(EXEEXT) \
@@ -1711,23 +1810,22 @@ am__EXEEXT_10 = libnm-core/tests/test-compare$(EXEEXT) \
 	src/tests/test-general$(EXEEXT) \
 	src/tests/test-general-with-expect$(EXEEXT) \
 	src/tests/test-ip4-config$(EXEEXT) \
-	src/tests/test-ip6-config$(EXEEXT) \
-	src/tests/test-route-manager-linux$(EXEEXT) \
-	src/tests/test-route-manager-fake$(EXEEXT) \
-	src/tests/test-dcb$(EXEEXT) src/tests/test-systemd$(EXEEXT) \
+	src/tests/test-ip6-config$(EXEEXT) src/tests/test-dcb$(EXEEXT) \
+	src/tests/test-systemd$(EXEEXT) \
 	src/tests/test-resolvconf-capture$(EXEEXT) \
 	src/tests/test-wired-defname$(EXEEXT) \
 	src/tests/test-utils$(EXEEXT) \
-	dispatcher/tests/test-dispatcher-envp$(EXEEXT) $(am__EXEEXT_9)
-@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_11 = libnm-util/tests/test-libnm-linking$(EXEEXT) \
+	dispatcher/tests/test-dispatcher-envp$(EXEEXT) $(am__EXEEXT_9) \
+	$(am__EXEEXT_10) $(am__EXEEXT_11)
+@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_13 = libnm-util/tests/test-libnm-linking$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-test$(EXEEXT)
-@WITH_QT_TRUE@am__EXEEXT_12 =  \
+@WITH_QT_TRUE@am__EXEEXT_14 =  \
 @WITH_QT_TRUE@	examples/C/qt/add-connection-wired$(EXEEXT) \
 @WITH_QT_TRUE@	examples/C/qt/list-connections$(EXEEXT) \
 @WITH_QT_TRUE@	examples/C/qt/change-ipv4-addresses$(EXEEXT) \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running$(EXEEXT)
-am__EXEEXT_13 = src/platform/tests/monitor$(EXEEXT) \
-	src/ndisc/tests/test-ndisc-linux$(EXEEXT) $(am__EXEEXT_11) \
+am__EXEEXT_15 = src/platform/tests/monitor$(EXEEXT) \
+	src/ndisc/tests/test-ndisc-linux$(EXEEXT) $(am__EXEEXT_13) \
 	examples/C/glib/add-connection-gdbus$(EXEEXT) \
 	examples/C/glib/add-connection-libnm$(EXEEXT) \
 	examples/C/glib/get-active-connections-gdbus$(EXEEXT) \
@@ -1736,48 +1834,49 @@ am__EXEEXT_13 = src/platform/tests/monitor$(EXEEXT) \
 	examples/C/glib/list-connections-libnm$(EXEEXT) \
 	examples/C/glib/monitor-nm-running-gdbus$(EXEEXT) \
 	examples/C/glib/monitor-nm-state-gdbus$(EXEEXT) \
-	$(am__EXEEXT_12)
-@ENABLE_TESTS_FALSE@am__EXEEXT_14 = $(am__EXEEXT_10) $(am__EXEEXT_13)
-@ENABLE_TESTS_TRUE@am__EXEEXT_15 = $(am__EXEEXT_10) $(am__EXEEXT_13)
+	$(am__EXEEXT_14)
+@ENABLE_TESTS_FALSE@am__EXEEXT_16 = $(am__EXEEXT_12) $(am__EXEEXT_15)
+@ENABLE_TESTS_TRUE@am__EXEEXT_17 = $(am__EXEEXT_12) $(am__EXEEXT_15)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) \
 	$(sbin_PROGRAMS)
-am__clients_cli_nmcli_SOURCES_DIST = clients/cli/agent.c \
-	clients/cli/agent.h clients/cli/common.c clients/cli/common.h \
-	clients/cli/connections.c clients/cli/connections.h \
-	clients/cli/devices.c clients/cli/devices.h \
-	clients/cli/general.c clients/cli/general.h \
-	clients/cli/settings.c clients/cli/settings.h \
-	clients/cli/nmcli.c clients/cli/nmcli.h clients/cli/utils.c \
-	clients/cli/utils.h clients/cli/polkit-agent.c \
-	clients/cli/polkit-agent.h \
-	clients/common/nm-secret-agent-simple.c \
-	clients/common/nm-secret-agent-simple.h \
-	clients/common/nm-vpn-helpers.c \
-	clients/common/nm-vpn-helpers.h \
+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_23 = clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT)
-@BUILD_NMCLI_TRUE@am_clients_cli_nmcli_OBJECTS = clients/cli/clients_cli_nmcli-agent.$(OBJEXT) \
-@BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-common.$(OBJEXT) \
+@BUILD_NMCLI_TRUE@am_clients_cli_nmcli_OBJECTS = clients/cli/clients_cli_nmcli-common.$(OBJEXT) \
+@BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-utils.$(OBJEXT) \
+@BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-agent.$(OBJEXT) \
+@BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-general.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-connections.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-devices.$(OBJEXT) \
-@BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-general.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-settings.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-nmcli.$(OBJEXT) \
-@BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-utils.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/clients_cli_nmcli-polkit-agent.$(OBJEXT) \
-@BUILD_NMCLI_TRUE@	clients/common/clients_cli_nmcli-nm-secret-agent-simple.$(OBJEXT) \
-@BUILD_NMCLI_TRUE@	clients/common/clients_cli_nmcli-nm-vpn-helpers.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	$(am__objects_23)
 clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS)
 @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
-@BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES =  \
+@BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES = libnm/libnm.la \
+@BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
+@BUILD_NMCLI_TRUE@	clients/common/libnmc.la \
 @BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@BUILD_NMCLI_TRUE@	libnm/libnm.la $(am__DEPENDENCIES_9)
+@BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_9)
 clients_cli_nmcli_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(clients_cli_nmcli_LDFLAGS) $(LDFLAGS) \
 	-o $@
+clients_common_tests_test_general_SOURCES =  \
+	clients/common/tests/test-general.c
+clients_common_tests_test_general_OBJECTS = clients/common/tests/clients_common_tests_test_general-test-general.$(OBJEXT)
+clients_common_tests_test_general_DEPENDENCIES = libnm/libnm.la \
+	clients/common/libnmc-base.la clients/common/libnmc.la \
+	$(am__DEPENDENCIES_1)
 clients_nm_online_SOURCES = clients/nm-online.c
 clients_nm_online_OBJECTS =  \
 	clients/clients_nm_online-nm-online.$(OBJEXT)
@@ -1834,11 +1933,7 @@ am__clients_tui_nmtui_SOURCES_DIST = clients/tui/nmtui.c \
 	clients/tui/nmt-route-table.c clients/tui/nmt-route-table.h \
 	clients/tui/nmt-slave-list.c clients/tui/nmt-slave-list.h \
 	clients/tui/nmt-utils.c clients/tui/nmt-utils.h \
-	clients/tui/nmt-widget-list.c clients/tui/nmt-widget-list.h \
-	clients/common/nm-secret-agent-simple.c \
-	clients/common/nm-secret-agent-simple.h \
-	clients/common/nm-vpn-helpers.c \
-	clients/common/nm-vpn-helpers.h
+	clients/tui/nmt-widget-list.c clients/tui/nmt-widget-list.h
 @BUILD_NMTUI_TRUE@am_clients_tui_nmtui_OBJECTS = clients/tui/clients_tui_nmtui-nmtui.$(OBJEXT) \
 @BUILD_NMTUI_TRUE@	clients/tui/clients_tui_nmtui-nmtui-connect.$(OBJEXT) \
 @BUILD_NMTUI_TRUE@	clients/tui/clients_tui_nmtui-nmtui-edit.$(OBJEXT) \
@@ -1878,12 +1973,11 @@ am__clients_tui_nmtui_SOURCES_DIST = clients/tui/nmtui.c \
 @BUILD_NMTUI_TRUE@	clients/tui/clients_tui_nmtui-nmt-route-table.$(OBJEXT) \
 @BUILD_NMTUI_TRUE@	clients/tui/clients_tui_nmtui-nmt-slave-list.$(OBJEXT) \
 @BUILD_NMTUI_TRUE@	clients/tui/clients_tui_nmtui-nmt-utils.$(OBJEXT) \
-@BUILD_NMTUI_TRUE@	clients/tui/clients_tui_nmtui-nmt-widget-list.$(OBJEXT) \
-@BUILD_NMTUI_TRUE@	clients/common/clients_tui_nmtui-nm-secret-agent-simple.$(OBJEXT) \
-@BUILD_NMTUI_TRUE@	clients/common/clients_tui_nmtui-nm-vpn-helpers.$(OBJEXT)
+@BUILD_NMTUI_TRUE@	clients/tui/clients_tui_nmtui-nmt-widget-list.$(OBJEXT)
 clients_tui_nmtui_OBJECTS = $(am_clients_tui_nmtui_OBJECTS)
 @BUILD_NMTUI_TRUE@clients_tui_nmtui_DEPENDENCIES = libnm/libnm.la \
 @BUILD_NMTUI_TRUE@	clients/tui/newt/libnmt-newt.a \
+@BUILD_NMTUI_TRUE@	clients/common/libnmc-base.la \
 @BUILD_NMTUI_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 clients_tui_nmtui_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -2417,27 +2511,10 @@ src_tests_test_resolvconf_capture_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_tests_test_resolvconf_capture_LDFLAGS) $(LDFLAGS) -o $@
-am_src_tests_test_route_manager_fake_OBJECTS = src/tests/src_tests_test_route_manager_fake-test-route-manager.$(OBJEXT)
-src_tests_test_route_manager_fake_OBJECTS =  \
-	$(am_src_tests_test_route_manager_fake_OBJECTS)
-src_tests_test_route_manager_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_14)
-src_tests_test_route_manager_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_tests_test_route_manager_fake_LDFLAGS) $(LDFLAGS) -o $@
-am_src_tests_test_route_manager_linux_OBJECTS = src/tests/src_tests_test_route_manager_linux-test-route-manager.$(OBJEXT)
-src_tests_test_route_manager_linux_OBJECTS =  \
-	$(am_src_tests_test_route_manager_linux_OBJECTS)
-src_tests_test_route_manager_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_14)
-src_tests_test_route_manager_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_tests_test_route_manager_linux_LDFLAGS) $(LDFLAGS) -o $@
-src_tests_test_systemd_SOURCES = src/tests/test-systemd.c
-src_tests_test_systemd_OBJECTS =  \
+am_src_tests_test_systemd_OBJECTS =  \
+	shared/nm-utils/src_tests_test_systemd-siphash24.$(OBJEXT) \
 	src/tests/src_tests_test_systemd-test-systemd.$(OBJEXT)
+src_tests_test_systemd_OBJECTS = $(am_src_tests_test_systemd_OBJECTS)
 src_tests_test_systemd_DEPENDENCIES = src/libsystemd-nm.la \
 	$(am__DEPENDENCIES_8)
 src_tests_test_utils_SOURCES = src/tests/test-utils.c
@@ -2508,6 +2585,8 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
 SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
+	$(clients_common_libnmc_base_la_SOURCES) \
+	$(clients_common_libnmc_la_SOURCES) \
 	$(dispatcher_libnm_dispatcher_core_la_SOURCES) \
 	$(nodist_introspection_libnmdbus_la_SOURCES) \
 	$(libnm_core_libnm_core_la_SOURCES) \
@@ -2525,6 +2604,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \
 	$(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \
 	$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES) \
+	$(src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES) \
 	$(src_devices_team_libnm_device_plugin_team_la_SOURCES) \
 	$(src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES) \
 	$(src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES) \
@@ -2544,7 +2624,8 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES) \
 	$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES) \
 	$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES) \
-	$(clients_cli_nmcli_SOURCES) clients/nm-online.c \
+	$(clients_cli_nmcli_SOURCES) \
+	clients/common/tests/test-general.c clients/nm-online.c \
 	$(clients_tui_nmtui_SOURCES) \
 	$(dispatcher_nm_dispatcher_SOURCES) \
 	$(nodist_dispatcher_nm_dispatcher_SOURCES) \
@@ -2613,11 +2694,11 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	src/tests/test-general.c src/tests/test-general-with-expect.c \
 	src/tests/test-ip4-config.c src/tests/test-ip6-config.c \
 	src/tests/test-resolvconf-capture.c \
-	$(src_tests_test_route_manager_fake_SOURCES) \
-	$(src_tests_test_route_manager_linux_SOURCES) \
-	src/tests/test-systemd.c src/tests/test-utils.c \
+	$(src_tests_test_systemd_SOURCES) src/tests/test-utils.c \
 	src/tests/test-wired-defname.c
 DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
+	$(clients_common_libnmc_base_la_SOURCES) \
+	$(clients_common_libnmc_la_SOURCES) \
 	$(dispatcher_libnm_dispatcher_core_la_SOURCES) \
 	$(am__libnm_core_libnm_core_la_SOURCES_DIST) \
 	$(am__libnm_glib_libdeprecated_nm_glib_la_SOURCES_DIST) \
@@ -2629,6 +2710,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \
 	$(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \
 	$(am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST) \
+	$(am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST) \
 	$(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_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST) \
@@ -2647,7 +2729,8 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(am__src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES_DIST) \
 	$(am__src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST) \
 	$(am__src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES_DIST) \
-	$(am__clients_cli_nmcli_SOURCES_DIST) clients/nm-online.c \
+	$(am__clients_cli_nmcli_SOURCES_DIST) \
+	clients/common/tests/test-general.c clients/nm-online.c \
 	$(am__clients_tui_nmtui_SOURCES_DIST) \
 	$(dispatcher_nm_dispatcher_SOURCES) \
 	dispatcher/tests/test-dispatcher-envp.c \
@@ -2714,9 +2797,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	src/tests/test-general.c src/tests/test-general-with-expect.c \
 	src/tests/test-ip4-config.c src/tests/test-ip6-config.c \
 	src/tests/test-resolvconf-capture.c \
-	$(src_tests_test_route_manager_fake_SOURCES) \
-	$(src_tests_test_route_manager_linux_SOURCES) \
-	src/tests/test-systemd.c src/tests/test-utils.c \
+	$(src_tests_test_systemd_SOURCES) src/tests/test-utils.c \
 	src/tests/test-wired-defname.c
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
@@ -2740,8 +2821,9 @@ MANS = $(man_MANS)
 DATA = $(dbusactivation_DATA) $(dbusinterfaces_DATA) \
 	$(dbusservice_DATA) $(examples_DATA) $(gir_DATA) \
 	$(noinst_DATA) $(pkgconfig_DATA) $(polkit_policy_DATA) \
-	$(service_DATA) $(systemdsystemunit_DATA) $(typelib_DATA) \
-	$(udevrules_DATA) $(vapi_DATA)
+	$(service_DATA) $(systemdnmunit_DATA) \
+	$(systemdsystemunit_DATA) $(typelib_DATA) $(udevrules_DATA) \
+	$(vapi_DATA)
 am__libdeprecated_HEADERS_DIST = libnm-glib/libnm_glib.h
 am__libnm_glib_libnminclude_HEADERS_DIST = libnm-glib/nm-object.h \
 	libnm-glib/nm-client.h libnm-glib/nm-device.h \
@@ -3071,7 +3153,6 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BINUTILS_NM = @BINUTILS_NM@
 BLUEZ5_CFLAGS = @BLUEZ5_CFLAGS@
 BLUEZ5_LIBS = @BLUEZ5_LIBS@
 CC = @CC@
@@ -3093,6 +3174,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
+DHCPCANON_PATH = @DHCPCANON_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
@@ -3281,6 +3363,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_NM = @ac_ct_NM@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -3342,6 +3425,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_dhclient = @with_dhclient@
+with_dhcpcanon = @with_dhcpcanon@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
@@ -3365,14 +3449,14 @@ noinst_LTLIBRARIES = introspection/libnmdbus.la \
 	src/libNetworkManagerBase.la src/libNetworkManager.la \
 	src/libsystemd-nm.la $(am__append_22) $(am__append_27) \
 	$(am__append_33) $(am__append_37) \
-	dispatcher/libnm-dispatcher-core.la $(am__append_84) \
-	$(am__append_99)
-check_LTLIBRARIES = $(am__append_101)
-noinst_LIBRARIES = $(am__append_58)
+	dispatcher/libnm-dispatcher-core.la $(am__append_90) \
+	$(am__append_108)
+check_LTLIBRARIES = $(am__append_110)
+noinst_LIBRARIES = $(am__append_64)
 noinst_DATA = $(am__append_14)
 
 ###############################################################################
-lib_LTLIBRARIES = libnm/libnm.la $(am__append_63)
+lib_LTLIBRARIES = libnm/libnm.la $(am__append_69)
 pkglib_LTLIBRARIES = $(core_plugins)
 
 ###############################################################################
@@ -3381,9 +3465,9 @@ pkglib_LTLIBRARIES = $(core_plugins)
 core_plugins = $(am__append_19) $(am__append_21) $(am__append_26) \
 	$(am__append_32) $(am__append_36) \
 	src/devices/adsl/libnm-device-plugin-adsl.la $(am__append_40) \
-	$(am__append_46) $(am__append_49)
-service_DATA = $(am__append_62)
-man_MANS = $(am__append_92)
+	$(am__append_46) $(am__append_49) $(am__append_51)
+service_DATA = $(am__append_68)
+man_MANS = $(am__append_101)
 examples_DATA = data/server.conf
 CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \
 	src/NetworkManager.ver $(am__append_28) \
@@ -3393,13 +3477,13 @@ CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \
 	data/NetworkManager-wait-online.service \
 	data/NetworkManager-dispatcher.service \
 	data/org.freedesktop.NetworkManager.service data/server.conf \
-	$(am__append_85) $(am__append_86) man/common.ent \
-	$(am__append_93) $(am__append_97) $(GLIB_GENERATED) \
+	$(am__append_91) $(am__append_92) man/common.ent \
+	$(am__append_102) $(am__append_106) $(GLIB_GENERATED) \
 	$(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \
-	cscope.po.out $(NULL) $(am__append_103)
+	cscope.po.out $(NULL) $(am__append_112)
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
-	$(polkit_policy_DATA) libnm/libnm.pc $(am__append_57) \
-	$(am__append_78)
+	$(polkit_policy_DATA) libnm/libnm.pc $(am__append_52) \
+	$(am__append_84)
 
 # test-cert.p12 created with:
 #
@@ -3595,6 +3679,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
@@ -3695,7 +3780,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	src/settings/plugins/ifnet/tests/nm-system-settings.conf \
 	src/settings/plugins/ifnet/tests/wpa_supplicant.conf \
 	src/settings/plugins/ifnet/tests/test_ca_cert.pem \
-	src/devices/wwan/libnm-wwan.ver \
+	src/devices/wwan/libnm-wwan.ver data/NetworkManager-ovs.conf \
 	src/supplicant/tests/certs/test-ca-cert.pem \
 	src/supplicant/tests/certs/test-cert.p12 \
 	src/tests/config/NetworkManager.conf \
@@ -3716,17 +3801,19 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	dispatcher/tests/dispatcher-up \
 	dispatcher/tests/dispatcher-vpn-down \
 	dispatcher/tests/dispatcher-vpn-up \
-	$(clients_cli_settings_doc_c) clients/cli/nmcli-completion \
-	clients/cli/settings-docs.xsl data/NetworkManager.service.in \
+	$(clients_common_settings_doc_c) \
+	$(clients_common_settings_doc_c).in \
+	clients/cli/nmcli-completion clients/common/settings-docs.xsl \
+	data/NetworkManager.service.in \
 	data/NetworkManager-wait-online.service.in \
 	data/NetworkManager-wait-online-systemd-pre200.service.in \
 	data/NetworkManager-dispatcher.service.in \
 	data/org.freedesktop.NetworkManager.service.in \
 	data/84-nm-drivers.rules data/85-nm-unmanaged.rules \
-	data/server.conf.in $(am__append_71) $(am__append_88) \
-	man/common.ent.in $(man_nm_settings_xml) $(addsuffix \
-	.xsl,$(basename $(man_nm_settings_xml))) $(man_pages) \
-	$(addsuffix .xml,$(basename $(man_pages))) \
+	data/server.conf.in $(am__append_77) $(am__append_94) \
+	$(am__append_97) man/common.ent.in $(man_nm_settings_xml) \
+	$(addsuffix .xsl,$(basename $(man_nm_settings_xml))) \
+	$(man_pages) $(addsuffix .xml,$(basename $(man_pages))) \
 	$(man_pages_autogen) vapi/NM-1.0.metadata \
 	vapi/NetworkManager-1.0.metadata vapi/NMClient-1.0.metadata \
 	vapi/libnm.deps vapi/libnm-util.deps vapi/libnm-glib.deps \
@@ -3737,9 +3824,11 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	valgrind.suppressions shared/nm-common-macros.h \
 	shared/nm-dbus-compat.h shared/nm-default.h \
 	shared/nm-dispatcher-api.h shared/nm-test-libnm-utils.h \
-	shared/nm-test-utils-impl.c \
+	shared/nm-test-utils-impl.c shared/nm-utils/c-list.h \
+	shared/nm-utils/c-list-util.c shared/nm-utils/c-list-util.h \
 	shared/nm-utils/gsystem-local-alloc.h \
-	shared/nm-utils/nm-glib.h shared/nm-utils/nm-macros-internal.h \
+	shared/nm-utils/nm-glib.h shared/nm-utils/nm-obj.h \
+	shared/nm-utils/nm-macros-internal.h \
 	shared/nm-utils/nm-shared-utils.c \
 	shared/nm-utils/nm-shared-utils.h \
 	shared/nm-utils/nm-test-utils.h \
@@ -3803,15 +3892,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	examples/shell/get-hostname.sh examples/shell/list-devices.sh \
 	examples/shell/disconnect-device.sh \
 	examples/shell/active-wifi.sh $(NULL)
+EXTRA_LTLIBRARIES = $(am__append_55)
 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_81) $(am__append_89) \
-	$(man_pages) $(man_pages_autogen)
+	libnm-core/nm-dbus-types.xml $(am__append_87) $(am__append_95) \
+	$(am__append_98) $(man_pages) $(man_pages_autogen)
 dist_configure_check = $(am__append_3) $(am__append_4)
-install_data_hook = install-data-hook-dispatcher $(am__append_55) \
-	$(am__append_90)
-install_exec_hook = $(am__append_60)
-uninstall_hook = $(am__append_56) $(am__append_61) $(am__append_91)
+install_data_hook = install-data-hook-dispatcher $(am__append_62) \
+	$(am__append_99)
+install_exec_hook = $(am__append_66)
+uninstall_hook = $(am__append_63) $(am__append_67) $(am__append_100)
 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) \
@@ -3819,11 +3909,12 @@ GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \
 	libnm-core/tests/nm-core-tests-enum-types.h \
 	libnm-core/tests/nm-core-tests-enum-types.c \
 	$(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums) \
-	$(am__append_64)
+	$(am__append_70)
 man_pages = man/NetworkManager.8 man/NetworkManager.conf.5 \
-	man/nm-online.1 man/nmcli-examples.7 man/nmcli.1 man/nmtui.1
+	man/nm-online.1 man/nmcli-examples.7 man/nmcli.1 man/nmtui.1 \
+	$(am__append_93)
 man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
-	$(am__append_87)
+	$(am__append_96)
 
 ###############################################################################
 
@@ -3874,13 +3965,13 @@ check_programs = libnm-core/tests/test-compare \
 	src/supplicant/tests/test-supplicant-config \
 	src/tests/config/test-config src/tests/test-general \
 	src/tests/test-general-with-expect src/tests/test-ip4-config \
-	src/tests/test-ip6-config src/tests/test-route-manager-linux \
-	src/tests/test-route-manager-fake src/tests/test-dcb \
+	src/tests/test-ip6-config src/tests/test-dcb \
 	src/tests/test-systemd src/tests/test-resolvconf-capture \
 	src/tests/test-wired-defname src/tests/test-utils \
-	dispatcher/tests/test-dispatcher-envp $(am__append_82)
+	dispatcher/tests/test-dispatcher-envp $(am__append_56) \
+	$(am__append_57) $(am__append_88)
 check_programs_norun = src/platform/tests/monitor \
-	src/ndisc/tests/test-ndisc-linux $(am__append_83) \
+	src/ndisc/tests/test-ndisc-linux $(am__append_89) \
 	examples/C/glib/add-connection-gdbus \
 	examples/C/glib/add-connection-libnm \
 	examples/C/glib/get-active-connections-gdbus \
@@ -3888,7 +3979,7 @@ check_programs_norun = src/platform/tests/monitor \
 	examples/C/glib/list-connections-gdbus \
 	examples/C/glib/list-connections-libnm \
 	examples/C/glib/monitor-nm-running-gdbus \
-	examples/C/glib/monitor-nm-state-gdbus $(am__append_102)
+	examples/C/glib/monitor-nm-state-gdbus $(am__append_111)
 
 ###############################################################################
 
@@ -3896,17 +3987,18 @@ check_programs_norun = src/platform/tests/monitor \
 
 ###############################################################################
 check_ltlibraries = libnm/tests/libnm-vpn-plugin-utils-test.la \
-	src/libNetworkManagerTest.la $(am__append_72)
+	src/libNetworkManagerTest.la clients/common/libnmc-base.la \
+	$(am__append_54) $(am__append_78)
 check_local = check-local-exports-libnm $(am__append_25) \
 	$(am__append_29) $(am__append_34) $(am__append_38) \
 	check-local-devices-adsl $(am__append_42) $(am__append_47) \
-	$(am__append_50) $(am__append_80)
-VAPIGEN_VAPIS = $(am__append_94) $(am__append_95)
+	$(am__append_50) $(am__append_53) $(am__append_86)
+VAPIGEN_VAPIS = $(am__append_103) $(am__append_104)
 dbusservice_DATA = $(am__append_31) dispatcher/nm-dispatcher.conf \
 	src/org.freedesktop.NetworkManager.conf
 dbusactivation_DATA =  \
 	dispatcher/org.freedesktop.nm_dispatcher.service
-INTROSPECTION_GIRS = $(am__append_13) $(am__append_79)
+INTROSPECTION_GIRS = $(am__append_13) $(am__append_85)
 INTROSPECTION_SCANNER_ARGS = 
 INTROSPECTION_COMPILER_ARGS = 
 # Pass SANITIZER_ENV where a command that uses built libraries is
@@ -3920,11 +4012,11 @@ nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \
 pkgconfigdir = $(libdir)/pkgconfig
 
 ###############################################################################
-pkgconfig_DATA = NetworkManager.pc libnm/libnm.pc $(am__append_77)
+pkgconfig_DATA = NetworkManager.pc libnm/libnm.pc $(am__append_83)
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = $(am__append_20)
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(am__append_96)
+vapi_DATA = $(am__append_105)
 examplesdir = $(docdir)/examples
 rundir = $(runstatedir)/NetworkManager
 statedir = $(localstatedir)/lib/NetworkManager
@@ -4011,6 +4103,14 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.Modem.h \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.c \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.h \
+	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c \
+	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.h \
+	introspection/org.freedesktop.NetworkManager.Device.OvsPort.c \
+	introspection/org.freedesktop.NetworkManager.Device.OvsPort.h \
+	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c \
+	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.h \
+	introspection/org.freedesktop.NetworkManager.Device.Ppp.c \
+	introspection/org.freedesktop.NetworkManager.Device.Ppp.h \
 	introspection/org.freedesktop.NetworkManager.Device.Statistics.c \
 	introspection/org.freedesktop.NetworkManager.Device.Statistics.h \
 	introspection/org.freedesktop.NetworkManager.Device.Team.c \
@@ -4083,6 +4183,10 @@ DBUS_INTERFACE_DOCS = \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsInterface.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsPort.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsBridge.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Ppp.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
@@ -4114,6 +4218,10 @@ dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.xml \
+	introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml \
+	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Ppp.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Statistics.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Team.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Tun.xml \
@@ -4165,6 +4273,10 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-macsec.h \
 	libnm-core/nm-setting-macvlan.h \
 	libnm-core/nm-setting-olpc-mesh.h \
+	libnm-core/nm-setting-ovs-bridge.h \
+	libnm-core/nm-setting-ovs-interface.h \
+	libnm-core/nm-setting-ovs-patch.h \
+	libnm-core/nm-setting-ovs-port.h \
 	libnm-core/nm-setting-ppp.h \
 	libnm-core/nm-setting-pppoe.h \
 	libnm-core/nm-setting-proxy.h \
@@ -4192,9 +4304,15 @@ libnm_core_lib_h_pub_mkenums = \
 	libnm-core/nm-core-enum-types.h
 
 libnm_core_lib_h_priv = \
+	shared/nm-utils/c-list-util.h \
+	shared/nm-utils/nm-dedup-multi.h \
+	shared/nm-utils/nm-enum-utils.h \
+	shared/nm-utils/nm-hash-utils.h \
 	shared/nm-utils/nm-shared-utils.h \
+	shared/nm-utils/nm-random-utils.h \
 	shared/nm-utils/nm-udev-utils.h \
-	shared/nm-setting-metadata.h \
+	shared/nm-utils/siphash24.h \
+	shared/nm-meta-setting.h \
 	libnm-core/crypto.h \
 	libnm-core/nm-connection-private.h \
 	libnm-core/nm-core-internal.h \
@@ -4205,12 +4323,17 @@ libnm_core_lib_h_priv = \
 	libnm-core/nm-setting-private.h \
 	libnm-core/nm-utils-private.h
 
-libnm_core_lib_c_real = shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-udev-utils.c shared/nm-setting-metadata.c \
-	libnm-core/crypto.c libnm-core/nm-connection.c \
-	libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \
-	libnm-core/nm-keyfile-reader.c libnm-core/nm-keyfile-utils.c \
-	libnm-core/nm-keyfile-writer.c \
+libnm_core_lib_c_real = shared/nm-utils/c-list-util.c \
+	shared/nm-utils/nm-dedup-multi.c \
+	shared/nm-utils/nm-enum-utils.c \
+	shared/nm-utils/nm-hash-utils.c \
+	shared/nm-utils/nm-shared-utils.c \
+	shared/nm-utils/nm-random-utils.c \
+	shared/nm-utils/nm-udev-utils.c shared/nm-utils/siphash24.c \
+	shared/nm-meta-setting.c libnm-core/crypto.c \
+	libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \
+	libnm-core/nm-errors.c libnm-core/nm-keyfile-reader.c \
+	libnm-core/nm-keyfile-utils.c libnm-core/nm-keyfile-writer.c \
 	libnm-core/nm-property-compare.c libnm-core/nm-setting-8021x.c \
 	libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c \
 	libnm-core/nm-setting-bond.c \
@@ -4224,7 +4347,11 @@ libnm_core_lib_c_real = shared/nm-utils/nm-shared-utils.c \
 	libnm-core/nm-setting-ip4-config.c \
 	libnm-core/nm-setting-ip6-config.c \
 	libnm-core/nm-setting-macsec.c libnm-core/nm-setting-macvlan.c \
-	libnm-core/nm-setting-olpc-mesh.c libnm-core/nm-setting-ppp.c \
+	libnm-core/nm-setting-olpc-mesh.c \
+	libnm-core/nm-setting-ovs-bridge.c \
+	libnm-core/nm-setting-ovs-interface.c \
+	libnm-core/nm-setting-ovs-patch.c \
+	libnm-core/nm-setting-ovs-port.c libnm-core/nm-setting-ppp.c \
 	libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \
 	libnm-core/nm-setting-serial.c \
 	libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \
@@ -4332,6 +4459,10 @@ libnm_lib_h_pub_real = \
 	libnm/nm-device-macvlan.h \
 	libnm/nm-device-modem.h \
 	libnm/nm-device-olpc-mesh.h \
+	libnm/nm-device-ovs-interface.h \
+	libnm/nm-device-ovs-port.h \
+	libnm/nm-device-ovs-bridge.h \
+	libnm/nm-device-ppp.h \
 	libnm/nm-device-team.h \
 	libnm/nm-device-tun.h \
 	libnm/nm-device-vlan.h \
@@ -4388,6 +4519,10 @@ libnm_lib_c_real = \
 	libnm/nm-device-macvlan.c \
 	libnm/nm-device-modem.c \
 	libnm/nm-device-olpc-mesh.c \
+	libnm/nm-device-ovs-interface.c \
+	libnm/nm-device-ovs-port.c \
+	libnm/nm-device-ovs-bridge.c \
+	libnm/nm-device-ppp.c \
 	libnm/nm-device-team.c \
 	libnm/nm-device-tun.c \
 	libnm/nm-device-vlan.c \
@@ -4589,6 +4724,7 @@ src_cppflags = \
 	-DNMSTATEDIR=\"$(nmstatedir)\" \
 	-DNMLIBDIR=\"$(nmlibdir)\" \
 	\
+	-DDHCPCANON_PATH=\"$(DHCPCANON_PATH)\" \
 	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
 	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
 	\
@@ -4614,6 +4750,7 @@ src_libsystemd_nm_la_cppflags = \
 	-I$(builddir)/libnm-core \
 	-I$(srcdir)/src \
 	-I$(srcdir)/src/systemd/sd-adapt \
+	-I$(srcdir)/shared/nm-utils \
 	-I$(srcdir)/src/systemd/src/systemd \
 	-I$(srcdir)/src/systemd/src/basic \
 	-I$(srcdir)/src/systemd/src/shared \
@@ -4631,6 +4768,8 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/nm-sd.h \
 	src/systemd/sd-adapt/nm-sd-adapt.c \
 	src/systemd/sd-adapt/nm-sd-adapt.h \
+	src/systemd/sd-adapt/architecture.h \
+	src/systemd/sd-adapt/btrfs-util.h \
 	src/systemd/sd-adapt/build.h \
 	src/systemd/sd-adapt/cgroup-util.h \
 	src/systemd/sd-adapt/condition.h \
@@ -4640,11 +4779,12 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/sd-adapt/env-util.h \
 	src/systemd/sd-adapt/format-util.h \
 	src/systemd/sd-adapt/gunicode.h \
+	src/systemd/sd-adapt/ioprio.h \
 	src/systemd/sd-adapt/khash.h \
 	src/systemd/sd-adapt/libudev.h \
 	src/systemd/sd-adapt/missing.h \
 	src/systemd/sd-adapt/mkdir.h \
-	src/systemd/sd-adapt/process-util.h \
+	src/systemd/sd-adapt/raw-clone.h \
 	src/systemd/sd-adapt/sd-daemon.h \
 	src/systemd/sd-adapt/stat-util.h \
 	src/systemd/sd-adapt/udev-util.h \
@@ -4690,13 +4830,13 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/src/basic/path-util.h \
 	src/systemd/src/basic/prioq.c \
 	src/systemd/src/basic/prioq.h \
+	src/systemd/src/basic/process-util.c \
+	src/systemd/src/basic/process-util.h \
 	src/systemd/src/basic/random-util.c \
 	src/systemd/src/basic/random-util.h \
 	src/systemd/src/basic/refcnt.h \
 	src/systemd/src/basic/set.h \
 	src/systemd/src/basic/signal-util.h \
-	src/systemd/src/basic/siphash24.c \
-	src/systemd/src/basic/siphash24.h \
 	src/systemd/src/basic/socket-util.c \
 	src/systemd/src/basic/socket-util.h \
 	src/systemd/src/basic/sparse-endian.h \
@@ -4710,7 +4850,6 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/src/basic/time-util.c \
 	src/systemd/src/basic/time-util.h \
 	src/systemd/src/basic/umask-util.h \
-	src/systemd/src/basic/unaligned.h \
 	src/systemd/src/basic/utf8.c \
 	src/systemd/src/basic/utf8.h \
 	src/systemd/src/basic/util.c \
@@ -4769,13 +4908,13 @@ src_libsystemd_nm_la_LIBADD = $(src_libsystemd_nm_la_libadd)
 src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags)
 src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \
 	src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \
-	src/nm-multi-index.c src/nm-multi-index.h \
 	src/NetworkManagerUtils.c src/NetworkManagerUtils.h \
 	src/platform/nmp-netns.c src/platform/nmp-netns.h \
 	src/platform/nmp-object.c src/platform/nmp-object.h \
 	src/platform/nm-platform-utils.c \
 	src/platform/nm-platform-utils.h src/platform/nm-platform.c \
-	src/platform/nm-platform.h src/platform/nm-linux-platform.c \
+	src/platform/nm-platform.h src/platform/nm-platform-private.h \
+	src/platform/nm-linux-platform.c \
 	src/platform/nm-linux-platform.h \
 	src/platform/wifi/wifi-utils-nl80211.c \
 	src/platform/wifi/wifi-utils-nl80211.h \
@@ -4786,7 +4925,6 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \
 	src/ndisc/nm-ndisc-private.h src/nm-exported-object.c \
 	src/nm-exported-object.h src/nm-ip4-config.c \
 	src/nm-ip4-config.h src/nm-ip6-config.c src/nm-ip6-config.h \
-	src/nm-route-manager.c src/nm-route-manager.h \
 	src/dhcp/nm-dhcp-client.c src/dhcp/nm-dhcp-client.h \
 	src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \
 	src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \
@@ -4827,14 +4965,15 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \
 	src/devices/nm-device-ip-tunnel.h \
 	src/devices/nm-device-macsec.c src/devices/nm-device-macsec.h \
 	src/devices/nm-device-macvlan.c \
-	src/devices/nm-device-macvlan.h src/devices/nm-device-tun.c \
+	src/devices/nm-device-macvlan.h src/devices/nm-device-ppp.c \
+	src/devices/nm-device-ppp.h src/devices/nm-device-tun.c \
 	src/devices/nm-device-tun.h src/devices/nm-device-veth.c \
 	src/devices/nm-device-veth.h src/devices/nm-device-vlan.c \
 	src/devices/nm-device-vlan.h src/devices/nm-device-vxlan.c \
-	src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhclient.c \
-	src/dhcp/nm-dhcp-dhcpcd.c src/dhcp/nm-dhcp-helper-api.h \
-	src/dhcp/nm-dhcp-listener.c src/dhcp/nm-dhcp-listener.h \
-	src/dhcp/nm-dhcp-dhclient-utils.c \
+	src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhcpcanon.c \
+	src/dhcp/nm-dhcp-dhclient.c src/dhcp/nm-dhcp-dhcpcd.c \
+	src/dhcp/nm-dhcp-helper-api.h src/dhcp/nm-dhcp-listener.c \
+	src/dhcp/nm-dhcp-listener.h src/dhcp/nm-dhcp-dhclient-utils.c \
 	src/dhcp/nm-dhcp-dhclient-utils.h src/dns/nm-dns-dnsmasq.c \
 	src/dns/nm-dns-dnsmasq.h src/dns/nm-dns-systemd-resolved.c \
 	src/dns/nm-dns-systemd-resolved.h src/dns/nm-dns-unbound.c \
@@ -4845,6 +4984,7 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \
 	src/dnsmasq/nm-dnsmasq-utils.c src/dnsmasq/nm-dnsmasq-utils.h \
 	src/ppp/nm-ppp-manager-call.c src/ppp/nm-ppp-manager-call.h \
 	src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \
+	src/nm-hostname-manager.c src/nm-hostname-manager.h \
 	src/settings/nm-agent-manager.c \
 	src/settings/nm-agent-manager.h \
 	src/settings/nm-inotify-helper.c \
@@ -4882,10 +5022,9 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \
 	src/nm-bus-manager.c src/nm-bus-manager.h src/nm-config.c \
 	src/nm-config.h src/nm-config-data.c src/nm-config-data.h \
 	src/nm-connectivity.h src/nm-dcb.c src/nm-dcb.h src/nm-netns.c \
-	src/nm-netns.h src/nm-default-route-manager.c \
-	src/nm-default-route-manager.h src/nm-dhcp4-config.c \
-	src/nm-dhcp4-config.h src/nm-dhcp6-config.c \
-	src/nm-dhcp6-config.h src/nm-dispatcher.c src/nm-dispatcher.h \
+	src/nm-netns.h src/nm-dhcp4-config.c src/nm-dhcp4-config.h \
+	src/nm-dhcp6-config.c src/nm-dhcp6-config.h \
+	src/nm-dispatcher.c src/nm-dispatcher.h \
 	src/nm-firewall-manager.c src/nm-firewall-manager.h \
 	src/nm-proxy-config.c src/nm-proxy-config.h \
 	src/nm-auth-manager.c src/nm-auth-manager.h \
@@ -5028,12 +5167,12 @@ src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd)
 @WITH_PPP_TRUE@	src/ppp/nm-ppp-plugin.ver
 
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \
-@WITH_PPP_TRUE@	-I${top_srcdir}/src \
-@WITH_PPP_TRUE@	-I${top_builddir}/src \
-@WITH_PPP_TRUE@	-I${top_srcdir}/shared \
-@WITH_PPP_TRUE@	-I$(top_builddir)/shared \
-@WITH_PPP_TRUE@	-I${top_builddir}/libnm-core \
-@WITH_PPP_TRUE@	-I${top_srcdir}/libnm-core \
+@WITH_PPP_TRUE@	-I$(srcdir)/src \
+@WITH_PPP_TRUE@	-I$(builddir)/src \
+@WITH_PPP_TRUE@	-I$(srcdir)/shared \
+@WITH_PPP_TRUE@	-I$(builddir)/shared \
+@WITH_PPP_TRUE@	-I$(builddir)/libnm-core \
+@WITH_PPP_TRUE@	-I$(srcdir)/libnm-core \
 @WITH_PPP_TRUE@	-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
 @WITH_PPP_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 @WITH_PPP_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
@@ -5041,7 +5180,7 @@ src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd)
 
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LDFLAGS = \
 @WITH_PPP_TRUE@	-module -avoid-version \
-@WITH_PPP_TRUE@	-Wl,--version-script="$(top_srcdir)/src/ppp/nm-ppp-plugin.ver"
+@WITH_PPP_TRUE@	-Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver"
 
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LIBADD = \
 @WITH_PPP_TRUE@	introspection/libnmdbus.la \
@@ -5496,6 +5635,49 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_TEAMDCTL_TRUE@	$(JANSSON_LIBS) \
 @WITH_TEAMDCTL_TRUE@	$(GLIB_LIBS)
 
+
+###############################################################################
+# src/devices/ovs
+###############################################################################
+@HAVE_SYSTEMD_TRUE@@WITH_OPENVSWITCH_TRUE@systemdnmunitdir = $(systemdsystemunitdir)/NetworkManager.service.d
+@HAVE_SYSTEMD_TRUE@@WITH_OPENVSWITCH_TRUE@systemdnmunit_DATA = \
+@HAVE_SYSTEMD_TRUE@@WITH_OPENVSWITCH_TRUE@	data/NetworkManager-ovs.conf
+
+@WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-ovsdb.c \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-ovsdb.h \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-ovs-factory.c \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-interface.c \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-interface.h \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-port.c \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-port.h \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-bridge.c \
+@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-bridge.h
+
+@WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \
+@WITH_OPENVSWITCH_TRUE@	-I$(srcdir)/src \
+@WITH_OPENVSWITCH_TRUE@	-I$(builddir)/src \
+@WITH_OPENVSWITCH_TRUE@	-I$(srcdir)/shared \
+@WITH_OPENVSWITCH_TRUE@	-I$(builddir)/shared \
+@WITH_OPENVSWITCH_TRUE@	-I$(builddir)/libnm-core \
+@WITH_OPENVSWITCH_TRUE@	-I$(srcdir)/libnm-core \
+@WITH_OPENVSWITCH_TRUE@	\
+@WITH_OPENVSWITCH_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+@WITH_OPENVSWITCH_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+@WITH_OPENVSWITCH_TRUE@	-DRUNSTATEDIR=\"$(runstatedir)\" \
+@WITH_OPENVSWITCH_TRUE@	\
+@WITH_OPENVSWITCH_TRUE@	$(JANSSON_CFLAGS) \
+@WITH_OPENVSWITCH_TRUE@	$(GLIB_CFLAGS)
+
+@WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \
+@WITH_OPENVSWITCH_TRUE@	-module -avoid-version \
+@WITH_OPENVSWITCH_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
+
+@WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \
+@WITH_OPENVSWITCH_TRUE@	introspection/libnmdbus.la \
+@WITH_OPENVSWITCH_TRUE@	$(JANSSON_LIBS) \
+@WITH_OPENVSWITCH_TRUE@	$(GLIB_LIBS)
+
 src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \
 	$(src_tests_cppflags) \
 	-DTESTDIR="\"$(abs_srcdir)\""
@@ -5645,24 +5827,11 @@ src_tests_test_wired_defname_LDADD = $(src_tests_ldadd)
 src_tests_test_utils_CPPFLAGS = $(src_tests_cppflags)
 src_tests_test_utils_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_utils_LDADD = $(src_tests_ldadd)
-src_tests_test_route_manager_ldflags = \
-	$(CODE_COVERAGE_LDFLAGS)
-
-src_tests_test_route_manager_ldadd = \
-	src/libNetworkManagerTest.la \
-	$(GLIB_LIBS) \
-	$(LIBUDEV_LIBS) \
-	$(LIBNL_LIBS)
-
-src_tests_test_route_manager_fake_SOURCES = src/tests/test-route-manager.c
-src_tests_test_route_manager_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_tests_test_route_manager_fake_LDFLAGS = $(src_tests_test_route_manager_ldflags)
-src_tests_test_route_manager_fake_LDADD = $(src_tests_test_route_manager_ldadd)
-src_tests_test_route_manager_linux_SOURCES = src/tests/test-route-manager.c
-src_tests_test_route_manager_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_tests_test_route_manager_linux_LDFLAGS = $(src_tests_test_route_manager_ldflags)
-src_tests_test_route_manager_linux_LDADD = $(src_tests_test_route_manager_ldadd)
 src_tests_test_systemd_CPPFLAGS = $(src_libsystemd_nm_la_cppflags)
+src_tests_test_systemd_SOURCES = \
+	shared/nm-utils/siphash24.c \
+	src/tests/test-systemd.c
+
 src_tests_test_systemd_LDADD = \
 	src/libsystemd-nm.la \
 	$(src_libsystemd_nm_la_libadd)
@@ -5741,40 +5910,106 @@ clients_nm_online_LDADD = \
 	libnm/libnm.la \
 	$(GLIB_LIBS)
 
-@BUILD_NMCLI_TRUE@clients_cli_nmcli_SOURCES = clients/cli/agent.c \
-@BUILD_NMCLI_TRUE@	clients/cli/agent.h clients/cli/common.c \
-@BUILD_NMCLI_TRUE@	clients/cli/common.h \
+
+###############################################################################
+# clients/common
+###############################################################################
+clients_cppflags = \
+	-I$(srcdir)/shared \
+	-I$(builddir)/shared \
+	-I$(srcdir)/libnm-core \
+	-I$(builddir)/libnm-core \
+	-I$(srcdir)/libnm \
+	-I$(builddir)/libnm \
+	-I$(srcdir)/clients/common \
+	-I$(builddir)/clients/common \
+	$(GLIB_CFLAGS) \
+	-DNMLOCALEDIR=\"$(datadir)/locale\"
+
+clients_common_libnmc_base_la_SOURCES = \
+	shared/nm-utils/nm-enum-utils.c \
+	shared/nm-utils/nm-enum-utils.h \
+	shared/nm-utils/nm-hash-utils.c \
+	shared/nm-utils/nm-hash-utils.h \
+	shared/nm-utils/nm-random-utils.c \
+	shared/nm-utils/nm-random-utils.h \
+	shared/nm-utils/nm-shared-utils.c \
+	shared/nm-utils/nm-shared-utils.h \
+	shared/nm-utils/siphash24.c \
+	shared/nm-utils/siphash24.h \
+	\
+	clients/common/nm-secret-agent-simple.c \
+	clients/common/nm-secret-agent-simple.h \
+	clients/common/nm-vpn-helpers.c \
+	clients/common/nm-vpn-helpers.h \
+	clients/common/nm-client-utils.c \
+	clients/common/nm-client-utils.h
+
+clients_common_libnmc_base_la_CPPFLAGS = \
+	$(clients_cppflags) \
+	-DG_LOG_DOMAIN=\""libnmc"\"
+
+clients_common_libnmc_base_la_LIBADD = \
+	libnm/libnm.la \
+	$(GLIB_LIBS)
+
+clients_common_settings_doc_c = clients/common/settings-docs.c
+clients_common_libnmc_la_SOURCES = \
+	shared/nm-meta-setting.c \
+	shared/nm-meta-setting.h \
+	\
+	clients/common/nm-meta-setting-desc.c \
+	clients/common/nm-meta-setting-desc.h \
+	clients/common/nm-meta-setting-access.c \
+	clients/common/nm-meta-setting-access.h \
+	$(NULL)
+
+clients_common_libnmc_la_CPPFLAGS = \
+	$(clients_cppflags) \
+	-DG_LOG_DOMAIN=\""libnmc"\"
+
+clients_common_libnmc_la_LIBADD = \
+	libnm/libnm.la \
+	clients/common/libnmc-base.la \
+	$(GLIB_LIBS)
+
+clients_common_tests_test_general_CPPFLAGS = \
+	-I$(srcdir)/clients/common/tests \
+	$(clients_cppflags) \
+	-DG_LOG_DOMAIN=\""libnmc"\"
+
+clients_common_tests_test_general_LDADD = \
+	libnm/libnm.la \
+	clients/common/libnmc-base.la \
+	clients/common/libnmc.la \
+	$(GLIB_LIBS)
+
+@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/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/general.c clients/cli/general.h \
 @BUILD_NMCLI_TRUE@	clients/cli/settings.c \
 @BUILD_NMCLI_TRUE@	clients/cli/settings.h clients/cli/nmcli.c \
-@BUILD_NMCLI_TRUE@	clients/cli/nmcli.h clients/cli/utils.c \
-@BUILD_NMCLI_TRUE@	clients/cli/utils.h \
+@BUILD_NMCLI_TRUE@	clients/cli/nmcli.h \
 @BUILD_NMCLI_TRUE@	clients/cli/polkit-agent.c \
-@BUILD_NMCLI_TRUE@	clients/cli/polkit-agent.h \
-@BUILD_NMCLI_TRUE@	clients/common/nm-secret-agent-simple.c \
-@BUILD_NMCLI_TRUE@	clients/common/nm-secret-agent-simple.h \
-@BUILD_NMCLI_TRUE@	clients/common/nm-vpn-helpers.c \
-@BUILD_NMCLI_TRUE@	clients/common/nm-vpn-helpers.h $(NULL) \
-@BUILD_NMCLI_TRUE@	$(am__append_53)
-@BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS = -I$(srcdir)/shared \
-@BUILD_NMCLI_TRUE@	-I$(builddir)/shared -I$(srcdir)/libnm-core \
-@BUILD_NMCLI_TRUE@	-I$(builddir)/libnm-core -I$(srcdir)/libnm \
-@BUILD_NMCLI_TRUE@	-I$(builddir)/libnm -I$(srcdir)/clients/cli \
-@BUILD_NMCLI_TRUE@	-I$(builddir)/clients/cli \
-@BUILD_NMCLI_TRUE@	-I$(srcdir)/clients/common $(GLIB_CFLAGS) \
+@BUILD_NMCLI_TRUE@	clients/cli/polkit-agent.h $(NULL) \
+@BUILD_NMCLI_TRUE@	$(am__append_60)
+@BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS =  \
+@BUILD_NMCLI_TRUE@	-I$(srcdir)/clients/cli $(clients_cppflags) \
 @BUILD_NMCLI_TRUE@	-DG_LOG_DOMAIN=\""nmcli"\" \
 @BUILD_NMCLI_TRUE@	-DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \
-@BUILD_NMCLI_TRUE@	$(am__append_52)
-@BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = $(GLIB_LIBS) \
-@BUILD_NMCLI_TRUE@	$(READLINE_LIBS) libnm/libnm.la \
-@BUILD_NMCLI_TRUE@	$(am__append_54)
+@BUILD_NMCLI_TRUE@	$(am__append_59)
+@BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = libnm/libnm.la \
+@BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
+@BUILD_NMCLI_TRUE@	clients/common/libnmc.la $(GLIB_LIBS) \
+@BUILD_NMCLI_TRUE@	$(READLINE_LIBS) $(am__append_61)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \
 @BUILD_NMCLI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
 
-clients_cli_settings_doc_c = clients/cli/settings-docs.c
 @BUILD_NMTUI_TRUE@clients_tui_newt_libnmt_newt_a_SOURCES = \
 @BUILD_NMTUI_TRUE@	clients/tui/newt/nmt-newt.h \
 @BUILD_NMTUI_TRUE@	clients/tui/newt/nmt-newt-types.h \
@@ -5913,26 +6148,14 @@ clients_cli_settings_doc_c = clients/cli/settings-docs.c
 @BUILD_NMTUI_TRUE@	clients/tui/nmt-utils.h \
 @BUILD_NMTUI_TRUE@	clients/tui/nmt-widget-list.c \
 @BUILD_NMTUI_TRUE@	clients/tui/nmt-widget-list.h \
-@BUILD_NMTUI_TRUE@	clients/common/nm-secret-agent-simple.c \
-@BUILD_NMTUI_TRUE@	clients/common/nm-secret-agent-simple.h \
-@BUILD_NMTUI_TRUE@	clients/common/nm-vpn-helpers.c \
-@BUILD_NMTUI_TRUE@	clients/common/nm-vpn-helpers.h \
 @BUILD_NMTUI_TRUE@	$(NULL)
 
 @BUILD_NMTUI_TRUE@clients_tui_nmtui_CPPFLAGS = \
-@BUILD_NMTUI_TRUE@	-I$(srcdir)/shared \
-@BUILD_NMTUI_TRUE@	-I$(builddir)/shared \
-@BUILD_NMTUI_TRUE@	-I$(srcdir)/libnm-core \
-@BUILD_NMTUI_TRUE@	-I$(builddir)/libnm-core \
-@BUILD_NMTUI_TRUE@	-I$(srcdir)/libnm \
-@BUILD_NMTUI_TRUE@	-I$(builddir)/libnm \
 @BUILD_NMTUI_TRUE@	-I$(srcdir)/clients/tui/newt \
-@BUILD_NMTUI_TRUE@	-I$(srcdir)/clients/common \
-@BUILD_NMTUI_TRUE@	$(GLIB_CFLAGS) \
+@BUILD_NMTUI_TRUE@	$(clients_cppflags) \
 @BUILD_NMTUI_TRUE@	$(NEWT_CFLAGS) \
 @BUILD_NMTUI_TRUE@	-DG_LOG_DOMAIN=\""nmtui"\" \
-@BUILD_NMTUI_TRUE@	-DLOCALEDIR=\""$(localedir)"\" \
-@BUILD_NMTUI_TRUE@	$(NULL)
+@BUILD_NMTUI_TRUE@	-DLOCALEDIR=\""$(localedir)"\"
 
 @BUILD_NMTUI_TRUE@clients_tui_nmtui_LDFLAGS = \
 @BUILD_NMTUI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
@@ -5940,6 +6163,7 @@ clients_cli_settings_doc_c = clients/cli/settings-docs.c
 @BUILD_NMTUI_TRUE@clients_tui_nmtui_LDADD = \
 @BUILD_NMTUI_TRUE@	libnm/libnm.la \
 @BUILD_NMTUI_TRUE@	clients/tui/newt/libnmt-newt.a \
+@BUILD_NMTUI_TRUE@	clients/common/libnmc-base.la \
 @BUILD_NMTUI_TRUE@	$(GLIB_LIBS) \
 @BUILD_NMTUI_TRUE@	$(NEWT_LIBS) \
 @BUILD_NMTUI_TRUE@	$(NULL)
@@ -5984,8 +6208,8 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DLOCALEDIR=\"$(datadir)/locale\" \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_CFLAGS) $(am__append_65) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_68)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_CFLAGS) $(am__append_71) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_74)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_h_pub_real = \
 @WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-version-macros.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/NetworkManager.h \
@@ -6073,7 +6297,7 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-vpn.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-value-transforms.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_66) $(am__append_69)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_72) $(am__append_75)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_mkenums = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.c
 
@@ -6090,19 +6314,19 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_lib_h_pub_real))
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LIBADD =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(DBUS_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_LIBS) $(am__append_67) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_70)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_LIBS) $(am__append_73) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_76)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LDFLAGS = \
 @WITH_LEGACY_LIBRARIES_TRUE@	-Wl,--version-script=$(srcdir)/libnm-util/libnm-util.ver \
 @WITH_LEGACY_LIBRARIES_TRUE@	-version-info "9:0:7"
 
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_SOURCES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_73) $(am__append_75)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_79) $(am__append_81)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_CPPFLAGS = $(libnm_util_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_LIBADD =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(am__append_74) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_76)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(am__append_80) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_82)
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util
@@ -6798,6 +7022,62 @@ clean-pppd_pluginLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
+shared/nm-utils/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-utils
+	@: > shared/nm-utils/$(am__dirstamp)
+shared/nm-utils/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-utils/$(DEPDIR)
+	@: > shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+clients/common/$(am__dirstamp):
+	@$(MKDIR_P) clients/common
+	@: > clients/common/$(am__dirstamp)
+clients/common/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) clients/common/$(DEPDIR)
+	@: > clients/common/$(DEPDIR)/$(am__dirstamp)
+clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo:  \
+	clients/common/$(am__dirstamp) \
+	clients/common/$(DEPDIR)/$(am__dirstamp)
+clients/common/clients_common_libnmc_base_la-nm-vpn-helpers.lo:  \
+	clients/common/$(am__dirstamp) \
+	clients/common/$(DEPDIR)/$(am__dirstamp)
+clients/common/clients_common_libnmc_base_la-nm-client-utils.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)
+shared/$(am__dirstamp):
+	@$(MKDIR_P) shared
+	@: > shared/$(am__dirstamp)
+shared/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/$(DEPDIR)
+	@: > shared/$(DEPDIR)/$(am__dirstamp)
+shared/clients_common_libnmc_la-nm-meta-setting.lo:  \
+	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
+clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo:  \
+	clients/common/$(am__dirstamp) \
+	clients/common/$(DEPDIR)/$(am__dirstamp)
+clients/common/clients_common_libnmc_la-nm-meta-setting-access.lo:  \
+	clients/common/$(am__dirstamp) \
+	clients/common/$(DEPDIR)/$(am__dirstamp)
+
+clients/common/libnmc.la: $(clients_common_libnmc_la_OBJECTS) $(clients_common_libnmc_la_DEPENDENCIES) $(EXTRA_clients_common_libnmc_la_DEPENDENCIES) clients/common/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK) $(am_clients_common_libnmc_la_rpath) $(clients_common_libnmc_la_OBJECTS) $(clients_common_libnmc_la_LIBADD) $(LIBS)
 dispatcher/$(am__dirstamp):
 	@$(MKDIR_P) dispatcher
 	@: > dispatcher/$(am__dirstamp)
@@ -6867,6 +7147,18 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.M
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OlpcMesh.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
+introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo:  \
+	introspection/$(am__dirstamp) \
+	introspection/$(DEPDIR)/$(am__dirstamp)
+introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo:  \
+	introspection/$(am__dirstamp) \
+	introspection/$(DEPDIR)/$(am__dirstamp)
+introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo:  \
+	introspection/$(am__dirstamp) \
+	introspection/$(DEPDIR)/$(am__dirstamp)
+introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo:  \
+	introspection/$(am__dirstamp) \
+	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Statistics.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
@@ -6933,25 +7225,31 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plug
 
 introspection/libnmdbus.la: $(introspection_libnmdbus_la_OBJECTS) $(introspection_libnmdbus_la_DEPENDENCIES) $(EXTRA_introspection_libnmdbus_la_DEPENDENCIES) introspection/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK)  $(introspection_libnmdbus_la_OBJECTS) $(introspection_libnmdbus_la_LIBADD) $(LIBS)
-shared/nm-utils/$(am__dirstamp):
-	@$(MKDIR_P) shared/nm-utils
-	@: > shared/nm-utils/$(am__dirstamp)
-shared/nm-utils/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) shared/nm-utils/$(DEPDIR)
-	@: > shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo:  \
 	shared/nm-utils/$(am__dirstamp) \
 	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo:  \
 	shared/nm-utils/$(am__dirstamp) \
 	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/$(am__dirstamp):
-	@$(MKDIR_P) shared
-	@: > shared/$(am__dirstamp)
-shared/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) shared/$(DEPDIR)
-	@: > shared/$(DEPDIR)/$(am__dirstamp)
-shared/libnm_core_libnm_core_la-nm-setting-metadata.lo:  \
+shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/libnm_core_libnm_core_la-nm-meta-setting.lo:  \
 	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
 libnm-core/$(am__dirstamp):
 	@$(MKDIR_P) libnm-core
@@ -7043,6 +7341,18 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-macvlan.lo:  \
 libnm-core/libnm_core_libnm_core_la-nm-setting-olpc-mesh.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-bridge.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-interface.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-patch.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-port.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_libnm_core_la-nm-setting-ppp.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -7415,6 +7725,14 @@ libnm/libnm_libnm_la-nm-device-modem.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-device-olpc-mesh.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/libnm_libnm_la-nm-device-ovs-interface.lo:  \
+	libnm/$(am__dirstamp) libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/libnm_libnm_la-nm-device-ovs-port.lo: libnm/$(am__dirstamp) \
+	libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/libnm_libnm_la-nm-device-ovs-bridge.lo: libnm/$(am__dirstamp) \
+	libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/libnm_libnm_la-nm-device-ppp.lo: libnm/$(am__dirstamp) \
+	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-device-team.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_libnm_la-nm-device-tun.lo: libnm/$(am__dirstamp) \
@@ -7525,6 +7843,30 @@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-
 
 src/devices/bluetooth/libnm-device-plugin-bluetooth.la: $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES) $(EXTRA_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES) src/devices/bluetooth/$(am__dirstamp)
 	$(AM_V_CCLD)$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK) $(am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_rpath) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD) $(LIBS)
+src/devices/ovs/$(am__dirstamp):
+	@$(MKDIR_P) src/devices/ovs
+	@: > src/devices/ovs/$(am__dirstamp)
+src/devices/ovs/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/devices/ovs/$(DEPDIR)
+	@: > src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.lo:  \
+	src/devices/ovs/$(am__dirstamp) \
+	src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-factory.lo:  \
+	src/devices/ovs/$(am__dirstamp) \
+	src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo:  \
+	src/devices/ovs/$(am__dirstamp) \
+	src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.lo:  \
+	src/devices/ovs/$(am__dirstamp) \
+	src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo:  \
+	src/devices/ovs/$(am__dirstamp) \
+	src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+
+src/devices/ovs/libnm-device-plugin-ovs.la: $(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS) $(src_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES) $(EXTRA_src_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES) src/devices/ovs/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_devices_ovs_libnm_device_plugin_ovs_la_LINK) $(am_src_devices_ovs_libnm_device_plugin_ovs_la_rpath) $(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS) $(src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD) $(LIBS)
 src/devices/team/$(am__dirstamp):
 	@$(MKDIR_P) src/devices/team
 	@: > src/devices/team/$(am__dirstamp)
@@ -7652,6 +7994,9 @@ src/devices/src_libNetworkManager_la-nm-device-macsec.lo:  \
 src/devices/src_libNetworkManager_la-nm-device-macvlan.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
+src/devices/src_libNetworkManager_la-nm-device-ppp.lo:  \
+	src/devices/$(am__dirstamp) \
+	src/devices/$(DEPDIR)/$(am__dirstamp)
 src/devices/src_libNetworkManager_la-nm-device-tun.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
@@ -7670,6 +8015,8 @@ src/dhcp/$(am__dirstamp):
 src/dhcp/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/dhcp/$(DEPDIR)
 	@: > src/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.lo:  \
+	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
 src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient.lo:  \
 	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
 src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcd.lo:  \
@@ -7714,6 +8061,8 @@ src/ppp/$(DEPDIR)/$(am__dirstamp):
 	@: > src/ppp/$(DEPDIR)/$(am__dirstamp)
 src/ppp/src_libNetworkManager_la-nm-ppp-manager-call.lo:  \
 	src/ppp/$(am__dirstamp) src/ppp/$(DEPDIR)/$(am__dirstamp)
+src/src_libNetworkManager_la-nm-hostname-manager.lo:  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/settings/$(am__dirstamp):
 	@$(MKDIR_P) src/settings
 	@: > src/settings/$(am__dirstamp)
@@ -7803,8 +8152,6 @@ src/src_libNetworkManager_la-nm-dcb.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManager_la-nm-netns.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/src_libNetworkManager_la-nm-default-route-manager.lo:  \
-	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManager_la-nm-dhcp4-config.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManager_la-nm-dhcp6-config.lo: src/$(am__dirstamp) \
@@ -7842,8 +8189,6 @@ src/src_libNetworkManagerBase_la-nm-core-utils.lo:  \
 	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManagerBase_la-nm-logging.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/src_libNetworkManagerBase_la-nm-multi-index.lo:  \
-	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo:  \
 	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/platform/$(am__dirstamp):
@@ -7895,8 +8240,6 @@ src/src_libNetworkManagerBase_la-nm-ip4-config.lo:  \
 	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_libNetworkManagerBase_la-nm-ip6-config.lo:  \
 	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/src_libNetworkManagerBase_la-nm-route-manager.lo:  \
-	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-client.lo:  \
 	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
 src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-utils.lo:  \
@@ -8005,10 +8348,10 @@ src/systemd/src/basic/src_libsystemd_nm_la-path-util.lo:  \
 src/systemd/src/basic/src_libsystemd_nm_la-prioq.lo:  \
 	src/systemd/src/basic/$(am__dirstamp) \
 	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/src_libsystemd_nm_la-random-util.lo:  \
+src/systemd/src/basic/src_libsystemd_nm_la-process-util.lo:  \
 	src/systemd/src/basic/$(am__dirstamp) \
 	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/src_libsystemd_nm_la-siphash24.lo:  \
+src/systemd/src/basic/src_libsystemd_nm_la-random-util.lo:  \
 	src/systemd/src/basic/$(am__dirstamp) \
 	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
 src/systemd/src/basic/src_libsystemd_nm_la-socket-util.lo:  \
@@ -8414,10 +8757,16 @@ clients/cli/$(am__dirstamp):
 clients/cli/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) clients/cli/$(DEPDIR)
 	@: > clients/cli/$(DEPDIR)/$(am__dirstamp)
+clients/cli/clients_cli_nmcli-common.$(OBJEXT):  \
+	clients/cli/$(am__dirstamp) \
+	clients/cli/$(DEPDIR)/$(am__dirstamp)
+clients/cli/clients_cli_nmcli-utils.$(OBJEXT):  \
+	clients/cli/$(am__dirstamp) \
+	clients/cli/$(DEPDIR)/$(am__dirstamp)
 clients/cli/clients_cli_nmcli-agent.$(OBJEXT):  \
 	clients/cli/$(am__dirstamp) \
 	clients/cli/$(DEPDIR)/$(am__dirstamp)
-clients/cli/clients_cli_nmcli-common.$(OBJEXT):  \
+clients/cli/clients_cli_nmcli-general.$(OBJEXT):  \
 	clients/cli/$(am__dirstamp) \
 	clients/cli/$(DEPDIR)/$(am__dirstamp)
 clients/cli/clients_cli_nmcli-connections.$(OBJEXT):  \
@@ -8426,33 +8775,15 @@ clients/cli/clients_cli_nmcli-connections.$(OBJEXT):  \
 clients/cli/clients_cli_nmcli-devices.$(OBJEXT):  \
 	clients/cli/$(am__dirstamp) \
 	clients/cli/$(DEPDIR)/$(am__dirstamp)
-clients/cli/clients_cli_nmcli-general.$(OBJEXT):  \
-	clients/cli/$(am__dirstamp) \
-	clients/cli/$(DEPDIR)/$(am__dirstamp)
 clients/cli/clients_cli_nmcli-settings.$(OBJEXT):  \
 	clients/cli/$(am__dirstamp) \
 	clients/cli/$(DEPDIR)/$(am__dirstamp)
 clients/cli/clients_cli_nmcli-nmcli.$(OBJEXT):  \
 	clients/cli/$(am__dirstamp) \
 	clients/cli/$(DEPDIR)/$(am__dirstamp)
-clients/cli/clients_cli_nmcli-utils.$(OBJEXT):  \
-	clients/cli/$(am__dirstamp) \
-	clients/cli/$(DEPDIR)/$(am__dirstamp)
 clients/cli/clients_cli_nmcli-polkit-agent.$(OBJEXT):  \
 	clients/cli/$(am__dirstamp) \
 	clients/cli/$(DEPDIR)/$(am__dirstamp)
-clients/common/$(am__dirstamp):
-	@$(MKDIR_P) clients/common
-	@: > clients/common/$(am__dirstamp)
-clients/common/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) clients/common/$(DEPDIR)
-	@: > clients/common/$(DEPDIR)/$(am__dirstamp)
-clients/common/clients_cli_nmcli-nm-secret-agent-simple.$(OBJEXT):  \
-	clients/common/$(am__dirstamp) \
-	clients/common/$(DEPDIR)/$(am__dirstamp)
-clients/common/clients_cli_nmcli-nm-vpn-helpers.$(OBJEXT):  \
-	clients/common/$(am__dirstamp) \
-	clients/common/$(DEPDIR)/$(am__dirstamp)
 clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT):  \
 	clients/common/$(am__dirstamp) \
 	clients/common/$(DEPDIR)/$(am__dirstamp)
@@ -8460,6 +8791,19 @@ clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT):  \
 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)
 	$(AM_V_CCLD)$(clients_cli_nmcli_LINK) $(clients_cli_nmcli_OBJECTS) $(clients_cli_nmcli_LDADD) $(LIBS)
+clients/common/tests/$(am__dirstamp):
+	@$(MKDIR_P) clients/common/tests
+	@: > clients/common/tests/$(am__dirstamp)
+clients/common/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) clients/common/tests/$(DEPDIR)
+	@: > clients/common/tests/$(DEPDIR)/$(am__dirstamp)
+clients/common/tests/clients_common_tests_test_general-test-general.$(OBJEXT):  \
+	clients/common/tests/$(am__dirstamp) \
+	clients/common/tests/$(DEPDIR)/$(am__dirstamp)
+
+clients/common/tests/test-general$(EXEEXT): $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_DEPENDENCIES) $(EXTRA_clients_common_tests_test_general_DEPENDENCIES) clients/common/tests/$(am__dirstamp)
+	@rm -f clients/common/tests/test-general$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_LDADD) $(LIBS)
 clients/$(am__dirstamp):
 	@$(MKDIR_P) clients
 	@: > clients/$(am__dirstamp)
@@ -8598,12 +8942,6 @@ clients/tui/clients_tui_nmtui-nmt-utils.$(OBJEXT):  \
 clients/tui/clients_tui_nmtui-nmt-widget-list.$(OBJEXT):  \
 	clients/tui/$(am__dirstamp) \
 	clients/tui/$(DEPDIR)/$(am__dirstamp)
-clients/common/clients_tui_nmtui-nm-secret-agent-simple.$(OBJEXT):  \
-	clients/common/$(am__dirstamp) \
-	clients/common/$(DEPDIR)/$(am__dirstamp)
-clients/common/clients_tui_nmtui-nm-vpn-helpers.$(OBJEXT):  \
-	clients/common/$(am__dirstamp) \
-	clients/common/$(DEPDIR)/$(am__dirstamp)
 
 clients/tui/nmtui$(EXEEXT): $(clients_tui_nmtui_OBJECTS) $(clients_tui_nmtui_DEPENDENCIES) $(EXTRA_clients_tui_nmtui_DEPENDENCIES) clients/tui/$(am__dirstamp)
 	@rm -f clients/tui/nmtui$(EXEEXT)
@@ -9245,18 +9583,9 @@ src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.$(OBJEXT):
 src/tests/test-resolvconf-capture$(EXEEXT): $(src_tests_test_resolvconf_capture_OBJECTS) $(src_tests_test_resolvconf_capture_DEPENDENCIES) $(EXTRA_src_tests_test_resolvconf_capture_DEPENDENCIES) src/tests/$(am__dirstamp)
 	@rm -f src/tests/test-resolvconf-capture$(EXEEXT)
 	$(AM_V_CCLD)$(src_tests_test_resolvconf_capture_LINK) $(src_tests_test_resolvconf_capture_OBJECTS) $(src_tests_test_resolvconf_capture_LDADD) $(LIBS)
-src/tests/src_tests_test_route_manager_fake-test-route-manager.$(OBJEXT):  \
-	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-route-manager-fake$(EXEEXT): $(src_tests_test_route_manager_fake_OBJECTS) $(src_tests_test_route_manager_fake_DEPENDENCIES) $(EXTRA_src_tests_test_route_manager_fake_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-route-manager-fake$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_route_manager_fake_LINK) $(src_tests_test_route_manager_fake_OBJECTS) $(src_tests_test_route_manager_fake_LDADD) $(LIBS)
-src/tests/src_tests_test_route_manager_linux-test-route-manager.$(OBJEXT):  \
-	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-route-manager-linux$(EXEEXT): $(src_tests_test_route_manager_linux_OBJECTS) $(src_tests_test_route_manager_linux_DEPENDENCIES) $(EXTRA_src_tests_test_route_manager_linux_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-route-manager-linux$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_route_manager_linux_LINK) $(src_tests_test_route_manager_linux_OBJECTS) $(src_tests_test_route_manager_linux_LDADD) $(LIBS)
+shared/nm-utils/src_tests_test_systemd-siphash24.$(OBJEXT):  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 src/tests/src_tests_test_systemd-test-systemd.$(OBJEXT):  \
 	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
 
@@ -9281,6 +9610,8 @@ mostlyclean-compile:
 	-rm -f clients/*.$(OBJEXT)
 	-rm -f clients/cli/*.$(OBJEXT)
 	-rm -f clients/common/*.$(OBJEXT)
+	-rm -f clients/common/*.lo
+	-rm -f clients/common/tests/*.$(OBJEXT)
 	-rm -f clients/tui/*.$(OBJEXT)
 	-rm -f clients/tui/newt/*.$(OBJEXT)
 	-rm -f dispatcher/*.$(OBJEXT)
@@ -9314,6 +9645,8 @@ mostlyclean-compile:
 	-rm -f src/devices/adsl/*.lo
 	-rm -f src/devices/bluetooth/*.$(OBJEXT)
 	-rm -f src/devices/bluetooth/*.lo
+	-rm -f src/devices/ovs/*.$(OBJEXT)
+	-rm -f src/devices/ovs/*.lo
 	-rm -f src/devices/team/*.$(OBJEXT)
 	-rm -f src/devices/team/*.lo
 	-rm -f src/devices/tests/*.$(OBJEXT)
@@ -9394,10 +9727,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@clients/cli/$(DEPDIR)/clients_cli_nmcli-settings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/clients_cli_nmcli-nm-polkit-listener.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/clients_cli_nmcli-nm-secret-agent-simple.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/clients_cli_nmcli-nm-vpn-helpers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/clients_tui_nmtui-nm-secret-agent-simple.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/clients_tui_nmtui-nm-vpn-helpers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-client-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-vpn-helpers.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-access.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-desc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clients/tui/$(DEPDIR)/clients_tui_nmtui-nm-editor-bindings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clients/tui/$(DEPDIR)/clients_tui_nmtui-nm-editor-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clients/tui/$(DEPDIR)/clients_tui_nmtui-nmt-address-list.Po@am__quote@
@@ -9492,7 +9827,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Macvlan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Modem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OlpcMesh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Statistics.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Team.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Tun.Plo@am__quote@
@@ -9543,6 +9882,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-macsec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-macvlan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-olpc-mesh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-bridge.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-interface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-patch.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-port.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ppp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-pppoe.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-proxy.Plo@am__quote@
@@ -9674,6 +10017,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-macvlan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-modem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-olpc-mesh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-bridge.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-interface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-port.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ppp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-team.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-tun.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-vlan.Plo@am__quote@
@@ -9704,17 +10051,30 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_secret_agent-test-secret-agent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-metadata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_NetworkManager-main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-NetworkManagerUtils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-main-utils.Plo@am__quote@
@@ -9723,8 +10083,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip4-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip6-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-logging.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-multi-index.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-route-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-act-request.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-active-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-audit-manager.Plo@am__quote@
@@ -9738,11 +10096,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-default-route-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp4-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp6-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dispatcher.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-firewall-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-hostname-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-netns.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-pacrunner-manager.Plo@am__quote@
@@ -9764,6 +10122,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ip-tunnel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-macsec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-macvlan.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ppp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-tun.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-veth.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-vlan.Plo@am__quote@
@@ -9780,6 +10139,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/bluetooth/$(DEPDIR)/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/bluetooth/$(DEPDIR)/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bt-error.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/bluetooth/$(DEPDIR)/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-device-bt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-factory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-device-team.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-team-factory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Po@am__quote@
@@ -9805,6 +10169,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dhcp-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhclient-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhclient.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhcpcanon.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhcpcd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-listener.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/tests/$(DEPDIR)/src_dhcp_tests_test_dhcp_dhclient-test-dhcp-dhclient.Po@am__quote@
@@ -9906,8 +10271,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-parse-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-path-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-prioq.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-process-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-random-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-siphash24.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-socket-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-string-table.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-string-util.Plo@am__quote@
@@ -9942,8 +10307,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_ip4_config-test-ip4-config.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_ip6_config-test-ip6-config.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_route_manager_fake-test-route-manager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_route_manager_linux-test-route-manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_systemd-test-systemd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_utils-test-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_wired_defname-test-wired-defname.Po@am__quote@
@@ -10256,6 +10619,83 @@ clients/tui/newt/clients_tui_newt_libnmt_newt_a-nmt-newt-widget.obj: clients/tui
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_tui_newt_libnmt_newt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/tui/newt/clients_tui_newt_libnmt_newt_a-nmt-newt-widget.obj `if test -f 'clients/tui/newt/nmt-newt-widget.c'; then $(CYGPATH_W) 'clients/tui/newt/nmt-newt-widget.c'; else $(CYGPATH_W) '$(srcdir)/clients/tui/newt/nmt-newt-widget.c'; fi`
 
+shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo: shared/nm-utils/nm-enum-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-enum-utils.c' object='shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
+
+shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo: shared/nm-utils/nm-hash-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-hash-utils.c' object='shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
+
+shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo: shared/nm-utils/nm-random-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-random-utils.c' object='shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
+
+shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
+
+shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo: shared/nm-utils/siphash24.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
+
+clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo: clients/common/nm-secret-agent-simple.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo -MD -MP -MF clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Tpo -c -o clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo `test -f 'clients/common/nm-secret-agent-simple.c' || echo '$(srcdir)/'`clients/common/nm-secret-agent-simple.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Tpo clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-secret-agent-simple.c' object='clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.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/clients_common_libnmc_base_la-nm-secret-agent-simple.lo `test -f 'clients/common/nm-secret-agent-simple.c' || echo '$(srcdir)/'`clients/common/nm-secret-agent-simple.c
+
+clients/common/clients_common_libnmc_base_la-nm-vpn-helpers.lo: clients/common/nm-vpn-helpers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_common_libnmc_base_la-nm-vpn-helpers.lo -MD -MP -MF clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-vpn-helpers.Tpo -c -o clients/common/clients_common_libnmc_base_la-nm-vpn-helpers.lo `test -f 'clients/common/nm-vpn-helpers.c' || echo '$(srcdir)/'`clients/common/nm-vpn-helpers.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-vpn-helpers.Tpo clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-vpn-helpers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-vpn-helpers.c' object='clients/common/clients_common_libnmc_base_la-nm-vpn-helpers.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/clients_common_libnmc_base_la-nm-vpn-helpers.lo `test -f 'clients/common/nm-vpn-helpers.c' || echo '$(srcdir)/'`clients/common/nm-vpn-helpers.c
+
+clients/common/clients_common_libnmc_base_la-nm-client-utils.lo: clients/common/nm-client-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_common_libnmc_base_la-nm-client-utils.lo -MD -MP -MF clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-client-utils.Tpo -c -o clients/common/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
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-client-utils.Tpo clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-client-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-client-utils.c' object='clients/common/clients_common_libnmc_base_la-nm-client-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/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
+
+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
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/clients_common_libnmc_la-nm-meta-setting.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/clients_common_libnmc_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
+
+clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo: clients/common/nm-meta-setting-desc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo -MD -MP -MF clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-desc.Tpo -c -o clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo `test -f 'clients/common/nm-meta-setting-desc.c' || echo '$(srcdir)/'`clients/common/nm-meta-setting-desc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-desc.Tpo clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-desc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-meta-setting-desc.c' object='clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/clients_common_libnmc_la-nm-meta-setting-desc.lo `test -f 'clients/common/nm-meta-setting-desc.c' || echo '$(srcdir)/'`clients/common/nm-meta-setting-desc.c
+
+clients/common/clients_common_libnmc_la-nm-meta-setting-access.lo: clients/common/nm-meta-setting-access.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_common_libnmc_la-nm-meta-setting-access.lo -MD -MP -MF clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-access.Tpo -c -o clients/common/clients_common_libnmc_la-nm-meta-setting-access.lo `test -f 'clients/common/nm-meta-setting-access.c' || echo '$(srcdir)/'`clients/common/nm-meta-setting-access.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-access.Tpo clients/common/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting-access.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-meta-setting-access.c' object='clients/common/clients_common_libnmc_la-nm-meta-setting-access.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/clients_common_libnmc_la-nm-meta-setting-access.lo `test -f 'clients/common/nm-meta-setting-access.c' || echo '$(srcdir)/'`clients/common/nm-meta-setting-access.c
+
 dispatcher/dispatcher_libnm_dispatcher_core_la-nm-dispatcher-utils.lo: dispatcher/nm-dispatcher-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dispatcher_libnm_dispatcher_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatcher/dispatcher_libnm_dispatcher_core_la-nm-dispatcher-utils.lo -MD -MP -MF dispatcher/$(DEPDIR)/dispatcher_libnm_dispatcher_core_la-nm-dispatcher-utils.Tpo -c -o dispatcher/dispatcher_libnm_dispatcher_core_la-nm-dispatcher-utils.lo `test -f 'dispatcher/nm-dispatcher-utils.c' || echo '$(srcdir)/'`dispatcher/nm-dispatcher-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dispatcher/$(DEPDIR)/dispatcher_libnm_dispatcher_core_la-nm-dispatcher-utils.Tpo dispatcher/$(DEPDIR)/dispatcher_libnm_dispatcher_core_la-nm-dispatcher-utils.Plo
@@ -10382,6 +10822,34 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.O
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OlpcMesh.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.c
 
+introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo: introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c
+
+introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo: introspection/org.freedesktop.NetworkManager.Device.OvsPort.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsPort.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsPort.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.OvsPort.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsPort.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsPort.c
+
+introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo: introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c
+
+introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo: introspection/org.freedesktop.NetworkManager.Device.Ppp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Ppp.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Ppp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Ppp.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Ppp.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Ppp.c
+
 introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Statistics.lo: introspection/org.freedesktop.NetworkManager.Device.Statistics.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Statistics.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Statistics.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Statistics.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Statistics.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Statistics.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Statistics.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Device.Statistics.Plo
@@ -10529,6 +10997,34 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plug
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.c
 
+shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo: shared/nm-utils/c-list-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/c-list-util.c' object='shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c
+
+shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo: shared/nm-utils/nm-dedup-multi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-dedup-multi.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c
+
+shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo: shared/nm-utils/nm-enum-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-enum-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
+
+shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: shared/nm-utils/nm-hash-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-hash-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
+
 shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo
@@ -10536,6 +11032,13 @@ shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: shared/nm-utils/nm-
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
 
+shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo: shared/nm-utils/nm-random-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-random-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
+
 shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo
@@ -10543,12 +11046,19 @@ shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: shared/nm-utils/nm-ud
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
 
-shared/libnm_core_libnm_core_la-nm-setting-metadata.lo: shared/nm-setting-metadata.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-setting-metadata.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-metadata.Tpo -c -o shared/libnm_core_libnm_core_la-nm-setting-metadata.lo `test -f 'shared/nm-setting-metadata.c' || echo '$(srcdir)/'`shared/nm-setting-metadata.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-metadata.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-metadata.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-setting-metadata.c' object='shared/libnm_core_libnm_core_la-nm-setting-metadata.lo' libtool=yes @AMDEPBACKSLASH@
+shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo: shared/nm-utils/siphash24.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-setting-metadata.lo `test -f 'shared/nm-setting-metadata.c' || echo '$(srcdir)/'`shared/nm-setting-metadata.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
+
+shared/libnm_core_libnm_core_la-nm-meta-setting.lo: shared/nm-meta-setting.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/libnm_core_libnm_core_la-nm-meta-setting.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
 
 libnm-core/libnm_core_libnm_core_la-crypto.lo: libnm-core/crypto.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c
@@ -10746,6 +11256,34 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-olpc-mesh.lo: libnm-core/nm-setti
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-olpc-mesh.lo `test -f 'libnm-core/nm-setting-olpc-mesh.c' || echo '$(srcdir)/'`libnm-core/nm-setting-olpc-mesh.c
 
+libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-bridge.lo: libnm-core/nm-setting-ovs-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-bridge.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-bridge.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-bridge.lo `test -f 'libnm-core/nm-setting-ovs-bridge.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-bridge.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-bridge.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-bridge.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-bridge.lo `test -f 'libnm-core/nm-setting-ovs-bridge.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-bridge.c
+
+libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-interface.lo: libnm-core/nm-setting-ovs-interface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-interface.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-interface.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-interface.lo `test -f 'libnm-core/nm-setting-ovs-interface.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-interface.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-interface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-interface.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-interface.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-interface.lo `test -f 'libnm-core/nm-setting-ovs-interface.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-interface.c
+
+libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-patch.lo: libnm-core/nm-setting-ovs-patch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-patch.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-patch.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-patch.lo `test -f 'libnm-core/nm-setting-ovs-patch.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-patch.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-patch.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-patch.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-patch.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-patch.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-patch.lo `test -f 'libnm-core/nm-setting-ovs-patch.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-patch.c
+
+libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-port.lo: libnm-core/nm-setting-ovs-port.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-port.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-port.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-port.lo `test -f 'libnm-core/nm-setting-ovs-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-port.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-port.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ovs-port.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-port.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-port.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-ovs-port.lo `test -f 'libnm-core/nm-setting-ovs-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-port.c
+
 libnm-core/libnm_core_libnm_core_la-nm-setting-ppp.lo: libnm-core/nm-setting-ppp.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-ppp.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ppp.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-ppp.lo `test -f 'libnm-core/nm-setting-ppp.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ppp.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ppp.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-ppp.Plo
@@ -11565,6 +12103,34 @@ libnm/libnm_libnm_la-nm-device-olpc-mesh.lo: libnm/nm-device-olpc-mesh.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-device-olpc-mesh.lo `test -f 'libnm/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`libnm/nm-device-olpc-mesh.c
 
+libnm/libnm_libnm_la-nm-device-ovs-interface.lo: libnm/nm-device-ovs-interface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-device-ovs-interface.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-interface.Tpo -c -o libnm/libnm_libnm_la-nm-device-ovs-interface.lo `test -f 'libnm/nm-device-ovs-interface.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-interface.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-interface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-interface.c' object='libnm/libnm_libnm_la-nm-device-ovs-interface.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-device-ovs-interface.lo `test -f 'libnm/nm-device-ovs-interface.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-interface.c
+
+libnm/libnm_libnm_la-nm-device-ovs-port.lo: libnm/nm-device-ovs-port.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-device-ovs-port.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-port.Tpo -c -o libnm/libnm_libnm_la-nm-device-ovs-port.lo `test -f 'libnm/nm-device-ovs-port.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-port.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-port.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-port.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-port.c' object='libnm/libnm_libnm_la-nm-device-ovs-port.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-device-ovs-port.lo `test -f 'libnm/nm-device-ovs-port.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-port.c
+
+libnm/libnm_libnm_la-nm-device-ovs-bridge.lo: libnm/nm-device-ovs-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-device-ovs-bridge.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-bridge.Tpo -c -o libnm/libnm_libnm_la-nm-device-ovs-bridge.lo `test -f 'libnm/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-bridge.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ovs-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-bridge.c' object='libnm/libnm_libnm_la-nm-device-ovs-bridge.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-device-ovs-bridge.lo `test -f 'libnm/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-bridge.c
+
+libnm/libnm_libnm_la-nm-device-ppp.lo: libnm/nm-device-ppp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-device-ppp.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ppp.Tpo -c -o libnm/libnm_libnm_la-nm-device-ppp.lo `test -f 'libnm/nm-device-ppp.c' || echo '$(srcdir)/'`libnm/nm-device-ppp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ppp.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-ppp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ppp.c' object='libnm/libnm_libnm_la-nm-device-ppp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-device-ppp.lo `test -f 'libnm/nm-device-ppp.c' || echo '$(srcdir)/'`libnm/nm-device-ppp.c
+
 libnm/libnm_libnm_la-nm-device-team.lo: libnm/nm-device-team.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-device-team.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-device-team.Tpo -c -o libnm/libnm_libnm_la-nm-device-team.lo `test -f 'libnm/nm-device-team.c' || echo '$(srcdir)/'`libnm/nm-device-team.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-device-team.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-device-team.Plo
@@ -11817,6 +12383,41 @@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo `test -f 'src/devices/bluetooth/nm-bluez5-dun.c' || echo '$(srcdir)/'`src/devices/bluetooth/nm-bluez5-dun.c
 
+src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.lo: src/devices/ovs/nm-ovsdb.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_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.lo -MD -MP -MF src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.Tpo -c -o src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.lo `test -f 'src/devices/ovs/nm-ovsdb.c' || echo '$(srcdir)/'`src/devices/ovs/nm-ovsdb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.Tpo src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/ovs/nm-ovsdb.c' object='src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.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_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.lo `test -f 'src/devices/ovs/nm-ovsdb.c' || echo '$(srcdir)/'`src/devices/ovs/nm-ovsdb.c
+
+src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-factory.lo: src/devices/ovs/nm-ovs-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_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-factory.lo -MD -MP -MF src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-factory.Tpo -c -o src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-factory.lo `test -f 'src/devices/ovs/nm-ovs-factory.c' || echo '$(srcdir)/'`src/devices/ovs/nm-ovs-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-factory.Tpo src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-factory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/ovs/nm-ovs-factory.c' object='src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-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_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovs-factory.lo `test -f 'src/devices/ovs/nm-ovs-factory.c' || echo '$(srcdir)/'`src/devices/ovs/nm-ovs-factory.c
+
+src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo: src/devices/ovs/nm-device-ovs-interface.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_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo -MD -MP -MF src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.Tpo -c -o src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo `test -f 'src/devices/ovs/nm-device-ovs-interface.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.Tpo src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/ovs/nm-device-ovs-interface.c' object='src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.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_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo `test -f 'src/devices/ovs/nm-device-ovs-interface.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-interface.c
+
+src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.lo: src/devices/ovs/nm-device-ovs-port.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_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.lo -MD -MP -MF src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.Tpo -c -o src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.lo `test -f 'src/devices/ovs/nm-device-ovs-port.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-port.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.Tpo src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/ovs/nm-device-ovs-port.c' object='src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.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_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-port.lo `test -f 'src/devices/ovs/nm-device-ovs-port.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-port.c
+
+src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo: src/devices/ovs/nm-device-ovs-bridge.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_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo -MD -MP -MF src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Tpo -c -o src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo `test -f 'src/devices/ovs/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Tpo src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/ovs/nm-device-ovs-bridge.c' object='src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.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_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo `test -f 'src/devices/ovs/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-bridge.c
+
 src/devices/team/src_devices_team_libnm_device_plugin_team_la-nm-team-factory.lo: src/devices/team/nm-team-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_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/team/src_devices_team_libnm_device_plugin_team_la-nm-team-factory.lo -MD -MP -MF src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-team-factory.Tpo -c -o src/devices/team/src_devices_team_libnm_device_plugin_team_la-nm-team-factory.lo `test -f 'src/devices/team/nm-team-factory.c' || echo '$(srcdir)/'`src/devices/team/nm-team-factory.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-team-factory.Tpo src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-team-factory.Plo
@@ -12020,6 +12621,13 @@ src/devices/src_libNetworkManager_la-nm-device-macvlan.lo: src/devices/nm-device
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-device-macvlan.lo `test -f 'src/devices/nm-device-macvlan.c' || echo '$(srcdir)/'`src/devices/nm-device-macvlan.c
 
+src/devices/src_libNetworkManager_la-nm-device-ppp.lo: src/devices/nm-device-ppp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-device-ppp.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ppp.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-ppp.lo `test -f 'src/devices/nm-device-ppp.c' || echo '$(srcdir)/'`src/devices/nm-device-ppp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ppp.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ppp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-ppp.c' object='src/devices/src_libNetworkManager_la-nm-device-ppp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-device-ppp.lo `test -f 'src/devices/nm-device-ppp.c' || echo '$(srcdir)/'`src/devices/nm-device-ppp.c
+
 src/devices/src_libNetworkManager_la-nm-device-tun.lo: src/devices/nm-device-tun.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-device-tun.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-tun.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-tun.lo `test -f 'src/devices/nm-device-tun.c' || echo '$(srcdir)/'`src/devices/nm-device-tun.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-tun.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-tun.Plo
@@ -12048,6 +12656,13 @@ src/devices/src_libNetworkManager_la-nm-device-vxlan.lo: src/devices/nm-device-v
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-device-vxlan.lo `test -f 'src/devices/nm-device-vxlan.c' || echo '$(srcdir)/'`src/devices/nm-device-vxlan.c
 
+src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.lo: src/dhcp/nm-dhcp-dhcpcanon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.lo -MD -MP -MF src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhcpcanon.Tpo -c -o src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.lo `test -f 'src/dhcp/nm-dhcp-dhcpcanon.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhcpcanon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhcpcanon.Tpo src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhcpcanon.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-dhcpcanon.c' object='src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.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/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcanon.lo `test -f 'src/dhcp/nm-dhcp-dhcpcanon.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhcpcanon.c
+
 src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient.lo: src/dhcp/nm-dhcp-dhclient.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient.lo -MD -MP -MF src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhclient.Tpo -c -o src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient.lo `test -f 'src/dhcp/nm-dhcp-dhclient.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhclient.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhclient.Tpo src/dhcp/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp-dhclient.Plo
@@ -12132,6 +12747,13 @@ src/ppp/src_libNetworkManager_la-nm-ppp-manager-call.lo: src/ppp/nm-ppp-manager-
 @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/ppp/src_libNetworkManager_la-nm-ppp-manager-call.lo `test -f 'src/ppp/nm-ppp-manager-call.c' || echo '$(srcdir)/'`src/ppp/nm-ppp-manager-call.c
 
+src/src_libNetworkManager_la-nm-hostname-manager.lo: src/nm-hostname-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-hostname-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-hostname-manager.Tpo -c -o src/src_libNetworkManager_la-nm-hostname-manager.lo `test -f 'src/nm-hostname-manager.c' || echo '$(srcdir)/'`src/nm-hostname-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-hostname-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-hostname-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-hostname-manager.c' object='src/src_libNetworkManager_la-nm-hostname-manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-hostname-manager.lo `test -f 'src/nm-hostname-manager.c' || echo '$(srcdir)/'`src/nm-hostname-manager.c
+
 src/settings/src_libNetworkManager_la-nm-agent-manager.lo: src/settings/nm-agent-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/src_libNetworkManager_la-nm-agent-manager.lo -MD -MP -MF src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-agent-manager.Tpo -c -o src/settings/src_libNetworkManager_la-nm-agent-manager.lo `test -f 'src/settings/nm-agent-manager.c' || echo '$(srcdir)/'`src/settings/nm-agent-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-agent-manager.Tpo src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-agent-manager.Plo
@@ -12307,13 +12929,6 @@ src/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/src_libNetworkManager_la-nm-netns.lo `test -f 'src/nm-netns.c' || echo '$(srcdir)/'`src/nm-netns.c
 
-src/src_libNetworkManager_la-nm-default-route-manager.lo: src/nm-default-route-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-default-route-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-default-route-manager.Tpo -c -o src/src_libNetworkManager_la-nm-default-route-manager.lo `test -f 'src/nm-default-route-manager.c' || echo '$(srcdir)/'`src/nm-default-route-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-default-route-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-default-route-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-default-route-manager.c' object='src/src_libNetworkManager_la-nm-default-route-manager.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-default-route-manager.lo `test -f 'src/nm-default-route-manager.c' || echo '$(srcdir)/'`src/nm-default-route-manager.c
-
 src/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/src_libNetworkManager_la-nm-dhcp4-config.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp4-config.Tpo -c -o src/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)/src_libNetworkManager_la-nm-dhcp4-config.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp4-config.Plo
@@ -12433,13 +13048,6 @@ src/src_libNetworkManagerBase_la-nm-logging.lo: src/nm-logging.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-logging.lo `test -f 'src/nm-logging.c' || echo '$(srcdir)/'`src/nm-logging.c
 
-src/src_libNetworkManagerBase_la-nm-multi-index.lo: src/nm-multi-index.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-multi-index.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-multi-index.Tpo -c -o src/src_libNetworkManagerBase_la-nm-multi-index.lo `test -f 'src/nm-multi-index.c' || echo '$(srcdir)/'`src/nm-multi-index.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-multi-index.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-multi-index.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-multi-index.c' object='src/src_libNetworkManagerBase_la-nm-multi-index.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-multi-index.lo `test -f 'src/nm-multi-index.c' || echo '$(srcdir)/'`src/nm-multi-index.c
-
 src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo: src/NetworkManagerUtils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-NetworkManagerUtils.Tpo -c -o src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo `test -f 'src/NetworkManagerUtils.c' || echo '$(srcdir)/'`src/NetworkManagerUtils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-NetworkManagerUtils.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-NetworkManagerUtils.Plo
@@ -12531,13 +13139,6 @@ src/src_libNetworkManagerBase_la-nm-ip6-config.lo: src/nm-ip6-config.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-ip6-config.lo `test -f 'src/nm-ip6-config.c' || echo '$(srcdir)/'`src/nm-ip6-config.c
 
-src/src_libNetworkManagerBase_la-nm-route-manager.lo: src/nm-route-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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-route-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-route-manager.Tpo -c -o src/src_libNetworkManagerBase_la-nm-route-manager.lo `test -f 'src/nm-route-manager.c' || echo '$(srcdir)/'`src/nm-route-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-route-manager.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-route-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-route-manager.c' object='src/src_libNetworkManagerBase_la-nm-route-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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-route-manager.lo `test -f 'src/nm-route-manager.c' || echo '$(srcdir)/'`src/nm-route-manager.c
-
 src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-client.lo: src/dhcp/nm-dhcp-client.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-client.lo -MD -MP -MF src/dhcp/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dhcp-client.Tpo -c -o src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-client.lo `test -f 'src/dhcp/nm-dhcp-client.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-client.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dhcp-client.Tpo src/dhcp/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dhcp-client.Plo
@@ -12734,6 +13335,13 @@ src/systemd/src/basic/src_libsystemd_nm_la-prioq.lo: src/systemd/src/basic/prioq
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/src_libsystemd_nm_la-prioq.lo `test -f 'src/systemd/src/basic/prioq.c' || echo '$(srcdir)/'`src/systemd/src/basic/prioq.c
 
+src/systemd/src/basic/src_libsystemd_nm_la-process-util.lo: src/systemd/src/basic/process-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/src_libsystemd_nm_la-process-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-process-util.Tpo -c -o src/systemd/src/basic/src_libsystemd_nm_la-process-util.lo `test -f 'src/systemd/src/basic/process-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/process-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-process-util.Tpo src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-process-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/process-util.c' object='src/systemd/src/basic/src_libsystemd_nm_la-process-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/src_libsystemd_nm_la-process-util.lo `test -f 'src/systemd/src/basic/process-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/process-util.c
+
 src/systemd/src/basic/src_libsystemd_nm_la-random-util.lo: src/systemd/src/basic/random-util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/src_libsystemd_nm_la-random-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-random-util.Tpo -c -o src/systemd/src/basic/src_libsystemd_nm_la-random-util.lo `test -f 'src/systemd/src/basic/random-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/random-util.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-random-util.Tpo src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-random-util.Plo
@@ -12741,13 +13349,6 @@ src/systemd/src/basic/src_libsystemd_nm_la-random-util.lo: src/systemd/src/basic
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/src_libsystemd_nm_la-random-util.lo `test -f 'src/systemd/src/basic/random-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/random-util.c
 
-src/systemd/src/basic/src_libsystemd_nm_la-siphash24.lo: src/systemd/src/basic/siphash24.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/src_libsystemd_nm_la-siphash24.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-siphash24.Tpo -c -o src/systemd/src/basic/src_libsystemd_nm_la-siphash24.lo `test -f 'src/systemd/src/basic/siphash24.c' || echo '$(srcdir)/'`src/systemd/src/basic/siphash24.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-siphash24.Tpo src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-siphash24.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/siphash24.c' object='src/systemd/src/basic/src_libsystemd_nm_la-siphash24.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/src_libsystemd_nm_la-siphash24.lo `test -f 'src/systemd/src/basic/siphash24.c' || echo '$(srcdir)/'`src/systemd/src/basic/siphash24.c
-
 src/systemd/src/basic/src_libsystemd_nm_la-socket-util.lo: src/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) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/src_libsystemd_nm_la-socket-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-socket-util.Tpo -c -o src/systemd/src/basic/src_libsystemd_nm_la-socket-util.lo `test -f 'src/systemd/src/basic/socket-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/socket-util.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-socket-util.Tpo src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-socket-util.Plo
@@ -13098,6 +13699,34 @@ src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnms_ifupdown_core
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnms_ifupdown_core_la-nms-ifupdown-parser.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-parser.c
 
+clients/cli/clients_cli_nmcli-common.o: clients/cli/common.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-common.o -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Tpo -c -o clients/cli/clients_cli_nmcli-common.o `test -f 'clients/cli/common.c' || echo '$(srcdir)/'`clients/cli/common.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/common.c' object='clients/cli/clients_cli_nmcli-common.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/cli/clients_cli_nmcli-common.o `test -f 'clients/cli/common.c' || echo '$(srcdir)/'`clients/cli/common.c
+
+clients/cli/clients_cli_nmcli-common.obj: clients/cli/common.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-common.obj -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Tpo -c -o clients/cli/clients_cli_nmcli-common.obj `if test -f 'clients/cli/common.c'; then $(CYGPATH_W) 'clients/cli/common.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/common.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/common.c' object='clients/cli/clients_cli_nmcli-common.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/cli/clients_cli_nmcli-common.obj `if test -f 'clients/cli/common.c'; then $(CYGPATH_W) 'clients/cli/common.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/common.c'; fi`
+
+clients/cli/clients_cli_nmcli-utils.o: clients/cli/utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-utils.o -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Tpo -c -o clients/cli/clients_cli_nmcli-utils.o `test -f 'clients/cli/utils.c' || echo '$(srcdir)/'`clients/cli/utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/utils.c' object='clients/cli/clients_cli_nmcli-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) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cli/clients_cli_nmcli-utils.o `test -f 'clients/cli/utils.c' || echo '$(srcdir)/'`clients/cli/utils.c
+
+clients/cli/clients_cli_nmcli-utils.obj: clients/cli/utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-utils.obj -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Tpo -c -o clients/cli/clients_cli_nmcli-utils.obj `if test -f 'clients/cli/utils.c'; then $(CYGPATH_W) 'clients/cli/utils.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/utils.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/utils.c' object='clients/cli/clients_cli_nmcli-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) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cli/clients_cli_nmcli-utils.obj `if test -f 'clients/cli/utils.c'; then $(CYGPATH_W) 'clients/cli/utils.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/utils.c'; fi`
+
 clients/cli/clients_cli_nmcli-agent.o: clients/cli/agent.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-agent.o -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-agent.Tpo -c -o clients/cli/clients_cli_nmcli-agent.o `test -f 'clients/cli/agent.c' || echo '$(srcdir)/'`clients/cli/agent.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-agent.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-agent.Po
@@ -13112,19 +13741,19 @@ clients/cli/clients_cli_nmcli-agent.obj: clients/cli/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/clients_cli_nmcli-agent.obj `if test -f 'clients/cli/agent.c'; then $(CYGPATH_W) 'clients/cli/agent.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/agent.c'; fi`
 
-clients/cli/clients_cli_nmcli-common.o: clients/cli/common.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-common.o -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Tpo -c -o clients/cli/clients_cli_nmcli-common.o `test -f 'clients/cli/common.c' || echo '$(srcdir)/'`clients/cli/common.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/common.c' object='clients/cli/clients_cli_nmcli-common.o' libtool=no @AMDEPBACKSLASH@
+clients/cli/clients_cli_nmcli-general.o: clients/cli/general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-general.o -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Tpo -c -o clients/cli/clients_cli_nmcli-general.o `test -f 'clients/cli/general.c' || echo '$(srcdir)/'`clients/cli/general.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/general.c' object='clients/cli/clients_cli_nmcli-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) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cli/clients_cli_nmcli-common.o `test -f 'clients/cli/common.c' || echo '$(srcdir)/'`clients/cli/common.c
+@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/clients_cli_nmcli-general.o `test -f 'clients/cli/general.c' || echo '$(srcdir)/'`clients/cli/general.c
 
-clients/cli/clients_cli_nmcli-common.obj: clients/cli/common.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-common.obj -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Tpo -c -o clients/cli/clients_cli_nmcli-common.obj `if test -f 'clients/cli/common.c'; then $(CYGPATH_W) 'clients/cli/common.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/common.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/common.c' object='clients/cli/clients_cli_nmcli-common.obj' libtool=no @AMDEPBACKSLASH@
+clients/cli/clients_cli_nmcli-general.obj: clients/cli/general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-general.obj -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Tpo -c -o clients/cli/clients_cli_nmcli-general.obj `if test -f 'clients/cli/general.c'; then $(CYGPATH_W) 'clients/cli/general.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/general.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/general.c' object='clients/cli/clients_cli_nmcli-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) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cli/clients_cli_nmcli-common.obj `if test -f 'clients/cli/common.c'; then $(CYGPATH_W) 'clients/cli/common.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/common.c'; fi`
+@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/clients_cli_nmcli-general.obj `if test -f 'clients/cli/general.c'; then $(CYGPATH_W) 'clients/cli/general.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/general.c'; fi`
 
 clients/cli/clients_cli_nmcli-connections.o: clients/cli/connections.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-connections.o -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-connections.Tpo -c -o clients/cli/clients_cli_nmcli-connections.o `test -f 'clients/cli/connections.c' || echo '$(srcdir)/'`clients/cli/connections.c
@@ -13154,20 +13783,6 @@ clients/cli/clients_cli_nmcli-devices.obj: clients/cli/devices.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/clients_cli_nmcli-devices.obj `if test -f 'clients/cli/devices.c'; then $(CYGPATH_W) 'clients/cli/devices.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/devices.c'; fi`
 
-clients/cli/clients_cli_nmcli-general.o: clients/cli/general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-general.o -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Tpo -c -o clients/cli/clients_cli_nmcli-general.o `test -f 'clients/cli/general.c' || echo '$(srcdir)/'`clients/cli/general.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/general.c' object='clients/cli/clients_cli_nmcli-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) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cli/clients_cli_nmcli-general.o `test -f 'clients/cli/general.c' || echo '$(srcdir)/'`clients/cli/general.c
-
-clients/cli/clients_cli_nmcli-general.obj: clients/cli/general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-general.obj -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Tpo -c -o clients/cli/clients_cli_nmcli-general.obj `if test -f 'clients/cli/general.c'; then $(CYGPATH_W) 'clients/cli/general.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/general.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/general.c' object='clients/cli/clients_cli_nmcli-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) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cli/clients_cli_nmcli-general.obj `if test -f 'clients/cli/general.c'; then $(CYGPATH_W) 'clients/cli/general.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/general.c'; fi`
-
 clients/cli/clients_cli_nmcli-settings.o: clients/cli/settings.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-settings.o -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-settings.Tpo -c -o clients/cli/clients_cli_nmcli-settings.o `test -f 'clients/cli/settings.c' || echo '$(srcdir)/'`clients/cli/settings.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-settings.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-settings.Po
@@ -13196,20 +13811,6 @@ clients/cli/clients_cli_nmcli-nmcli.obj: clients/cli/nmcli.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/clients_cli_nmcli-nmcli.obj `if test -f 'clients/cli/nmcli.c'; then $(CYGPATH_W) 'clients/cli/nmcli.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/nmcli.c'; fi`
 
-clients/cli/clients_cli_nmcli-utils.o: clients/cli/utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-utils.o -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Tpo -c -o clients/cli/clients_cli_nmcli-utils.o `test -f 'clients/cli/utils.c' || echo '$(srcdir)/'`clients/cli/utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/utils.c' object='clients/cli/clients_cli_nmcli-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) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cli/clients_cli_nmcli-utils.o `test -f 'clients/cli/utils.c' || echo '$(srcdir)/'`clients/cli/utils.c
-
-clients/cli/clients_cli_nmcli-utils.obj: clients/cli/utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-utils.obj -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Tpo -c -o clients/cli/clients_cli_nmcli-utils.obj `if test -f 'clients/cli/utils.c'; then $(CYGPATH_W) 'clients/cli/utils.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cli/utils.c' object='clients/cli/clients_cli_nmcli-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) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cli/clients_cli_nmcli-utils.obj `if test -f 'clients/cli/utils.c'; then $(CYGPATH_W) 'clients/cli/utils.c'; else $(CYGPATH_W) '$(srcdir)/clients/cli/utils.c'; fi`
-
 clients/cli/clients_cli_nmcli-polkit-agent.o: clients/cli/polkit-agent.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/clients_cli_nmcli-polkit-agent.o -MD -MP -MF clients/cli/$(DEPDIR)/clients_cli_nmcli-polkit-agent.Tpo -c -o clients/cli/clients_cli_nmcli-polkit-agent.o `test -f 'clients/cli/polkit-agent.c' || echo '$(srcdir)/'`clients/cli/polkit-agent.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cli/$(DEPDIR)/clients_cli_nmcli-polkit-agent.Tpo clients/cli/$(DEPDIR)/clients_cli_nmcli-polkit-agent.Po
@@ -13224,34 +13825,6 @@ clients/cli/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/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/clients_cli_nmcli-nm-secret-agent-simple.o: clients/common/nm-secret-agent-simple.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_cli_nmcli-nm-secret-agent-simple.o -MD -MP -MF clients/common/$(DEPDIR)/clients_cli_nmcli-nm-secret-agent-simple.Tpo -c -o clients/common/clients_cli_nmcli-nm-secret-agent-simple.o `test -f 'clients/common/nm-secret-agent-simple.c' || echo '$(srcdir)/'`clients/common/nm-secret-agent-simple.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_cli_nmcli-nm-secret-agent-simple.Tpo clients/common/$(DEPDIR)/clients_cli_nmcli-nm-secret-agent-simple.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-secret-agent-simple.c' object='clients/common/clients_cli_nmcli-nm-secret-agent-simple.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/clients_cli_nmcli-nm-secret-agent-simple.o `test -f 'clients/common/nm-secret-agent-simple.c' || echo '$(srcdir)/'`clients/common/nm-secret-agent-simple.c
-
-clients/common/clients_cli_nmcli-nm-secret-agent-simple.obj: clients/common/nm-secret-agent-simple.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_cli_nmcli-nm-secret-agent-simple.obj -MD -MP -MF clients/common/$(DEPDIR)/clients_cli_nmcli-nm-secret-agent-simple.Tpo -c -o clients/common/clients_cli_nmcli-nm-secret-agent-simple.obj `if test -f 'clients/common/nm-secret-agent-simple.c'; then $(CYGPATH_W) 'clients/common/nm-secret-agent-simple.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-secret-agent-simple.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_cli_nmcli-nm-secret-agent-simple.Tpo clients/common/$(DEPDIR)/clients_cli_nmcli-nm-secret-agent-simple.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-secret-agent-simple.c' object='clients/common/clients_cli_nmcli-nm-secret-agent-simple.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/clients_cli_nmcli-nm-secret-agent-simple.obj `if test -f 'clients/common/nm-secret-agent-simple.c'; then $(CYGPATH_W) 'clients/common/nm-secret-agent-simple.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-secret-agent-simple.c'; fi`
-
-clients/common/clients_cli_nmcli-nm-vpn-helpers.o: clients/common/nm-vpn-helpers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_cli_nmcli-nm-vpn-helpers.o -MD -MP -MF clients/common/$(DEPDIR)/clients_cli_nmcli-nm-vpn-helpers.Tpo -c -o clients/common/clients_cli_nmcli-nm-vpn-helpers.o `test -f 'clients/common/nm-vpn-helpers.c' || echo '$(srcdir)/'`clients/common/nm-vpn-helpers.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_cli_nmcli-nm-vpn-helpers.Tpo clients/common/$(DEPDIR)/clients_cli_nmcli-nm-vpn-helpers.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-vpn-helpers.c' object='clients/common/clients_cli_nmcli-nm-vpn-helpers.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/clients_cli_nmcli-nm-vpn-helpers.o `test -f 'clients/common/nm-vpn-helpers.c' || echo '$(srcdir)/'`clients/common/nm-vpn-helpers.c
-
-clients/common/clients_cli_nmcli-nm-vpn-helpers.obj: clients/common/nm-vpn-helpers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_cli_nmcli-nm-vpn-helpers.obj -MD -MP -MF clients/common/$(DEPDIR)/clients_cli_nmcli-nm-vpn-helpers.Tpo -c -o clients/common/clients_cli_nmcli-nm-vpn-helpers.obj `if test -f 'clients/common/nm-vpn-helpers.c'; then $(CYGPATH_W) 'clients/common/nm-vpn-helpers.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-vpn-helpers.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_cli_nmcli-nm-vpn-helpers.Tpo clients/common/$(DEPDIR)/clients_cli_nmcli-nm-vpn-helpers.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-vpn-helpers.c' object='clients/common/clients_cli_nmcli-nm-vpn-helpers.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/clients_cli_nmcli-nm-vpn-helpers.obj `if test -f 'clients/common/nm-vpn-helpers.c'; then $(CYGPATH_W) 'clients/common/nm-vpn-helpers.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-vpn-helpers.c'; fi`
-
 clients/common/clients_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/clients_cli_nmcli-nm-polkit-listener.o -MD -MP -MF clients/common/$(DEPDIR)/clients_cli_nmcli-nm-polkit-listener.Tpo -c -o clients/common/clients_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)/clients_cli_nmcli-nm-polkit-listener.Tpo clients/common/$(DEPDIR)/clients_cli_nmcli-nm-polkit-listener.Po
@@ -13266,6 +13839,20 @@ clients/common/clients_cli_nmcli-nm-polkit-listener.obj: clients/common/nm-polki
 @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/clients_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/common/tests/clients_common_tests_test_general-test-general.o: clients/common/tests/test-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/tests/clients_common_tests_test_general-test-general.o -MD -MP -MF clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Tpo -c -o clients/common/tests/clients_common_tests_test_general-test-general.o `test -f 'clients/common/tests/test-general.c' || echo '$(srcdir)/'`clients/common/tests/test-general.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Tpo clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/tests/test-general.c' object='clients/common/tests/clients_common_tests_test_general-test-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) $(clients_common_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/tests/clients_common_tests_test_general-test-general.o `test -f 'clients/common/tests/test-general.c' || echo '$(srcdir)/'`clients/common/tests/test-general.c
+
+clients/common/tests/clients_common_tests_test_general-test-general.obj: clients/common/tests/test-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/tests/clients_common_tests_test_general-test-general.obj -MD -MP -MF clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Tpo -c -o clients/common/tests/clients_common_tests_test_general-test-general.obj `if test -f 'clients/common/tests/test-general.c'; then $(CYGPATH_W) 'clients/common/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/tests/test-general.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Tpo clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/tests/test-general.c' object='clients/common/tests/clients_common_tests_test_general-test-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) $(clients_common_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/tests/clients_common_tests_test_general-test-general.obj `if test -f 'clients/common/tests/test-general.c'; then $(CYGPATH_W) 'clients/common/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/tests/test-general.c'; fi`
+
 clients/clients_nm_online-nm-online.o: clients/nm-online.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_nm_online_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/clients_nm_online-nm-online.o -MD -MP -MF clients/$(DEPDIR)/clients_nm_online-nm-online.Tpo -c -o clients/clients_nm_online-nm-online.o `test -f 'clients/nm-online.c' || echo '$(srcdir)/'`clients/nm-online.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/$(DEPDIR)/clients_nm_online-nm-online.Tpo clients/$(DEPDIR)/clients_nm_online-nm-online.Po
@@ -13840,34 +14427,6 @@ clients/tui/clients_tui_nmtui-nmt-widget-list.obj: clients/tui/nmt-widget-list.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_tui_nmtui_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/tui/clients_tui_nmtui-nmt-widget-list.obj `if test -f 'clients/tui/nmt-widget-list.c'; then $(CYGPATH_W) 'clients/tui/nmt-widget-list.c'; else $(CYGPATH_W) '$(srcdir)/clients/tui/nmt-widget-list.c'; fi`
 
-clients/common/clients_tui_nmtui-nm-secret-agent-simple.o: clients/common/nm-secret-agent-simple.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_tui_nmtui_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_tui_nmtui-nm-secret-agent-simple.o -MD -MP -MF clients/common/$(DEPDIR)/clients_tui_nmtui-nm-secret-agent-simple.Tpo -c -o clients/common/clients_tui_nmtui-nm-secret-agent-simple.o `test -f 'clients/common/nm-secret-agent-simple.c' || echo '$(srcdir)/'`clients/common/nm-secret-agent-simple.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_tui_nmtui-nm-secret-agent-simple.Tpo clients/common/$(DEPDIR)/clients_tui_nmtui-nm-secret-agent-simple.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-secret-agent-simple.c' object='clients/common/clients_tui_nmtui-nm-secret-agent-simple.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_tui_nmtui_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/clients_tui_nmtui-nm-secret-agent-simple.o `test -f 'clients/common/nm-secret-agent-simple.c' || echo '$(srcdir)/'`clients/common/nm-secret-agent-simple.c
-
-clients/common/clients_tui_nmtui-nm-secret-agent-simple.obj: clients/common/nm-secret-agent-simple.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_tui_nmtui_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_tui_nmtui-nm-secret-agent-simple.obj -MD -MP -MF clients/common/$(DEPDIR)/clients_tui_nmtui-nm-secret-agent-simple.Tpo -c -o clients/common/clients_tui_nmtui-nm-secret-agent-simple.obj `if test -f 'clients/common/nm-secret-agent-simple.c'; then $(CYGPATH_W) 'clients/common/nm-secret-agent-simple.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-secret-agent-simple.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_tui_nmtui-nm-secret-agent-simple.Tpo clients/common/$(DEPDIR)/clients_tui_nmtui-nm-secret-agent-simple.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-secret-agent-simple.c' object='clients/common/clients_tui_nmtui-nm-secret-agent-simple.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_tui_nmtui_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/clients_tui_nmtui-nm-secret-agent-simple.obj `if test -f 'clients/common/nm-secret-agent-simple.c'; then $(CYGPATH_W) 'clients/common/nm-secret-agent-simple.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-secret-agent-simple.c'; fi`
-
-clients/common/clients_tui_nmtui-nm-vpn-helpers.o: clients/common/nm-vpn-helpers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_tui_nmtui_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_tui_nmtui-nm-vpn-helpers.o -MD -MP -MF clients/common/$(DEPDIR)/clients_tui_nmtui-nm-vpn-helpers.Tpo -c -o clients/common/clients_tui_nmtui-nm-vpn-helpers.o `test -f 'clients/common/nm-vpn-helpers.c' || echo '$(srcdir)/'`clients/common/nm-vpn-helpers.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_tui_nmtui-nm-vpn-helpers.Tpo clients/common/$(DEPDIR)/clients_tui_nmtui-nm-vpn-helpers.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-vpn-helpers.c' object='clients/common/clients_tui_nmtui-nm-vpn-helpers.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_tui_nmtui_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/clients_tui_nmtui-nm-vpn-helpers.o `test -f 'clients/common/nm-vpn-helpers.c' || echo '$(srcdir)/'`clients/common/nm-vpn-helpers.c
-
-clients/common/clients_tui_nmtui-nm-vpn-helpers.obj: clients/common/nm-vpn-helpers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_tui_nmtui_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_tui_nmtui-nm-vpn-helpers.obj -MD -MP -MF clients/common/$(DEPDIR)/clients_tui_nmtui-nm-vpn-helpers.Tpo -c -o clients/common/clients_tui_nmtui-nm-vpn-helpers.obj `if test -f 'clients/common/nm-vpn-helpers.c'; then $(CYGPATH_W) 'clients/common/nm-vpn-helpers.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-vpn-helpers.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_tui_nmtui-nm-vpn-helpers.Tpo clients/common/$(DEPDIR)/clients_tui_nmtui-nm-vpn-helpers.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-vpn-helpers.c' object='clients/common/clients_tui_nmtui-nm-vpn-helpers.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_tui_nmtui_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/clients_tui_nmtui-nm-vpn-helpers.obj `if test -f 'clients/common/nm-vpn-helpers.c'; then $(CYGPATH_W) 'clients/common/nm-vpn-helpers.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-vpn-helpers.c'; fi`
-
 dispatcher/dispatcher_nm_dispatcher-nm-dispatcher.o: dispatcher/nm-dispatcher.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dispatcher_nm_dispatcher_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatcher/dispatcher_nm_dispatcher-nm-dispatcher.o -MD -MP -MF dispatcher/$(DEPDIR)/dispatcher_nm_dispatcher-nm-dispatcher.Tpo -c -o dispatcher/dispatcher_nm_dispatcher-nm-dispatcher.o `test -f 'dispatcher/nm-dispatcher.c' || echo '$(srcdir)/'`dispatcher/nm-dispatcher.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dispatcher/$(DEPDIR)/dispatcher_nm_dispatcher-nm-dispatcher.Tpo dispatcher/$(DEPDIR)/dispatcher_nm_dispatcher-nm-dispatcher.Po
@@ -14960,33 +15519,19 @@ src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj: src/tes
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj `if test -f 'src/tests/test-resolvconf-capture.c'; then $(CYGPATH_W) 'src/tests/test-resolvconf-capture.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-resolvconf-capture.c'; fi`
 
-src/tests/src_tests_test_route_manager_fake-test-route-manager.o: src/tests/test-route-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_route_manager_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_route_manager_fake-test-route-manager.o -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_route_manager_fake-test-route-manager.Tpo -c -o src/tests/src_tests_test_route_manager_fake-test-route-manager.o `test -f 'src/tests/test-route-manager.c' || echo '$(srcdir)/'`src/tests/test-route-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_route_manager_fake-test-route-manager.Tpo src/tests/$(DEPDIR)/src_tests_test_route_manager_fake-test-route-manager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-route-manager.c' object='src/tests/src_tests_test_route_manager_fake-test-route-manager.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_route_manager_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_route_manager_fake-test-route-manager.o `test -f 'src/tests/test-route-manager.c' || echo '$(srcdir)/'`src/tests/test-route-manager.c
-
-src/tests/src_tests_test_route_manager_fake-test-route-manager.obj: src/tests/test-route-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_route_manager_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_route_manager_fake-test-route-manager.obj -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_route_manager_fake-test-route-manager.Tpo -c -o src/tests/src_tests_test_route_manager_fake-test-route-manager.obj `if test -f 'src/tests/test-route-manager.c'; then $(CYGPATH_W) 'src/tests/test-route-manager.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-route-manager.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_route_manager_fake-test-route-manager.Tpo src/tests/$(DEPDIR)/src_tests_test_route_manager_fake-test-route-manager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-route-manager.c' object='src/tests/src_tests_test_route_manager_fake-test-route-manager.obj' libtool=no @AMDEPBACKSLASH@
+shared/nm-utils/src_tests_test_systemd-siphash24.o: shared/nm-utils/siphash24.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/src_tests_test_systemd-siphash24.o -MD -MP -MF shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo -c -o shared/nm-utils/src_tests_test_systemd-siphash24.o `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/src_tests_test_systemd-siphash24.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_route_manager_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_route_manager_fake-test-route-manager.obj `if test -f 'src/tests/test-route-manager.c'; then $(CYGPATH_W) 'src/tests/test-route-manager.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-route-manager.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/src_tests_test_systemd-siphash24.o `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c
 
-src/tests/src_tests_test_route_manager_linux-test-route-manager.o: src/tests/test-route-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_route_manager_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_route_manager_linux-test-route-manager.o -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_route_manager_linux-test-route-manager.Tpo -c -o src/tests/src_tests_test_route_manager_linux-test-route-manager.o `test -f 'src/tests/test-route-manager.c' || echo '$(srcdir)/'`src/tests/test-route-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_route_manager_linux-test-route-manager.Tpo src/tests/$(DEPDIR)/src_tests_test_route_manager_linux-test-route-manager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-route-manager.c' object='src/tests/src_tests_test_route_manager_linux-test-route-manager.o' libtool=no @AMDEPBACKSLASH@
+shared/nm-utils/src_tests_test_systemd-siphash24.obj: shared/nm-utils/siphash24.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/src_tests_test_systemd-siphash24.obj -MD -MP -MF shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo -c -o shared/nm-utils/src_tests_test_systemd-siphash24.obj `if test -f 'shared/nm-utils/siphash24.c'; then $(CYGPATH_W) 'shared/nm-utils/siphash24.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/siphash24.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/src_tests_test_systemd-siphash24.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_route_manager_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_route_manager_linux-test-route-manager.o `test -f 'src/tests/test-route-manager.c' || echo '$(srcdir)/'`src/tests/test-route-manager.c
-
-src/tests/src_tests_test_route_manager_linux-test-route-manager.obj: src/tests/test-route-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_route_manager_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_route_manager_linux-test-route-manager.obj -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_route_manager_linux-test-route-manager.Tpo -c -o src/tests/src_tests_test_route_manager_linux-test-route-manager.obj `if test -f 'src/tests/test-route-manager.c'; then $(CYGPATH_W) 'src/tests/test-route-manager.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-route-manager.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_route_manager_linux-test-route-manager.Tpo src/tests/$(DEPDIR)/src_tests_test_route_manager_linux-test-route-manager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-route-manager.c' object='src/tests/src_tests_test_route_manager_linux-test-route-manager.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_route_manager_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_route_manager_linux-test-route-manager.obj `if test -f 'src/tests/test-route-manager.c'; then $(CYGPATH_W) 'src/tests/test-route-manager.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-route-manager.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/src_tests_test_systemd-siphash24.obj `if test -f 'shared/nm-utils/siphash24.c'; then $(CYGPATH_W) 'shared/nm-utils/siphash24.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/siphash24.c'; fi`
 
 src/tests/src_tests_test_systemd-test-systemd.o: src/tests/test-systemd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_systemd-test-systemd.o -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_systemd-test-systemd.Tpo -c -o src/tests/src_tests_test_systemd-test-systemd.o `test -f 'src/tests/test-systemd.c' || echo '$(srcdir)/'`src/tests/test-systemd.c
@@ -15117,6 +15662,8 @@ clean-libtool:
 	-rm -rf .libs _libs
 	-rm -rf clients/.libs clients/_libs
 	-rm -rf clients/cli/.libs clients/cli/_libs
+	-rm -rf clients/common/.libs clients/common/_libs
+	-rm -rf clients/common/tests/.libs clients/common/tests/_libs
 	-rm -rf clients/tui/.libs clients/tui/_libs
 	-rm -rf dispatcher/.libs dispatcher/_libs
 	-rm -rf dispatcher/tests/.libs dispatcher/tests/_libs
@@ -15137,6 +15684,7 @@ clean-libtool:
 	-rm -rf src/devices/.libs src/devices/_libs
 	-rm -rf src/devices/adsl/.libs src/devices/adsl/_libs
 	-rm -rf src/devices/bluetooth/.libs src/devices/bluetooth/_libs
+	-rm -rf src/devices/ovs/.libs src/devices/ovs/_libs
 	-rm -rf src/devices/team/.libs src/devices/team/_libs
 	-rm -rf src/devices/tests/.libs src/devices/tests/_libs
 	-rm -rf src/devices/wifi/.libs src/devices/wifi/_libs
@@ -15519,6 +16067,27 @@ uninstall-serviceDATA:
 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
+install-systemdnmunitDATA: $(systemdnmunit_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(systemdnmunit_DATA)'; test -n "$(systemdnmunitdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(systemdnmunitdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(systemdnmunitdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemdnmunitdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(systemdnmunitdir)" || exit $$?; \
+	done
+
+uninstall-systemdnmunitDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(systemdnmunit_DATA)'; test -n "$(systemdnmunitdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(systemdnmunitdir)'; $(am__uninstall_files_from_dir)
 install-systemdsystemunitDATA: $(systemdsystemunit_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
@@ -16324,20 +16893,6 @@ src/tests/test-ip6-config.log: src/tests/test-ip6-config$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/tests/test-route-manager-linux.log: src/tests/test-route-manager-linux$(EXEEXT)
-	@p='src/tests/test-route-manager-linux$(EXEEXT)'; \
-	b='src/tests/test-route-manager-linux'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/tests/test-route-manager-fake.log: src/tests/test-route-manager-fake$(EXEEXT)
-	@p='src/tests/test-route-manager-fake$(EXEEXT)'; \
-	b='src/tests/test-route-manager-fake'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 src/tests/test-dcb.log: src/tests/test-dcb$(EXEEXT)
 	@p='src/tests/test-dcb$(EXEEXT)'; \
 	b='src/tests/test-dcb'; \
@@ -16380,6 +16935,13 @@ dispatcher/tests/test-dispatcher-envp.log: dispatcher/tests/test-dispatcher-envp
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+clients/common/tests/test-general.log: clients/common/tests/test-general$(EXEEXT)
+	@p='clients/common/tests/test-general$(EXEEXT)'; \
+	b='clients/common/tests/test-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) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 libnm-util/tests/test-settings-defaults.log: libnm-util/tests/test-settings-defaults$(EXEEXT)
 	@p='libnm-util/tests/test-settings-defaults$(EXEEXT)'; \
 	b='libnm-util/tests/test-settings-defaults'; \
@@ -16652,7 +17214,7 @@ install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pppd_plugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusinterfacesdir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(polkit_policydir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(libdeprecateddir)" "$(DESTDIR)$(libnm_glib_libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmvpndir)" "$(DESTDIR)$(libnm_util_libnm_util_includedir)" "$(DESTDIR)$(libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmvpndir)" "$(DESTDIR)$(libnm_util_libnm_util_includedir)" "$(DESTDIR)$(libnmincludedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pppd_plugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusinterfacesdir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(polkit_policydir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdnmunitdir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(libdeprecateddir)" "$(DESTDIR)$(libnm_glib_libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmvpndir)" "$(DESTDIR)$(libnm_util_libnm_util_includedir)" "$(DESTDIR)$(libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmvpndir)" "$(DESTDIR)$(libnm_util_libnm_util_includedir)" "$(DESTDIR)$(libnmincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -16692,6 +17254,8 @@ distclean-generic:
 	-rm -f clients/cli/$(am__dirstamp)
 	-rm -f clients/common/$(DEPDIR)/$(am__dirstamp)
 	-rm -f clients/common/$(am__dirstamp)
+	-rm -f clients/common/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f clients/common/tests/$(am__dirstamp)
 	-rm -f clients/tui/$(DEPDIR)/$(am__dirstamp)
 	-rm -f clients/tui/$(am__dirstamp)
 	-rm -f clients/tui/newt/$(DEPDIR)/$(am__dirstamp)
@@ -16734,6 +17298,8 @@ distclean-generic:
 	-rm -f src/devices/adsl/$(am__dirstamp)
 	-rm -f src/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/devices/bluetooth/$(am__dirstamp)
+	-rm -f src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/devices/ovs/$(am__dirstamp)
 	-rm -f src/devices/team/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/devices/team/$(am__dirstamp)
 	-rm -f src/devices/tests/$(DEPDIR)/$(am__dirstamp)
@@ -16828,7 +17394,7 @@ clean-am: clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifnet/$(DEPDIR) src/settings/plugins/ifnet/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR)
+	-rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifnet/$(DEPDIR) src/settings/plugins/ifnet/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@@ -16857,8 +17423,9 @@ install-data-am: install-dbusactivationDATA install-dbusinterfacesDATA \
 	install-nodist_libnm_util_libnm_util_includeHEADERS \
 	install-nodist_libnmincludeHEADERS install-pkgconfigDATA \
 	install-polkit_policyDATA install-pppd_pluginLTLIBRARIES \
-	install-serviceDATA install-systemdsystemunitDATA \
-	install-typelibDATA install-udevrulesDATA install-vapiDATA
+	install-serviceDATA install-systemdnmunitDATA \
+	install-systemdsystemunitDATA install-typelibDATA \
+	install-udevrulesDATA install-vapiDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-recursive
@@ -16893,7 +17460,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifnet/$(DEPDIR) src/settings/plugins/ifnet/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR)
+	-rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifnet/$(DEPDIR) src/settings/plugins/ifnet/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -16925,9 +17492,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dbusactivationDATA \
 	uninstall-nodist_libnmincludeHEADERS uninstall-pkgconfigDATA \
 	uninstall-pkglibLTLIBRARIES uninstall-polkit_policyDATA \
 	uninstall-pppd_pluginLTLIBRARIES uninstall-sbinPROGRAMS \
-	uninstall-serviceDATA uninstall-systemdsystemunitDATA \
-	uninstall-typelibDATA uninstall-udevrulesDATA \
-	uninstall-vapiDATA
+	uninstall-serviceDATA uninstall-systemdnmunitDATA \
+	uninstall-systemdsystemunitDATA uninstall-typelibDATA \
+	uninstall-udevrulesDATA uninstall-vapiDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \
@@ -16968,7 +17535,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \
 	install-pkgconfigDATA install-pkglibLTLIBRARIES \
 	install-polkit_policyDATA install-pppd_pluginLTLIBRARIES \
 	install-ps install-ps-am install-sbinPROGRAMS \
-	install-serviceDATA install-strip \
+	install-serviceDATA install-strip install-systemdnmunitDATA \
 	install-systemdsystemunitDATA install-typelibDATA \
 	install-udevrulesDATA install-vapiDATA installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
@@ -16991,9 +17558,9 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \
 	uninstall-nodist_libnmincludeHEADERS uninstall-pkgconfigDATA \
 	uninstall-pkglibLTLIBRARIES uninstall-polkit_policyDATA \
 	uninstall-pppd_pluginLTLIBRARIES uninstall-sbinPROGRAMS \
-	uninstall-serviceDATA uninstall-systemdsystemunitDATA \
-	uninstall-typelibDATA uninstall-udevrulesDATA \
-	uninstall-vapiDATA
+	uninstall-serviceDATA uninstall-systemdnmunitDATA \
+	uninstall-systemdsystemunitDATA uninstall-typelibDATA \
+	uninstall-udevrulesDATA uninstall-vapiDATA
 
 .PRECIOUS: Makefile
 
@@ -17149,7 +17716,7 @@ $(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 ###############################################################################
 
 src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins)
-	$(AM_V_GEN) BINUTILS_NM="$(BINUTILS_NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-make "$(srcdir)"
+	$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-make "$(srcdir)"
 
 $(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
@@ -17236,6 +17803,10 @@ check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la
 @WITH_TEAMDCTL_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver"
 @WITH_TEAMDCTL_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so)
 
+@WITH_OPENVSWITCH_TRUE@check-local-devices-ovs: src/devices/ovs/libnm-device-plugin-ovs.la
+@WITH_OPENVSWITCH_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so "$(srcdir)/linker-script-devices.ver"
+@WITH_OPENVSWITCH_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so)
+
 $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 $(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -17269,9 +17840,6 @@ $(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_tests_test_route_manager_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_route_manager_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
 $(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml
@@ -17304,8 +17872,28 @@ $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums
 
 $(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@BUILD_NMCLI_TRUE@$(clients_cli_nmcli_OBJECTS): $(clients_cli_settings_doc_c)
-@BUILD_NMCLI_TRUE@$(clients_cli_nmcli_OBJECTS): clients/cli/.dirstamp
+$(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
+@HAVE_INTROSPECTION_TRUE@$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp
+@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
+@HAVE_INTROSPECTION_TRUE@check-local-settings-docs: $(clients_common_settings_doc_c)
+@HAVE_INTROSPECTION_TRUE@	@if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then  \
+@HAVE_INTROSPECTION_TRUE@		if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \
+@HAVE_INTROSPECTION_TRUE@			echo "The generated file \"$(builddir)/$(clients_common_settings_doc_c)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_c).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \
+@HAVE_INTROSPECTION_TRUE@			false; \
+@HAVE_INTROSPECTION_TRUE@		fi;\
+@HAVE_INTROSPECTION_TRUE@	fi
+@HAVE_INTROSPECTION_FALSE@$(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp
+@HAVE_INTROSPECTION_FALSE@	$(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)"
+@HAVE_INTROSPECTION_FALSE@check-local-settings-docs:
+
+$(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_c)
+$(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp
+
+$(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+
+@BUILD_NMCLI_TRUE@$(clients_cli_nmcli_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 @BUILD_NMCLI_TRUE@install-data-hook-nmcli:
 @BUILD_NMCLI_TRUE@	$(mkinstalldirs) $(DESTDIR)$(completiondir)
@@ -17313,13 +17901,6 @@ $(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 @BUILD_NMCLI_TRUE@uninstall-hook-nmcli:
 @BUILD_NMCLI_TRUE@	rm -f $(DESTDIR)$(completiondir)/nmcli
-@HAVE_INTROSPECTION_TRUE@$(clients_cli_settings_doc_c): clients/cli/settings-docs.xsl libnm/nm-property-docs.xml
-@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
-@HAVE_INTROSPECTION_TRUE@$(clients_cli_settings_doc_c): clients/cli/.dirstamp
-@HAVE_INTROSPECTION_FALSE@$(clients_cli_settings_doc_c):
-@HAVE_INTROSPECTION_FALSE@	@echo "to generate $(clients_cli_settings_doc_c), configure with --enable-introspection"
-@HAVE_INTROSPECTION_FALSE@	@echo "alternatively, build --without-nmcli"
-@HAVE_INTROSPECTION_FALSE@	@false
 
 @BUILD_NMTUI_TRUE@$(clients_tui_nmtui_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
@@ -17470,6 +18051,7 @@ cscope:
 
 ###############################################################################
 
+.PRECIOUS: test-suite.log
 .DELETE_ON_ERROR:
 .PHONY: cscope dist-configure-check $(check_local) $(dist_hook)