summary refs log tree commit diff
path: root/Makefile.in
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2019-07-31 10:51:42 +0200
committerMichael Biebl <biebl@debian.org>2019-07-31 10:51:42 +0200
commit2e5fa45ddfbb5cffa1e78221f1cea706e2f298af (patch)
tree86f69d36c56de3074280456eddc854a780b8e04b /Makefile.in
parent85563b7fc7ec2cd21e38debb9b28db342e2e8e7c (diff)
New upstream version 1.19.90 upstream/1.19.90
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in7003
1 files changed, 2360 insertions, 4643 deletions
diff --git a/Makefile.in b/Makefile.in
index 09f7e0fb..4a29e439 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -135,8 +135,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = $(am__EXEEXT_21)
-check_PROGRAMS = $(am__EXEEXT_20)
+noinst_PROGRAMS = $(am__EXEEXT_15)
+check_PROGRAMS = $(am__EXEEXT_14)
 sbin_PROGRAMS = src/NetworkManager$(EXEEXT)
 bin_PROGRAMS = clients/nm-online$(EXEEXT) $(am__EXEEXT_1) \
 	$(am__EXEEXT_2)
@@ -144,44 +144,31 @@ libexec_PROGRAMS = src/nm-iface-helper$(EXEEXT) \
 	src/initrd/nm-initrd-generator$(EXEEXT) \
 	src/dhcp/nm-dhcp-helper$(EXEEXT) \
 	dispatcher/nm-dispatcher$(EXEEXT)
-TESTS = $(am__EXEEXT_14)
+TESTS = $(am__EXEEXT_10)
 @HAVE_DOCS_TRUE@am__append_1 = \
 @HAVE_DOCS_TRUE@	docs/libnm \
 @HAVE_DOCS_TRUE@	docs/api
 
-@HAVE_DOCS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_2 = \
-@HAVE_DOCS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	docs/libnm-util \
-@HAVE_DOCS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	docs/libnm-glib
-
-@BUILD_DOCS_FALSE@am__append_3 = dist-configure-check
-@WITH_LEGACY_LIBRARIES_FALSE@am__append_4 = dist-configure-check
-
-###############################################################################
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_5 = NetworkManager.pc
-@WITH_EBPF_TRUE@am__append_6 = shared/n-acd/src/n-acd-bpf.c
-@WITH_EBPF_FALSE@am__append_7 = shared/n-acd/src/n-acd-bpf-fallback.c
-@WITH_JSON_VALIDATION_TRUE@am__append_8 = \
+@BUILD_DOCS_FALSE@am__append_2 = dist-configure-check
+@WITH_EBPF_TRUE@am__append_3 = shared/n-acd/src/n-acd-bpf.c
+@WITH_EBPF_FALSE@am__append_4 = shared/n-acd/src/n-acd-bpf-fallback.c
+@WITH_JSON_VALIDATION_TRUE@am__append_5 = \
 @WITH_JSON_VALIDATION_TRUE@	libnm-core/nm-json.h
 
-@WITH_JSON_VALIDATION_TRUE@am__append_9 = \
+@WITH_JSON_VALIDATION_TRUE@am__append_6 = \
 @WITH_JSON_VALIDATION_TRUE@	libnm-core/nm-json.c
 
-@WITH_JSON_VALIDATION_TRUE@am__append_10 = $(JANSSON_CFLAGS)
-@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am__append_11 = libnm-core/libnm-crypto-gnutls.la
-@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am__append_12 = libnm-core/libnm-crypto-nss.la
-@HAVE_INTROSPECTION_TRUE@am__append_13 = libnm/NM-1.0.typelib
-@HAVE_INTROSPECTION_TRUE@am__append_14 = libnm/NM-1.0.gir
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@am__append_15 = \
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/typelibs.c \
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/NMClient.typelib \
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/NetworkManager.typelib
-
-@HAVE_INTROSPECTION_TRUE@am__append_16 = $(libnm_noinst_data)
-@HAVE_INTROSPECTION_TRUE@am__append_17 = $(libnm_noinst_data)
-@HAVE_INTROSPECTION_TRUE@am__append_18 = $(libnm_tests_programs_req_introspection)
-@HAVE_INTROSPECTION_FALSE@am__append_19 = $(libnm_tests_programs_req_introspection)
-@REQUIRE_ROOT_TESTS_TRUE@am__append_20 = -DREQUIRE_ROOT_TESTS=1
-@WITH_WEXT_TRUE@am__append_21 = \
+@WITH_JSON_VALIDATION_TRUE@am__append_7 = $(JANSSON_CFLAGS)
+@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am__append_8 = libnm-core/libnm-crypto-gnutls.la
+@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am__append_9 = libnm-core/libnm-crypto-nss.la
+@HAVE_INTROSPECTION_TRUE@am__append_10 = libnm/NM-1.0.typelib
+@HAVE_INTROSPECTION_TRUE@am__append_11 = libnm/NM-1.0.gir
+@HAVE_INTROSPECTION_TRUE@am__append_12 = $(libnm_noinst_data)
+@HAVE_INTROSPECTION_TRUE@am__append_13 = $(libnm_noinst_data)
+@HAVE_INTROSPECTION_TRUE@am__append_14 = $(libnm_tests_programs_req_introspection)
+@HAVE_INTROSPECTION_FALSE@am__append_15 = $(libnm_tests_programs_req_introspection)
+@REQUIRE_ROOT_TESTS_TRUE@am__append_16 = -DREQUIRE_ROOT_TESTS=1
+@WITH_WEXT_TRUE@am__append_17 = \
 @WITH_WEXT_TRUE@	src/platform/wifi/nm-wifi-utils-wext.c \
 @WITH_WEXT_TRUE@	src/platform/wifi/nm-wifi-utils-wext.h
 
@@ -189,235 +176,146 @@ TESTS = $(am__EXEEXT_14)
 ###############################################################################
 # src/ppp
 ###############################################################################
-@WITH_PPP_TRUE@am__append_22 = src/ppp/libnm-ppp-plugin.la
-@WITH_PPP_TRUE@am__append_23 = src/ppp/nm-pppd-plugin.la
-
-###############################################################################
-# src/settings/plugins/ibft
-###############################################################################
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_24 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_25 = src/settings/plugins/ibft/libnms-ibft-core.la
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_26 = src/settings/plugins/ibft/tests/test-ibft
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_27 = check-local-symbols-settings-ibft
+@WITH_PPP_TRUE@am__append_18 = src/ppp/libnm-ppp-plugin.la
+@WITH_PPP_TRUE@am__append_19 = src/ppp/nm-pppd-plugin.la
 
 ###############################################################################
 # src/settings/plugins/ifcfg-rh
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_20 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_21 = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = check-local-symbols-settings-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_22 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_23 = check-local-symbols-settings-ifcfg-rh
 
 ###############################################################################
 # src/settings/plugins/ifcfg-rh/tests
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_32 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_33 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_24 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_25 = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nm-ifup \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nm-ifdown
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_34 = install-data-hook-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = install-data-hook-ifcfg-rh
 
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_35 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
 
 ###############################################################################
 # src/settings/plugins/ifupdown
 ###############################################################################
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_36 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_37 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_38 = check-local-symbols-settings-ifupdown
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_28 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_29 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_30 = check-local-symbols-settings-ifupdown
 
 ###############################################################################
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_39 = src/settings/plugins/ifupdown/tests/test-ifupdown
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_31 = src/settings/plugins/ifupdown/tests/test-ifupdown
 
 ###############################################################################
 # src/devices/bluetooth
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@am__append_40 =  \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_32 =  \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-device-plugin-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm-device-plugin-bluetooth.la
-@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_41 = \
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_33 = \
 @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@	src/devices/wwan/nm-modem-ofono.c \
 @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@	src/devices/wwan/nm-modem-ofono.h
 
-@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = check-local-devices-wwan \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_34 = check-local-devices-wwan \
 @WITH_MODEM_MANAGER_1_TRUE@	check-local-devices-bluetooth
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = $(BLUEZ5_CFLAGS)
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_44 = \
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_35 = $(BLUEZ5_CFLAGS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_36 = \
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bluez5-dun.c \
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bluez5-dun.h
 
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_45 = $(BLUEZ5_LIBS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_37 = $(BLUEZ5_LIBS)
 
 ###############################################################################
 # src/devices/wifi
 ###############################################################################
-@WITH_WIFI_TRUE@am__append_46 = src/devices/wifi/libnm-device-plugin-wifi.la
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_47 = \
+@WITH_WIFI_TRUE@am__append_38 = src/devices/wifi/libnm-device-plugin-wifi.la
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_39 = \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-iwd.c \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-iwd.h \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-iwd-manager.c \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-iwd-manager.h \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	$(NULL)
 
-@WITH_WIFI_TRUE@am__append_48 = check-local-devices-wifi
-@WITH_WIFI_TRUE@am__append_49 = src/devices/wifi/tests/test-general
+@WITH_WIFI_TRUE@am__append_40 = check-local-devices-wifi
+@WITH_WIFI_TRUE@am__append_41 = src/devices/wifi/tests/test-devices-wifi
 
 ###############################################################################
 # src/devices/team
 ###############################################################################
-@WITH_TEAMDCTL_TRUE@am__append_50 = src/devices/team/libnm-device-plugin-team.la
-@WITH_TEAMDCTL_TRUE@am__append_51 = check-local-devices-team
-@WITH_OPENVSWITCH_TRUE@am__append_52 = src/devices/ovs/libnm-device-plugin-ovs.la
-@HAVE_INTROSPECTION_TRUE@am__append_53 = $(clients_common_settings_doc_h)
-@HAVE_INTROSPECTION_TRUE@am__append_54 = check-local-settings-docs
-@HAVE_INTROSPECTION_TRUE@am__append_55 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_FALSE@am__append_56 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_TRUE@am__append_57 = clients/common/tests/test-general
-@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_58 = clients/common/tests/test-general
+@WITH_TEAMDCTL_TRUE@am__append_42 = src/devices/team/libnm-device-plugin-team.la
+@WITH_TEAMDCTL_TRUE@am__append_43 = check-local-devices-team
+@WITH_OPENVSWITCH_TRUE@am__append_44 = src/devices/ovs/libnm-device-plugin-ovs.la
+@HAVE_INTROSPECTION_TRUE@am__append_45 = $(clients_common_settings_doc_h)
+@HAVE_INTROSPECTION_TRUE@am__append_46 = check-local-settings-docs
+@HAVE_INTROSPECTION_TRUE@am__append_47 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_FALSE@am__append_48 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_TRUE@am__append_49 = clients/common/tests/test-clients-common
+@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_50 = clients/common/tests/test-clients-common
 
 ###############################################################################
 # clients/cli
 ###############################################################################
-@BUILD_NMCLI_TRUE@am__append_59 = clients/cli/nmcli
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_60 = $(POLKIT_CFLAGS)
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_61 = \
+@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@@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_62 = $(POLKIT_LIBS)
-@BUILD_NMCLI_TRUE@am__append_63 = install-data-hook-nmcli
-@BUILD_NMCLI_TRUE@am__append_64 = uninstall-hook-nmcli
+@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
 
 ###############################################################################
 # clients/tui
 ###############################################################################
-@BUILD_NMTUI_TRUE@am__append_65 = clients/tui/newt/libnmt-newt.a
-@BUILD_NMTUI_TRUE@am__append_66 = clients/tui/nmtui
-@BUILD_NMTUI_TRUE@am__append_67 = install-exec-hook-nmtui
-@BUILD_NMTUI_TRUE@am__append_68 = uninstall-hook-nmtui
-
-###############################################################################
-# libnm-util
-###############################################################################
-@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_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_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 \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.pc.in \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.ver \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.c.template \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.h.template \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/meson.build \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/meson.build \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc.in \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.pc.in \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.ver \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.ver \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-enum-types.c.template \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-enum-types.h.template \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-glib-enum-types.c.template \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-glib-enum-types.h.template \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/meson.build
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_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_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_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_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_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_88 = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-settings-defaults \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-crypto \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-secrets \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-general \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-8021x \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-dcb
-
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-util/tests/test-libnm-linking \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-test \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-nm-client
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = libnm-glib/libdeprecated-nm-glib.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-plugin-glue.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-secret-agent-glue.h
-
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = check-local-libnm-glib-nm-client
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = libnm-glib/tests/test-remote-settings-client
-@HAVE_INTROSPECTION_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_94 = libnm-glib/tests/test-remote-settings-client
-@HAVE_INTROSPECTION_TRUE@am__append_95 = $(man_nm_settings_xml)
-@WITH_OPENVSWITCH_TRUE@am__append_96 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_97 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_98 = man/nm-openvswitch.7
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_99 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_100 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_101 = man/nm-settings-ifcfg-rh.5
-@HAVE_DOCS_TRUE@am__append_102 = install-data-hook-man
-@HAVE_DOCS_TRUE@am__append_103 = uninstall-hook-man
-@HAVE_DOCS_TRUE@am__append_104 = $(man_pages) $(man_pages_autogen)
-@BUILD_DOCS_TRUE@am__append_105 = $(man_pages) $(man_pages_autogen)
+@BUILD_NMTUI_TRUE@am__append_57 = clients/tui/newt/libnmt-newt.a
+@BUILD_NMTUI_TRUE@am__append_58 = clients/tui/nmtui
+@BUILD_NMTUI_TRUE@am__append_59 = install-exec-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_60 = uninstall-hook-nmtui
+@HAVE_INTROSPECTION_TRUE@am__append_61 = $(man_nm_settings_xml)
+@WITH_OPENVSWITCH_TRUE@am__append_62 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_63 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_64 = man/nm-openvswitch.7
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_65 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_66 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_67 = man/nm-settings-ifcfg-rh.5
+@HAVE_DOCS_TRUE@am__append_68 = install-data-hook-man
+@HAVE_DOCS_TRUE@am__append_69 = uninstall-hook-man
+@HAVE_DOCS_TRUE@am__append_70 = $(man_pages) $(man_pages_autogen)
+@BUILD_DOCS_TRUE@am__append_71 = $(man_pages) $(man_pages_autogen)
 
 ###############################################################################
 # vapi
 ###############################################################################
-@ENABLE_VAPIGEN_TRUE@am__append_106 = \
+@ENABLE_VAPIGEN_TRUE@am__append_72 = \
 @ENABLE_VAPIGEN_TRUE@	vapi/libnm.vapi
 
-@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_107 = \
-@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	vapi/libnm-util.vapi \
-@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	vapi/libnm-glib.vapi
-
-@ENABLE_VAPIGEN_TRUE@am__append_108 = \
+@ENABLE_VAPIGEN_TRUE@am__append_73 = \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS) \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS:.vapi=.deps)
 
-@ENABLE_VAPIGEN_TRUE@am__append_109 = $(VAPIGEN_VAPIS)
+@ENABLE_VAPIGEN_TRUE@am__append_74 = $(VAPIGEN_VAPIS)
 
 ###############################################################################
-@ENABLE_TESTS_TRUE@am__append_110 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_TRUE@am__append_111 = $(check_ltlibraries)
-@ENABLE_TESTS_FALSE@am__append_112 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_FALSE@am__append_113 = $(check_ltlibraries)
-@WITH_QT_TRUE@am__append_114 = \
+@ENABLE_TESTS_TRUE@am__append_75 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_TRUE@am__append_76 = $(check_ltlibraries)
+@ENABLE_TESTS_FALSE@am__append_77 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_FALSE@am__append_78 = $(check_ltlibraries)
+@WITH_QT_TRUE@am__append_79 = \
 @WITH_QT_TRUE@	examples/C/qt/add-connection-wired \
 @WITH_QT_TRUE@	examples/C/qt/list-connections \
 @WITH_QT_TRUE@	examples/C/qt/change-ipv4-addresses \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running
 
-@WITH_QT_TRUE@am__append_115 = \
+@WITH_QT_TRUE@am__append_80 = \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running.moc
 
 subdir = .
@@ -440,18 +338,12 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(am__dist_libexec_SCRIPTS_DIST) \
-	$(am__libdeprecated_HEADERS_DIST) \
-	$(am__libnm_glib_libnminclude_HEADERS_DIST) \
-	$(am__libnm_glib_libnmvpn_HEADERS_DIST) \
-	$(am__libnm_util_libnm_util_include_HEADERS_DIST) \
 	$(libnminclude_HEADERS) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = shared/nm-version-macros.h libnm/libnm.pc \
-	libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc \
-	libnm-glib/libnm-glib-vpn.pc \
 	data/org.freedesktop.NetworkManager.policy.in \
 	NetworkManager.pc
 CONFIG_CLEAN_VPATH_FILES =
@@ -469,35 +361,17 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(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)"
-am__EXEEXT_3 = libnm/tests/test-general$(EXEEXT)
-am__EXEEXT_4 = libnm/tests/test-nm-client$(EXEEXT) \
+	"$(DESTDIR)$(libnmincludedir)" "$(DESTDIR)$(libnmincludedir)"
+am__EXEEXT_3 = libnm/tests/test-nm-client$(EXEEXT) \
 	libnm/tests/test-remote-settings-client$(EXEEXT) \
 	libnm/tests/test-secret-agent$(EXEEXT)
-@HAVE_INTROSPECTION_TRUE@am__EXEEXT_5 = $(am__EXEEXT_4)
-@CONFIG_PLUGIN_IBFT_TRUE@am__EXEEXT_6 = src/settings/plugins/ibft/tests/test-ibft$(EXEEXT)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__EXEEXT_7 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__EXEEXT_8 = src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)
-@WITH_WIFI_TRUE@am__EXEEXT_9 =  \
-@WITH_WIFI_TRUE@	src/devices/wifi/tests/test-general$(EXEEXT)
-@HAVE_INTROSPECTION_TRUE@am__EXEEXT_10 = clients/common/tests/test-general$(EXEEXT)
-@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_11 = clients/common/tests/test-general$(EXEEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_12 = 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) \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-8021x$(EXEEXT) \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-dcb$(EXEEXT)
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_13 = libnm-glib/tests/test-remote-settings-client$(EXEEXT)
-am__EXEEXT_14 = shared/nm-utils/tests/test-shared-general$(EXEEXT) \
+@HAVE_INTROSPECTION_TRUE@am__EXEEXT_4 = $(am__EXEEXT_3)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__EXEEXT_5 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__EXEEXT_6 = src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)
+@WITH_WIFI_TRUE@am__EXEEXT_7 = src/devices/wifi/tests/test-devices-wifi$(EXEEXT)
+@HAVE_INTROSPECTION_TRUE@am__EXEEXT_8 = clients/common/tests/test-clients-common$(EXEEXT)
+@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_9 = clients/common/tests/test-clients-common$(EXEEXT)
+am__EXEEXT_10 = shared/nm-utils/tests/test-shared-general$(EXEEXT) \
 	libnm-core/tests/test-compare$(EXEEXT) \
 	libnm-core/tests/test-crypto$(EXEEXT) \
 	libnm-core/tests/test-general$(EXEEXT) \
@@ -505,52 +379,48 @@ am__EXEEXT_14 = shared/nm-utils/tests/test-shared-general$(EXEEXT) \
 	libnm-core/tests/test-secrets$(EXEEXT) \
 	libnm-core/tests/test-setting$(EXEEXT) \
 	libnm-core/tests/test-settings-defaults$(EXEEXT) \
-	$(am__EXEEXT_3) $(am__EXEEXT_5) \
+	libnm/tests/test-libnm$(EXEEXT) $(am__EXEEXT_4) \
 	src/initrd/tests/test-ibft-reader$(EXEEXT) \
 	src/initrd/tests/test-cmdline-reader$(EXEEXT) \
 	src/dhcp/tests/test-dhcp-dhclient$(EXEEXT) \
 	src/dhcp/tests/test-dhcp-utils$(EXEEXT) \
-	src/settings/plugins/keyfile/tests/test-keyfile$(EXEEXT) \
-	$(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
-	$(am__EXEEXT_9) src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) \
-	src/platform/tests/test-link-fake$(EXEEXT) \
-	src/platform/tests/test-link-linux$(EXEEXT) \
+	src/settings/plugins/keyfile/tests/test-keyfile-settings$(EXEEXT) \
+	$(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
+	src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) \
 	src/platform/tests/test-address-fake$(EXEEXT) \
 	src/platform/tests/test-address-linux$(EXEEXT) \
-	src/platform/tests/test-general$(EXEEXT) \
+	src/platform/tests/test-cleanup-fake$(EXEEXT) \
+	src/platform/tests/test-cleanup-linux$(EXEEXT) \
+	src/platform/tests/test-link-fake$(EXEEXT) \
+	src/platform/tests/test-link-linux$(EXEEXT) \
 	src/platform/tests/test-nmp-object$(EXEEXT) \
+	src/platform/tests/test-platform-general$(EXEEXT) \
 	src/platform/tests/test-route-fake$(EXEEXT) \
 	src/platform/tests/test-route-linux$(EXEEXT) \
-	src/platform/tests/test-cleanup-fake$(EXEEXT) \
-	src/platform/tests/test-cleanup-linux$(EXEEXT) \
 	src/devices/tests/test-lldp$(EXEEXT) \
 	src/devices/tests/test-acd$(EXEEXT) \
 	src/ndisc/tests/test-ndisc-fake$(EXEEXT) \
 	src/supplicant/tests/test-supplicant-config$(EXEEXT) \
 	src/tests/config/test-config$(EXEEXT) \
-	src/tests/test-general$(EXEEXT) \
-	src/tests/test-general-with-expect$(EXEEXT) \
+	src/tests/test-core$(EXEEXT) \
+	src/tests/test-core-with-expect$(EXEEXT) \
 	src/tests/test-ip4-config$(EXEEXT) \
 	src/tests/test-ip6-config$(EXEEXT) src/tests/test-dcb$(EXEEXT) \
 	src/tests/test-systemd$(EXEEXT) \
 	src/tests/test-wired-defname$(EXEEXT) \
 	src/tests/test-utils$(EXEEXT) \
-	dispatcher/tests/test-dispatcher-envp$(EXEEXT) \
-	$(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
-	$(am__EXEEXT_13)
-@HAVE_INTROSPECTION_FALSE@am__EXEEXT_15 = $(am__EXEEXT_4)
-@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_16 = libnm-util/tests/test-libnm-linking$(EXEEXT) \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-test$(EXEEXT) \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-nm-client$(EXEEXT)
-@HAVE_INTROSPECTION_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_17 = libnm-glib/tests/test-remote-settings-client$(EXEEXT)
-@WITH_QT_TRUE@am__EXEEXT_18 =  \
+	dispatcher/tests/test-dispatcher-envp$(EXEEXT) $(am__EXEEXT_8) \
+	$(am__EXEEXT_9) \
+	clients/common/tests/test-libnm-core-aux$(EXEEXT)
+@HAVE_INTROSPECTION_FALSE@am__EXEEXT_11 = $(am__EXEEXT_3)
+@WITH_QT_TRUE@am__EXEEXT_12 =  \
 @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_19 = $(am__EXEEXT_15) src/platform/tests/monitor$(EXEEXT) \
-	src/ndisc/tests/test-ndisc-linux$(EXEEXT) $(am__EXEEXT_16) \
-	$(am__EXEEXT_17) examples/C/glib/add-connection-gdbus$(EXEEXT) \
+am__EXEEXT_13 = $(am__EXEEXT_11) src/platform/tests/monitor$(EXEEXT) \
+	src/ndisc/tests/test-ndisc-linux$(EXEEXT) \
+	examples/C/glib/add-connection-gdbus$(EXEEXT) \
 	examples/C/glib/add-connection-libnm$(EXEEXT) \
 	examples/C/glib/get-active-connections-gdbus$(EXEEXT) \
 	examples/C/glib/get-ap-info-libnm$(EXEEXT) \
@@ -558,9 +428,9 @@ am__EXEEXT_19 = $(am__EXEEXT_15) src/platform/tests/monitor$(EXEEXT) \
 	examples/C/glib/list-connections-libnm$(EXEEXT) \
 	examples/C/glib/monitor-nm-running-gdbus$(EXEEXT) \
 	examples/C/glib/monitor-nm-state-gdbus$(EXEEXT) \
-	$(am__EXEEXT_18)
-@ENABLE_TESTS_FALSE@am__EXEEXT_20 = $(am__EXEEXT_14) $(am__EXEEXT_19)
-@ENABLE_TESTS_TRUE@am__EXEEXT_21 = $(am__EXEEXT_14) $(am__EXEEXT_19)
+	$(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)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) \
 	$(sbin_PROGRAMS)
 LIBRARIES = $(noinst_LIBRARIES)
@@ -667,7 +537,7 @@ clients_tui_newt_libnmt_newt_a_OBJECTS =  \
 	$(am_clients_tui_newt_libnmt_newt_a_OBJECTS)
 am__DEPENDENCIES_1 =
 clients_common_libnmc_base_la_DEPENDENCIES = libnm/libnm.la \
-	shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am_clients_common_libnmc_base_la_OBJECTS =  \
 	clients/common/libnmc_base_la-nm-secret-agent-simple.lo \
 	clients/common/libnmc_base_la-nm-vpn-helpers.lo \
@@ -680,10 +550,7 @@ 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 = clients/common/libnmc-base.la \
-	libnm/libnm.la \
-	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+clients_common_libnmc_la_DEPENDENCIES = libnm/libnm.la \
 	$(am__DEPENDENCIES_1)
 am_clients_common_libnmc_la_OBJECTS =  \
 	shared/clients_common_libnmc_la-nm-meta-setting.lo \
@@ -773,6 +640,7 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-match.h \
 	libnm-core/nm-setting-olpc-mesh.h \
 	libnm-core/nm-setting-ovs-bridge.h \
+	libnm-core/nm-setting-ovs-dpdk.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 \
@@ -792,16 +660,17 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-vpn-dbus-interface.h \
 	libnm-core/nm-vpn-editor-plugin.h \
 	libnm-core/nm-vpn-plugin-info.h shared/nm-meta-setting.h \
-	libnm-core/nm-crypto.h libnm-core/nm-crypto-impl.h \
 	libnm-core/nm-connection-private.h \
 	libnm-core/nm-core-internal.h \
 	libnm-core/nm-core-types-internal.h \
+	libnm-core/nm-crypto-impl.h libnm-core/nm-crypto.h \
 	libnm-core/nm-keyfile-internal.h libnm-core/nm-keyfile-utils.h \
 	libnm-core/nm-property-compare.h \
-	libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \
-	libnm-core/nm-json.h libnm-core/nm-setting-6lowpan.c \
-	libnm-core/nm-setting-8021x.c libnm-core/nm-setting-adsl.c \
-	libnm-core/nm-setting-bluetooth.c libnm-core/nm-setting-bond.c \
+	libnm-core/nm-setting-private.h libnm-core/nm-team-utils.h \
+	libnm-core/nm-utils-private.h libnm-core/nm-json.h \
+	libnm-core/nm-setting-6lowpan.c libnm-core/nm-setting-8021x.c \
+	libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c \
+	libnm-core/nm-setting-bond.c \
 	libnm-core/nm-setting-bridge-port.c \
 	libnm-core/nm-setting-bridge.c libnm-core/nm-setting-cdma.c \
 	libnm-core/nm-setting-connection.c libnm-core/nm-setting-dcb.c \
@@ -816,6 +685,7 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-match.c \
 	libnm-core/nm-setting-olpc-mesh.c \
 	libnm-core/nm-setting-ovs-bridge.c \
+	libnm-core/nm-setting-ovs-dpdk.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 \
@@ -830,12 +700,13 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-wireguard.c \
 	libnm-core/nm-setting-wireless-security.c \
 	libnm-core/nm-setting-wireless.c libnm-core/nm-setting-wpan.c \
-	shared/nm-meta-setting.c libnm-core/nm-crypto.c \
-	libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \
-	libnm-core/nm-errors.c libnm-core/nm-keyfile.c \
-	libnm-core/nm-keyfile-utils.c libnm-core/nm-property-compare.c \
+	shared/nm-meta-setting.c libnm-core/nm-connection.c \
+	libnm-core/nm-crypto.c libnm-core/nm-dbus-utils.c \
+	libnm-core/nm-errors.c libnm-core/nm-keyfile-utils.c \
+	libnm-core/nm-keyfile.c libnm-core/nm-property-compare.c \
 	libnm-core/nm-setting.c libnm-core/nm-simple-connection.c \
-	libnm-core/nm-utils.c libnm-core/nm-vpn-editor-plugin.c \
+	libnm-core/nm-team-utils.c libnm-core/nm-utils.c \
+	libnm-core/nm-vpn-editor-plugin.c \
 	libnm-core/nm-vpn-plugin-info.c libnm-core/nm-json.c
 am__objects_2 =
 am__objects_3 = $(am__objects_2)
@@ -863,6 +734,7 @@ am__objects_4 = libnm-core/libnm_core_la-nm-setting-6lowpan.lo \
 	libnm-core/libnm_core_la-nm-setting-match.lo \
 	libnm-core/libnm_core_la-nm-setting-olpc-mesh.lo \
 	libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo \
+	libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo \
 	libnm-core/libnm_core_la-nm-setting-ovs-interface.lo \
 	libnm-core/libnm_core_la-nm-setting-ovs-patch.lo \
 	libnm-core/libnm_core_la-nm-setting-ovs-port.lo \
@@ -889,15 +761,16 @@ am__objects_4 = libnm-core/libnm_core_la-nm-setting-6lowpan.lo \
 @WITH_JSON_VALIDATION_TRUE@am__objects_5 = libnm-core/libnm_core_la-nm-json.lo
 am__objects_6 = $(am__objects_4) \
 	shared/libnm_core_libnm_core_la-nm-meta-setting.lo \
-	libnm-core/libnm_core_la-nm-crypto.lo \
 	libnm-core/libnm_core_la-nm-connection.lo \
+	libnm-core/libnm_core_la-nm-crypto.lo \
 	libnm-core/libnm_core_la-nm-dbus-utils.lo \
 	libnm-core/libnm_core_la-nm-errors.lo \
-	libnm-core/libnm_core_la-nm-keyfile.lo \
 	libnm-core/libnm_core_la-nm-keyfile-utils.lo \
+	libnm-core/libnm_core_la-nm-keyfile.lo \
 	libnm-core/libnm_core_la-nm-property-compare.lo \
 	libnm-core/libnm_core_la-nm-setting.lo \
 	libnm-core/libnm_core_la-nm-simple-connection.lo \
+	libnm-core/libnm_core_la-nm-team-utils.lo \
 	libnm-core/libnm_core_la-nm-utils.lo \
 	libnm-core/libnm_core_la-nm-vpn-editor-plugin.lo \
 	libnm-core/libnm_core_la-nm-vpn-plugin-info.lo \
@@ -914,9 +787,8 @@ libnm_core_libnm_core_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libnm_core_libnm_core_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 @HAVE_CRYPTO_GNUTLS_TRUE@libnm_core_libnm_crypto_gnutls_la_DEPENDENCIES =  \
-@HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_2) \
+@HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_1) \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_1)
 am__libnm_core_libnm_crypto_gnutls_la_SOURCES_DIST =  \
 	libnm-core/nm-crypto-gnutls.c
@@ -931,7 +803,7 @@ libnm_core_libnm_crypto_gnutls_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 @ENABLE_TESTS_TRUE@@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am_libnm_core_libnm_crypto_gnutls_la_rpath =
 @HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_TRUE@am_libnm_core_libnm_crypto_gnutls_la_rpath =
 @HAVE_CRYPTO_NSS_TRUE@libnm_core_libnm_crypto_nss_la_DEPENDENCIES =  \
-@HAVE_CRYPTO_NSS_TRUE@	$(am__DEPENDENCIES_2) \
+@HAVE_CRYPTO_NSS_TRUE@	$(am__DEPENDENCIES_1) \
 @HAVE_CRYPTO_NSS_TRUE@	$(am__DEPENDENCIES_1)
 am__libnm_core_libnm_crypto_nss_la_SOURCES_DIST =  \
 	libnm-core/nm-crypto-nss.c
@@ -945,313 +817,75 @@ libnm_core_libnm_crypto_nss_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @ENABLE_TESTS_FALSE@@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am_libnm_core_libnm_crypto_nss_la_rpath =
 @ENABLE_TESTS_TRUE@@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am_libnm_core_libnm_crypto_nss_la_rpath =
 @HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_TRUE@am_libnm_core_libnm_crypto_nss_la_rpath =
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libdeprecated_nm_glib_la_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
-am__libnm_glib_libdeprecated_nm_glib_la_SOURCES_DIST =  \
-	libnm-glib/libnm_glib.h libnm-glib/libnm_glib.c
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libdeprecated_nm_glib_la_OBJECTS = libnm-glib/libdeprecated_nm_glib_la-libnm_glib.lo
-libnm_glib_libdeprecated_nm_glib_la_OBJECTS =  \
-	$(am_libnm_glib_libdeprecated_nm_glib_la_OBJECTS)
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libdeprecated_nm_glib_la_rpath =
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_vpn_la_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
-am__libnm_glib_libnm_glib_vpn_la_SOURCES_DIST =  \
-	libnm-glib/nm-vpn-plugin.c \
-	libnm-glib/nm-vpn-plugin-ui-interface.c \
-	libnm-glib/nm-vpn-plugin-utils.c
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_8 = libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-utils.lo
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_vpn_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_8)
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_9 = libnm-glib/libnm_glib_vpn_la-nm-vpn-enum-types.lo
-@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_9)
-libnm_glib_libnm_glib_vpn_la_OBJECTS =  \
-	$(am_libnm_glib_libnm_glib_vpn_la_OBJECTS) \
-	$(nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS)
-libnm_glib_libnm_glib_vpn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libnm_glib_libnm_glib_vpn_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_vpn_la_rpath =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	-rpath $(libdir)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libdeprecated-nm-glib.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-udev-aux/libnm-udev-aux.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
-am__libnm_glib_libnm_glib_la_SOURCES_DIST = libnm-glib/nm-object.c \
-	libnm-glib/nm-dbus-helpers.c libnm-glib/nm-client.c \
-	libnm-glib/nm-device.c libnm-glib/nm-device-ethernet.c \
-	libnm-glib/nm-device-infiniband.c libnm-glib/nm-device-adsl.c \
-	libnm-glib/nm-device-wifi.c libnm-glib/nm-device-bt.c \
-	libnm-glib/nm-device-olpc-mesh.c libnm-glib/nm-device-bond.c \
-	libnm-glib/nm-device-team.c libnm-glib/nm-device-bridge.c \
-	libnm-glib/nm-device-vlan.c libnm-glib/nm-device-generic.c \
-	libnm-glib/nm-access-point.c libnm-glib/nm-ip4-config.c \
-	libnm-glib/nm-device-modem.c libnm-glib/nm-vpn-connection.c \
-	libnm-glib/nm-types.c libnm-glib/nm-object-cache.c \
-	libnm-glib/nm-active-connection.c libnm-glib/nm-dhcp4-config.c \
-	libnm-glib/nm-ip6-config.c libnm-glib/nm-dhcp6-config.c \
-	libnm-glib/nm-remote-connection.c \
-	libnm-glib/nm-remote-settings.c libnm-glib/nm-secret-agent.c \
-	libnm-glib/nm-device-wimax.c libnm-glib/nm-wimax-nsp.c \
-	libnm-glib/nm-object.h libnm-glib/nm-client.h \
-	libnm-glib/nm-device.h libnm-glib/nm-device-ethernet.h \
-	libnm-glib/nm-device-infiniband.h libnm-glib/nm-device-adsl.h \
-	libnm-glib/nm-device-wifi.h libnm-glib/nm-device-bt.h \
-	libnm-glib/nm-device-olpc-mesh.h libnm-glib/nm-device-bond.h \
-	libnm-glib/nm-device-team.h libnm-glib/nm-device-bridge.h \
-	libnm-glib/nm-device-vlan.h libnm-glib/nm-device-generic.h \
-	libnm-glib/nm-access-point.h libnm-glib/nm-ip4-config.h \
-	libnm-glib/nm-device-modem.h libnm-glib/nm-vpn-connection.h \
-	libnm-glib/nm-types.h libnm-glib/nm-active-connection.h \
-	libnm-glib/nm-dhcp4-config.h libnm-glib/nm-ip6-config.h \
-	libnm-glib/nm-dhcp6-config.h libnm-glib/nm-remote-connection.h \
-	libnm-glib/nm-remote-settings.h libnm-glib/nm-secret-agent.h \
-	libnm-glib/nm-device-wimax.h libnm-glib/nm-wimax-nsp.h \
-	libnm-glib/nm-object-private.h libnm-glib/nm-device-private.h \
-	libnm-glib/nm-types-private.h libnm-glib/nm-object-cache.h \
-	libnm-glib/nm-remote-connection-private.h \
-	libnm-glib/nm-dbus-helpers-private.h
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_10 = libnm-glib/libnm_glib_la-nm-object.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-dbus-helpers.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-client.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-ethernet.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-infiniband.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-adsl.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-wifi.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-bt.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-olpc-mesh.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-bond.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-team.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-bridge.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-vlan.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-generic.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-access-point.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-ip4-config.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-modem.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-vpn-connection.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-types.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-object-cache.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-active-connection.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-dhcp4-config.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-ip6-config.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-dhcp6-config.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-remote-connection.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-remote-settings.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-secret-agent.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device-wimax.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-wimax-nsp.lo
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_10) $(am__objects_2) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_2)
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_11 = libnm-glib/libnm_glib_la-nm-glib-enum-types.lo
-@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_11) $(am__objects_2)
-libnm_glib_libnm_glib_la_OBJECTS =  \
-	$(am_libnm_glib_libnm_glib_la_OBJECTS) \
-	$(nodist_libnm_glib_libnm_glib_la_OBJECTS)
-libnm_glib_libnm_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libnm_glib_libnm_glib_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_la_rpath =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	-rpath $(libdir)
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_DEPENDENCIES = shared/nm-glib-aux/libnm-glib-aux.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_3) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_4)
-am__libnm_util_libnm_util_la_SOURCES_DIST = libnm-util/crypto.c \
-	libnm-util/nm-connection.c \
-	libnm-util/nm-param-spec-specialized.c libnm-util/nm-setting.c \
-	libnm-util/nm-setting-8021x.c libnm-util/nm-setting-adsl.c \
-	libnm-util/nm-setting-bluetooth.c libnm-util/nm-setting-bond.c \
-	libnm-util/nm-setting-team.c libnm-util/nm-setting-team-port.c \
-	libnm-util/nm-setting-bridge.c \
-	libnm-util/nm-setting-bridge-port.c \
-	libnm-util/nm-setting-connection.c libnm-util/nm-setting-dcb.c \
-	libnm-util/nm-setting-infiniband.c \
-	libnm-util/nm-setting-ip4-config.c \
-	libnm-util/nm-setting-vlan.c \
-	libnm-util/nm-setting-ip6-config.c libnm-util/nm-setting-ppp.c \
-	libnm-util/nm-setting-pppoe.c libnm-util/nm-setting-serial.c \
-	libnm-util/nm-setting-generic.c libnm-util/nm-setting-gsm.c \
-	libnm-util/nm-setting-cdma.c libnm-util/nm-setting-olpc-mesh.c \
-	libnm-util/nm-setting-wimax.c libnm-util/nm-setting-wired.c \
-	libnm-util/nm-setting-wireless.c \
-	libnm-util/nm-setting-wireless-security.c \
-	libnm-util/nm-setting-vpn.c libnm-util/nm-utils.c \
-	libnm-util/nm-value-transforms.c libnm-util/crypto_gnutls.c \
-	libnm-util/crypto_nss.c shared/nm-version-macros.h \
-	libnm-util/NetworkManager.h libnm-util/NetworkManagerVPN.h \
-	libnm-util/nm-connection.h libnm-util/nm-setting.h \
-	libnm-util/nm-setting-8021x.h libnm-util/nm-setting-adsl.h \
-	libnm-util/nm-setting-bluetooth.h libnm-util/nm-setting-bond.h \
-	libnm-util/nm-setting-team.h libnm-util/nm-setting-team-port.h \
-	libnm-util/nm-setting-bridge.h \
-	libnm-util/nm-setting-bridge-port.h \
-	libnm-util/nm-setting-connection.h libnm-util/nm-setting-dcb.h \
-	libnm-util/nm-setting-infiniband.h \
-	libnm-util/nm-setting-ip4-config.h \
-	libnm-util/nm-setting-vlan.h \
-	libnm-util/nm-setting-ip6-config.h libnm-util/nm-setting-ppp.h \
-	libnm-util/nm-setting-pppoe.h libnm-util/nm-setting-serial.h \
-	libnm-util/nm-setting-generic.h libnm-util/nm-setting-gsm.h \
-	libnm-util/nm-setting-cdma.h libnm-util/nm-setting-olpc-mesh.h \
-	libnm-util/nm-setting-wimax.h libnm-util/nm-setting-wired.h \
-	libnm-util/nm-setting-wireless.h \
-	libnm-util/nm-setting-wireless-security.h \
-	libnm-util/nm-setting-vpn.h libnm-util/nm-utils.h \
-	libnm-util/nm-version.h libnm-util/crypto.h \
-	libnm-util/nm-dbus-glib-types.h \
-	libnm-util/nm-gvaluearray-compat.h \
-	libnm-util/nm-param-spec-specialized.h \
-	libnm-util/nm-setting-private.h libnm-util/nm-utils-private.h
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_12 = libnm-util/libnm_util_la-crypto_gnutls.lo
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_13 = libnm-util/libnm_util_la-crypto_nss.lo
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_14 = libnm-util/libnm_util_la-crypto.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-connection.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-param-spec-specialized.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-8021x.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-adsl.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-bluetooth.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-bond.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-team.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-team-port.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-bridge.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-bridge-port.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-connection.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-dcb.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-infiniband.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-ip4-config.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-vlan.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-ip6-config.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-ppp.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-pppoe.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-serial.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-generic.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-gsm.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-cdma.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-olpc-mesh.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-wimax.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-wired.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-wireless.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-wireless-security.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting-vpn.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-utils.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-value-transforms.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_12) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_13)
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libnm_util_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_14) $(am__objects_2) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_2)
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_15 = libnm-util/libnm_util_la-nm-utils-enum-types.lo
-@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_util_libnm_util_la_OBJECTS =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_2) $(am__objects_15)
-libnm_util_libnm_util_la_OBJECTS =  \
-	$(am_libnm_util_libnm_util_la_OBJECTS) \
-	$(nodist_libnm_util_libnm_util_la_OBJECTS)
-libnm_util_libnm_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libnm_util_libnm_util_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libnm_util_la_rpath =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	-rpath $(libdir)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_3) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_4)
-am__libnm_util_libtest_crypto_la_SOURCES_DIST = libnm-util/crypto.c \
-	libnm-util/crypto_gnutls.c libnm-util/crypto_nss.c
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_16 = libnm-util/libtest_crypto_la-crypto_gnutls.lo
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_17 = libnm-util/libtest_crypto_la-crypto_nss.lo
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_OBJECTS = libnm-util/libtest_crypto_la-crypto.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_16) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__objects_17)
-libnm_util_libtest_crypto_la_OBJECTS =  \
-	$(am_libnm_util_libtest_crypto_la_OBJECTS)
-@ENABLE_TESTS_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_rpath =
-@ENABLE_TESTS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_rpath =
-libnm_libnm_utils_la_DEPENDENCIES =  \
+libnm_liblibnm_la_DEPENDENCIES =  \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/libnm-core.la $(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	introspection/libnmdbus.la \
-	shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1)
-am_libnm_libnm_utils_la_OBJECTS =  \
-	libnm/libnm_utils_la-nm-libnm-utils.lo
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@nodist_libnm_libnm_utils_la_OBJECTS = libnm/fake-typelib/libnm_utils_la-typelibs.lo
-libnm_libnm_utils_la_OBJECTS = $(am_libnm_libnm_utils_la_OBJECTS) \
-	$(nodist_libnm_libnm_utils_la_OBJECTS)
-libnm_libnm_la_DEPENDENCIES = libnm/libnm-utils.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
-	shared/nm-udev-aux/libnm-udev-aux.la $(am__DEPENDENCIES_1) \
+	shared/nm-udev-aux/libnm-udev-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__objects_18 = libnm/libnm_la-nm-access-point.lo \
-	libnm/libnm_la-nm-active-connection.lo \
-	libnm/libnm_la-nm-checkpoint.lo libnm/libnm_la-nm-client.lo \
-	libnm/libnm_la-nm-dbus-helpers.lo \
-	libnm/libnm_la-nm-device-6lowpan.lo \
-	libnm/libnm_la-nm-device-adsl.lo \
-	libnm/libnm_la-nm-device-bond.lo \
-	libnm/libnm_la-nm-device-bridge.lo \
-	libnm/libnm_la-nm-device-bt.lo \
-	libnm/libnm_la-nm-device-dummy.lo \
-	libnm/libnm_la-nm-device-ethernet.lo \
-	libnm/libnm_la-nm-device-generic.lo \
-	libnm/libnm_la-nm-device-infiniband.lo \
-	libnm/libnm_la-nm-device-ip-tunnel.lo \
-	libnm/libnm_la-nm-device-macsec.lo \
-	libnm/libnm_la-nm-device-macvlan.lo \
-	libnm/libnm_la-nm-device-modem.lo \
-	libnm/libnm_la-nm-device-olpc-mesh.lo \
-	libnm/libnm_la-nm-device-ovs-bridge.lo \
-	libnm/libnm_la-nm-device-ovs-interface.lo \
-	libnm/libnm_la-nm-device-ovs-port.lo \
-	libnm/libnm_la-nm-device-ppp.lo \
-	libnm/libnm_la-nm-device-team.lo \
-	libnm/libnm_la-nm-device-tun.lo \
-	libnm/libnm_la-nm-device-vlan.lo \
-	libnm/libnm_la-nm-device-vxlan.lo \
-	libnm/libnm_la-nm-device-wifi-p2p.lo \
-	libnm/libnm_la-nm-device-wifi.lo \
-	libnm/libnm_la-nm-device-wimax.lo \
-	libnm/libnm_la-nm-device-wireguard.lo \
-	libnm/libnm_la-nm-device-wpan.lo libnm/libnm_la-nm-device.lo \
-	libnm/libnm_la-nm-dhcp-config.lo \
-	libnm/libnm_la-nm-dhcp4-config.lo \
-	libnm/libnm_la-nm-dhcp6-config.lo \
-	libnm/libnm_la-nm-dns-manager.lo \
-	libnm/libnm_la-nm-ip-config.lo libnm/libnm_la-nm-ip4-config.lo \
-	libnm/libnm_la-nm-ip6-config.lo libnm/libnm_la-nm-manager.lo \
-	libnm/libnm_la-nm-object.lo \
-	libnm/libnm_la-nm-remote-connection.lo \
-	libnm/libnm_la-nm-remote-settings.lo \
-	libnm/libnm_la-nm-secret-agent-old.lo \
-	libnm/libnm_la-nm-vpn-connection.lo \
-	libnm/libnm_la-nm-vpn-editor.lo \
-	libnm/libnm_la-nm-vpn-plugin-old.lo \
-	libnm/libnm_la-nm-vpn-service-plugin.lo \
-	libnm/libnm_la-nm-wifi-p2p-peer.lo \
-	libnm/libnm_la-nm-wimax-nsp.lo
-am_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_2) \
-	$(am__objects_18)
-am__objects_19 = libnm/libnm_la-nm-enum-types.lo
-nodist_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_19)
+am__objects_8 = libnm/liblibnm_la-nm-access-point.lo \
+	libnm/liblibnm_la-nm-active-connection.lo \
+	libnm/liblibnm_la-nm-checkpoint.lo \
+	libnm/liblibnm_la-nm-client.lo \
+	libnm/liblibnm_la-nm-dbus-helpers.lo \
+	libnm/liblibnm_la-nm-device-6lowpan.lo \
+	libnm/liblibnm_la-nm-device-adsl.lo \
+	libnm/liblibnm_la-nm-device-bond.lo \
+	libnm/liblibnm_la-nm-device-bridge.lo \
+	libnm/liblibnm_la-nm-device-bt.lo \
+	libnm/liblibnm_la-nm-device-dummy.lo \
+	libnm/liblibnm_la-nm-device-ethernet.lo \
+	libnm/liblibnm_la-nm-device-generic.lo \
+	libnm/liblibnm_la-nm-device-infiniband.lo \
+	libnm/liblibnm_la-nm-device-ip-tunnel.lo \
+	libnm/liblibnm_la-nm-device-macsec.lo \
+	libnm/liblibnm_la-nm-device-macvlan.lo \
+	libnm/liblibnm_la-nm-device-modem.lo \
+	libnm/liblibnm_la-nm-device-olpc-mesh.lo \
+	libnm/liblibnm_la-nm-device-ovs-bridge.lo \
+	libnm/liblibnm_la-nm-device-ovs-interface.lo \
+	libnm/liblibnm_la-nm-device-ovs-port.lo \
+	libnm/liblibnm_la-nm-device-ppp.lo \
+	libnm/liblibnm_la-nm-device-team.lo \
+	libnm/liblibnm_la-nm-device-tun.lo \
+	libnm/liblibnm_la-nm-device-vlan.lo \
+	libnm/liblibnm_la-nm-device-vxlan.lo \
+	libnm/liblibnm_la-nm-device-wifi-p2p.lo \
+	libnm/liblibnm_la-nm-device-wifi.lo \
+	libnm/liblibnm_la-nm-device-wimax.lo \
+	libnm/liblibnm_la-nm-device-wireguard.lo \
+	libnm/liblibnm_la-nm-device-wpan.lo \
+	libnm/liblibnm_la-nm-device.lo \
+	libnm/liblibnm_la-nm-dhcp-config.lo \
+	libnm/liblibnm_la-nm-dhcp4-config.lo \
+	libnm/liblibnm_la-nm-dhcp6-config.lo \
+	libnm/liblibnm_la-nm-dns-manager.lo \
+	libnm/liblibnm_la-nm-ip-config.lo \
+	libnm/liblibnm_la-nm-ip4-config.lo \
+	libnm/liblibnm_la-nm-ip6-config.lo \
+	libnm/liblibnm_la-nm-libnm-utils.lo \
+	libnm/liblibnm_la-nm-manager.lo libnm/liblibnm_la-nm-object.lo \
+	libnm/liblibnm_la-nm-remote-connection.lo \
+	libnm/liblibnm_la-nm-remote-settings.lo \
+	libnm/liblibnm_la-nm-secret-agent-old.lo \
+	libnm/liblibnm_la-nm-vpn-connection.lo \
+	libnm/liblibnm_la-nm-vpn-editor.lo \
+	libnm/liblibnm_la-nm-vpn-plugin-old.lo \
+	libnm/liblibnm_la-nm-vpn-service-plugin.lo \
+	libnm/liblibnm_la-nm-wifi-p2p-peer.lo \
+	libnm/liblibnm_la-nm-wimax-nsp.lo
+am_libnm_liblibnm_la_OBJECTS = $(am__objects_8)
+libnm_liblibnm_la_OBJECTS = $(am_libnm_liblibnm_la_OBJECTS)
+libnm_libnm_la_DEPENDENCIES = libnm/liblibnm.la
+am_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_2)
+am__objects_9 = libnm/libnm_la-nm-enum-types.lo
+nodist_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_9)
 libnm_libnm_la_OBJECTS = $(am_libnm_libnm_la_OBJECTS) \
 	$(nodist_libnm_libnm_la_OBJECTS)
 libnm_libnm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1284,34 +918,53 @@ am_shared_libcsiphash_la_OBJECTS =  \
 shared_libcsiphash_la_OBJECTS = $(am_shared_libcsiphash_la_OBJECTS)
 shared_libcsiphash_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(shared_libcsiphash_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-shared_libnacd_la_DEPENDENCIES = shared/libcrbtree.la
+	$(shared_libcsiphash_la_CFLAGS) $(CFLAGS) \
+	$(shared_libcsiphash_la_LDFLAGS) $(LDFLAGS) -o $@
+shared_libnacd_la_LIBADD =
 am__shared_libnacd_la_SOURCES_DIST = shared/n-acd/src/n-acd.c \
 	shared/n-acd/src/n-acd.h shared/n-acd/src/n-acd-private.h \
 	shared/n-acd/src/n-acd-probe.c shared/n-acd/src/util/timer.c \
 	shared/n-acd/src/util/timer.h shared/n-acd/src/n-acd-bpf.c \
 	shared/n-acd/src/n-acd-bpf-fallback.c
-@WITH_EBPF_TRUE@am__objects_20 =  \
+@WITH_EBPF_TRUE@am__objects_10 =  \
 @WITH_EBPF_TRUE@	shared/n-acd/src/libnacd_la-n-acd-bpf.lo
-@WITH_EBPF_FALSE@am__objects_21 = shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo
+@WITH_EBPF_FALSE@am__objects_11 = shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo
 am_shared_libnacd_la_OBJECTS = shared/n-acd/src/libnacd_la-n-acd.lo \
 	shared/n-acd/src/libnacd_la-n-acd-probe.lo \
-	shared/n-acd/src/util/libnacd_la-timer.lo $(am__objects_20) \
-	$(am__objects_21)
+	shared/n-acd/src/util/libnacd_la-timer.lo $(am__objects_10) \
+	$(am__objects_11)
 shared_libnacd_la_OBJECTS = $(am_shared_libnacd_la_OBJECTS)
 shared_libnacd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(shared_libnacd_la_CFLAGS) $(CFLAGS) \
 	$(shared_libnacd_la_LDFLAGS) $(LDFLAGS) -o $@
+shared_libndhcp4_la_LIBADD =
+am_shared_libndhcp4_la_OBJECTS =  \
+	shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-connection.lo \
+	shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-lease.lo \
+	shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-probe.lo \
+	shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-client.lo \
+	shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-incoming.lo \
+	shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-outgoing.lo \
+	shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-socket.lo \
+	shared/n-dhcp4/src/util/libndhcp4_la-packet.lo \
+	shared/n-dhcp4/src/util/libndhcp4_la-socket.lo
+shared_libndhcp4_la_OBJECTS = $(am_shared_libndhcp4_la_OBJECTS)
+shared_libndhcp4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(shared_libndhcp4_la_CFLAGS) $(CFLAGS) \
+	$(shared_libndhcp4_la_LDFLAGS) $(LDFLAGS) -o $@
 shared_nm_glib_aux_libnm_glib_aux_la_DEPENDENCIES =  \
-	shared/nm-std-aux/libnm-std-aux.la $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am_shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS =  \
+	shared/nm-glib-aux/libnm_glib_aux_la-nm-dbus-aux.lo \
 	shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo \
 	shared/nm-glib-aux/libnm_glib_aux_la-nm-enum-utils.lo \
 	shared/nm-glib-aux/libnm_glib_aux_la-nm-errno.lo \
 	shared/nm-glib-aux/libnm_glib_aux_la-nm-hash-utils.lo \
 	shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo \
+	shared/nm-glib-aux/libnm_glib_aux_la-nm-json-aux.lo \
+	shared/nm-glib-aux/libnm_glib_aux_la-nm-keyfile-aux.lo \
 	shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo \
 	shared/nm-glib-aux/libnm_glib_aux_la-nm-secret-utils.lo \
 	shared/nm-glib-aux/libnm_glib_aux_la-nm-shared-utils.lo \
@@ -1325,7 +978,7 @@ shared_nm_glib_aux_libnm_glib_aux_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$@
 shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
-am_shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS =
+am_shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS = shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo
 shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS = $(am_shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS)
 shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -1342,8 +995,7 @@ shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LINK =  \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-shared_nm_std_aux_libnm_std_aux_la_DEPENDENCIES =  \
-	shared/libcsiphash.la
+shared_nm_std_aux_libnm_std_aux_la_LIBADD =
 am_shared_nm_std_aux_libnm_std_aux_la_OBJECTS =  \
 	shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo
 shared_nm_std_aux_libnm_std_aux_la_OBJECTS =  \
@@ -1364,12 +1016,12 @@ shared_nm_udev_aux_libnm_udev_aux_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS) $(LDFLAGS) -o \
 	$@
 shared_systemd_libnm_systemd_logging_stub_la_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_2)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_shared_systemd_libnm_systemd_logging_stub_la_OBJECTS = shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo
 shared_systemd_libnm_systemd_logging_stub_la_OBJECTS =  \
 	$(am_shared_systemd_libnm_systemd_logging_stub_la_OBJECTS)
 shared_systemd_libnm_systemd_shared_la_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_2)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
 	shared/systemd/libnm_systemd_shared_la-nm-sd-utils-shared.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-alloc-util.lo \
@@ -1380,6 +1032,7 @@ am_shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
 	shared/systemd/src/basic/libnm_systemd_shared_la-extract-word.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-fd-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-format-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-hash-funcs.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-hashmap.lo \
@@ -1399,10 +1052,12 @@ am_shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
 	shared/systemd/src/basic/libnm_systemd_shared_la-string-table.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-string-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-strxcpyx.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-tmpfile-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-utf8.lo \
-	shared/systemd/src/basic/libnm_systemd_shared_la-util.lo
+	shared/systemd/src/basic/libnm_systemd_shared_la-util.lo \
+	shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo
 shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
 	$(am_shared_systemd_libnm_systemd_shared_la_OBJECTS)
 src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES =  \
@@ -1416,11 +1071,11 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LINK = $(LIBTOOL) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES =  \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_5)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_2)
 am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST =  \
 	src/devices/bluetooth/nm-bluez-manager.c \
 	src/devices/bluetooth/nm-bluez-common.h \
@@ -1438,7 +1093,7 @@ am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST =  \
 	src/devices/bluetooth/nm-device-bt.h \
 	src/devices/bluetooth/nm-bluez5-dun.c \
 	src/devices/bluetooth/nm-bluez5-dun.h
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_22 = src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_12 = src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo
 @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-device.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez4-adapter.lo \
@@ -1446,7 +1101,7 @@ am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST =  \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez5-manager.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bt-error.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_22)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_12)
 src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = $(am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS)
 src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK =  \
 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -1521,7 +1176,7 @@ am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
 	src/devices/wifi/nm-device-iwd.h \
 	src/devices/wifi/nm-iwd-manager.c \
 	src/devices/wifi/nm-iwd-manager.h
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__objects_23 = src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__objects_13 = src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-iwd-manager.lo
 @WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo \
 @WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo \
@@ -1531,7 +1186,7 @@ am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
 @WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo \
 @WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo \
 @WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo \
-@WITH_WIFI_TRUE@	$(am__objects_23)
+@WITH_WIFI_TRUE@	$(am__objects_13)
 src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS =  \
 	$(am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS)
 src_devices_wifi_libnm_device_plugin_wifi_la_LINK = $(LIBTOOL) \
@@ -1571,11 +1226,11 @@ am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST =  \
 	src/devices/wwan/nm-modem.c src/devices/wwan/nm-modem.h \
 	src/devices/wwan/nm-modem-ofono.c \
 	src/devices/wwan/nm-modem-ofono.h
-@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_24 = src/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_14 = src/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo
 @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_wwan_la_OBJECTS = src/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm_wwan_la-nm-modem-manager.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm_wwan_la-nm-modem.lo \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_24)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_14)
 src_devices_wwan_libnm_wwan_la_OBJECTS =  \
 	$(am_src_devices_wwan_libnm_wwan_la_OBJECTS)
 src_devices_wwan_libnm_wwan_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1591,8 +1246,14 @@ am_src_initrd_libnmi_core_la_OBJECTS =  \
 src_initrd_libnmi_core_la_OBJECTS =  \
 	$(am_src_initrd_libnmi_core_la_OBJECTS)
 src_libNetworkManager_la_DEPENDENCIES = src/libNetworkManagerBase.la \
-	src/libnm-systemd-core.la \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	libnm-core/libnm-core.la $(libnm_crypto_lib) \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la src/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la shared/libnacd.la \
+	shared/libndhcp4.la shared/libcrbtree.la shared/libcsiphash.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1640,9 +1301,11 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/settings/libNetworkManager_la-nm-agent-manager.lo \
 	src/settings/libNetworkManager_la-nm-secret-agent.lo \
 	src/settings/libNetworkManager_la-nm-settings-connection.lo \
+	src/settings/libNetworkManager_la-nm-settings-storage.lo \
 	src/settings/libNetworkManager_la-nm-settings-plugin.lo \
 	src/settings/libNetworkManager_la-nm-settings.lo \
-	src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-connection.lo \
+	src/settings/libNetworkManager_la-nm-settings-utils.lo \
+	src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo \
 	src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo \
 	src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo \
 	src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo \
@@ -1679,12 +1342,7 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/libNetworkManager_la-nm-sleep-monitor.lo
 src_libNetworkManager_la_OBJECTS =  \
 	$(am_src_libNetworkManager_la_OBJECTS)
-src_libNetworkManagerBase_la_DEPENDENCIES =  \
-	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/libnm-core.la $(libnm_crypto_lib) \
-	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
-	shared/nm-udev-aux/libnm-udev-aux.la \
-	shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1) \
+src_libNetworkManagerBase_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
 	src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \
@@ -1712,13 +1370,14 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
 	src/nm-dbus-object.h src/nm-ip4-config.c src/nm-ip4-config.h \
 	src/nm-ip6-config.c src/nm-ip6-config.h \
 	src/dhcp/nm-dhcp-client.c src/dhcp/nm-dhcp-client.h \
-	src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \
-	src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \
-	src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \
-	src/main-utils.c src/main-utils.h \
+	src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-nettools.c \
+	src/dhcp/nm-dhcp-utils.c src/dhcp/nm-dhcp-utils.h \
+	src/dhcp/nm-dhcp-options.c src/dhcp/nm-dhcp-options.h \
+	src/dhcp/nm-dhcp-systemd.c src/dhcp/nm-dhcp-manager.c \
+	src/dhcp/nm-dhcp-manager.h src/main-utils.c src/main-utils.h \
 	src/platform/wifi/nm-wifi-utils-wext.c \
 	src/platform/wifi/nm-wifi-utils-wext.h
-@WITH_WEXT_TRUE@am__objects_25 = src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo
+@WITH_WEXT_TRUE@am__objects_15 = src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo
 am_src_libNetworkManagerBase_la_OBJECTS =  \
 	src/libNetworkManagerBase_la-nm-core-utils.lo \
 	src/libNetworkManagerBase_la-nm-logging.lo \
@@ -1740,10 +1399,12 @@ am_src_libNetworkManagerBase_la_OBJECTS =  \
 	src/libNetworkManagerBase_la-nm-ip4-config.lo \
 	src/libNetworkManagerBase_la-nm-ip6-config.lo \
 	src/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo \
+	src/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo \
 	src/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo \
+	src/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo \
 	src/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo \
 	src/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo \
-	src/libNetworkManagerBase_la-main-utils.lo $(am__objects_25)
+	src/libNetworkManagerBase_la-main-utils.lo $(am__objects_15)
 src_libNetworkManagerBase_la_OBJECTS =  \
 	$(am_src_libNetworkManagerBase_la_OBJECTS)
 src_libNetworkManagerTest_la_DEPENDENCIES = src/libNetworkManager.la \
@@ -1757,11 +1418,12 @@ src_libNetworkManagerTest_la_OBJECTS =  \
 	$(am_src_libNetworkManagerTest_la_OBJECTS)
 @ENABLE_TESTS_FALSE@am_src_libNetworkManagerTest_la_rpath =
 @ENABLE_TESTS_TRUE@am_src_libNetworkManagerTest_la_rpath =
-am__DEPENDENCIES_6 = $(am__DEPENDENCIES_2)
-src_libnm_systemd_core_la_DEPENDENCIES = $(am__DEPENDENCIES_6)
+src_libnm_systemd_core_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_src_libnm_systemd_core_la_OBJECTS =  \
 	src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo \
 	src/systemd/libnm_systemd_core_la-nm-sd.lo \
+	src/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo \
 	src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo \
 	src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo \
 	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo \
@@ -1783,8 +1445,7 @@ am_src_libnm_systemd_core_la_OBJECTS =  \
 	src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo \
 	src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo \
 	src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo \
-	src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo \
-	src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo
+	src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo
 src_libnm_systemd_core_la_OBJECTS =  \
 	$(am_src_libnm_systemd_core_la_OBJECTS)
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_DEPENDENCIES =  \
@@ -1817,37 +1478,13 @@ src_ppp_nm_pppd_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(LDFLAGS) -o $@
 @WITH_PPP_TRUE@am_src_ppp_nm_pppd_plugin_la_rpath = -rpath \
 @WITH_PPP_TRUE@	$(pppd_plugindir)
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_DEPENDENCIES = src/settings/plugins/ibft/libnms-ibft-core.la
-am__src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES_DIST =  \
-	src/settings/plugins/ibft/nms-ibft-plugin.c \
-	src/settings/plugins/ibft/nms-ibft-plugin.h \
-	src/settings/plugins/ibft/nms-ibft-connection.c \
-	src/settings/plugins/ibft/nms-ibft-connection.h
-@CONFIG_PLUGIN_IBFT_TRUE@am_src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS = src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-plugin.lo \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-connection.lo
-src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS = $(am_src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS)
-src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LINK =  \
-	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@CONFIG_PLUGIN_IBFT_TRUE@am_src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_rpath =  \
-@CONFIG_PLUGIN_IBFT_TRUE@	-rpath $(plugindir)
-src_settings_plugins_ibft_libnms_ibft_core_la_LIBADD =
-am__src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES_DIST =  \
-	src/settings/plugins/ibft/nms-ibft-reader.c \
-	src/settings/plugins/ibft/nms-ibft-reader.h
-@CONFIG_PLUGIN_IBFT_TRUE@am_src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS = src/settings/plugins/ibft/libnms_ibft_core_la-nms-ibft-reader.lo
-src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS =  \
-	$(am_src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS)
-@CONFIG_PLUGIN_IBFT_TRUE@am_src_settings_plugins_ibft_libnms_ibft_core_la_rpath =
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES = src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 am__src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES_DIST =  \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h \
+	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c \
+	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS = src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.lo \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS = src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo
 src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS = $(am_src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS)
 src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LINK =  \
@@ -1866,8 +1503,6 @@ am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST =  \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
 	src/settings/plugins/ifcfg-rh/shvar.c \
 	src/settings/plugins/ifcfg-rh/shvar.h \
-	src/settings/plugins/ifcfg-rh/nm-inotify-helper.c \
-	src/settings/plugins/ifcfg-rh/nm-inotify-helper.h \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
@@ -1875,7 +1510,6 @@ am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST =  \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS = src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nm-inotify-helper.lo \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo
@@ -1884,12 +1518,9 @@ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS = $(am_src_setting
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES = src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(am__DEPENDENCIES_1)
 am__src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST =  \
-	src/settings/plugins/ifupdown/nms-ifupdown-connection.c \
-	src/settings/plugins/ifupdown/nms-ifupdown-connection.h \
 	src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
 	src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS = src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS = src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo
 src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS = $(am_src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS)
 src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LINK =  \
 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -1919,7 +1550,7 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \
 	clients/cli/polkit-agent.c clients/cli/polkit-agent.h \
 	clients/common/nm-polkit-listener.c \
 	clients/common/nm-polkit-listener.h
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_26 = clients/common/cli_nmcli-nm-polkit-listener.$(OBJEXT)
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_16 = clients/common/cli_nmcli-nm-polkit-listener.$(OBJEXT)
 @BUILD_NMCLI_TRUE@am_clients_cli_nmcli_OBJECTS =  \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-common.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-utils.$(OBJEXT) \
@@ -1930,28 +1561,51 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-settings.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-nmcli.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-polkit-agent.$(OBJEXT) \
-@BUILD_NMCLI_TRUE@	$(am__objects_26)
+@BUILD_NMCLI_TRUE@	$(am__objects_16)
 clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS)
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
-@BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES = libnm/libnm.la \
-@BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+@BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES =  \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc.la \
+@BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
+@BUILD_NMCLI_TRUE@	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+@BUILD_NMCLI_TRUE@	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NMCLI_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
+@BUILD_NMCLI_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
+@BUILD_NMCLI_TRUE@	shared/libcsiphash.la libnm/libnm.la \
 @BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_7)
+@BUILD_NMCLI_TRUE@	$(am__DEPENDENCIES_3)
 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_common_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) \
+clients_common_tests_test_clients_common_SOURCES =  \
+	clients/common/tests/test-clients-common.c
+clients_common_tests_test_clients_common_OBJECTS = clients/common/tests/test_clients_common-test-clients-common.$(OBJEXT)
+clients_common_tests_test_clients_common_DEPENDENCIES =  \
+	clients/common/libnmc.la clients/common/libnmc-base.la \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
+	libnm/libnm.la $(am__DEPENDENCIES_1)
+clients_common_tests_test_clients_common_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(clients_common_tests_test_clients_common_LDFLAGS) $(LDFLAGS) \
+	-o $@
+clients_common_tests_test_libnm_core_aux_SOURCES =  \
+	clients/common/tests/test-libnm-core-aux.c
+clients_common_tests_test_libnm_core_aux_OBJECTS = clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.$(OBJEXT)
+clients_common_tests_test_libnm_core_aux_DEPENDENCIES =  \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
+	libnm/libnm.la $(am__DEPENDENCIES_1)
+clients_common_tests_test_libnm_core_aux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(clients_common_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@
+	$(clients_common_tests_test_libnm_core_aux_LDFLAGS) $(LDFLAGS) \
+	-o $@
 clients_nm_online_SOURCES = clients/nm-online.c
 clients_nm_online_OBJECTS = clients/nm_online-nm-online.$(OBJEXT)
 clients_nm_online_DEPENDENCIES = libnm/libnm.la $(am__DEPENDENCIES_1)
@@ -2050,10 +1704,15 @@ am__clients_tui_nmtui_SOURCES_DIST = clients/tui/nmtui.c \
 @BUILD_NMTUI_TRUE@	clients/tui/nmtui-nmt-utils.$(OBJEXT) \
 @BUILD_NMTUI_TRUE@	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_nmtui_DEPENDENCIES =  \
 @BUILD_NMTUI_TRUE@	clients/tui/newt/libnmt-newt.a \
-@BUILD_NMTUI_TRUE@	clients/common/libnmc-base.la \
 @BUILD_NMTUI_TRUE@	clients/common/libnmc.la \
+@BUILD_NMTUI_TRUE@	clients/common/libnmc-base.la \
+@BUILD_NMTUI_TRUE@	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+@BUILD_NMTUI_TRUE@	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NMTUI_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
+@BUILD_NMTUI_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
+@BUILD_NMTUI_TRUE@	shared/libcsiphash.la libnm/libnm.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) \
@@ -2061,23 +1720,27 @@ clients_tui_nmtui_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	-o $@
 am_dispatcher_nm_dispatcher_OBJECTS =  \
 	dispatcher/nm_dispatcher-nm-dispatcher.$(OBJEXT)
-am__objects_27 = dispatcher/nm_dispatcher-nmdbus-dispatcher.$(OBJEXT)
-nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_27)
 dispatcher_nm_dispatcher_OBJECTS =  \
-	$(am_dispatcher_nm_dispatcher_OBJECTS) \
-	$(nodist_dispatcher_nm_dispatcher_OBJECTS)
-dispatcher_nm_dispatcher_DEPENDENCIES = libnm/libnm.la \
-	dispatcher/libnm-dispatcher-core.la $(am__DEPENDENCIES_1)
+	$(am_dispatcher_nm_dispatcher_OBJECTS)
+dispatcher_nm_dispatcher_DEPENDENCIES =  \
+	dispatcher/libnm-dispatcher-core.la libnm/libnm.la \
+	$(am__DEPENDENCIES_1)
 dispatcher_nm_dispatcher_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(dispatcher_nm_dispatcher_LDFLAGS) \
 	$(LDFLAGS) -o $@
-dispatcher_tests_test_dispatcher_envp_SOURCES =  \
-	dispatcher/tests/test-dispatcher-envp.c
-dispatcher_tests_test_dispatcher_envp_OBJECTS = dispatcher/tests/test_dispatcher_envp-test-dispatcher-envp.$(OBJEXT)
+am_dispatcher_tests_test_dispatcher_envp_OBJECTS = dispatcher/tests/test_dispatcher_envp-test-dispatcher-envp.$(OBJEXT)
+am__objects_17 = dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.$(OBJEXT)
+nodist_dispatcher_tests_test_dispatcher_envp_OBJECTS =  \
+	$(am__objects_17)
+dispatcher_tests_test_dispatcher_envp_OBJECTS =  \
+	$(am_dispatcher_tests_test_dispatcher_envp_OBJECTS) \
+	$(nodist_dispatcher_tests_test_dispatcher_envp_OBJECTS)
 dispatcher_tests_test_dispatcher_envp_DEPENDENCIES =  \
-	dispatcher/libnm-dispatcher-core.la libnm/libnm.la \
-	shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1)
+	dispatcher/libnm-dispatcher-core.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
+	libnm/libnm.la $(am__DEPENDENCIES_1)
 dispatcher_tests_test_dispatcher_envp_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2130,72 +1793,78 @@ am__examples_C_qt_add_connection_wired_SOURCES_DIST =  \
 examples_C_qt_add_connection_wired_OBJECTS =  \
 	$(am_examples_C_qt_add_connection_wired_OBJECTS)
 @WITH_QT_TRUE@examples_C_qt_add_connection_wired_DEPENDENCIES =  \
-@WITH_QT_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@WITH_QT_TRUE@	$(am__DEPENDENCIES_1)
 am__examples_C_qt_change_ipv4_addresses_SOURCES_DIST =  \
 	examples/C/qt/change-ipv4-addresses.cpp
 @WITH_QT_TRUE@am_examples_C_qt_change_ipv4_addresses_OBJECTS = examples/C/qt/change_ipv4_addresses-change-ipv4-addresses.$(OBJEXT)
 examples_C_qt_change_ipv4_addresses_OBJECTS =  \
 	$(am_examples_C_qt_change_ipv4_addresses_OBJECTS)
 @WITH_QT_TRUE@examples_C_qt_change_ipv4_addresses_DEPENDENCIES =  \
-@WITH_QT_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@WITH_QT_TRUE@	$(am__DEPENDENCIES_1)
 am__examples_C_qt_list_connections_SOURCES_DIST =  \
 	examples/C/qt/list-connections.cpp
 @WITH_QT_TRUE@am_examples_C_qt_list_connections_OBJECTS = examples/C/qt/list_connections-list-connections.$(OBJEXT)
 examples_C_qt_list_connections_OBJECTS =  \
 	$(am_examples_C_qt_list_connections_OBJECTS)
 @WITH_QT_TRUE@examples_C_qt_list_connections_DEPENDENCIES =  \
-@WITH_QT_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@WITH_QT_TRUE@	$(am__DEPENDENCIES_1)
 am__examples_C_qt_monitor_nm_running_SOURCES_DIST =  \
 	examples/C/qt/monitor-nm-running.cpp
 @WITH_QT_TRUE@am_examples_C_qt_monitor_nm_running_OBJECTS = examples/C/qt/monitor_nm_running-monitor-nm-running.$(OBJEXT)
 examples_C_qt_monitor_nm_running_OBJECTS =  \
 	$(am_examples_C_qt_monitor_nm_running_OBJECTS)
 @WITH_QT_TRUE@examples_C_qt_monitor_nm_running_DEPENDENCIES =  \
-@WITH_QT_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@WITH_QT_TRUE@	$(am__DEPENDENCIES_1)
 libnm_core_tests_test_compare_SOURCES =  \
 	libnm-core/tests/test-compare.c
 libnm_core_tests_test_compare_OBJECTS =  \
 	libnm-core/tests/test_compare-test-compare.$(OBJEXT)
-am__DEPENDENCIES_8 = shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+am__DEPENDENCIES_4 = shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/libnm-core.la $(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
-	shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1)
-libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_8)
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
+	$(am__DEPENDENCIES_1)
+libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_4)
 libnm_core_tests_test_compare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
 	$(libnm_core_tests_test_compare_LDFLAGS) $(LDFLAGS) -o $@
 libnm_core_tests_test_crypto_SOURCES = libnm-core/tests/test-crypto.c
-libnm_core_tests_test_crypto_OBJECTS = libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.$(OBJEXT)
-libnm_core_tests_test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_8)
+libnm_core_tests_test_crypto_OBJECTS =  \
+	libnm-core/tests/test_crypto-test-crypto.$(OBJEXT)
+libnm_core_tests_test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_4)
 libnm_core_tests_test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libnm_core_tests_test_crypto_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests_test_general-test-general.$(OBJEXT)
-nodist_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.$(OBJEXT)
+am_libnm_core_tests_test_general_OBJECTS =  \
+	libnm-core/tests/test_general-test-general.$(OBJEXT)
+nodist_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/test_general-nm-core-tests-enum-types.$(OBJEXT)
 libnm_core_tests_test_general_OBJECTS =  \
 	$(am_libnm_core_tests_test_general_OBJECTS) \
 	$(nodist_libnm_core_tests_test_general_OBJECTS)
-libnm_core_tests_test_general_DEPENDENCIES = $(am__DEPENDENCIES_8)
+libnm_core_tests_test_general_DEPENDENCIES = $(am__DEPENDENCIES_4)
 libnm_core_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
 	$(libnm_core_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@
 libnm_core_tests_test_keyfile_SOURCES =  \
 	libnm-core/tests/test-keyfile.c
-libnm_core_tests_test_keyfile_OBJECTS = libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.$(OBJEXT)
-libnm_core_tests_test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_8)
+libnm_core_tests_test_keyfile_OBJECTS =  \
+	libnm-core/tests/test_keyfile-test-keyfile.$(OBJEXT)
+libnm_core_tests_test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_4)
 libnm_core_tests_test_keyfile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
 	$(libnm_core_tests_test_keyfile_LDFLAGS) $(LDFLAGS) -o $@
 libnm_core_tests_test_secrets_SOURCES =  \
 	libnm-core/tests/test-secrets.c
-libnm_core_tests_test_secrets_OBJECTS = libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT)
-libnm_core_tests_test_secrets_DEPENDENCIES = $(am__DEPENDENCIES_8)
+libnm_core_tests_test_secrets_OBJECTS =  \
+	libnm-core/tests/test_secrets-test-secrets.$(OBJEXT)
+libnm_core_tests_test_secrets_DEPENDENCIES = $(am__DEPENDENCIES_4)
 libnm_core_tests_test_secrets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -2204,157 +1873,46 @@ libnm_core_tests_test_setting_SOURCES =  \
 	libnm-core/tests/test-setting.c
 libnm_core_tests_test_setting_OBJECTS =  \
 	libnm-core/tests/test_setting-test-setting.$(OBJEXT)
-libnm_core_tests_test_setting_DEPENDENCIES = $(am__DEPENDENCIES_8)
+libnm_core_tests_test_setting_DEPENDENCIES = $(am__DEPENDENCIES_4)
 libnm_core_tests_test_setting_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
 	$(libnm_core_tests_test_setting_LDFLAGS) $(LDFLAGS) -o $@
 libnm_core_tests_test_settings_defaults_SOURCES =  \
 	libnm-core/tests/test-settings-defaults.c
-libnm_core_tests_test_settings_defaults_OBJECTS = libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT)
+libnm_core_tests_test_settings_defaults_OBJECTS = libnm-core/tests/test_settings_defaults-test-settings-defaults.$(OBJEXT)
 libnm_core_tests_test_settings_defaults_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_8)
+	$(am__DEPENDENCIES_4)
 libnm_core_tests_test_settings_defaults_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libnm_core_tests_test_settings_defaults_LDFLAGS) $(LDFLAGS) \
 	-o $@
-libnm_glib_libnm_glib_test_SOURCES = libnm-glib/libnm-glib-test.c
-libnm_glib_libnm_glib_test_OBJECTS =  \
-	libnm-glib/libnm_glib_test-libnm-glib-test.$(OBJEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_test_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
-libnm_glib_libnm_glib_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libnm_glib_libnm_glib_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am__libnm_glib_tests_test_nm_client_SOURCES_DIST =  \
-	shared/nm-test-utils-impl.c shared/nm-test-libnm-utils.h \
-	libnm-glib/tests/test-nm-client.c
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_tests_test_nm_client_OBJECTS = shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT) \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.$(OBJEXT)
-libnm_glib_tests_test_nm_client_OBJECTS =  \
-	$(am_libnm_glib_tests_test_nm_client_OBJECTS)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_test_nm_client_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
-am__libnm_glib_tests_test_remote_settings_client_SOURCES_DIST =  \
-	shared/nm-test-utils-impl.c shared/nm-test-libnm-utils.h \
-	libnm-glib/tests/test-remote-settings-client.c
-@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_tests_test_remote_settings_client_OBJECTS = shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT) \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT)
-libnm_glib_tests_test_remote_settings_client_OBJECTS =  \
-	$(am_libnm_glib_tests_test_remote_settings_client_OBJECTS)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_test_remote_settings_client_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
-libnm_util_tests_test_crypto_SOURCES = libnm-util/tests/test-crypto.c
-libnm_util_tests_test_crypto_OBJECTS = libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.$(OBJEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_9 =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libtest-crypto.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_9)
-libnm_util_tests_test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libnm_util_tests_test_crypto_LDFLAGS) \
-	$(LDFLAGS) -o $@
-libnm_util_tests_test_general_SOURCES =  \
-	libnm-util/tests/test-general.c
-libnm_util_tests_test_general_OBJECTS = libnm-util/tests/libnm_util_tests_test_general-test-general.$(OBJEXT)
-libnm_util_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(libnm_util_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@
-libnm_util_tests_test_libnm_linking_SOURCES =  \
-	libnm-util/tests/test-libnm-linking.c
-libnm_util_tests_test_libnm_linking_OBJECTS = libnm-util/tests/test_libnm_linking-test-libnm-linking.$(OBJEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm/libnm.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_9)
-libnm_util_tests_test_libnm_linking_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libnm_util_tests_test_libnm_linking_LDFLAGS) $(LDFLAGS) -o \
-	$@
-libnm_util_tests_test_secrets_SOURCES =  \
-	libnm-util/tests/test-secrets.c
-libnm_util_tests_test_secrets_OBJECTS = libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.$(OBJEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_9)
-libnm_util_tests_test_secrets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(libnm_util_tests_test_secrets_LDFLAGS) $(LDFLAGS) -o $@
-libnm_util_tests_test_setting_8021x_SOURCES =  \
-	libnm-util/tests/test-setting-8021x.c
-libnm_util_tests_test_setting_8021x_OBJECTS = libnm-util/tests/test_setting_8021x-test-setting-8021x.$(OBJEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_9)
-libnm_util_tests_test_setting_8021x_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libnm_util_tests_test_setting_8021x_LDFLAGS) $(LDFLAGS) -o \
-	$@
-libnm_util_tests_test_setting_dcb_SOURCES =  \
-	libnm-util/tests/test-setting-dcb.c
-libnm_util_tests_test_setting_dcb_OBJECTS =  \
-	libnm-util/tests/test_setting_dcb-test-setting-dcb.$(OBJEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_9)
-libnm_util_tests_test_setting_dcb_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libnm_util_tests_test_setting_dcb_LDFLAGS) $(LDFLAGS) -o $@
-libnm_util_tests_test_settings_defaults_SOURCES =  \
-	libnm-util/tests/test-settings-defaults.c
-libnm_util_tests_test_settings_defaults_OBJECTS = libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_DEPENDENCIES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_9)
-libnm_util_tests_test_settings_defaults_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libnm_util_tests_test_settings_defaults_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_libnm_tests_test_general_OBJECTS =  \
-	shared/nm-utils/libnm_tests_test_general-nm-compat.$(OBJEXT) \
-	libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT)
-libnm_tests_test_general_OBJECTS =  \
-	$(am_libnm_tests_test_general_OBJECTS)
-am__DEPENDENCIES_10 = libnm/libnm.la \
-	shared/systemd/libnm-systemd-shared.la \
-	shared/systemd/libnm-systemd-logging-stub.la \
-	$(am__DEPENDENCIES_1)
-libnm_tests_test_general_DEPENDENCIES = libnm/libnm-utils.la \
-	$(am__DEPENDENCIES_10)
-libnm_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+am_libnm_tests_test_libnm_OBJECTS =  \
+	shared/nm-utils/libnm_tests_test_libnm-nm-compat.$(OBJEXT) \
+	libnm/tests/test_libnm-test-libnm.$(OBJEXT)
+libnm_tests_test_libnm_OBJECTS = $(am_libnm_tests_test_libnm_OBJECTS)
+am__DEPENDENCIES_5 = libnm/liblibnm.la $(am__DEPENDENCIES_1)
+libnm_tests_test_libnm_DEPENDENCIES = $(am__DEPENDENCIES_5)
+libnm_tests_test_libnm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libnm_tests_test_general_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(libnm_tests_test_libnm_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_libnm_tests_test_nm_client_OBJECTS = shared/libnm_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT) \
-	libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT)
+	libnm/tests/test_nm_client-test-nm-client.$(OBJEXT)
 libnm_tests_test_nm_client_OBJECTS =  \
 	$(am_libnm_tests_test_nm_client_OBJECTS)
-libnm_tests_test_nm_client_DEPENDENCIES = $(am__DEPENDENCIES_10)
+libnm_tests_test_nm_client_DEPENDENCIES = $(am__DEPENDENCIES_5)
 libnm_tests_test_nm_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libnm_tests_test_nm_client_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_libnm_tests_test_remote_settings_client_OBJECTS = shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT) \
-	libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT)
+	libnm/tests/test_remote_settings_client-test-remote-settings-client.$(OBJEXT)
 libnm_tests_test_remote_settings_client_OBJECTS =  \
 	$(am_libnm_tests_test_remote_settings_client_OBJECTS)
 libnm_tests_test_remote_settings_client_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_10)
+	$(am__DEPENDENCIES_5)
 libnm_tests_test_remote_settings_client_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2364,7 +1922,7 @@ am_libnm_tests_test_secret_agent_OBJECTS = shared/libnm_tests_test_secret_agent-
 	libnm/tests/test_secret_agent-test-secret-agent.$(OBJEXT)
 libnm_tests_test_secret_agent_OBJECTS =  \
 	$(am_libnm_tests_test_secret_agent_OBJECTS)
-libnm_tests_test_secret_agent_DEPENDENCIES = $(am__DEPENDENCIES_10)
+libnm_tests_test_secret_agent_DEPENDENCIES = $(am__DEPENDENCIES_5)
 libnm_tests_test_secret_agent_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -2373,7 +1931,10 @@ shared_nm_utils_tests_test_shared_general_SOURCES =  \
 	shared/nm-utils/tests/test-shared-general.c
 shared_nm_utils_tests_test_shared_general_OBJECTS = shared/nm-utils/tests/test_shared_general-test-shared-general.$(OBJEXT)
 shared_nm_utils_tests_test_shared_general_DEPENDENCIES =  \
-	shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1)
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
+	$(am__DEPENDENCIES_1)
 shared_nm_utils_tests_test_shared_general_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2381,7 +1942,8 @@ shared_nm_utils_tests_test_shared_general_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(LDFLAGS) -o $@
 am_src_NetworkManager_OBJECTS = src/NetworkManager-main.$(OBJEXT)
 src_NetworkManager_OBJECTS = $(am_src_NetworkManager_OBJECTS)
-src_NetworkManager_DEPENDENCIES = src/libNetworkManager.la
+src_NetworkManager_DEPENDENCIES = src/libNetworkManager.la \
+	$(am__DEPENDENCIES_1)
 src_NetworkManager_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_NetworkManager_LDFLAGS) \
@@ -2404,23 +1966,23 @@ src_devices_tests_test_lldp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_devices_tests_test_lldp_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__src_devices_wifi_tests_test_general_SOURCES_DIST =  \
-	src/devices/wifi/tests/test-general.c \
+am__src_devices_wifi_tests_test_devices_wifi_SOURCES_DIST =  \
+	src/devices/wifi/tests/test-devices-wifi.c \
 	src/devices/wifi/nm-wifi-ap.c src/devices/wifi/nm-wifi-ap.h \
 	src/devices/wifi/nm-wifi-utils.c \
 	src/devices/wifi/nm-wifi-utils.h
-@WITH_WIFI_TRUE@am_src_devices_wifi_tests_test_general_OBJECTS = src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.$(OBJEXT) \
-@WITH_WIFI_TRUE@	src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.$(OBJEXT) \
-@WITH_WIFI_TRUE@	src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.$(OBJEXT)
-src_devices_wifi_tests_test_general_OBJECTS =  \
-	$(am_src_devices_wifi_tests_test_general_OBJECTS)
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_DEPENDENCIES =  \
+@WITH_WIFI_TRUE@am_src_devices_wifi_tests_test_devices_wifi_OBJECTS = src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.$(OBJEXT) \
+@WITH_WIFI_TRUE@	src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.$(OBJEXT) \
+@WITH_WIFI_TRUE@	src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.$(OBJEXT)
+src_devices_wifi_tests_test_devices_wifi_OBJECTS =  \
+	$(am_src_devices_wifi_tests_test_devices_wifi_OBJECTS)
+@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_DEPENDENCIES =  \
 @WITH_WIFI_TRUE@	src/libNetworkManagerTest.la
-src_devices_wifi_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) \
+src_devices_wifi_tests_test_devices_wifi_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_wifi_tests_test_general_LDFLAGS) $(LDFLAGS) -o \
-	$@
+	$(src_devices_wifi_tests_test_devices_wifi_LDFLAGS) $(LDFLAGS) \
+	-o $@
 am_src_dhcp_nm_dhcp_helper_OBJECTS =  \
 	src/dhcp/nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT)
 src_dhcp_nm_dhcp_helper_OBJECTS =  \
@@ -2464,8 +2026,16 @@ src_initrd_nm_initrd_generator_OBJECTS =  \
 	$(am_src_initrd_nm_initrd_generator_OBJECTS)
 src_initrd_nm_initrd_generator_DEPENDENCIES =  \
 	src/initrd/libnmi-core.la src/libNetworkManagerBase.la \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	libnm-core/libnm-core.la $(libnm_crypto_lib) \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
 	shared/systemd/libnm-systemd-shared.la \
-	shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1)
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libndhcp4.la \
+	shared/libcsiphash.la $(am__DEPENDENCIES_1)
 src_initrd_nm_initrd_generator_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -2475,7 +2045,9 @@ src_initrd_tests_test_cmdline_reader_SOURCES =  \
 src_initrd_tests_test_cmdline_reader_OBJECTS = src/initrd/tests/test_cmdline_reader-test-cmdline-reader.$(OBJEXT)
 src_initrd_tests_test_cmdline_reader_DEPENDENCIES =  \
 	src/initrd/libnmi-core.la src/libNetworkManagerTest.la \
-	shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1)
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
+	$(am__DEPENDENCIES_1)
 src_initrd_tests_test_cmdline_reader_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2487,7 +2059,9 @@ src_initrd_tests_test_ibft_reader_OBJECTS =  \
 	src/initrd/tests/test_ibft_reader-test-ibft-reader.$(OBJEXT)
 src_initrd_tests_test_ibft_reader_DEPENDENCIES =  \
 	src/initrd/libnmi-core.la src/libNetworkManagerTest.la \
-	shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1)
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
+	$(am__DEPENDENCIES_1)
 src_initrd_tests_test_ibft_reader_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2496,9 +2070,9 @@ src_ndisc_tests_test_ndisc_fake_SOURCES =  \
 	src/ndisc/tests/test-ndisc-fake.c
 src_ndisc_tests_test_ndisc_fake_OBJECTS =  \
 	src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.$(OBJEXT)
-am__DEPENDENCIES_11 = src/libNetworkManagerTest.la \
+am__DEPENDENCIES_6 = src/libNetworkManagerTest.la \
 	$(am__DEPENDENCIES_1)
-src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_11)
+src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_6)
 src_ndisc_tests_test_ndisc_fake_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -2507,8 +2081,7 @@ src_ndisc_tests_test_ndisc_linux_SOURCES =  \
 	src/ndisc/tests/test-ndisc-linux.c
 src_ndisc_tests_test_ndisc_linux_OBJECTS =  \
 	src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.$(OBJEXT)
-src_ndisc_tests_test_ndisc_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_11)
+src_ndisc_tests_test_ndisc_linux_DEPENDENCIES = $(am__DEPENDENCIES_6)
 src_ndisc_tests_test_ndisc_linux_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -2517,8 +2090,14 @@ am_src_nm_iface_helper_OBJECTS =  \
 	src/nm_iface_helper-nm-iface-helper.$(OBJEXT)
 src_nm_iface_helper_OBJECTS = $(am_src_nm_iface_helper_OBJECTS)
 src_nm_iface_helper_DEPENDENCIES = src/libNetworkManagerBase.la \
-	src/libnm-systemd-core.la \
-	shared/systemd/libnm-systemd-shared.la $(am__DEPENDENCIES_1) \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	libnm-core/libnm-core.la $(libnm_crypto_lib) \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la src/libnm-systemd-core.la \
+	shared/systemd/libnm-systemd-shared.la shared/libndhcp4.la \
+	shared/libcsiphash.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -2528,9 +2107,9 @@ src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 src_platform_tests_monitor_SOURCES = src/platform/tests/monitor.c
 src_platform_tests_monitor_OBJECTS =  \
 	src/platform/tests/monitor-monitor.$(OBJEXT)
-am__DEPENDENCIES_12 = src/libNetworkManagerTest.la \
+am__DEPENDENCIES_7 = src/libNetworkManagerTest.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_12)
+src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_7)
 src_platform_tests_monitor_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_platform_tests_monitor_LDFLAGS) \
@@ -2540,7 +2119,7 @@ am_src_platform_tests_test_address_fake_OBJECTS =  \
 src_platform_tests_test_address_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_address_fake_OBJECTS)
 src_platform_tests_test_address_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_7)
 src_platform_tests_test_address_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2551,7 +2130,7 @@ am_src_platform_tests_test_address_linux_OBJECTS =  \
 src_platform_tests_test_address_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_address_linux_OBJECTS)
 src_platform_tests_test_address_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_7)
 src_platform_tests_test_address_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2562,7 +2141,7 @@ am_src_platform_tests_test_cleanup_fake_OBJECTS =  \
 src_platform_tests_test_cleanup_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_cleanup_fake_OBJECTS)
 src_platform_tests_test_cleanup_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_7)
 src_platform_tests_test_cleanup_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2573,27 +2152,18 @@ am_src_platform_tests_test_cleanup_linux_OBJECTS =  \
 src_platform_tests_test_cleanup_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_cleanup_linux_OBJECTS)
 src_platform_tests_test_cleanup_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_7)
 src_platform_tests_test_cleanup_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_platform_tests_test_cleanup_linux_LDFLAGS) $(LDFLAGS) -o \
 	$@
-src_platform_tests_test_general_SOURCES =  \
-	src/platform/tests/test-general.c
-src_platform_tests_test_general_OBJECTS = src/platform/tests/src_platform_tests_test_general-test-general.$(OBJEXT)
-src_platform_tests_test_general_DEPENDENCIES =  \
-	src/libNetworkManagerTest.la
-src_platform_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(src_platform_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@
 am_src_platform_tests_test_link_fake_OBJECTS =  \
 	src/platform/tests/test_link_fake-test-link.$(OBJEXT)
 src_platform_tests_test_link_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_link_fake_OBJECTS)
 src_platform_tests_test_link_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_7)
 src_platform_tests_test_link_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2603,7 +2173,7 @@ am_src_platform_tests_test_link_linux_OBJECTS =  \
 src_platform_tests_test_link_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_link_linux_OBJECTS)
 src_platform_tests_test_link_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_7)
 src_platform_tests_test_link_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2618,12 +2188,22 @@ src_platform_tests_test_nmp_object_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_platform_tests_test_nmp_object_LDFLAGS) $(LDFLAGS) -o $@
+src_platform_tests_test_platform_general_SOURCES =  \
+	src/platform/tests/test-platform-general.c
+src_platform_tests_test_platform_general_OBJECTS = src/platform/tests/test_platform_general-test-platform-general.$(OBJEXT)
+src_platform_tests_test_platform_general_DEPENDENCIES =  \
+	src/libNetworkManagerTest.la
+src_platform_tests_test_platform_general_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_platform_tests_test_platform_general_LDFLAGS) $(LDFLAGS) \
+	-o $@
 am_src_platform_tests_test_route_fake_OBJECTS =  \
 	src/platform/tests/test_route_fake-test-route.$(OBJEXT)
 src_platform_tests_test_route_fake_OBJECTS =  \
 	$(am_src_platform_tests_test_route_fake_OBJECTS)
 src_platform_tests_test_route_fake_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_7)
 src_platform_tests_test_route_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2633,23 +2213,12 @@ am_src_platform_tests_test_route_linux_OBJECTS =  \
 src_platform_tests_test_route_linux_OBJECTS =  \
 	$(am_src_platform_tests_test_route_linux_OBJECTS)
 src_platform_tests_test_route_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_12)
+	$(am__DEPENDENCIES_7)
 src_platform_tests_test_route_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_platform_tests_test_route_linux_LDFLAGS) $(LDFLAGS) -o \
 	$@
-src_settings_plugins_ibft_tests_test_ibft_SOURCES =  \
-	src/settings/plugins/ibft/tests/test-ibft.c
-src_settings_plugins_ibft_tests_test_ibft_OBJECTS =  \
-	src/settings/plugins/ibft/tests/test_ibft-test-ibft.$(OBJEXT)
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_DEPENDENCIES = src/settings/plugins/ibft/libnms-ibft-core.la \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/libNetworkManagerTest.la
-src_settings_plugins_ibft_tests_test_ibft_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_settings_plugins_ibft_tests_test_ibft_LDFLAGS) \
-	$(LDFLAGS) -o $@
 am__src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES_DIST =  \
 	src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS = src/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.$(OBJEXT)
@@ -2672,15 +2241,15 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_LINK = $(LIBTOOL) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_settings_plugins_keyfile_tests_test_keyfile_SOURCES =  \
-	src/settings/plugins/keyfile/tests/test-keyfile.c
-src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS = src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.$(OBJEXT)
-src_settings_plugins_keyfile_tests_test_keyfile_DEPENDENCIES =  \
+src_settings_plugins_keyfile_tests_test_keyfile_settings_SOURCES =  \
+	src/settings/plugins/keyfile/tests/test-keyfile-settings.c
+src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS = src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.$(OBJEXT)
+src_settings_plugins_keyfile_tests_test_keyfile_settings_DEPENDENCIES =  \
 	src/libNetworkManagerTest.la
-src_settings_plugins_keyfile_tests_test_keyfile_LINK = $(LIBTOOL) \
-	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS) \
+src_settings_plugins_keyfile_tests_test_keyfile_settings_LINK =  \
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS) \
 	$(LDFLAGS) -o $@
 src_supplicant_tests_test_supplicant_config_SOURCES =  \
 	src/supplicant/tests/test-supplicant-config.c
@@ -2703,6 +2272,21 @@ src_tests_config_test_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_tests_config_test_config_LDFLAGS) \
 	$(LDFLAGS) -o $@
+src_tests_test_core_SOURCES = src/tests/test-core.c
+src_tests_test_core_OBJECTS = src/tests/test_core-test-core.$(OBJEXT)
+src_tests_test_core_DEPENDENCIES = $(src_tests_ldadd)
+src_tests_test_core_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_core_LDFLAGS) \
+	$(LDFLAGS) -o $@
+src_tests_test_core_with_expect_SOURCES =  \
+	src/tests/test-core-with-expect.c
+src_tests_test_core_with_expect_OBJECTS = src/tests/test_core_with_expect-test-core-with-expect.$(OBJEXT)
+src_tests_test_core_with_expect_DEPENDENCIES = $(src_tests_ldadd)
+src_tests_test_core_with_expect_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(src_tests_test_core_with_expect_LDFLAGS) $(LDFLAGS) -o $@
 src_tests_test_dcb_SOURCES = src/tests/test-dcb.c
 src_tests_test_dcb_OBJECTS = src/tests/test_dcb-test-dcb.$(OBJEXT)
 src_tests_test_dcb_DEPENDENCIES = $(src_tests_ldadd)
@@ -2710,22 +2294,6 @@ src_tests_test_dcb_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_dcb_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_tests_test_general_SOURCES = src/tests/test-general.c
-src_tests_test_general_OBJECTS =  \
-	src/tests/src_tests_test_general-test-general.$(OBJEXT)
-src_tests_test_general_DEPENDENCIES = $(src_tests_ldadd)
-src_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_general_LDFLAGS) \
-	$(LDFLAGS) -o $@
-src_tests_test_general_with_expect_SOURCES =  \
-	src/tests/test-general-with-expect.c
-src_tests_test_general_with_expect_OBJECTS = src/tests/test_general_with_expect-test-general-with-expect.$(OBJEXT)
-src_tests_test_general_with_expect_DEPENDENCIES = $(src_tests_ldadd)
-src_tests_test_general_with_expect_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_tests_test_general_with_expect_LDFLAGS) $(LDFLAGS) -o $@
 src_tests_test_ip4_config_SOURCES = src/tests/test-ip4-config.c
 src_tests_test_ip4_config_OBJECTS =  \
 	src/tests/test_ip4_config-test-ip4-config.$(OBJEXT)
@@ -2747,7 +2315,7 @@ src_tests_test_systemd_OBJECTS =  \
 	src/tests/test_systemd-test-systemd.$(OBJEXT)
 src_tests_test_systemd_DEPENDENCIES = src/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la shared/libcsiphash.la \
-	$(am__DEPENDENCIES_6)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 src_tests_test_systemd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_systemd_LDFLAGS) \
@@ -2802,7 +2370,8 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo \
 	clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo \
 	clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Plo \
-	clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Po \
+	clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Po \
+	clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Po \
 	clients/tui/$(DEPDIR)/nmtui-nm-editor-bindings.Po \
 	clients/tui/$(DEPDIR)/nmtui-nm-editor-utils.Po \
 	clients/tui/$(DEPDIR)/nmtui-nmt-address-list.Po \
@@ -2865,7 +2434,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	clients/tui/newt/$(DEPDIR)/libnmt_newt_a-nmt-newt-widget.Po \
 	dispatcher/$(DEPDIR)/libnm_dispatcher_core_la-nm-dispatcher-utils.Plo \
 	dispatcher/$(DEPDIR)/nm_dispatcher-nm-dispatcher.Po \
-	dispatcher/$(DEPDIR)/nm_dispatcher-nmdbus-dispatcher.Po \
+	dispatcher/$(DEPDIR)/tests_test_dispatcher_envp-nmdbus-dispatcher.Po \
 	dispatcher/tests/$(DEPDIR)/test_dispatcher_envp-test-dispatcher-envp.Po \
 	examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connection-gdbus.Po \
 	examples/C/glib/$(DEPDIR)/add_connection_libnm-add-connection-libnm.Po \
@@ -2959,6 +2528,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-match.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-olpc-mesh.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-bridge.Plo \
+	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-interface.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-patch.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-port.Plo \
@@ -2984,165 +2554,79 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-simple-connection.Plo \
+	libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-editor-plugin.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-plugin-info.Plo \
 	libnm-core/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo \
 	libnm-core/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo \
-	libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Po \
-	libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Po \
-	libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Po \
-	libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Po \
-	libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Po \
-	libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Po \
 	libnm-core/tests/$(DEPDIR)/test_compare-test-compare.Po \
+	libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Po \
+	libnm-core/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Po \
+	libnm-core/tests/$(DEPDIR)/test_general-test-general.Po \
+	libnm-core/tests/$(DEPDIR)/test_keyfile-test-keyfile.Po \
+	libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Po \
 	libnm-core/tests/$(DEPDIR)/test_setting-test-setting.Po \
-	libnm-glib/$(DEPDIR)/libdeprecated_nm_glib_la-libnm_glib.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-access-point.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-active-connection.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-client.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dbus-helpers.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-adsl.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bond.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bridge.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bt.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-ethernet.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-generic.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-infiniband.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-modem.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-olpc-mesh.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-team.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-vlan.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wifi.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wimax.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp4-config.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp6-config.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-glib-enum-types.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip4-config.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip6-config.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object-cache.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-connection.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-settings.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-secret-agent.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-types.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-vpn-connection.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_la-nm-wimax-nsp.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_test-libnm-glib-test.Po \
-	libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-enum-types.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-utils.Plo \
-	libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin.Plo \
-	libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_nm_client-test-nm-client.Po \
-	libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.Po \
-	libnm-util/$(DEPDIR)/libnm_util_la-crypto.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-crypto_gnutls.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-crypto_nss.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-connection.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-param-spec-specialized.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-8021x.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-adsl.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bluetooth.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bond.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-cdma.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-connection.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-dcb.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-generic.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-gsm.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-infiniband.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip4-config.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip6-config.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-olpc-mesh.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ppp.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-pppoe.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-serial.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team-port.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vlan.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vpn.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wimax.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wired.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless-security.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-setting.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-utils-enum-types.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-utils.Plo \
-	libnm-util/$(DEPDIR)/libnm_util_la-nm-value-transforms.Plo \
-	libnm-util/$(DEPDIR)/libtest_crypto_la-crypto.Plo \
-	libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_gnutls.Plo \
-	libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_nss.Plo \
-	libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_crypto-test-crypto.Po \
-	libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_general-test-general.Po \
-	libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_secrets-test-secrets.Po \
-	libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Po \
-	libnm-util/tests/$(DEPDIR)/test_libnm_linking-test-libnm-linking.Po \
-	libnm-util/tests/$(DEPDIR)/test_setting_8021x-test-setting-8021x.Po \
-	libnm-util/tests/$(DEPDIR)/test_setting_dcb-test-setting-dcb.Po \
-	libnm/$(DEPDIR)/libnm_la-nm-access-point.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-active-connection.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-checkpoint.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-client.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-dbus-helpers.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-6lowpan.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-adsl.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-bond.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-bridge.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-bt.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-dummy.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-ethernet.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-generic.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-infiniband.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-ip-tunnel.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-macsec.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-macvlan.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-modem.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-olpc-mesh.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-ovs-interface.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-ovs-port.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-ppp.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-team.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-tun.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device-wpan.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-device.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-dhcp-config.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-dhcp4-config.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-dhcp6-config.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-dns-manager.Plo \
+	libnm-core/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po \
+	libnm/$(DEPDIR)/liblibnm_la-nm-access-point.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-active-connection.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-checkpoint.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-client.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-dbus-helpers.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-6lowpan.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-adsl.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-bond.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-bridge.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-bt.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-dummy.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-ethernet.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-generic.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-infiniband.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-ip-tunnel.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-macsec.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-macvlan.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-modem.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-olpc-mesh.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-bridge.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-interface.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-port.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-ppp.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-team.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-wimax.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-wireguard.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device-wpan.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-device.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-dhcp-config.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-dhcp4-config.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-dhcp6-config.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-dns-manager.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-ip-config.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-ip4-config.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-ip6-config.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-libnm-utils.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-manager.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-object.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-remote-connection.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-remote-settings.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-secret-agent-old.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-vpn-connection.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-vpn-editor.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-vpn-plugin-old.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-vpn-service-plugin.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-wifi-p2p-peer.Plo \
+	libnm/$(DEPDIR)/liblibnm_la-nm-wimax-nsp.Plo \
 	libnm/$(DEPDIR)/libnm_la-nm-enum-types.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-ip-config.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-ip4-config.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-ip6-config.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-manager.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-object.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-remote-connection.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-remote-settings.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-secret-agent-old.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-vpn-connection.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Plo \
-	libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Plo \
-	libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Plo \
-	libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Plo \
-	libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po \
-	libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po \
-	libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po \
+	libnm/tests/$(DEPDIR)/test_libnm-test-libnm.Po \
+	libnm/tests/$(DEPDIR)/test_nm_client-test-nm-client.Po \
+	libnm/tests/$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Po \
 	libnm/tests/$(DEPDIR)/test_secret_agent-test-secret-agent.Po \
 	shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo \
 	shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo \
-	shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po \
-	shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po \
 	shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po \
 	shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po \
 	shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po \
@@ -3153,21 +2637,34 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo \
 	shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo \
 	shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo \
+	shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-connection.Plo \
+	shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-lease.Plo \
+	shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-probe.Plo \
+	shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-client.Plo \
+	shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-incoming.Plo \
+	shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-outgoing.Plo \
+	shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-socket.Plo \
+	shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-packet.Plo \
+	shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-socket.Plo \
+	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Plo \
+	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-json-aux.Plo \
+	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-keyfile-aux.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo \
+	shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo \
 	shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo \
 	shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo \
 	shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo \
 	shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo \
 	shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po \
+	shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Po \
 	shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po \
 	shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo \
 	shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo \
@@ -3179,6 +2676,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-format-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Plo \
@@ -3198,10 +2696,12 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strxcpyx.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo \
+	shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo \
 	src/$(DEPDIR)/NetworkManager-main.Po \
 	src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo \
 	src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo \
@@ -3290,9 +2790,9 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo \
-	src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po \
-	src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Po \
-	src/devices/wifi/tests/$(DEPDIR)/src_devices_wifi_tests_test_general-test-general.Po \
+	src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po \
+	src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po \
+	src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po \
 	src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo \
 	src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo \
 	src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo \
@@ -3301,6 +2801,8 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo \
 	src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Plo \
 	src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Plo \
+	src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Plo \
+	src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Plo \
 	src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Plo \
 	src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Plo \
 	src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Plo \
@@ -3339,7 +2841,6 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo \
 	src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo \
 	src/platform/tests/$(DEPDIR)/monitor-monitor.Po \
-	src/platform/tests/$(DEPDIR)/src_platform_tests_test_general-test-general.Po \
 	src/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po \
 	src/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po \
 	src/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po \
@@ -3347,6 +2848,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po \
 	src/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po \
 	src/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po \
+	src/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po \
 	src/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po \
 	src/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po \
 	src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo \
@@ -3360,37 +2862,34 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Plo \
 	src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Plo \
 	src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Plo \
+	src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Plo \
+	src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Plo \
 	src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Plo \
-	src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-connection.Plo \
-	src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-plugin.Plo \
-	src/settings/plugins/ibft/$(DEPDIR)/libnms_ibft_core_la-nms-ibft-reader.Plo \
-	src/settings/plugins/ibft/tests/$(DEPDIR)/test_ibft-test-ibft.Po \
-	src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.Plo \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo \
+	src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Plo \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo \
-	src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nm-inotify-helper.Plo \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Plo \
 	src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po \
-	src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo \
 	src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo \
 	src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo \
 	src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Plo \
 	src/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po \
-	src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-connection.Plo \
 	src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Plo \
 	src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Plo \
+	src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Plo \
 	src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Plo \
 	src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Plo \
-	src/settings/plugins/keyfile/tests/$(DEPDIR)/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.Po \
+	src/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po \
 	src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Plo \
 	src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Plo \
 	src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo \
 	src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo \
 	src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po \
 	src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo \
+	src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Plo \
 	src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo \
 	src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo \
@@ -3414,10 +2913,9 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo \
 	src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo \
 	src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo \
-	src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Plo \
-	src/tests/$(DEPDIR)/src_tests_test_general-test-general.Po \
+	src/tests/$(DEPDIR)/test_core-test-core.Po \
+	src/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po \
 	src/tests/$(DEPDIR)/test_dcb-test-dcb.Po \
-	src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Po \
 	src/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po \
 	src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po \
 	src/tests/$(DEPDIR)/test_systemd-test-systemd.Po \
@@ -3473,20 +2971,12 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(nodist_libnm_core_libnm_core_la_SOURCES) \
 	$(libnm_core_libnm_crypto_gnutls_la_SOURCES) \
 	$(libnm_core_libnm_crypto_nss_la_SOURCES) \
-	$(libnm_glib_libdeprecated_nm_glib_la_SOURCES) \
-	$(libnm_glib_libnm_glib_vpn_la_SOURCES) \
-	$(nodist_libnm_glib_libnm_glib_vpn_la_SOURCES) \
-	$(libnm_glib_libnm_glib_la_SOURCES) \
-	$(nodist_libnm_glib_libnm_glib_la_SOURCES) \
-	$(libnm_util_libnm_util_la_SOURCES) \
-	$(nodist_libnm_util_libnm_util_la_SOURCES) \
-	$(libnm_util_libtest_crypto_la_SOURCES) \
-	$(libnm_libnm_utils_la_SOURCES) \
-	$(nodist_libnm_libnm_utils_la_SOURCES) \
-	$(libnm_libnm_la_SOURCES) $(nodist_libnm_libnm_la_SOURCES) \
+	$(libnm_liblibnm_la_SOURCES) $(libnm_libnm_la_SOURCES) \
+	$(nodist_libnm_libnm_la_SOURCES) \
 	$(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \
 	$(shared_libcrbtree_la_SOURCES) \
 	$(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \
+	$(shared_libndhcp4_la_SOURCES) \
 	$(shared_nm_glib_aux_libnm_glib_aux_la_SOURCES) \
 	$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES) \
 	$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES) \
@@ -3508,19 +2998,18 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(src_libnm_systemd_core_la_SOURCES) \
 	$(src_ppp_libnm_ppp_plugin_la_SOURCES) \
 	$(src_ppp_nm_pppd_plugin_la_SOURCES) \
-	$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES) \
-	$(src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES) \
 	$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES) \
 	$(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) \
 	$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES) \
 	$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES) \
 	$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES) \
 	$(clients_cli_nmcli_SOURCES) \
-	clients/common/tests/test-general.c clients/nm-online.c \
+	clients/common/tests/test-clients-common.c \
+	clients/common/tests/test-libnm-core-aux.c clients/nm-online.c \
 	$(clients_tui_nmtui_SOURCES) \
 	$(dispatcher_nm_dispatcher_SOURCES) \
-	$(nodist_dispatcher_nm_dispatcher_SOURCES) \
-	dispatcher/tests/test-dispatcher-envp.c \
+	$(dispatcher_tests_test_dispatcher_envp_SOURCES) \
+	$(nodist_dispatcher_tests_test_dispatcher_envp_SOURCES) \
 	examples/C/glib/add-connection-gdbus.c \
 	examples/C/glib/add-connection-libnm.c \
 	examples/C/glib/get-active-connections-gdbus.c \
@@ -3540,23 +3029,14 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	libnm-core/tests/test-secrets.c \
 	libnm-core/tests/test-setting.c \
 	libnm-core/tests/test-settings-defaults.c \
-	libnm-glib/libnm-glib-test.c \
-	$(libnm_glib_tests_test_nm_client_SOURCES) \
-	$(libnm_glib_tests_test_remote_settings_client_SOURCES) \
-	libnm-util/tests/test-crypto.c libnm-util/tests/test-general.c \
-	libnm-util/tests/test-libnm-linking.c \
-	libnm-util/tests/test-secrets.c \
-	libnm-util/tests/test-setting-8021x.c \
-	libnm-util/tests/test-setting-dcb.c \
-	libnm-util/tests/test-settings-defaults.c \
-	$(libnm_tests_test_general_SOURCES) \
+	$(libnm_tests_test_libnm_SOURCES) \
 	$(libnm_tests_test_nm_client_SOURCES) \
 	$(libnm_tests_test_remote_settings_client_SOURCES) \
 	$(libnm_tests_test_secret_agent_SOURCES) \
 	shared/nm-utils/tests/test-shared-general.c \
 	$(src_NetworkManager_SOURCES) src/devices/tests/test-acd.c \
 	src/devices/tests/test-lldp.c \
-	$(src_devices_wifi_tests_test_general_SOURCES) \
+	$(src_devices_wifi_tests_test_devices_wifi_SOURCES) \
 	$(src_dhcp_nm_dhcp_helper_SOURCES) \
 	src/dhcp/tests/test-dhcp-dhclient.c \
 	src/dhcp/tests/test-dhcp-utils.c \
@@ -3571,19 +3051,18 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(src_platform_tests_test_address_linux_SOURCES) \
 	$(src_platform_tests_test_cleanup_fake_SOURCES) \
 	$(src_platform_tests_test_cleanup_linux_SOURCES) \
-	src/platform/tests/test-general.c \
 	$(src_platform_tests_test_link_fake_SOURCES) \
 	$(src_platform_tests_test_link_linux_SOURCES) \
 	src/platform/tests/test-nmp-object.c \
+	src/platform/tests/test-platform-general.c \
 	$(src_platform_tests_test_route_fake_SOURCES) \
 	$(src_platform_tests_test_route_linux_SOURCES) \
-	src/settings/plugins/ibft/tests/test-ibft.c \
 	$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES) \
 	src/settings/plugins/ifupdown/tests/test-ifupdown.c \
-	src/settings/plugins/keyfile/tests/test-keyfile.c \
+	src/settings/plugins/keyfile/tests/test-keyfile-settings.c \
 	src/supplicant/tests/test-supplicant-config.c \
-	$(src_tests_config_test_config_SOURCES) src/tests/test-dcb.c \
-	src/tests/test-general.c src/tests/test-general-with-expect.c \
+	$(src_tests_config_test_config_SOURCES) src/tests/test-core.c \
+	src/tests/test-core-with-expect.c src/tests/test-dcb.c \
 	src/tests/test-ip4-config.c src/tests/test-ip6-config.c \
 	src/tests/test-systemd.c src/tests/test-utils.c \
 	src/tests/test-wired-defname.c
@@ -3594,16 +3073,12 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(am__libnm_core_libnm_core_la_SOURCES_DIST) \
 	$(am__libnm_core_libnm_crypto_gnutls_la_SOURCES_DIST) \
 	$(am__libnm_core_libnm_crypto_nss_la_SOURCES_DIST) \
-	$(am__libnm_glib_libdeprecated_nm_glib_la_SOURCES_DIST) \
-	$(am__libnm_glib_libnm_glib_vpn_la_SOURCES_DIST) \
-	$(am__libnm_glib_libnm_glib_la_SOURCES_DIST) \
-	$(am__libnm_util_libnm_util_la_SOURCES_DIST) \
-	$(am__libnm_util_libtest_crypto_la_SOURCES_DIST) \
-	$(libnm_libnm_utils_la_SOURCES) $(libnm_libnm_la_SOURCES) \
+	$(libnm_liblibnm_la_SOURCES) $(libnm_libnm_la_SOURCES) \
 	$(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \
 	$(shared_libcrbtree_la_SOURCES) \
 	$(shared_libcsiphash_la_SOURCES) \
 	$(am__shared_libnacd_la_SOURCES_DIST) \
+	$(shared_libndhcp4_la_SOURCES) \
 	$(shared_nm_glib_aux_libnm_glib_aux_la_SOURCES) \
 	$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES) \
 	$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES) \
@@ -3625,17 +3100,16 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(src_libnm_systemd_core_la_SOURCES) \
 	$(am__src_ppp_libnm_ppp_plugin_la_SOURCES_DIST) \
 	$(am__src_ppp_nm_pppd_plugin_la_SOURCES_DIST) \
-	$(am__src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES_DIST) \
-	$(am__src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES_DIST) \
 	$(am__src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES_DIST) \
 	$(am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST) \
 	$(am__src_settings_plugins_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/common/tests/test-general.c clients/nm-online.c \
+	clients/common/tests/test-clients-common.c \
+	clients/common/tests/test-libnm-core-aux.c clients/nm-online.c \
 	$(am__clients_tui_nmtui_SOURCES_DIST) \
 	$(dispatcher_nm_dispatcher_SOURCES) \
-	dispatcher/tests/test-dispatcher-envp.c \
+	$(dispatcher_tests_test_dispatcher_envp_SOURCES) \
 	examples/C/glib/add-connection-gdbus.c \
 	examples/C/glib/add-connection-libnm.c \
 	examples/C/glib/get-active-connections-gdbus.c \
@@ -3654,23 +3128,14 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	libnm-core/tests/test-secrets.c \
 	libnm-core/tests/test-setting.c \
 	libnm-core/tests/test-settings-defaults.c \
-	libnm-glib/libnm-glib-test.c \
-	$(am__libnm_glib_tests_test_nm_client_SOURCES_DIST) \
-	$(am__libnm_glib_tests_test_remote_settings_client_SOURCES_DIST) \
-	libnm-util/tests/test-crypto.c libnm-util/tests/test-general.c \
-	libnm-util/tests/test-libnm-linking.c \
-	libnm-util/tests/test-secrets.c \
-	libnm-util/tests/test-setting-8021x.c \
-	libnm-util/tests/test-setting-dcb.c \
-	libnm-util/tests/test-settings-defaults.c \
-	$(libnm_tests_test_general_SOURCES) \
+	$(libnm_tests_test_libnm_SOURCES) \
 	$(libnm_tests_test_nm_client_SOURCES) \
 	$(libnm_tests_test_remote_settings_client_SOURCES) \
 	$(libnm_tests_test_secret_agent_SOURCES) \
 	shared/nm-utils/tests/test-shared-general.c \
 	$(src_NetworkManager_SOURCES) src/devices/tests/test-acd.c \
 	src/devices/tests/test-lldp.c \
-	$(am__src_devices_wifi_tests_test_general_SOURCES_DIST) \
+	$(am__src_devices_wifi_tests_test_devices_wifi_SOURCES_DIST) \
 	$(src_dhcp_nm_dhcp_helper_SOURCES) \
 	src/dhcp/tests/test-dhcp-dhclient.c \
 	src/dhcp/tests/test-dhcp-utils.c \
@@ -3685,19 +3150,18 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(src_platform_tests_test_address_linux_SOURCES) \
 	$(src_platform_tests_test_cleanup_fake_SOURCES) \
 	$(src_platform_tests_test_cleanup_linux_SOURCES) \
-	src/platform/tests/test-general.c \
 	$(src_platform_tests_test_link_fake_SOURCES) \
 	$(src_platform_tests_test_link_linux_SOURCES) \
 	src/platform/tests/test-nmp-object.c \
+	src/platform/tests/test-platform-general.c \
 	$(src_platform_tests_test_route_fake_SOURCES) \
 	$(src_platform_tests_test_route_linux_SOURCES) \
-	src/settings/plugins/ibft/tests/test-ibft.c \
 	$(am__src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES_DIST) \
 	src/settings/plugins/ifupdown/tests/test-ifupdown.c \
-	src/settings/plugins/keyfile/tests/test-keyfile.c \
+	src/settings/plugins/keyfile/tests/test-keyfile-settings.c \
 	src/supplicant/tests/test-supplicant-config.c \
-	$(src_tests_config_test_config_SOURCES) src/tests/test-dcb.c \
-	src/tests/test-general.c src/tests/test-general-with-expect.c \
+	$(src_tests_config_test_config_SOURCES) src/tests/test-core.c \
+	src/tests/test-core-with-expect.c src/tests/test-dcb.c \
 	src/tests/test-ip4-config.c src/tests/test-ip6-config.c \
 	src/tests/test-systemd.c src/tests/test-utils.c \
 	src/tests/test-wired-defname.c
@@ -3726,55 +3190,7 @@ DATA = $(dbusactivation_DATA) $(dbusinterfaces_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 \
-	libnm-glib/nm-device-ethernet.h \
-	libnm-glib/nm-device-infiniband.h libnm-glib/nm-device-adsl.h \
-	libnm-glib/nm-device-wifi.h libnm-glib/nm-device-bt.h \
-	libnm-glib/nm-device-olpc-mesh.h libnm-glib/nm-device-bond.h \
-	libnm-glib/nm-device-team.h libnm-glib/nm-device-bridge.h \
-	libnm-glib/nm-device-vlan.h libnm-glib/nm-device-generic.h \
-	libnm-glib/nm-access-point.h libnm-glib/nm-ip4-config.h \
-	libnm-glib/nm-device-modem.h libnm-glib/nm-vpn-connection.h \
-	libnm-glib/nm-types.h libnm-glib/nm-active-connection.h \
-	libnm-glib/nm-dhcp4-config.h libnm-glib/nm-ip6-config.h \
-	libnm-glib/nm-dhcp6-config.h libnm-glib/nm-remote-connection.h \
-	libnm-glib/nm-remote-settings.h libnm-glib/nm-secret-agent.h \
-	libnm-glib/nm-device-wimax.h libnm-glib/nm-wimax-nsp.h
-am__libnm_glib_libnmvpn_HEADERS_DIST = libnm-glib/nm-vpn-plugin.h \
-	libnm-glib/nm-vpn-plugin-ui-interface.h \
-	libnm-glib/nm-vpn-plugin-utils.h
-am__libnm_util_libnm_util_include_HEADERS_DIST =  \
-	shared/nm-version-macros.h libnm-util/NetworkManager.h \
-	libnm-util/NetworkManagerVPN.h libnm-util/nm-connection.h \
-	libnm-util/nm-setting.h libnm-util/nm-setting-8021x.h \
-	libnm-util/nm-setting-adsl.h libnm-util/nm-setting-bluetooth.h \
-	libnm-util/nm-setting-bond.h libnm-util/nm-setting-team.h \
-	libnm-util/nm-setting-team-port.h \
-	libnm-util/nm-setting-bridge.h \
-	libnm-util/nm-setting-bridge-port.h \
-	libnm-util/nm-setting-connection.h libnm-util/nm-setting-dcb.h \
-	libnm-util/nm-setting-infiniband.h \
-	libnm-util/nm-setting-ip4-config.h \
-	libnm-util/nm-setting-vlan.h \
-	libnm-util/nm-setting-ip6-config.h libnm-util/nm-setting-ppp.h \
-	libnm-util/nm-setting-pppoe.h libnm-util/nm-setting-serial.h \
-	libnm-util/nm-setting-generic.h libnm-util/nm-setting-gsm.h \
-	libnm-util/nm-setting-cdma.h libnm-util/nm-setting-olpc-mesh.h \
-	libnm-util/nm-setting-wimax.h libnm-util/nm-setting-wired.h \
-	libnm-util/nm-setting-wireless.h \
-	libnm-util/nm-setting-wireless-security.h \
-	libnm-util/nm-setting-vpn.h libnm-util/nm-utils.h \
-	libnm-util/nm-version.h
-HEADERS = $(libdeprecated_HEADERS) $(libnm_glib_libnminclude_HEADERS) \
-	$(libnm_glib_libnmvpn_HEADERS) \
-	$(libnm_util_libnm_util_include_HEADERS) \
-	$(libnminclude_HEADERS) \
-	$(nodist_libnm_glib_libnminclude_HEADERS) \
-	$(nodist_libnm_glib_libnmvpn_HEADERS) \
-	$(nodist_libnm_util_libnm_util_include_HEADERS) \
-	$(nodist_libnminclude_HEADERS)
+HEADERS = $(libnminclude_HEADERS) $(nodist_libnminclude_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -3980,11 +3396,11 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log)
 TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
-DIST_SUBDIRS = . po docs/libnm docs/api docs/libnm-util \
-	docs/libnm-glib
+DIST_SUBDIRS = . po docs/libnm docs/api
 am__DIST_COMMON = $(srcdir)/Makefile.examples $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.vapigen $(srcdir)/NetworkManager.pc.in \
-	$(srcdir)/config.h.in $(top_srcdir)/build-aux/compile \
+	$(srcdir)/config-extra.h.mk $(srcdir)/config.h.in \
+	$(top_srcdir)/build-aux/compile \
 	$(top_srcdir)/build-aux/config.guess \
 	$(top_srcdir)/build-aux/config.rpath \
 	$(top_srcdir)/build-aux/config.sub \
@@ -3995,9 +3411,6 @@ am__DIST_COMMON = $(srcdir)/Makefile.examples $(srcdir)/Makefile.in \
 	$(top_srcdir)/build-aux/tap-driver.sh \
 	$(top_srcdir)/build-aux/test-driver \
 	$(top_srcdir)/data/org.freedesktop.NetworkManager.policy.in.in \
-	$(top_srcdir)/libnm-glib/libnm-glib-vpn.pc.in \
-	$(top_srcdir)/libnm-glib/libnm-glib.pc.in \
-	$(top_srcdir)/libnm-util/libnm-util.pc.in \
 	$(top_srcdir)/libnm/libnm.pc.in \
 	$(top_srcdir)/shared/nm-version-macros.h.in ABOUT-NLS AUTHORS \
 	COPYING ChangeLog INSTALL NEWS README TODO build-aux/compile \
@@ -4072,8 +3485,6 @@ CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -4096,7 +3507,6 @@ GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MAKEFILE = @GLIB_MAKEFILE@
 GLIB_MKENUMS = @GLIB_MKENUMS@
@@ -4366,54 +3776,59 @@ AUTOMAKE_OPTIONS = subdir-objects
 ###############################################################################
 
 ###############################################################################
+
+###############################################################################
 noinst_LTLIBRARIES = shared/libcsiphash.la shared/libcrbtree.la \
-	shared/libnacd.la shared/nm-std-aux/libnm-std-aux.la \
+	shared/libnacd.la shared/libndhcp4.la \
+	shared/nm-std-aux/libnm-std-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-udev-aux/libnm-udev-aux.la \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	introspection/libnmdbus.la libnm-core/libnm-core.la \
-	$(libnm_crypto_lib) libnm/libnm-utils.la \
+	$(libnm_crypto_lib) libnm/liblibnm.la \
 	src/libNetworkManagerBase.la src/libNetworkManager.la \
 	src/libnm-systemd-core.la $(NULL) \
 	shared/systemd/libnm-systemd-logging-stub.la \
 	shared/systemd/libnm-systemd-shared.la \
-	src/initrd/libnmi-core.la $(am__append_25) $(am__append_29) \
-	$(am__append_37) dispatcher/libnm-dispatcher-core.la \
-	$(am__append_90) $(am__append_111)
-check_LTLIBRARIES = $(am__append_113)
-noinst_LIBRARIES = $(am__append_65)
-noinst_DATA = $(am__append_16)
-dist_libexec_SCRIPTS = $(am__append_33)
+	src/initrd/libnmi-core.la $(am__append_21) $(am__append_29) \
+	dispatcher/libnm-dispatcher-core.la $(am__append_76)
+check_LTLIBRARIES = $(am__append_78)
+noinst_LIBRARIES = $(am__append_57)
+noinst_DATA = $(am__append_12)
+dist_libexec_SCRIPTS = $(am__append_25)
 
 ###############################################################################
-lib_LTLIBRARIES = libnm/libnm.la $(am__append_69)
+lib_LTLIBRARIES = libnm/libnm.la
 plugin_LTLIBRARIES = $(core_plugins)
 
 ###############################################################################
 # src/devices/adsl
 ###############################################################################
-core_plugins = $(am__append_22) $(am__append_24) $(am__append_28) \
-	$(am__append_36) src/devices/adsl/libnm-device-plugin-adsl.la \
-	$(am__append_40) $(am__append_46) $(am__append_50) \
-	$(am__append_52)
+core_plugins = $(am__append_18) $(am__append_20) $(am__append_28) \
+	src/devices/adsl/libnm-device-plugin-adsl.la $(am__append_32) \
+	$(am__append_38) $(am__append_42) $(am__append_44)
 service_DATA = 
-man_MANS = $(am__append_104)
+man_MANS = $(am__append_70)
 examples_DATA = data/server.conf
 CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \
-	$(am__append_15) src/NetworkManager.ver $(am__append_30) \
+	src/NetworkManager.ver $(am__append_22) \
 	$(dispatcher_nmdbus_dispatcher_sources) \
 	dispatcher/org.freedesktop.nm_dispatcher.service \
 	clients/tests/test-client.log data/NetworkManager.service \
 	data/NetworkManager-wait-online.service \
 	data/NetworkManager-dispatcher.service data/server.conf \
-	$(am__append_91) $(am__append_95) man/common.ent \
-	$(am__append_105) $(am__append_109) $(GLIB_GENERATED) \
-	$(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \
-	cscope.po.out $(NULL) $(am__append_115)
+	$(am__append_61) man/common.ent $(am__append_71) \
+	$(am__append_74) $(GLIB_GENERATED) $(INTROSPECTION_GIRS) \
+	$(typelib_DATA) cscope.in.out cscope.out cscope.po.out $(NULL) \
+	$(am__append_80)
+
+###############################################################################
 DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
 	intltool-update $(polkit_policy_DATA) libnm/libnm.pc \
-	$(am__append_53) $(am__append_84)
+	$(am__append_45)
+
+###############################################################################
 
 # test-cert.p12 created with:
 #
@@ -4431,13 +3846,16 @@ DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
 ###############################################################################
 
 ###############################################################################
+
+###############################################################################
 # examples
 ###############################################################################
-EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
+EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
+	$(dbusinterfaces_DATA) introspection/meson.build \
 	libnm-core/nm-crypto-gnutls.c libnm-core/nm-crypto-nss.c \
 	libnm-core/nm-core-enum-types.c.template \
 	libnm-core/nm-core-enum-types.h.template \
-	libnm-core/meson.build \
+	libnm-core/meson.build $(NULL) \
 	libnm-core/tests/certs/ca-no-ending-newline.pem \
 	libnm-core/tests/certs/pkcs8-decrypted.der \
 	libnm-core/tests/certs/pkcs8-enc-key.pem \
@@ -4456,18 +3874,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	libnm-core/tests/certs/test-key-only-decrypted.der \
 	libnm-core/tests/certs/test-key-only-decrypted.pem \
 	libnm-core/tests/certs/test-key-only.pem \
+	libnm-core/tests/certs/test-tpm2wrapped-key.pem \
 	libnm-core/tests/nm-core-tests-enum-types.c.template \
 	libnm-core/tests/nm-core-tests-enum-types.h.template \
 	libnm-core/tests/meson.build libnm/libnm.pc.in libnm/libnm.ver \
-	libnm/fake-typelib/NetworkManager.gir \
-	libnm/fake-typelib/NMClient.gir \
-	libnm/fake-typelib/typelibs.gresource.xml \
-	libnm/fake-typelib/meson.build $(am__append_17) \
-	libnm/generate-setting-docs.py libnm/generate-plugin-docs.pl \
-	libnm/nm-enum-types.c.template libnm/nm-enum-types.h.template \
-	libnm/meson.build libnm/tests/meson.build \
-	src/systemd/meson.build src/platform/linux/nl802154.h \
-	src/initrd/meson.build src/initrd/tests/meson.build \
+	$(am__append_13) libnm/generate-setting-docs.py \
+	libnm/generate-plugin-docs.pl libnm/nm-enum-types.c.template \
+	libnm/nm-enum-types.h.template libnm/meson.build \
+	libnm/tests/meson.build src/systemd/meson.build \
+	src/platform/linux/nl802154.h src/initrd/meson.build \
+	src/initrd/tests/meson.build \
 	src/initrd/tests/sysfs/class/net/eth0/address \
 	src/initrd/tests/sysfs/class/net/eth2/address \
 	src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \
@@ -4703,17 +4119,6 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
 	src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \
 	src/settings/plugins/keyfile/tests/meson.build \
-	src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \
-	src/settings/plugins/ibft/tests/iscsiadm-test-static \
-	src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr \
-	src/settings/plugins/ibft/tests/iscsiadm-test-bad-gateway \
-	src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns1 \
-	src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 \
-	src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry \
-	src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \
-	src/settings/plugins/ibft/tests/iscsiadm-test-vlan \
-	src/settings/plugins/ibft/meson.build \
-	src/settings/plugins/ibft/tests/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \
@@ -4767,6 +4172,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \
@@ -4841,6 +4247,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	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 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \
@@ -4910,6 +4317,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 \
 	$(NULL) src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \
 	src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \
 	src/settings/plugins/ifcfg-rh/meson.build \
@@ -4945,8 +4353,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/devices/wifi/tests/meson.build \
 	src/devices/team/meson.build data/NetworkManager-ovs.conf \
 	src/devices/ovs/meson.build src/dnsmasq/tests/meson.build \
-	src/platform/tests/meson.build src/devices/tests/meson.build \
-	src/ndisc/tests/meson.build \
+	src/platform/tests/meson.build $(NULL) \
+	src/devices/tests/meson.build src/ndisc/tests/meson.build \
 	src/supplicant/tests/certs/test-ca-cert.pem \
 	src/supplicant/tests/certs/test-cert.p12 \
 	src/supplicant/tests/meson.build \
@@ -4970,7 +4378,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	dispatcher/tests/dispatcher-up \
 	dispatcher/tests/dispatcher-vpn-down \
 	dispatcher/tests/dispatcher-vpn-up \
-	dispatcher/tests/meson.build clients/meson.build \
+	dispatcher/tests/meson.build $(NULL) clients/meson.build \
 	$(clients_common_settings_doc_h) \
 	$(clients_common_settings_doc_h).in \
 	clients/common/tests/wg-test0.conf \
@@ -4991,21 +4399,19 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	data/NetworkManager-dispatcher.service.in \
 	data/84-nm-drivers.rules data/85-nm-unmanaged.rules \
 	data/90-nm-thunderbolt.rules data/server.conf.in \
-	data/meson.build $(am__append_77) libnm-glib/tests/meson.build \
-	$(am__append_97) $(am__append_100) man/common.ent.in \
-	$(man_nm_settings_xml) $(addsuffix .xsl,$(basename \
-	$(man_nm_settings_xml))) $(man_pages) $(addsuffix \
-	.xml,$(basename $(man_pages))) $(man_pages_autogen) \
-	man/meson.build vapi/NM-1.0.metadata \
-	vapi/NetworkManager-1.0.metadata vapi/NMClient-1.0.metadata \
-	vapi/libnm.deps vapi/libnm-util.deps vapi/libnm-glib.deps \
-	vapi/meson.build CONTRIBUTING NetworkManager.pc.in \
-	intltool-extract.in intltool-merge.in intltool-update.in \
-	linker-script-binary.ver linker-script-devices.ver \
-	linker-script-settings.ver src/ppp/nm-ppp-plugin.ver \
-	Makefile.glib autogen.sh valgrind.suppressions meson.build \
-	meson_options.txt config.h.meson config-extra.h.meson \
-	docs/meson.build po/meson.build shared/nm-default.h \
+	data/meson.build $(am__append_63) $(am__append_66) \
+	man/common.ent.in $(man_nm_settings_xml) $(addsuffix \
+	.xsl,$(basename $(man_nm_settings_xml))) $(man_pages) \
+	$(addsuffix .xml,$(basename $(man_pages))) \
+	$(man_pages_autogen) man/meson.build vapi/NM-1.0.metadata \
+	vapi/libnm.deps vapi/meson.build CONTRIBUTING \
+	NetworkManager.pc.in intltool-extract.in intltool-merge.in \
+	intltool-update.in linker-script-binary.ver \
+	linker-script-devices.ver linker-script-settings.ver \
+	src/ppp/nm-ppp-plugin.ver Makefile.glib autogen.sh \
+	valgrind.suppressions meson.build meson_options.txt \
+	config.h.meson config-extra.h.meson docs/meson.build \
+	po/meson.build shared/nm-default.h \
 	shared/nm-test-libnm-utils.h shared/nm-test-utils-impl.c \
 	shared/nm-utils/nm-compat.c shared/nm-utils/nm-compat.h \
 	shared/nm-utils/nm-test-utils.h \
@@ -5062,8 +4468,9 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	examples/python/gi/get-active-connections.py \
 	examples/python/gi/get_ips.py \
 	examples/python/gi/list-connections.py \
+	examples/python/gi/nm-add-connection2.py \
 	examples/python/gi/nm-connection-update-stable-id.py \
-	examples/python/gi/nm-wg-set \
+	examples/python/gi/nm-update2.py examples/python/gi/nm-wg-set \
 	examples/python/gi/setting-user-data.py \
 	examples/python/gi/show-wifi-networks.py \
 	examples/python/gi/update-ip4-method.py \
@@ -5074,29 +4481,30 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	examples/shell/get-hostname.sh examples/shell/list-devices.sh \
 	examples/shell/disconnect-device.sh \
 	examples/shell/active-wifi.sh $(NULL)
-EXTRA_LTLIBRARIES = $(am__append_56)
+EXTRA_LTLIBRARIES = $(am__append_48)
 dist_hook = dist-hook-settings-ifcfg-rh-alias-files
 dist_dependencies = libnm-core/nm-vpn-dbus-types.xml \
-	libnm-core/nm-dbus-types.xml $(am__append_87) $(am__append_98) \
-	$(am__append_101) $(man_pages) $(man_pages_autogen)
-dist_configure_check = $(am__append_3) $(am__append_4)
-install_data_hook = $(am__append_34) install-data-hook-dispatcher \
-	$(am__append_63) $(am__append_102)
-install_exec_hook = $(am__append_67)
-uninstall_hook = $(am__append_64) $(am__append_68) $(am__append_103)
+	libnm-core/nm-dbus-types.xml $(am__append_64) $(am__append_67) \
+	$(man_pages) $(man_pages_autogen)
+dist_configure_check = $(am__append_2)
+install_data_hook = $(am__append_26) install-data-hook-dispatcher \
+	$(am__append_55) $(am__append_68)
+install_exec_hook = $(am__append_59)
+uninstall_hook = $(am__append_56) $(am__append_60) $(am__append_69)
 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) \
 	$(libnm_core_lib_c_mkenums) \
 	libnm-core/tests/nm-core-tests-enum-types.h \
 	libnm-core/tests/nm-core-tests-enum-types.c \
-	$(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums) \
-	$(am__append_70)
+	$(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums)
 man_pages = man/NetworkManager.8 man/NetworkManager.conf.5 \
 	man/nm-online.1 man/nm-initrd-generator.8 man/nmcli-examples.7 \
-	man/nmcli.1 man/nmtui.1 $(am__append_96)
+	man/nmcli.1 man/nmtui.1 $(am__append_62)
 man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
-	$(am__append_99)
+	$(am__append_65)
+
+###############################################################################
 
 ###############################################################################
 
@@ -5121,71 +4529,71 @@ man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
 ###############################################################################
 # dispatcher/tests
 ###############################################################################
+
+###############################################################################
 check_programs = shared/nm-utils/tests/test-shared-general \
 	libnm-core/tests/test-compare libnm-core/tests/test-crypto \
 	libnm-core/tests/test-general libnm-core/tests/test-keyfile \
 	libnm-core/tests/test-secrets libnm-core/tests/test-setting \
-	libnm-core/tests/test-settings-defaults \
-	$(libnm_tests_programs) $(am__append_18) \
-	src/initrd/tests/test-ibft-reader \
+	libnm-core/tests/test-settings-defaults libnm/tests/test-libnm \
+	$(am__append_14) src/initrd/tests/test-ibft-reader \
 	src/initrd/tests/test-cmdline-reader \
 	src/dhcp/tests/test-dhcp-dhclient \
 	src/dhcp/tests/test-dhcp-utils \
-	src/settings/plugins/keyfile/tests/test-keyfile \
-	$(am__append_26) $(am__append_32) $(am__append_39) \
-	$(am__append_49) src/dnsmasq/tests/test-dnsmasq-utils \
-	src/platform/tests/test-link-fake \
-	src/platform/tests/test-link-linux \
+	src/settings/plugins/keyfile/tests/test-keyfile-settings \
+	$(am__append_24) $(am__append_31) $(am__append_41) \
+	src/dnsmasq/tests/test-dnsmasq-utils \
 	src/platform/tests/test-address-fake \
 	src/platform/tests/test-address-linux \
-	src/platform/tests/test-general \
-	src/platform/tests/test-nmp-object \
-	src/platform/tests/test-route-fake \
-	src/platform/tests/test-route-linux \
 	src/platform/tests/test-cleanup-fake \
 	src/platform/tests/test-cleanup-linux \
+	src/platform/tests/test-link-fake \
+	src/platform/tests/test-link-linux \
+	src/platform/tests/test-nmp-object \
+	src/platform/tests/test-platform-general \
+	src/platform/tests/test-route-fake \
+	src/platform/tests/test-route-linux $(NULL) \
 	src/devices/tests/test-lldp src/devices/tests/test-acd \
 	src/ndisc/tests/test-ndisc-fake \
 	src/supplicant/tests/test-supplicant-config \
-	src/tests/config/test-config src/tests/test-general \
-	src/tests/test-general-with-expect src/tests/test-ip4-config \
+	src/tests/config/test-config src/tests/test-core \
+	src/tests/test-core-with-expect src/tests/test-ip4-config \
 	src/tests/test-ip6-config src/tests/test-dcb \
 	src/tests/test-systemd src/tests/test-wired-defname \
 	src/tests/test-utils dispatcher/tests/test-dispatcher-envp \
-	$(am__append_57) $(am__append_58) $(am__append_88) \
-	$(am__append_93)
-check_programs_norun = $(am__append_19) src/platform/tests/monitor \
-	src/ndisc/tests/test-ndisc-linux $(am__append_89) \
-	$(am__append_94) examples/C/glib/add-connection-gdbus \
+	$(am__append_49) $(am__append_50) \
+	clients/common/tests/test-libnm-core-aux
+check_programs_norun = $(am__append_15) src/platform/tests/monitor \
+	src/ndisc/tests/test-ndisc-linux \
+	examples/C/glib/add-connection-gdbus \
 	examples/C/glib/add-connection-libnm \
 	examples/C/glib/get-active-connections-gdbus \
 	examples/C/glib/get-ap-info-libnm \
 	examples/C/glib/list-connections-gdbus \
 	examples/C/glib/list-connections-libnm \
 	examples/C/glib/monitor-nm-running-gdbus \
-	examples/C/glib/monitor-nm-state-gdbus $(am__append_114)
+	examples/C/glib/monitor-nm-state-gdbus $(am__append_79)
 
 ###############################################################################
 
 # just test, that we can build "nm-vpn-plugin-utils.c"
 
 ###############################################################################
-check_ltlibraries = $(am__append_11) $(am__append_12) \
+check_ltlibraries = $(am__append_8) $(am__append_9) \
 	libnm/tests/libnm-vpn-plugin-utils-test.la \
 	src/libNetworkManagerTest.la clients/common/libnmc-base.la \
-	$(am__append_55) $(am__append_78)
+	$(am__append_47)
 check_local = check-docs check-local-exports-libnm \
-	check-config-options $(am__append_27) $(am__append_31) \
-	$(am__append_38) check-local-devices-adsl $(am__append_42) \
-	$(am__append_48) $(am__append_51) $(am__append_54) \
-	check-local-clients-tests-test-client $(am__append_86) \
-	$(am__append_92)
-VAPIGEN_VAPIS = $(am__append_106) $(am__append_107)
-dbusservice_DATA = $(am__append_35) dispatcher/nm-dispatcher.conf \
+	check-config-options $(am__append_23) $(am__append_30) \
+	check-local-devices-adsl $(am__append_34) $(am__append_40) \
+	$(am__append_43) $(am__append_46) \
+	check-local-clients-tests-test-client
+VAPIGEN_VAPIS = $(am__append_72)
+dbusservice_DATA = $(am__append_27) dispatcher/nm-dispatcher.conf \
 	src/org.freedesktop.NetworkManager.conf
 dbusactivation_DATA =  \
 	dispatcher/org.freedesktop.nm_dispatcher.service
-INTROSPECTION_GIRS = $(am__append_14) $(am__append_85)
+INTROSPECTION_GIRS = $(am__append_11)
 INTROSPECTION_SCANNER_ARGS = 
 INTROSPECTION_COMPILER_ARGS = 
 # Pass SANITIZER_ENV where a command that uses built libraries is
@@ -5197,11 +4605,11 @@ libnminclude_HEADERS = $(libnm_core_lib_h_pub_real) \
 nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \
 	$(libnm_lib_h_pub_mkenums)
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_83)
+pkgconfig_DATA = libnm/libnm.pc
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
-pppd_plugin_LTLIBRARIES = $(am__append_23)
+pppd_plugin_LTLIBRARIES = $(am__append_19)
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(am__append_108)
+vapi_DATA = $(am__append_73)
 examplesdir = $(docdir)/examples
 rundir = $(runstatedir)/NetworkManager
 statedir = $(localstatedir)/lib/NetworkManager
@@ -5212,7 +4620,7 @@ completiondir = $(datadir)/bash-completion/completions
 nmlocaledir = $(datadir)/locale
 GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
 GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
-SUBDIRS = . po $(am__append_1) $(am__append_2)
+SUBDIRS = . po $(am__append_1)
 dflt_cppflags = -std=gnu11
 
 ###############################################################################
@@ -5232,14 +4640,12 @@ check_so_symbols = \
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-tests=yes \
 	--with-valgrind=no \
-	--with-libnm-glib=yes \
 	--enable-gtk-doc \
 	--enable-more-warnings=error \
 	--with-udev-dir=$$dc_install_base/lib/udev \
 	--with-wext=no \
 	--enable-ifcfg-rh \
 	--enable-ifupdown \
-	--enable-config-plugin-ibft \
 	--disable-dependency-tracking \
 	$(NULL)
 
@@ -5250,13 +4656,20 @@ dist_polkit_policy_in_in_files = \
 	data/org.freedesktop.NetworkManager.policy.in.in
 
 polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy)
+shared_libcsiphash_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-std=c11 \
+	-I$(srcdir)/shared/c-stdaux/src \
+	$(NULL)
+
 shared_libcsiphash_la_CPPFLAGS = \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
 shared_libcsiphash_la_LDFLAGS = \
-	$(SANITIZER_LIB_LDFLAGS)
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
 
 shared_libcsiphash_la_SOURCES = \
 	shared/c-siphash/src/c-siphash.c \
@@ -5266,6 +4679,7 @@ shared_libcsiphash_la_SOURCES = \
 shared_libcrbtree_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-std=c11 \
+	-I$(srcdir)/shared/c-stdaux/src \
 	$(NULL)
 
 shared_libcrbtree_la_CPPFLAGS = \
@@ -5274,7 +4688,8 @@ shared_libcrbtree_la_CPPFLAGS = \
 	$(NULL)
 
 shared_libcrbtree_la_LDFLAGS = \
-	$(SANITIZER_LIB_LDFLAGS)
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
 
 shared_libcrbtree_la_SOURCES = \
 	shared/c-rbtree/src/c-rbtree.c \
@@ -5294,21 +4709,54 @@ shared_libnacd_la_CPPFLAGS = \
 	-DSO_ATTACH_BPF=50 \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
+	-I$(srcdir)/shared/c-stdaux/src \
 	-I$(srcdir)/shared/c-list/src \
 	-I$(srcdir)/shared/c-siphash/src \
 	-I$(srcdir)/shared/c-rbtree/src \
 	$(NULL)
 
 shared_libnacd_la_LDFLAGS = \
-	$(SANITIZER_LIB_LDFLAGS)
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
 
 shared_libnacd_la_SOURCES = shared/n-acd/src/n-acd.c \
 	shared/n-acd/src/n-acd.h shared/n-acd/src/n-acd-private.h \
 	shared/n-acd/src/n-acd-probe.c shared/n-acd/src/util/timer.c \
-	shared/n-acd/src/util/timer.h $(NULL) $(am__append_6) \
-	$(am__append_7)
-shared_libnacd_la_LIBADD = \
-	shared/libcrbtree.la \
+	shared/n-acd/src/util/timer.h $(NULL) $(am__append_3) \
+	$(am__append_4)
+shared_libndhcp4_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-std=c11 \
+	-Wno-error=declaration-after-statement \
+	-Wno-pointer-arith \
+	$(NULL)
+
+shared_libndhcp4_la_CPPFLAGS = \
+	-D_GNU_SOURCE \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	-I$(srcdir)/shared/c-stdaux/src \
+	-I$(srcdir)/shared/c-list/src \
+	-I$(srcdir)/shared/c-siphash/src \
+	$(NULL)
+
+shared_libndhcp4_la_LDFLAGS = \
+	$(SANITIZER_LIB_LDFLAGS)
+
+shared_libndhcp4_la_SOURCES = \
+	shared/n-dhcp4/src/n-dhcp4-c-connection.c \
+	shared/n-dhcp4/src/n-dhcp4-c-lease.c \
+	shared/n-dhcp4/src/n-dhcp4-c-probe.c \
+	shared/n-dhcp4/src/n-dhcp4-client.c \
+	shared/n-dhcp4/src/n-dhcp4-incoming.c \
+	shared/n-dhcp4/src/n-dhcp4-outgoing.c \
+	shared/n-dhcp4/src/n-dhcp4-private.h \
+	shared/n-dhcp4/src/n-dhcp4-socket.c \
+	shared/n-dhcp4/src/n-dhcp4.h \
+	shared/n-dhcp4/src/util/packet.c \
+	shared/n-dhcp4/src/util/packet.h \
+	shared/n-dhcp4/src/util/socket.c \
+	shared/n-dhcp4/src/util/socket.h \
 	$(NULL)
 
 shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \
@@ -5333,10 +4781,6 @@ shared_nm_std_aux_libnm_std_aux_la_LDFLAGS = \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
-shared_nm_std_aux_libnm_std_aux_la_LIBADD = \
-	shared/libcsiphash.la \
-	$(NULL)
-
 
 ###############################################################################
 shared_nm_glib_aux_cppflags = \
@@ -5355,6 +4799,8 @@ shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \
 
 shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
 	shared/nm-glib-aux/nm-c-list.h \
+	shared/nm-glib-aux/nm-dbus-aux.c \
+	shared/nm-glib-aux/nm-dbus-aux.h \
 	shared/nm-glib-aux/nm-dedup-multi.c \
 	shared/nm-glib-aux/nm-dedup-multi.h \
 	shared/nm-glib-aux/nm-enum-utils.c \
@@ -5367,6 +4813,10 @@ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
 	shared/nm-glib-aux/nm-io-utils.c \
 	shared/nm-glib-aux/nm-io-utils.h \
 	shared/nm-glib-aux/nm-jansson.h \
+	shared/nm-glib-aux/nm-json-aux.c \
+	shared/nm-glib-aux/nm-json-aux.h \
+	shared/nm-glib-aux/nm-keyfile-aux.c \
+	shared/nm-glib-aux/nm-keyfile-aux.h \
 	shared/nm-glib-aux/nm-logging-fwd.h \
 	shared/nm-glib-aux/nm-macros-internal.h \
 	shared/nm-glib-aux/nm-obj.h \
@@ -5378,6 +4828,7 @@ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
 	shared/nm-glib-aux/nm-shared-utils.h \
 	shared/nm-glib-aux/nm-time-utils.c \
 	shared/nm-glib-aux/nm-time-utils.h \
+	shared/nm-glib-aux/nm-value-type.h \
 	$(NULL)
 
 shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \
@@ -5386,7 +4837,6 @@ shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \
 	$(NULL)
 
 shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \
-	shared/nm-std-aux/libnm-std-aux.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -5455,6 +4905,8 @@ shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \
 
 shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \
 	shared/nm-libnm-core-aux/nm-dispatcher-api.h \
+	shared/nm-libnm-core-aux/nm-libnm-core-aux.c \
+	shared/nm-libnm-core-aux/nm-libnm-core-aux.h \
 	$(NULL)
 
 shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LDFLAGS = \
@@ -5483,6 +4935,9 @@ shared_nm_utils_tests_test_shared_general_LDFLAGS = \
 
 shared_nm_utils_tests_test_shared_general_LDADD = \
 	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -5719,6 +5174,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-match.h \
 	libnm-core/nm-setting-olpc-mesh.h \
 	libnm-core/nm-setting-ovs-bridge.h \
+	libnm-core/nm-setting-ovs-dpdk.h \
 	libnm-core/nm-setting-ovs-interface.h \
 	libnm-core/nm-setting-ovs-patch.h \
 	libnm-core/nm-setting-ovs-port.h \
@@ -5748,20 +5204,22 @@ libnm_core_lib_h_pub_real = \
 	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 \
+	$(NULL)
 
 libnm_core_lib_h_pub_mkenums = \
-	libnm-core/nm-core-enum-types.h
+	libnm-core/nm-core-enum-types.h \
+	$(NULL)
 
 libnm_core_lib_h_priv = shared/nm-meta-setting.h \
-	libnm-core/nm-crypto.h libnm-core/nm-crypto-impl.h \
 	libnm-core/nm-connection-private.h \
 	libnm-core/nm-core-internal.h \
 	libnm-core/nm-core-types-internal.h \
+	libnm-core/nm-crypto-impl.h libnm-core/nm-crypto.h \
 	libnm-core/nm-keyfile-internal.h libnm-core/nm-keyfile-utils.h \
 	libnm-core/nm-property-compare.h \
-	libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \
-	$(am__append_8)
+	libnm-core/nm-setting-private.h libnm-core/nm-team-utils.h \
+	libnm-core/nm-utils-private.h $(NULL) $(am__append_5)
 libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-6lowpan.c \
 	libnm-core/nm-setting-8021x.c \
@@ -5787,6 +5245,7 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-match.c \
 	libnm-core/nm-setting-olpc-mesh.c \
 	libnm-core/nm-setting-ovs-bridge.c \
+	libnm-core/nm-setting-ovs-dpdk.c \
 	libnm-core/nm-setting-ovs-interface.c \
 	libnm-core/nm-setting-ovs-patch.c \
 	libnm-core/nm-setting-ovs-port.c \
@@ -5809,16 +5268,18 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-wireguard.c \
 	libnm-core/nm-setting-wireless-security.c \
 	libnm-core/nm-setting-wireless.c \
-	libnm-core/nm-setting-wpan.c
+	libnm-core/nm-setting-wpan.c \
+	$(NULL)
 
 libnm_core_lib_c_real = $(libnm_core_lib_c_settings_real) \
-	shared/nm-meta-setting.c libnm-core/nm-crypto.c \
-	libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \
-	libnm-core/nm-errors.c libnm-core/nm-keyfile.c \
-	libnm-core/nm-keyfile-utils.c libnm-core/nm-property-compare.c \
+	shared/nm-meta-setting.c libnm-core/nm-connection.c \
+	libnm-core/nm-crypto.c libnm-core/nm-dbus-utils.c \
+	libnm-core/nm-errors.c libnm-core/nm-keyfile-utils.c \
+	libnm-core/nm-keyfile.c libnm-core/nm-property-compare.c \
 	libnm-core/nm-setting.c libnm-core/nm-simple-connection.c \
-	libnm-core/nm-utils.c libnm-core/nm-vpn-editor-plugin.c \
-	libnm-core/nm-vpn-plugin-info.c $(am__append_9)
+	libnm-core/nm-team-utils.c libnm-core/nm-utils.c \
+	libnm-core/nm-vpn-editor-plugin.c \
+	libnm-core/nm-vpn-plugin-info.c $(NULL) $(am__append_6)
 libnm_core_lib_c_mkenums = \
 	libnm-core/nm-core-enum-types.c
 
@@ -5841,7 +5302,7 @@ nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "
 libnm_core_libnm_core_la_CPPFLAGS = $(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
-	$(NULL) $(am__append_10)
+	$(NULL) $(am__append_7)
 libnm_core_libnm_core_la_SOURCES = \
 	$(libnm_core_lib_h_pub_real) \
 	$(libnm_core_lib_h_priv) \
@@ -5858,7 +5319,8 @@ libnm_core_libnm_core_la_LIBADD = \
 
 libnm_core_libnm_core_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
-	$(SANITIZER_LIB_LDFLAGS)
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
 
 
 ###############################################################################
@@ -5873,7 +5335,7 @@ libnm_core_libnm_core_la_LDFLAGS = \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(libnm_core_libnm_core_la_LDFLAGS)
 
 @HAVE_CRYPTO_GNUTLS_TRUE@libnm_core_libnm_crypto_gnutls_la_LIBADD = \
-@HAVE_CRYPTO_GNUTLS_TRUE@	$(libnm_core_libnm_core_la_LIBADD) \
+@HAVE_CRYPTO_GNUTLS_TRUE@	$(GLIB_LIBS) \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(GNUTLS_LIBS)
 
 @HAVE_CRYPTO_NSS_TRUE@libnm_core_libnm_crypto_nss_la_SOURCES = libnm-core/nm-crypto-nss.c
@@ -5885,7 +5347,7 @@ libnm_core_libnm_core_la_LDFLAGS = \
 @HAVE_CRYPTO_NSS_TRUE@	$(libnm_core_libnm_core_la_LDFLAGS)
 
 @HAVE_CRYPTO_NSS_TRUE@libnm_core_libnm_crypto_nss_la_LIBADD = \
-@HAVE_CRYPTO_NSS_TRUE@	$(libnm_core_libnm_core_la_LIBADD) \
+@HAVE_CRYPTO_NSS_TRUE@	$(GLIB_LIBS) \
 @HAVE_CRYPTO_NSS_TRUE@	$(NSS_LIBS)
 
 nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h
@@ -5923,6 +5385,8 @@ libnm_core_tests_ldadd = \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -6053,6 +5517,7 @@ libnm_lib_c_real = \
 	libnm/nm-ip-config.c \
 	libnm/nm-ip4-config.c \
 	libnm/nm-ip6-config.c \
+	libnm/nm-libnm-utils.c \
 	libnm/nm-manager.c \
 	libnm/nm-object.c \
 	libnm/nm-remote-connection.c \
@@ -6063,7 +5528,8 @@ libnm_lib_c_real = \
 	libnm/nm-vpn-plugin-old.c \
 	libnm/nm-vpn-service-plugin.c \
 	libnm/nm-wifi-p2p-peer.c \
-	libnm/nm-wimax-nsp.c
+	libnm/nm-wimax-nsp.c \
+	$(NULL)
 
 libnm_lib_c_mkenums = \
 	libnm/nm-enum-types.c
@@ -6076,21 +5542,31 @@ libnm_lib_cppflags = \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
 	$(NULL)
 
-libnm_libnm_utils_la_CPPFLAGS = \
+libnm_liblibnm_la_CPPFLAGS = \
 	$(INTROSPECTION_CFLAGS) \
-	$(libnm_lib_cppflags)
+	$(libnm_lib_cppflags) \
+	$(NULL)
 
-libnm_libnm_utils_la_SOURCES = \
-	libnm/nm-libnm-utils.c
+libnm_liblibnm_la_SOURCES = \
+	$(libnm_lib_c_real) \
+	$(NULL)
 
-libnm_libnm_utils_la_LIBADD = \
+libnm_liblibnm_la_LIBADD = \
 	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
 	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	introspection/libnmdbus.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
+	$(DL_LIBS) \
+	$(UUID_LIBS) \
+	$(LIBUDEV_LIBS) \
 	$(NULL)
 
 nm_enum_types_sources = \
@@ -6102,28 +5578,24 @@ nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-de
 libnm_libnm_la_CPPFLAGS = \
 	$(libnm_lib_cppflags) \
 	$(LIBUDEV_CFLAGS) \
-	$(SANITIZER_LIB_CFLAGS)
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
 
 libnm_libnm_la_SOURCES = \
 	$(libnm_lib_h_pub_real) \
 	$(libnm_lib_h_priv) \
-	$(libnm_lib_c_real)
+	$(NULL)
 
 nodist_libnm_libnm_la_SOURCES = \
 	$(libnm_lib_h_pub_mkenums) \
-	$(libnm_lib_c_mkenums)
+	$(libnm_lib_c_mkenums) \
+	$(NULL)
 
 EXTRA_libnm_libnm_la_DEPENDENCIES = \
 	libnm/libnm.ver
 
 libnm_libnm_la_LIBADD = \
-	libnm/libnm-utils.la \
-	shared/systemd/libnm-systemd-shared.la \
-	shared/systemd/libnm-systemd-logging-stub.la \
-	shared/nm-udev-aux/libnm-udev-aux.la \
-	$(DL_LIBS) \
-	$(GLIB_LIBS) \
-	$(UUID_LIBS) \
+	libnm/liblibnm.la \
 	$(NULL)
 
 libnm_libnm_la_LDFLAGS = \
@@ -6132,7 +5604,7 @@ libnm_libnm_la_LDFLAGS = \
 	$(SANITIZER_LIB_LDFLAGS) \
 	-version-info "1:0:1"
 
-libnm_NM_1_0_typelib = $(am__append_13)
+libnm_NM_1_0_typelib = $(am__append_10)
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_INCLUDES = Gio-2.0
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_PACKAGES = gio-2.0
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm
@@ -6149,9 +5621,6 @@ libnm_NM_1_0_typelib = $(am__append_13)
 @HAVE_INTROSPECTION_TRUE@	$(libnm_lib_c_real)
 
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@nodist_libnm_libnm_utils_la_SOURCES = \
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/typelibs.c
-
 @HAVE_INTROSPECTION_TRUE@libnm_noinst_data = \
 @HAVE_INTROSPECTION_TRUE@	libnm/nm-property-docs.xml \
 @HAVE_INTROSPECTION_TRUE@	libnm/nm-settings-docs-overrides.xml \
@@ -6160,11 +5629,6 @@ libnm_NM_1_0_typelib = $(am__append_13)
 @HAVE_INTROSPECTION_TRUE@	libnm/nm-settings-ifcfg-rh-docs.xml
 
 @HAVE_INTROSPECTION_TRUE@libnm_docs_sources = $(libnm_core_lib_c_settings_real)
-
-###############################################################################
-libnm_tests_programs = \
-	libnm/tests/test-general
-
 libnm_tests_programs_req_introspection = \
 	libnm/tests/test-nm-client \
 	libnm/tests/test-remote-settings-client \
@@ -6180,21 +5644,21 @@ libnm_tests_cppflags = \
 	$(NULL)
 
 libnm_tests_ldadd = \
-	libnm/libnm.la \
-	shared/systemd/libnm-systemd-shared.la \
-	shared/systemd/libnm-systemd-logging-stub.la \
-	$(GLIB_LIBS)
+	libnm/liblibnm.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 libnm_tests_ldflags = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags)
+libnm_tests_test_libnm_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_remote_settings_client_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_secret_agent_CPPFLAGS = $(libnm_tests_cppflags)
-libnm_tests_test_general_SOURCES = \
+libnm_tests_test_libnm_SOURCES = \
 	shared/nm-utils/nm-compat.c \
-	libnm/tests/test-general.c
+	libnm/tests/test-libnm.c \
+	$(NULL)
 
 libnm_tests_test_nm_client_SOURCES = \
 	shared/nm-test-utils-impl.c \
@@ -6211,20 +5675,18 @@ libnm_tests_test_secret_agent_SOURCES = \
 	shared/nm-test-libnm-utils.h \
 	libnm/tests/test-secret-agent.c
 
-libnm_tests_test_general_LDADD = \
-	libnm/libnm-utils.la \
-	$(libnm_tests_ldadd)
-
+libnm_tests_test_libnm_LDADD = $(libnm_tests_ldadd)
 libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd)
 libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd)
 libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd)
-libnm_tests_test_general_LDFLAGS = $(libnm_tests_ldflags)
+libnm_tests_test_libnm_LDFLAGS = $(libnm_tests_ldflags)
 libnm_tests_test_nm_client_LDFLAGS = $(libnm_tests_ldflags)
 libnm_tests_test_remote_settings_client_LDFLAGS = $(libnm_tests_ldflags)
 libnm_tests_test_secret_agent_LDFLAGS = $(libnm_tests_ldflags)
 libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \
 	shared/nm-utils/nm-vpn-plugin-utils.c \
-	shared/nm-utils/nm-vpn-plugin-utils.h
+	shared/nm-utils/nm-vpn-plugin-utils.h \
+	$(NULL)
 
 libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
 	$(dflt_cppflags) \
@@ -6237,10 +5699,12 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	$(NULL)
 
 libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
-	$(GLIB_LIBS)
+	$(GLIB_LIBS) \
+	$(NULL)
 
 
 ###############################################################################
@@ -6275,7 +5739,7 @@ src_cppflags = \
 	$(NULL)
 
 src_cppflags_test = $(src_cppflags) -DNETWORKMANAGER_COMPILATION_TEST \
-	$(NULL) $(am__append_20)
+	$(NULL) $(am__append_16)
 src_ldflags = $(CODE_COVERAGE_LDFLAGS)
 
 ###############################################################################
@@ -6286,16 +5750,12 @@ libsystemd_cppflags = \
 	-I$(srcdir)/shared/systemd/ \
 	-I$(srcdir)/shared/systemd/sd-adapt-shared \
 	-I$(srcdir)/shared/systemd/src/basic \
+	-I$(srcdir)/shared/systemd/src/shared \
 	$(LIBSYSTEMD_NM_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libsystemd_libadd = \
-	$(GLIB_LIBS) \
-	$(CODE_COVERAGE_LDFLAGS) \
-	$(NULL)
-
 shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \
 	$(libsystemd_cppflags) \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
@@ -6307,7 +5767,8 @@ shared_systemd_libnm_systemd_logging_stub_la_SOURCES = \
 	$(NULL)
 
 shared_systemd_libnm_systemd_logging_stub_la_LIBADD = \
-	$(libsystemd_libadd) \
+	$(GLIB_LIBS) \
+	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \
@@ -6328,7 +5789,6 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/sd-adapt-shared/device-nodes.h \
 	shared/systemd/sd-adapt-shared/dirent-util.h \
 	shared/systemd/sd-adapt-shared/errno-list.h \
-	shared/systemd/sd-adapt-shared/format-util.h \
 	shared/systemd/sd-adapt-shared/glob-util.h \
 	shared/systemd/sd-adapt-shared/gunicode.h \
 	shared/systemd/sd-adapt-shared/ioprio.h \
@@ -6345,7 +5805,6 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/sd-adapt-shared/procfs-util.h \
 	shared/systemd/sd-adapt-shared/raw-clone.h \
 	shared/systemd/sd-adapt-shared/rlimit-util.h \
-	shared/systemd/sd-adapt-shared/strxcpyx.h \
 	shared/systemd/sd-adapt-shared/terminal-util.h \
 	shared/systemd/sd-adapt-shared/unaligned.h \
 	shared/systemd/sd-adapt-shared/user-util.h \
@@ -6368,6 +5827,8 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/fd-util.h \
 	shared/systemd/src/basic/fileio.c \
 	shared/systemd/src/basic/fileio.h \
+	shared/systemd/src/basic/format-util.c \
+	shared/systemd/src/basic/format-util.h \
 	shared/systemd/src/basic/fs-util.c \
 	shared/systemd/src/basic/fs-util.h \
 	shared/systemd/src/basic/hash-funcs.c \
@@ -6419,6 +5880,8 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/string-util.h \
 	shared/systemd/src/basic/strv.c \
 	shared/systemd/src/basic/strv.h \
+	shared/systemd/src/basic/strxcpyx.c \
+	shared/systemd/src/basic/strxcpyx.h \
 	shared/systemd/src/basic/time-util.c \
 	shared/systemd/src/basic/time-util.h \
 	shared/systemd/src/basic/tmpfile-util.c \
@@ -6428,10 +5891,13 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/utf8.h \
 	shared/systemd/src/basic/util.c \
 	shared/systemd/src/basic/util.h \
+	shared/systemd/src/shared/dns-domain.c \
+	shared/systemd/src/shared/dns-domain.h \
 	$(NULL)
 
 shared_systemd_libnm_systemd_shared_la_LIBADD = \
-	$(libsystemd_libadd) \
+	$(GLIB_LIBS) \
+	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 
@@ -6443,14 +5909,14 @@ src_libnm_systemd_core_la_cppflags = \
 	-I$(srcdir)/src \
 	-I$(srcdir)/src/systemd/sd-adapt-core \
 	-I$(srcdir)/src/systemd/src/systemd \
-	-I$(srcdir)/src/systemd/src/shared \
 	-I$(srcdir)/src/systemd/src/libsystemd-network \
 	-I$(srcdir)/src/systemd/src/libsystemd/sd-event \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
 	$(NULL)
 
 src_libnm_systemd_core_la_libadd = \
-	$(libsystemd_libadd) \
+	$(GLIB_LIBS) \
+	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 src_libnm_systemd_core_la_SOURCES = \
@@ -6458,6 +5924,8 @@ src_libnm_systemd_core_la_SOURCES = \
 	src/systemd/nm-sd-utils-core.h \
 	src/systemd/nm-sd.c \
 	src/systemd/nm-sd.h \
+	src/systemd/nm-sd-utils-dhcp.h \
+	src/systemd/nm-sd-utils-dhcp.c \
 	src/systemd/sd-adapt-core/condition.h \
 	src/systemd/sd-adapt-core/conf-parser.h \
 	src/systemd/sd-adapt-core/device-util.h \
@@ -6503,8 +5971,6 @@ src_libnm_systemd_core_la_SOURCES = \
 	src/systemd/src/libsystemd/sd-id128/id128-util.c \
 	src/systemd/src/libsystemd/sd-id128/id128-util.h \
 	src/systemd/src/libsystemd/sd-id128/sd-id128.c \
-	src/systemd/src/shared/dns-domain.c \
-	src/systemd/src/shared/dns-domain.h \
 	src/systemd/src/systemd/_sd-common.h \
 	src/systemd/src/systemd/sd-dhcp-client.h \
 	src/systemd/src/systemd/sd-dhcp-lease.h \
@@ -6518,10 +5984,17 @@ src_libnm_systemd_core_la_SOURCES = \
 	src/systemd/src/systemd/sd-ndisc.h
 
 src_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_la_cppflags)
-src_libnm_systemd_core_la_LIBADD = $(src_libnm_systemd_core_la_libadd)
+src_libnm_systemd_core_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(NULL)
+
 
 ###############################################################################
-src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags)
+src_libNetworkManagerBase_la_CPPFLAGS = \
+	$(libsystemd_cppflags) \
+	$(src_cppflags)
+
 src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \
 	src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \
 	src/NetworkManagerUtils.c src/NetworkManagerUtils.h \
@@ -6548,17 +6021,13 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \
 	src/nm-dbus-object.h src/nm-ip4-config.c src/nm-ip4-config.h \
 	src/nm-ip6-config.c src/nm-ip6-config.h \
 	src/dhcp/nm-dhcp-client.c src/dhcp/nm-dhcp-client.h \
-	src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \
-	src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \
-	src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \
-	src/main-utils.c src/main-utils.h $(NULL) $(am__append_21)
+	src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-nettools.c \
+	src/dhcp/nm-dhcp-utils.c src/dhcp/nm-dhcp-utils.h \
+	src/dhcp/nm-dhcp-options.c src/dhcp/nm-dhcp-options.h \
+	src/dhcp/nm-dhcp-systemd.c src/dhcp/nm-dhcp-manager.c \
+	src/dhcp/nm-dhcp-manager.h src/main-utils.c src/main-utils.h \
+	$(NULL) $(am__append_17)
 src_libNetworkManagerBase_la_LIBADD = \
-	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/libnm-core.la \
-	$(libnm_crypto_lib) \
-	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
-	shared/nm-udev-aux/libnm-udev-aux.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS) \
 	$(SYSTEMD_JOURNAL_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -6661,13 +6130,17 @@ src_libNetworkManager_la_SOURCES = \
 	src/settings/nm-secret-agent.h \
 	src/settings/nm-settings-connection.c \
 	src/settings/nm-settings-connection.h \
+	src/settings/nm-settings-storage.c \
+	src/settings/nm-settings-storage.h \
 	src/settings/nm-settings-plugin.c \
 	src/settings/nm-settings-plugin.h \
 	src/settings/nm-settings.c \
 	src/settings/nm-settings.h \
+	src/settings/nm-settings-utils.c \
+	src/settings/nm-settings-utils.h \
 	\
-	src/settings/plugins/keyfile/nms-keyfile-connection.c \
-	src/settings/plugins/keyfile/nms-keyfile-connection.h \
+	src/settings/plugins/keyfile/nms-keyfile-storage.c \
+	src/settings/plugins/keyfile/nms-keyfile-storage.h \
 	src/settings/plugins/keyfile/nms-keyfile-plugin.c \
 	src/settings/plugins/keyfile/nms-keyfile-plugin.h \
 	src/settings/plugins/keyfile/nms-keyfile-reader.c \
@@ -6746,9 +6219,19 @@ src_libNetworkManager_la_SOURCES = \
 
 src_libNetworkManager_la_LIBADD = \
 	src/libNetworkManagerBase.la \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	libnm-core/libnm-core.la \
+	$(libnm_crypto_lib) \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
 	src/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/libnacd.la \
+	shared/libndhcp4.la \
+	shared/libcrbtree.la \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(SYSTEMD_LOGIN_LIBS) \
@@ -6757,7 +6240,8 @@ src_libNetworkManager_la_LIBADD = \
 	$(SELINUX_LIBS) \
 	$(LIBAUDIT_LIBS) \
 	$(LIBPSL_LIBS) \
-	$(LIBCURL_LIBS)
+	$(LIBCURL_LIBS) \
+	$(NULL)
 
 src_tests_cppflags_fake = $(src_cppflags_test) -DSETUP=nm_fake_platform_setup
 src_tests_cppflags_linux = $(src_cppflags_test) -DSETUP=nm_linux_platform_setup
@@ -6768,13 +6252,15 @@ src_libNetworkManagerTest_la_SOURCES = \
 	src/platform/nm-fake-platform.c \
 	src/platform/nm-fake-platform.h \
 	src/platform/tests/test-common.c \
-	src/platform/tests/test-common.h
+	src/platform/tests/test-common.h \
+	$(NULL)
 
 src_libNetworkManagerTest_la_LIBADD = \
 	src/libNetworkManager.la \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(GLIB_LIBS) \
-	$(LIBUDEV_LIBS)
+	$(LIBUDEV_LIBS) \
+	$(NULL)
 
 EXTRA_src_NetworkManager_DEPENDENCIES = \
 	src/NetworkManager.ver
@@ -6784,7 +6270,9 @@ src_NetworkManager_SOURCES = \
 	src/main.c
 
 src_NetworkManager_LDADD = \
-	src/libNetworkManager.la
+	src/libNetworkManager.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 src_NetworkManager_LDFLAGS = \
 	-rdynamic \
@@ -6799,12 +6287,22 @@ src_nm_iface_helper_SOURCES = \
 
 src_nm_iface_helper_LDADD = \
 	src/libNetworkManagerBase.la \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	libnm-core/libnm-core.la \
+	$(libnm_crypto_lib) \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
 	src/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la \
+	shared/libndhcp4.la \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(LIBNDP_LIBS) \
-	$(DL_LIBS)
+	$(DL_LIBS) \
+	$(NULL)
 
 src_nm_iface_helper_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
@@ -6828,8 +6326,18 @@ src_initrd_nm_initrd_generator_SOURCES = \
 src_initrd_nm_initrd_generator_LDADD = \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerBase.la \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	libnm-core/libnm-core.la \
+	$(libnm_crypto_lib) \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libndhcp4.la \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -6850,6 +6358,8 @@ src_initrd_tests_test_ibft_reader_LDADD = \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerTest.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -6866,6 +6376,8 @@ src_initrd_tests_test_cmdline_reader_LDADD = \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerTest.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -6920,64 +6432,40 @@ src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags)
 
 @WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_LIBADD = \
 @WITH_PPP_TRUE@	$(GLIB_LIBS) \
-@WITH_PPP_TRUE@	$(DL_LIBS)
+@WITH_PPP_TRUE@	$(DL_LIBS) \
+@WITH_PPP_TRUE@	$(NULL)
 
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_SOURCES = \
 @WITH_PPP_TRUE@	src/ppp/nm-pppd-plugin.h \
 @WITH_PPP_TRUE@	src/ppp/nm-ppp-manager.c \
 @WITH_PPP_TRUE@	src/ppp/nm-ppp-manager.h \
 @WITH_PPP_TRUE@	src/ppp/nm-ppp-plugin-api.h \
-@WITH_PPP_TRUE@	src/ppp/nm-ppp-status.h
+@WITH_PPP_TRUE@	src/ppp/nm-ppp-status.h \
+@WITH_PPP_TRUE@	$(NULL)
 
 @WITH_PPP_TRUE@EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \
-@WITH_PPP_TRUE@	src/ppp/nm-ppp-plugin.ver
+@WITH_PPP_TRUE@	src/ppp/nm-ppp-plugin.ver \
+@WITH_PPP_TRUE@	$(NULL)
 
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_cppflags_base)
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LDFLAGS = \
 @WITH_PPP_TRUE@	-module -avoid-version \
-@WITH_PPP_TRUE@	-Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver"
+@WITH_PPP_TRUE@	-Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver" \
+@WITH_PPP_TRUE@	$(NULL)
 
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LIBADD = \
-@WITH_PPP_TRUE@	$(GLIB_LIBS)
+@WITH_PPP_TRUE@	$(GLIB_LIBS) \
+@WITH_PPP_TRUE@	$(NULL)
 
-src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = $(src_cppflags_test)
-src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
+src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_cppflags_test)
+src_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
+src_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \
 	src/libNetworkManagerTest.la
 
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnms_ibft_core_la_CPPFLAGS = $(src_cppflags_base)
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES = \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/nms-ibft-reader.c \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/nms-ibft-reader.h
-
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES = \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/nms-ibft-plugin.c \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/nms-ibft-plugin.h \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/nms-ibft-connection.c \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/nms-ibft-connection.h
-
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS = $(src_cppflags_base)
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LDFLAGS = \
-@CONFIG_PLUGIN_IBFT_TRUE@	-module -avoid-version \
-@CONFIG_PLUGIN_IBFT_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-settings.ver"
-
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LIBADD = \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/libnms-ibft-core.la
-
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = $(src_cppflags_base_test)
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \
-@CONFIG_PLUGIN_IBFT_TRUE@	$(GLIB_LIBS) \
-@CONFIG_PLUGIN_IBFT_TRUE@	$(CODE_COVERAGE_LDFLAGS) \
-@CONFIG_PLUGIN_IBFT_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
-
-@CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_LDADD = \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/settings/plugins/ibft/libnms-ibft-core.la \
-@CONFIG_PLUGIN_IBFT_TRUE@	src/libNetworkManagerTest.la
-
 
 ###############################################################################
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \
@@ -6991,23 +6479,23 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/shvar.c \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/shvar.h \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nm-inotify-helper.c \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nm-inotify-helper.h \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(NULL)
 
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_cppflags_base)
 
 ###############################################################################
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(NULL)
 
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_cppflags_base)
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \
@@ -7051,26 +6539,29 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-parser.c \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-parser.h
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-parser.h \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(NULL)
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_cppflags_base)
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(LIBUDEV_LIBS)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(LIBUDEV_LIBS) \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(NULL)
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-connection.c \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-connection.h \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-plugin.h \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(NULL)
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_cppflags_base)
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-module -avoid-version \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-settings.ver"
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-settings.ver" \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(NULL)
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(LIBUDEV_LIBS)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(LIBUDEV_LIBS) \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(NULL)
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_cppflags_base_test)
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
@@ -7111,7 +6602,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem-manager.h \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem.h \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_41)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_33)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_LDFLAGS = \
 @WITH_MODEM_MANAGER_1_TRUE@	-avoid-version \
@@ -7153,17 +6644,17 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bt-error.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-device-bt.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-device-bt.h \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_44)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_36)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS =  \
 @WITH_MODEM_MANAGER_1_TRUE@	$(src_cppflags_device_plugin) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_43)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_35)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \
 @WITH_MODEM_MANAGER_1_TRUE@	-module -avoid-version \
 @WITH_MODEM_MANAGER_1_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD =  \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
-@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) $(am__append_45)
+@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) $(am__append_37)
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES =  \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.h \
@@ -7180,7 +6671,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-p2p-peer.h \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.h $(NULL) \
-@WITH_WIFI_TRUE@	$(am__append_47)
+@WITH_WIFI_TRUE@	$(am__append_39)
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin)
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
 @WITH_WIFI_TRUE@	-module -avoid-version \
@@ -7189,20 +6680,21 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \
 @WITH_WIFI_TRUE@	$(GLIB_LIBS)
 
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_SOURCES = \
-@WITH_WIFI_TRUE@	src/devices/wifi/tests/test-general.c \
+@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_SOURCES = \
+@WITH_WIFI_TRUE@	src/devices/wifi/tests/test-devices-wifi.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-ap.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-ap.h \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.h
 
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_CPPFLAGS = $(src_cppflags_base_test)
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
+@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_cppflags_base_test)
+@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_LDADD = src/libNetworkManagerTest.la
+@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_SOURCES = \
 @WITH_TEAMDCTL_TRUE@	src/devices/team/nm-team-factory.c \
 @WITH_TEAMDCTL_TRUE@	src/devices/team/nm-device-team.c \
-@WITH_TEAMDCTL_TRUE@	src/devices/team/nm-device-team.h
+@WITH_TEAMDCTL_TRUE@	src/devices/team/nm-device-team.h \
+@WITH_TEAMDCTL_TRUE@	$(NULL)
 
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
 @WITH_TEAMDCTL_TRUE@	$(src_cppflags_device_plugin) \
@@ -7212,12 +6704,14 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \
 @WITH_TEAMDCTL_TRUE@	-module -avoid-version \
-@WITH_TEAMDCTL_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
+@WITH_TEAMDCTL_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver" \
+@WITH_TEAMDCTL_TRUE@	$(NULL)
 
 @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_LIBADD = \
 @WITH_TEAMDCTL_TRUE@	$(LIBTEAMDCTL_LIBS) \
 @WITH_TEAMDCTL_TRUE@	$(JANSSON_LIBS) \
-@WITH_TEAMDCTL_TRUE@	$(GLIB_LIBS)
+@WITH_TEAMDCTL_TRUE@	$(GLIB_LIBS) \
+@WITH_TEAMDCTL_TRUE@	$(NULL)
 
 
 ###############################################################################
@@ -7236,7 +6730,8 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @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/nm-device-ovs-bridge.h \
+@WITH_OPENVSWITCH_TRUE@	$(NULL)
 
 @WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \
 @WITH_OPENVSWITCH_TRUE@	$(src_cppflags_device_plugin) \
@@ -7245,11 +6740,13 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 
 @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@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver" \
+@WITH_OPENVSWITCH_TRUE@	$(NULL)
 
 @WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \
 @WITH_OPENVSWITCH_TRUE@	$(JANSSON_LIBS) \
-@WITH_OPENVSWITCH_TRUE@	$(GLIB_LIBS)
+@WITH_OPENVSWITCH_TRUE@	$(GLIB_LIBS) \
+@WITH_OPENVSWITCH_TRUE@	$(NULL)
 
 src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_cppflags_test)
 src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
@@ -7274,14 +6771,6 @@ src_platform_tests_libadd = \
 src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test)
 src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd)
-src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c
-src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd)
-src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c
-src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd)
 src_platform_tests_test_address_fake_SOURCES = src/platform/tests/test-address.c
 src_platform_tests_test_address_fake_CPPFLAGS = $(src_tests_cppflags_fake)
 src_platform_tests_test_address_fake_LDFLAGS = $(src_platform_tests_ldflags)
@@ -7290,14 +6779,6 @@ src_platform_tests_test_address_linux_SOURCES = src/platform/tests/test-address.
 src_platform_tests_test_address_linux_CPPFLAGS = $(src_tests_cppflags_linux)
 src_platform_tests_test_address_linux_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_address_linux_LDADD = $(src_platform_tests_libadd)
-src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c
-src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd)
-src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c
-src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd)
 src_platform_tests_test_cleanup_fake_SOURCES = src/platform/tests/test-cleanup.c
 src_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_tests_cppflags_fake)
 src_platform_tests_test_cleanup_fake_LDFLAGS = $(src_platform_tests_ldflags)
@@ -7306,12 +6787,28 @@ src_platform_tests_test_cleanup_linux_SOURCES = src/platform/tests/test-cleanup.
 src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux)
 src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd)
+src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c
+src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake)
+src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags)
+src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd)
+src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c
+src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux)
+src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags)
+src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd)
 src_platform_tests_test_nmp_object_CPPFLAGS = $(src_cppflags_test)
 src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la
-src_platform_tests_test_general_CPPFLAGS = $(src_cppflags_test)
-src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la
+src_platform_tests_test_platform_general_CPPFLAGS = $(src_cppflags_test)
+src_platform_tests_test_platform_general_LDFLAGS = $(src_platform_tests_ldflags)
+src_platform_tests_test_platform_general_LDADD = src/libNetworkManagerTest.la
+src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c
+src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake)
+src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags)
+src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd)
+src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c
+src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux)
+src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags)
+src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd)
 
 ###############################################################################
 # src/devices/tests
@@ -7387,12 +6884,12 @@ src_tests_test_ip6_config_LDADD = $(src_tests_ldadd)
 src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_dcb_LDADD = $(src_tests_ldadd)
-src_tests_test_general_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_general_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_general_LDADD = $(src_tests_ldadd)
-src_tests_test_general_with_expect_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_general_with_expect_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_general_with_expect_LDADD = $(src_tests_ldadd)
+src_tests_test_core_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_core_LDFLAGS = $(src_tests_ldflags)
+src_tests_test_core_LDADD = $(src_tests_ldadd)
+src_tests_test_core_with_expect_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_core_with_expect_LDFLAGS = $(src_tests_ldflags)
+src_tests_test_core_with_expect_LDADD = $(src_tests_ldadd)
 src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_wired_defname_LDADD = $(src_tests_ldadd)
@@ -7401,16 +6898,28 @@ src_tests_test_utils_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_utils_LDADD = $(src_tests_ldadd)
 src_tests_test_systemd_CPPFLAGS = \
 	$(src_libnm_systemd_core_la_cppflags) \
-	-DNETWORKMANAGER_COMPILATION_TEST
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	$(NULL)
 
 src_tests_test_systemd_LDFLAGS = \
-	$(SANITIZER_EXEC_LDFLAGS)
+	$(SANITIZER_EXEC_LDFLAGS) \
+	$(NULL)
 
 src_tests_test_systemd_LDADD = \
 	src/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/libcsiphash.la \
-	$(src_libnm_systemd_core_la_libadd) \
+	$(GLIB_LIBS) \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(NULL)
+
+
+###############################################################################
+# dispatcher
+###############################################################################
+dispatcher_nmdbus_dispatcher_sources = \
+	dispatcher/nmdbus-dispatcher.h \
+	dispatcher/nmdbus-dispatcher.c \
 	$(NULL)
 
 dispatcher_cppflags = \
@@ -7428,10 +6937,6 @@ dispatcher_cppflags = \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(NULL)
 
-dispatcher_nmdbus_dispatcher_sources = \
-	dispatcher/nmdbus-dispatcher.h \
-	dispatcher/nmdbus-dispatcher.c
-
 dispatcher_libnm_dispatcher_core_la_SOURCES = \
 	dispatcher/nm-dispatcher-utils.c \
 	dispatcher/nm-dispatcher-utils.h \
@@ -7446,17 +6951,15 @@ dispatcher_nm_dispatcher_SOURCES = \
 	dispatcher/nm-dispatcher.c \
 	$(NULL)
 
-nodist_dispatcher_nm_dispatcher_SOURCES = $(dispatcher_nmdbus_dispatcher_sources)
 dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags)
 dispatcher_nm_dispatcher_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
 
 dispatcher_nm_dispatcher_LDADD = \
-	libnm/libnm.la \
 	dispatcher/libnm-dispatcher-core.la \
+	libnm/libnm.la \
 	$(GLIB_LIBS)
 
-dispatcherdir = $(sysconfdir)/NetworkManager/dispatcher.d
 dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
@@ -7466,20 +6969,30 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/dispatcher \
+	-I$(builddir)/dispatcher \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
+dispatcher_tests_test_dispatcher_envp_SOURCES = \
+	dispatcher/tests/test-dispatcher-envp.c \
+	$(NULL)
+
+nodist_dispatcher_tests_test_dispatcher_envp_SOURCES = $(dispatcher_nmdbus_dispatcher_sources)
 dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
-	$(SANITIZER_EXEC_LDFLAGS)
+	$(SANITIZER_EXEC_LDFLAGS) \
+	$(NULL)
 
 dispatcher_tests_test_dispatcher_envp_LDADD = \
 	dispatcher/libnm-dispatcher-core.la \
-	libnm/libnm.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
-	$(GLIB_LIBS)
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
+	libnm/libnm.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 clients_nm_online_CPPFLAGS = \
 	$(dflt_cppflags) \
@@ -7514,7 +7027,6 @@ clients_cppflags = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/clients/common \
-	-I$(builddir)/clients/common \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
@@ -7526,7 +7038,8 @@ clients_common_libnmc_base_la_SOURCES = \
 	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/nm-client-utils.h \
+	$(NULL)
 
 clients_common_libnmc_base_la_CPPFLAGS = \
 	$(clients_cppflags) \
@@ -7535,7 +7048,6 @@ clients_common_libnmc_base_la_CPPFLAGS = \
 
 clients_common_libnmc_base_la_LIBADD = \
 	libnm/libnm.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -7552,31 +7064,64 @@ clients_common_libnmc_la_SOURCES = \
 
 clients_common_libnmc_la_CPPFLAGS = \
 	$(clients_cppflags) \
+	-I$(builddir)/clients/common \
 	-DG_LOG_DOMAIN=\""libnmc"\" \
 	$(NULL)
 
 clients_common_libnmc_la_LIBADD = \
-	clients/common/libnmc-base.la \
 	libnm/libnm.la \
-	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
-	$(GLIB_LIBS)
+	$(GLIB_LIBS) \
+	$(NULL)
 
-clients_common_tests_test_general_CPPFLAGS = \
+clients_common_tests_test_clients_common_CPPFLAGS = \
 	-I$(srcdir)/clients/common/tests \
 	$(clients_cppflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	$(NULL)
 
-clients_common_tests_test_general_LDFLAGS = \
+clients_common_tests_test_clients_common_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-clients_common_tests_test_general_LDADD = \
-	libnm/libnm.la \
-	clients/common/libnmc-base.la \
+clients_common_tests_test_clients_common_LDADD = \
 	clients/common/libnmc.la \
+	clients/common/libnmc-base.la \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
+	libnm/libnm.la \
 	$(GLIB_LIBS)
 
+clients_common_tests_test_libnm_core_aux_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(builddir)/shared \
+	-I$(srcdir)/shared \
+	-I$(builddir)/libnm-core \
+	-I$(srcdir)/libnm-core \
+	-I$(builddir)/libnm \
+	-I$(srcdir)/libnm \
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
+
+clients_common_tests_test_libnm_core_aux_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_EXEC_LDFLAGS) \
+	$(NULL)
+
+clients_common_tests_test_libnm_core_aux_LDADD = \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
+	libnm/libnm.la \
+	$(GLIB_LIBS) \
+	$(NULL)
+
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_SOURCES = clients/cli/common.c \
 @BUILD_NMCLI_TRUE@	clients/cli/common.h clients/cli/utils.c \
 @BUILD_NMCLI_TRUE@	clients/cli/utils.h clients/cli/agent.c \
@@ -7590,15 +7135,20 @@ clients_common_tests_test_general_LDADD = \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli.h \
 @BUILD_NMCLI_TRUE@	clients/cli/polkit-agent.c \
 @BUILD_NMCLI_TRUE@	clients/cli/polkit-agent.h $(NULL) \
-@BUILD_NMCLI_TRUE@	$(am__append_61)
+@BUILD_NMCLI_TRUE@	$(am__append_53)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS =  \
 @BUILD_NMCLI_TRUE@	-I$(srcdir)/clients/cli $(clients_cppflags) \
 @BUILD_NMCLI_TRUE@	-DG_LOG_DOMAIN=\""nmcli"\" $(NULL) \
-@BUILD_NMCLI_TRUE@	$(am__append_60)
-@BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = libnm/libnm.la \
+@BUILD_NMCLI_TRUE@	$(am__append_52)
+@BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = clients/common/libnmc.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_62)
+@BUILD_NMCLI_TRUE@	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+@BUILD_NMCLI_TRUE@	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NMCLI_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
+@BUILD_NMCLI_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
+@BUILD_NMCLI_TRUE@	shared/libcsiphash.la libnm/libnm.la \
+@BUILD_NMCLI_TRUE@	$(GLIB_LIBS) $(READLINE_LIBS) \
+@BUILD_NMCLI_TRUE@	$(am__append_54)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \
 @BUILD_NMCLI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 @BUILD_NMCLI_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
@@ -7751,10 +7301,15 @@ clients_common_tests_test_general_LDADD = \
 @BUILD_NMTUI_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
 @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@	clients/common/libnmc.la \
+@BUILD_NMTUI_TRUE@	clients/common/libnmc-base.la \
+@BUILD_NMTUI_TRUE@	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+@BUILD_NMTUI_TRUE@	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NMTUI_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
+@BUILD_NMTUI_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
+@BUILD_NMTUI_TRUE@	shared/libcsiphash.la \
+@BUILD_NMTUI_TRUE@	libnm/libnm.la \
 @BUILD_NMTUI_TRUE@	$(GLIB_LIBS) \
 @BUILD_NMTUI_TRUE@	$(NEWT_LIBS) \
 @BUILD_NMTUI_TRUE@	$(NULL)
@@ -7791,458 +7346,6 @@ data_edit = sed \
 @WITH_UDEV_DIR_TRUE@	data/85-nm-unmanaged.rules \
 @WITH_UDEV_DIR_TRUE@	data/90-nm-thunderbolt.rules
 
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_includedir = $(includedir)/NetworkManager
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_cppflags = $(dflt_cppflags) \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-util \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-util \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/shared \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/shared \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DG_LOG_DOMAIN=\""libnm-util"\" \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
-@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 \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/NetworkManagerVPN.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-connection.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-8021x.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-adsl.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-bluetooth.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-bond.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-team.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-team-port.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-bridge.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-bridge-port.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-connection.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-dcb.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-infiniband.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-ip4-config.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-vlan.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-ip6-config.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-ppp.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-pppoe.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-serial.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-generic.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-gsm.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-cdma.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-olpc-mesh.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-wimax.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-wired.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-wireless.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-wireless-security.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-vpn.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-version.h
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_h_pub_mkenums = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.h
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_h_priv = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-dbus-glib-types.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-gvaluearray-compat.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-param-spec-specialized.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-private.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-private.h
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_include_HEADERS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_pub_real)
-
-@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_util_libnm_util_include_HEADERS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_pub_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_real =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-connection.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-param-spec-specialized.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-8021x.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-adsl.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-bluetooth.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-bond.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-team.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-team-port.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-bridge.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-bridge-port.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-connection.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-dcb.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-infiniband.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-ip4-config.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-vlan.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-ip6-config.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-ppp.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-pppoe.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-serial.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-generic.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-gsm.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-cdma.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-olpc-mesh.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-wimax.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-wired.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-wireless.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-wireless-security.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-vpn.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-value-transforms.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_72) $(am__append_75)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_mkenums = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.c
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_SOURCES = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_c_real) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_pub_real) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_priv)
-
-@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_util_libnm_util_la_SOURCES = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_pub_mkenums) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_c_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_CPPFLAGS = $(libnm_util_cppflags)
-@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 = shared/nm-glib-aux/libnm-glib-aux.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(DBUS_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_LIBS) $(am__append_73) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_76)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LDFLAGS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	-Wl,--version-script=$(srcdir)/libnm-util/libnm-util.ver \
-@WITH_LEGACY_LIBRARIES_TRUE@	-version-info "9:0:7"
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_SOURCES =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_79) $(am__append_81)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_CPPFLAGS = $(libnm_util_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_LIBADD =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(am__append_80) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_82)
-@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
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/libnm-util
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_LIBS = libnm-util/libnm-util.la
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_FILES = \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_pub_mkenums) \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_pub_real) \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_c_mkenums) \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_c_real)
-
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_SCANNERFLAGS = \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/shared \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/shared \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-util \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-util \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	--warn-all --identifier-prefix=NM --symbol-prefix=nm
-
-
-###############################################################################
-# libnm-util/tests
-###############################################################################
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_cppflags = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(dflt_cppflags) \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/shared \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/shared \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-util \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-util \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(SANITIZER_EXEC_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(NULL)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_ldadd = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_LIBS)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_ldflags = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_CPPFLAGS = $(libnm_util_tests_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_LDADD = $(libnm_util_tests_ldadd)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_LDFLAGS = $(libnm_util_tests_ldflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_CPPFLAGS = $(libnm_util_tests_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_LDADD = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libtest-crypto.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_tests_ldadd)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_LDFLAGS = $(libnm_util_tests_ldflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_CPPFLAGS = $(libnm_util_tests_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_LDADD = $(libnm_util_tests_ldadd)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_LDFLAGS = $(libnm_util_tests_ldflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_DEPENDENCIES = libnm-util/tests/test-libnm-linking
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_CPPFLAGS = $(libnm_util_tests_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_LDADD = $(libnm_util_tests_ldadd)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_LDFLAGS = $(libnm_util_tests_ldflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_CPPFLAGS = $(libnm_util_tests_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_LDADD = $(libnm_util_tests_ldadd)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_LDFLAGS = $(libnm_util_tests_ldflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_CPPFLAGS = $(libnm_util_tests_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_LDADD = $(libnm_util_tests_ldadd)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_LDFLAGS = $(libnm_util_tests_ldflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_CPPFLAGS = $(libnm_util_tests_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_LDADD = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm/libnm.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_tests_ldadd)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_LDFLAGS = $(libnm_util_tests_ldflags)
-
-###############################################################################
-# libnm-glib
-###############################################################################
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_cppflags = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(dflt_cppflags) \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/shared \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/shared \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-util \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-util \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-glib \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-glib \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DG_LOG_DOMAIN=\""libnm-glib"\" \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libdeprecated_nm_glib_la_SOURCES = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib.c
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libdeprecated_nm_glib_la_CPPFLAGS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_cppflags) \
-@WITH_LEGACY_LIBRARIES_TRUE@	-Wno-deprecated-declarations \
-@WITH_LEGACY_LIBRARIES_TRUE@	-Wno-deprecated
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libdeprecated_nm_glib_la_LIBADD = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libdeprecateddir = $(includedir)/libnm-glib
-@WITH_LEGACY_LIBRARIES_TRUE@libdeprecated_HEADERS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib.h
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnmincludedir = $(includedir)/libnm-glib
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnmvpndir = $(includedir)/libnm-glib
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_lib_h_pub_real = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-object.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-client.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-ethernet.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-infiniband.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-adsl.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-wifi.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-bt.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-olpc-mesh.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-bond.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-team.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-bridge.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-vlan.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-generic.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-access-point.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-ip4-config.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-modem.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-connection.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-types.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-active-connection.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-dhcp4-config.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-ip6-config.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-dhcp6-config.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-remote-connection.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-remote-settings.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-secret-agent.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-wimax.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-wimax-nsp.h
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_lib_h_pub_mkenums = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-glib-enum-types.h
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_lib_h_priv = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-object-private.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-private.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-types-private.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-object-cache.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-remote-connection-private.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-dbus-helpers-private.h
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnminclude_HEADERS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_h_pub_real)
-
-@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnminclude_HEADERS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_h_pub_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_vpn_h_real = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-plugin.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-plugin-ui-interface.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-plugin-utils.h
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_vpn_h_mkenums = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-enum-types.h
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnmvpn_HEADERS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_h_real)
-
-@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnmvpn_HEADERS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_h_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_lib_c_real = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-object.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-dbus-helpers.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-client.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-ethernet.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-infiniband.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-adsl.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-wifi.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-bt.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-olpc-mesh.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-bond.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-team.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-bridge.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-vlan.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-generic.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-access-point.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-ip4-config.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-modem.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-connection.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-types.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-object-cache.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-active-connection.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-dhcp4-config.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-ip6-config.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-dhcp6-config.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-remote-connection.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-remote-settings.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-secret-agent.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-wimax.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-wimax-nsp.c
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_lib_c_mkenums = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-glib-enum-types.c
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_SOURCES = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_c_real) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_h_pub_real) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_h_priv)
-
-@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_la_SOURCES = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_c_mkenums) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_h_pub_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_CPPFLAGS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_cppflags) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(LIBUDEV_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(NULL)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_LDFLAGS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	-Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib.ver \
-@WITH_LEGACY_LIBRARIES_TRUE@	-version-info "13:0:9"
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_LIBADD = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libdeprecated-nm-glib.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-udev-aux/libnm-udev-aux.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(LIBUDEV_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(NULL)
-
-@WITH_LEGACY_LIBRARIES_TRUE@nm_glib_enum_types_sources = $(libnm_glib_lib_h_pub_real)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_test_CFLAGS = $(libnm_glib_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_test_LDADD = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_LIBS)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_vpn_c_real = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-plugin.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-plugin-ui-interface.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-plugin-utils.c
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_vpn_c_mkenums = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-enum-types.c
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_vpn_la_SOURCES = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_c_real)
-
-@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_vpn_la_SOURCES = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_c_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_vpn_la_CPPFLAGS = $(libnm_glib_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_vpn_la_LIBADD = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_LIBS)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_vpn_la_LDFLAGS = \
-@WITH_LEGACY_LIBRARIES_TRUE@	-Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib-vpn.ver \
-@WITH_LEGACY_LIBRARIES_TRUE@	-version-info "3:0:2"
-
-@WITH_LEGACY_LIBRARIES_TRUE@nm_vpn_enum_types_sources = $(libnm_glib_vpn_h_real)
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_CFLAGS = $(libnm_glib_cppflags)
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_LIBS = \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la
-
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_FILES = \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_h_pub_mkenums) \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_h_pub_real) \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_c_mkenums) \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_c_real)
-
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_NMClient_1_0_gir_SCANNERFLAGS = \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-util \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-util \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-glib \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-glib \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	--warn-all --identifier-prefix=NM --symbol-prefix=nm \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	--include-uninstalled=$(builddir)/libnm-util/NetworkManager-1.0.gir
-
-
-###############################################################################
-# libnm-glib/tests
-###############################################################################
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_cppflags = \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(dflt_cppflags) \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/shared \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/shared \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-util \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(builddir)/libnm-util \
-@WITH_LEGACY_LIBRARIES_TRUE@	-I$(srcdir)/libnm-glib \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
-@WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(NULL)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_test_nm_client_CPPFLAGS = $(libnm_glib_tests_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_test_nm_client_SOURCES = \
-@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-test-utils-impl.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-test-libnm-utils.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-nm-client.c
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_test_nm_client_LDADD = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_LIBS)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_test_remote_settings_client_CPPFLAGS = $(libnm_glib_tests_cppflags)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_test_remote_settings_client_SOURCES = \
-@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-test-utils-impl.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-test-libnm-utils.h \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-remote-settings-client.c
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_test_remote_settings_client_LDADD = \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_LIBS)
-
 xsltproc_flags = \
 	--path man \
 	--xinclude \
@@ -8262,13 +7365,6 @@ man_nm_settings_xml = \
 @ENABLE_VAPIGEN_TRUE@vapi_libnm_vapi_METADATADIRS = $(srcdir)/vapi
 @ENABLE_VAPIGEN_TRUE@vapi_libnm_vapi_FILES = $(builddir)/libnm/NM-1.0.gir
 @ENABLE_VAPIGEN_TRUE@vapi_libnm_vapi_DEPS = gio-2.0
-@ENABLE_VAPIGEN_TRUE@vapi_libnm_util_vapi_METADATADIRS = $(srcdir)/vapi
-@ENABLE_VAPIGEN_TRUE@vapi_libnm_util_vapi_FILES = $(builddir)/libnm-util/NetworkManager-1.0.gir
-@ENABLE_VAPIGEN_TRUE@vapi_libnm_glib_vapi_METADATADIRS = $(srcdir)/vapi
-@ENABLE_VAPIGEN_TRUE@vapi_libnm_glib_vapi_FILES = $(builddir)/libnm-glib/NMClient-1.0.gir
-@ENABLE_VAPIGEN_TRUE@vapi_libnm_glib_vapi_VAPIDIRS = $(builddir)/vapi
-@ENABLE_VAPIGEN_TRUE@vapi_libnm_glib_vapi_GIRDIRS = $(builddir)/libnm-util
-@ENABLE_VAPIGEN_TRUE@vapi_libnm_glib_vapi_DEPS = gio-2.0 dbus-glib-1 libnm-util
 
 ###############################################################################
 girdir = $(datadir)/gir-1.0
@@ -8365,7 +7461,7 @@ all: $(BUILT_SOURCES) config.h
 .SUFFIXES: .c .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.vapigen $(srcdir)/Makefile.examples $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.vapigen $(srcdir)/config-extra.h.mk $(srcdir)/Makefile.examples $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -8387,7 +7483,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(srcdir)/Makefile.vapigen $(srcdir)/Makefile.examples $(am__empty):
+$(srcdir)/Makefile.vapigen $(srcdir)/config-extra.h.mk $(srcdir)/Makefile.examples $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -8416,12 +7512,6 @@ shared/nm-version-macros.h: $(top_builddir)/config.status $(top_srcdir)/shared/n
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 libnm/libnm.pc: $(top_builddir)/config.status $(top_srcdir)/libnm/libnm.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-libnm-util/libnm-util.pc: $(top_builddir)/config.status $(top_srcdir)/libnm-util/libnm-util.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-libnm-glib/libnm-glib.pc: $(top_builddir)/config.status $(top_srcdir)/libnm-glib/libnm-glib.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-libnm-glib/libnm-glib-vpn.pc: $(top_builddir)/config.status $(top_srcdir)/libnm-glib/libnm-glib-vpn.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 data/org.freedesktop.NetworkManager.policy.in: $(top_builddir)/config.status $(top_srcdir)/data/org.freedesktop.NetworkManager.policy.in.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 NetworkManager.pc: $(top_builddir)/config.status $(srcdir)/NetworkManager.pc.in
@@ -9067,6 +8157,9 @@ libnm-core/libnm_core_la-nm-setting-olpc-mesh.lo:  \
 libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-setting-ovs-interface.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -9138,19 +8231,19 @@ libnm-core/libnm_core_la-nm-setting-wpan.lo:  \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
 shared/libnm_core_libnm_core_la-nm-meta-setting.lo:  \
 	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_la-nm-crypto.lo: libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-connection.lo: libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-crypto.lo: libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-dbus-utils.lo: libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-errors.lo: libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
-libnm-core/libnm_core_la-nm-keyfile.lo: libnm-core/$(am__dirstamp) \
-	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-keyfile-utils.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-keyfile.lo: libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-property-compare.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -9159,6 +8252,8 @@ libnm-core/libnm_core_la-nm-setting.lo: libnm-core/$(am__dirstamp) \
 libnm-core/libnm_core_la-nm-simple-connection.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-team-utils.lo: libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-utils.lo: libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-vpn-editor-plugin.lo:  \
@@ -9187,362 +8282,119 @@ libnm-core/libnm_crypto_nss_la-nm-crypto-nss.lo:  \
 
 libnm-core/libnm-crypto-nss.la: $(libnm_core_libnm_crypto_nss_la_OBJECTS) $(libnm_core_libnm_crypto_nss_la_DEPENDENCIES) $(EXTRA_libnm_core_libnm_crypto_nss_la_DEPENDENCIES) libnm-core/$(am__dirstamp)
 	$(AM_V_CCLD)$(libnm_core_libnm_crypto_nss_la_LINK) $(am_libnm_core_libnm_crypto_nss_la_rpath) $(libnm_core_libnm_crypto_nss_la_OBJECTS) $(libnm_core_libnm_crypto_nss_la_LIBADD) $(LIBS)
-libnm-glib/$(am__dirstamp):
-	@$(MKDIR_P) libnm-glib
-	@: > libnm-glib/$(am__dirstamp)
-libnm-glib/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) libnm-glib/$(DEPDIR)
-	@: > libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libdeprecated_nm_glib_la-libnm_glib.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-
-libnm-glib/libdeprecated-nm-glib.la: $(libnm_glib_libdeprecated_nm_glib_la_OBJECTS) $(libnm_glib_libdeprecated_nm_glib_la_DEPENDENCIES) $(EXTRA_libnm_glib_libdeprecated_nm_glib_la_DEPENDENCIES) libnm-glib/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK) $(am_libnm_glib_libdeprecated_nm_glib_la_rpath) $(libnm_glib_libdeprecated_nm_glib_la_OBJECTS) $(libnm_glib_libdeprecated_nm_glib_la_LIBADD) $(LIBS)
-libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-utils.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_vpn_la-nm-vpn-enum-types.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-
-libnm-glib/libnm-glib-vpn.la: $(libnm_glib_libnm_glib_vpn_la_OBJECTS) $(libnm_glib_libnm_glib_vpn_la_DEPENDENCIES) $(EXTRA_libnm_glib_libnm_glib_vpn_la_DEPENDENCIES) libnm-glib/$(am__dirstamp)
-	$(AM_V_CCLD)$(libnm_glib_libnm_glib_vpn_la_LINK) $(am_libnm_glib_libnm_glib_vpn_la_rpath) $(libnm_glib_libnm_glib_vpn_la_OBJECTS) $(libnm_glib_libnm_glib_vpn_la_LIBADD) $(LIBS)
-libnm-glib/libnm_glib_la-nm-object.lo: libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-dbus-helpers.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-client.lo: libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device.lo: libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-ethernet.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-infiniband.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-adsl.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-wifi.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-bt.lo: libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-olpc-mesh.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-bond.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-team.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-bridge.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-vlan.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-generic.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-access-point.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-ip4-config.lo: libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-modem.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-vpn-connection.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-types.lo: libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-object-cache.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-active-connection.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-dhcp4-config.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-ip6-config.lo: libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-dhcp6-config.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-remote-connection.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-remote-settings.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-secret-agent.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-device-wimax.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-wimax-nsp.lo: libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/libnm_glib_la-nm-glib-enum-types.lo:  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-
-libnm-glib/libnm-glib.la: $(libnm_glib_libnm_glib_la_OBJECTS) $(libnm_glib_libnm_glib_la_DEPENDENCIES) $(EXTRA_libnm_glib_libnm_glib_la_DEPENDENCIES) libnm-glib/$(am__dirstamp)
-	$(AM_V_CCLD)$(libnm_glib_libnm_glib_la_LINK) $(am_libnm_glib_libnm_glib_la_rpath) $(libnm_glib_libnm_glib_la_OBJECTS) $(libnm_glib_libnm_glib_la_LIBADD) $(LIBS)
-libnm-util/$(am__dirstamp):
-	@$(MKDIR_P) libnm-util
-	@: > libnm-util/$(am__dirstamp)
-libnm-util/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) libnm-util/$(DEPDIR)
-	@: > libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-crypto.lo: libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-connection.lo: libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-param-spec-specialized.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting.lo: libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-8021x.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-adsl.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-bluetooth.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-bond.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-team.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-team-port.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-bridge.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-bridge-port.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-connection.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-dcb.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-infiniband.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-ip4-config.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-vlan.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-ip6-config.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-ppp.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-pppoe.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-serial.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-generic.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-gsm.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-cdma.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-olpc-mesh.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-wimax.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-wired.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-wireless.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-wireless-security.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-setting-vpn.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-utils.lo: libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-value-transforms.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-crypto_gnutls.lo: libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-crypto_nss.lo: libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libnm_util_la-nm-utils-enum-types.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-
-libnm-util/libnm-util.la: $(libnm_util_libnm_util_la_OBJECTS) $(libnm_util_libnm_util_la_DEPENDENCIES) $(EXTRA_libnm_util_libnm_util_la_DEPENDENCIES) libnm-util/$(am__dirstamp)
-	$(AM_V_CCLD)$(libnm_util_libnm_util_la_LINK) $(am_libnm_util_libnm_util_la_rpath) $(libnm_util_libnm_util_la_OBJECTS) $(libnm_util_libnm_util_la_LIBADD) $(LIBS)
-libnm-util/libtest_crypto_la-crypto.lo: libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libtest_crypto_la-crypto_gnutls.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-libnm-util/libtest_crypto_la-crypto_nss.lo:  \
-	libnm-util/$(am__dirstamp) \
-	libnm-util/$(DEPDIR)/$(am__dirstamp)
-
-libnm-util/libtest-crypto.la: $(libnm_util_libtest_crypto_la_OBJECTS) $(libnm_util_libtest_crypto_la_DEPENDENCIES) $(EXTRA_libnm_util_libtest_crypto_la_DEPENDENCIES) libnm-util/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK) $(am_libnm_util_libtest_crypto_la_rpath) $(libnm_util_libtest_crypto_la_OBJECTS) $(libnm_util_libtest_crypto_la_LIBADD) $(LIBS)
 libnm/$(am__dirstamp):
 	@$(MKDIR_P) libnm
 	@: > libnm/$(am__dirstamp)
 libnm/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) libnm/$(DEPDIR)
 	@: > libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_utils_la-nm-libnm-utils.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-access-point.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/fake-typelib/$(am__dirstamp):
-	@$(MKDIR_P) libnm/fake-typelib
-	@: > libnm/fake-typelib/$(am__dirstamp)
-libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) libnm/fake-typelib/$(DEPDIR)
-	@: > libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp)
-libnm/fake-typelib/libnm_utils_la-typelibs.lo:  \
-	libnm/fake-typelib/$(am__dirstamp) \
-	libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp)
-
-libnm/libnm-utils.la: $(libnm_libnm_utils_la_OBJECTS) $(libnm_libnm_utils_la_DEPENDENCIES) $(EXTRA_libnm_libnm_utils_la_DEPENDENCIES) libnm/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK)  $(libnm_libnm_utils_la_OBJECTS) $(libnm_libnm_utils_la_LIBADD) $(LIBS)
-libnm/libnm_la-nm-access-point.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-active-connection.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-active-connection.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-checkpoint.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-checkpoint.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-client.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-client.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-dbus-helpers.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-dbus-helpers.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-6lowpan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-6lowpan.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-adsl.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-adsl.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-bond.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-bond.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-bridge.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-bridge.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-bt.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-bt.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-dummy.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-dummy.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-ethernet.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-ethernet.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-generic.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-generic.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-infiniband.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-infiniband.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-ip-tunnel.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-ip-tunnel.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-macsec.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-macsec.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-macvlan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-macvlan.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-modem.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-modem.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-olpc-mesh.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-olpc-mesh.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-ovs-bridge.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-ovs-bridge.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-ovs-interface.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-ovs-interface.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-ovs-port.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-ovs-port.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-ppp.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-ppp.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-team.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-team.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-tun.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-tun.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-vlan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-vlan.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-vxlan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-vxlan.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-wifi-p2p.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-wifi-p2p.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-wifi.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-wifi.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-wimax.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-wimax.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-wireguard.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-wireguard.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device-wpan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-wpan.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-device.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-dhcp-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-dhcp-config.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-dhcp4-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-dhcp4-config.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-dhcp6-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-dhcp6-config.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-dns-manager.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-dns-manager.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-ip-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-ip-config.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-ip4-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-ip4-config.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-ip6-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-ip6-config.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-libnm-utils.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-manager.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-manager.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-object.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-object.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-remote-connection.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-remote-connection.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-remote-settings.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-remote-settings.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-secret-agent-old.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-secret-agent-old.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-vpn-connection.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-vpn-connection.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-vpn-editor.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-vpn-editor.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-vpn-plugin-old.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-vpn-plugin-old.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-vpn-service-plugin.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-vpn-service-plugin.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-wifi-p2p-peer.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-wifi-p2p-peer.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-wimax-nsp.lo: libnm/$(am__dirstamp) \
+libnm/liblibnm_la-nm-wimax-nsp.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
+
+libnm/liblibnm.la: $(libnm_liblibnm_la_OBJECTS) $(libnm_liblibnm_la_DEPENDENCIES) $(EXTRA_libnm_liblibnm_la_DEPENDENCIES) libnm/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK)  $(libnm_liblibnm_la_OBJECTS) $(libnm_liblibnm_la_LIBADD) $(LIBS)
 libnm/libnm_la-nm-enum-types.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 
@@ -9617,12 +8469,57 @@ shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo:  \
 
 shared/libnacd.la: $(shared_libnacd_la_OBJECTS) $(shared_libnacd_la_DEPENDENCIES) $(EXTRA_shared_libnacd_la_DEPENDENCIES) shared/$(am__dirstamp)
 	$(AM_V_CCLD)$(shared_libnacd_la_LINK)  $(shared_libnacd_la_OBJECTS) $(shared_libnacd_la_LIBADD) $(LIBS)
+shared/n-dhcp4/src/$(am__dirstamp):
+	@$(MKDIR_P) shared/n-dhcp4/src
+	@: > shared/n-dhcp4/src/$(am__dirstamp)
+shared/n-dhcp4/src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/n-dhcp4/src/$(DEPDIR)
+	@: > shared/n-dhcp4/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-connection.lo:  \
+	shared/n-dhcp4/src/$(am__dirstamp) \
+	shared/n-dhcp4/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-lease.lo:  \
+	shared/n-dhcp4/src/$(am__dirstamp) \
+	shared/n-dhcp4/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-probe.lo:  \
+	shared/n-dhcp4/src/$(am__dirstamp) \
+	shared/n-dhcp4/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-client.lo:  \
+	shared/n-dhcp4/src/$(am__dirstamp) \
+	shared/n-dhcp4/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-incoming.lo:  \
+	shared/n-dhcp4/src/$(am__dirstamp) \
+	shared/n-dhcp4/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-outgoing.lo:  \
+	shared/n-dhcp4/src/$(am__dirstamp) \
+	shared/n-dhcp4/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-socket.lo:  \
+	shared/n-dhcp4/src/$(am__dirstamp) \
+	shared/n-dhcp4/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-dhcp4/src/util/$(am__dirstamp):
+	@$(MKDIR_P) shared/n-dhcp4/src/util
+	@: > shared/n-dhcp4/src/util/$(am__dirstamp)
+shared/n-dhcp4/src/util/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/n-dhcp4/src/util/$(DEPDIR)
+	@: > shared/n-dhcp4/src/util/$(DEPDIR)/$(am__dirstamp)
+shared/n-dhcp4/src/util/libndhcp4_la-packet.lo:  \
+	shared/n-dhcp4/src/util/$(am__dirstamp) \
+	shared/n-dhcp4/src/util/$(DEPDIR)/$(am__dirstamp)
+shared/n-dhcp4/src/util/libndhcp4_la-socket.lo:  \
+	shared/n-dhcp4/src/util/$(am__dirstamp) \
+	shared/n-dhcp4/src/util/$(DEPDIR)/$(am__dirstamp)
+
+shared/libndhcp4.la: $(shared_libndhcp4_la_OBJECTS) $(shared_libndhcp4_la_DEPENDENCIES) $(EXTRA_shared_libndhcp4_la_DEPENDENCIES) shared/$(am__dirstamp)
+	$(AM_V_CCLD)$(shared_libndhcp4_la_LINK)  $(shared_libndhcp4_la_OBJECTS) $(shared_libndhcp4_la_LIBADD) $(LIBS)
 shared/nm-glib-aux/$(am__dirstamp):
 	@$(MKDIR_P) shared/nm-glib-aux
 	@: > shared/nm-glib-aux/$(am__dirstamp)
 shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) shared/nm-glib-aux/$(DEPDIR)
 	@: > shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp)
+shared/nm-glib-aux/libnm_glib_aux_la-nm-dbus-aux.lo:  \
+	shared/nm-glib-aux/$(am__dirstamp) \
+	shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp)
 shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo:  \
 	shared/nm-glib-aux/$(am__dirstamp) \
 	shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp)
@@ -9638,6 +8535,12 @@ shared/nm-glib-aux/libnm_glib_aux_la-nm-hash-utils.lo:  \
 shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo:  \
 	shared/nm-glib-aux/$(am__dirstamp) \
 	shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp)
+shared/nm-glib-aux/libnm_glib_aux_la-nm-json-aux.lo:  \
+	shared/nm-glib-aux/$(am__dirstamp) \
+	shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp)
+shared/nm-glib-aux/libnm_glib_aux_la-nm-keyfile-aux.lo:  \
+	shared/nm-glib-aux/$(am__dirstamp) \
+	shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp)
 shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo:  \
 	shared/nm-glib-aux/$(am__dirstamp) \
 	shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp)
@@ -9656,6 +8559,12 @@ shared/nm-glib-aux/libnm-glib-aux.la: $(shared_nm_glib_aux_libnm_glib_aux_la_OBJ
 shared/nm-libnm-core-aux/$(am__dirstamp):
 	@$(MKDIR_P) shared/nm-libnm-core-aux
 	@: > shared/nm-libnm-core-aux/$(am__dirstamp)
+shared/nm-libnm-core-aux/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-libnm-core-aux/$(DEPDIR)
+	@: > shared/nm-libnm-core-aux/$(DEPDIR)/$(am__dirstamp)
+shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo:  \
+	shared/nm-libnm-core-aux/$(am__dirstamp) \
+	shared/nm-libnm-core-aux/$(DEPDIR)/$(am__dirstamp)
 
 shared/nm-libnm-core-aux/libnm-libnm-core-aux.la: $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS) $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_DEPENDENCIES) $(EXTRA_shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_DEPENDENCIES) shared/nm-libnm-core-aux/$(am__dirstamp)
 	$(AM_V_CCLD)$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LINK)  $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS) $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LIBADD) $(LIBS)
@@ -9743,6 +8652,9 @@ shared/systemd/src/basic/libnm_systemd_shared_la-fd-util.lo:  \
 shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo:  \
 	shared/systemd/src/basic/$(am__dirstamp) \
 	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-format-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
 shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo:  \
 	shared/systemd/src/basic/$(am__dirstamp) \
 	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
@@ -9800,6 +8712,9 @@ shared/systemd/src/basic/libnm_systemd_shared_la-string-util.lo:  \
 shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo:  \
 	shared/systemd/src/basic/$(am__dirstamp) \
 	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-strxcpyx.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
 shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo:  \
 	shared/systemd/src/basic/$(am__dirstamp) \
 	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
@@ -9812,6 +8727,15 @@ shared/systemd/src/basic/libnm_systemd_shared_la-utf8.lo:  \
 shared/systemd/src/basic/libnm_systemd_shared_la-util.lo:  \
 	shared/systemd/src/basic/$(am__dirstamp) \
 	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/shared/$(am__dirstamp):
+	@$(MKDIR_P) shared/systemd/src/shared
+	@: > shared/systemd/src/shared/$(am__dirstamp)
+shared/systemd/src/shared/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/systemd/src/shared/$(DEPDIR)
+	@: > shared/systemd/src/shared/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo:  \
+	shared/systemd/src/shared/$(am__dirstamp) \
+	shared/systemd/src/shared/$(DEPDIR)/$(am__dirstamp)
 
 shared/systemd/libnm-systemd-shared.la: $(shared_systemd_libnm_systemd_shared_la_OBJECTS) $(shared_systemd_libnm_systemd_shared_la_DEPENDENCIES) $(EXTRA_shared_systemd_libnm_systemd_shared_la_DEPENDENCIES) shared/systemd/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK)  $(shared_systemd_libnm_systemd_shared_la_OBJECTS) $(shared_systemd_libnm_systemd_shared_la_LIBADD) $(LIBS)
@@ -10137,19 +9061,25 @@ src/settings/libNetworkManager_la-nm-secret-agent.lo:  \
 src/settings/libNetworkManager_la-nm-settings-connection.lo:  \
 	src/settings/$(am__dirstamp) \
 	src/settings/$(DEPDIR)/$(am__dirstamp)
+src/settings/libNetworkManager_la-nm-settings-storage.lo:  \
+	src/settings/$(am__dirstamp) \
+	src/settings/$(DEPDIR)/$(am__dirstamp)
 src/settings/libNetworkManager_la-nm-settings-plugin.lo:  \
 	src/settings/$(am__dirstamp) \
 	src/settings/$(DEPDIR)/$(am__dirstamp)
 src/settings/libNetworkManager_la-nm-settings.lo:  \
 	src/settings/$(am__dirstamp) \
 	src/settings/$(DEPDIR)/$(am__dirstamp)
+src/settings/libNetworkManager_la-nm-settings-utils.lo:  \
+	src/settings/$(am__dirstamp) \
+	src/settings/$(DEPDIR)/$(am__dirstamp)
 src/settings/plugins/keyfile/$(am__dirstamp):
 	@$(MKDIR_P) src/settings/plugins/keyfile
 	@: > src/settings/plugins/keyfile/$(am__dirstamp)
 src/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/settings/plugins/keyfile/$(DEPDIR)
 	@: > src/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-connection.lo:  \
+src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo:  \
 	src/settings/plugins/keyfile/$(am__dirstamp) \
 	src/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
 src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo:  \
@@ -10317,8 +9247,12 @@ src/libNetworkManagerBase_la-nm-ip6-config.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo:  \
 	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo:  \
+	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
 src/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo:  \
 	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo:  \
+	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
 src/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo:  \
 	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
 src/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo:  \
@@ -10360,6 +9294,9 @@ src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo:  \
 src/systemd/libnm_systemd_core_la-nm-sd.lo:  \
 	src/systemd/$(am__dirstamp) \
 	src/systemd/$(DEPDIR)/$(am__dirstamp)
+src/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo:  \
+	src/systemd/$(am__dirstamp) \
+	src/systemd/$(DEPDIR)/$(am__dirstamp)
 src/systemd/sd-adapt-core/$(am__dirstamp):
 	@$(MKDIR_P) src/systemd/sd-adapt-core
 	@: > src/systemd/sd-adapt-core/$(am__dirstamp)
@@ -10450,15 +9387,6 @@ src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo:  \
 src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo:  \
 	src/systemd/src/libsystemd/sd-id128/$(am__dirstamp) \
 	src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/shared/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/src/shared
-	@: > src/systemd/src/shared/$(am__dirstamp)
-src/systemd/src/shared/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/src/shared/$(DEPDIR)
-	@: > src/systemd/src/shared/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo:  \
-	src/systemd/src/shared/$(am__dirstamp) \
-	src/systemd/src/shared/$(DEPDIR)/$(am__dirstamp)
 
 src/libnm-systemd-core.la: $(src_libnm_systemd_core_la_OBJECTS) $(src_libnm_systemd_core_la_DEPENDENCIES) $(EXTRA_src_libnm_systemd_core_la_DEPENDENCIES) src/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK)  $(src_libnm_systemd_core_la_OBJECTS) $(src_libnm_systemd_core_la_LIBADD) $(LIBS)
@@ -10472,34 +9400,13 @@ src/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo: src/ppp/$(am__dirstamp) \
 
 src/ppp/nm-pppd-plugin.la: $(src_ppp_nm_pppd_plugin_la_OBJECTS) $(src_ppp_nm_pppd_plugin_la_DEPENDENCIES) $(EXTRA_src_ppp_nm_pppd_plugin_la_DEPENDENCIES) src/ppp/$(am__dirstamp)
 	$(AM_V_CCLD)$(src_ppp_nm_pppd_plugin_la_LINK) $(am_src_ppp_nm_pppd_plugin_la_rpath) $(src_ppp_nm_pppd_plugin_la_OBJECTS) $(src_ppp_nm_pppd_plugin_la_LIBADD) $(LIBS)
-src/settings/plugins/ibft/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ibft
-	@: > src/settings/plugins/ibft/$(am__dirstamp)
-src/settings/plugins/ibft/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ibft/$(DEPDIR)
-	@: > src/settings/plugins/ibft/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-plugin.lo:  \
-	src/settings/plugins/ibft/$(am__dirstamp) \
-	src/settings/plugins/ibft/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-connection.lo:  \
-	src/settings/plugins/ibft/$(am__dirstamp) \
-	src/settings/plugins/ibft/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ibft/libnm-settings-plugin-ibft.la: $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS) $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_DEPENDENCIES) src/settings/plugins/ibft/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LINK) $(am_src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_rpath) $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS) $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LIBADD) $(LIBS)
-src/settings/plugins/ibft/libnms_ibft_core_la-nms-ibft-reader.lo:  \
-	src/settings/plugins/ibft/$(am__dirstamp) \
-	src/settings/plugins/ibft/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ibft/libnms-ibft-core.la: $(src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS) $(src_settings_plugins_ibft_libnms_ibft_core_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ibft_libnms_ibft_core_la_DEPENDENCIES) src/settings/plugins/ibft/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK) $(am_src_settings_plugins_ibft_libnms_ibft_core_la_rpath) $(src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS) $(src_settings_plugins_ibft_libnms_ibft_core_la_LIBADD) $(LIBS)
 src/settings/plugins/ifcfg-rh/$(am__dirstamp):
 	@$(MKDIR_P) src/settings/plugins/ifcfg-rh
 	@: > src/settings/plugins/ifcfg-rh/$(am__dirstamp)
 src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/settings/plugins/ifcfg-rh/$(DEPDIR)
 	@: > src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.lo:  \
+src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo:  \
 	src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
 src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo:  \
@@ -10517,9 +9424,6 @@ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la: $(src_settings_plugins_ifcf
 src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo:  \
 	src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nm-inotify-helper.lo:  \
-	src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
-	src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
 src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo:  \
 	src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
@@ -10538,9 +9442,6 @@ src/settings/plugins/ifupdown/$(am__dirstamp):
 src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/settings/plugins/ifupdown/$(DEPDIR)
 	@: > src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo:  \
-	src/settings/plugins/ifupdown/$(am__dirstamp) \
-	src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
 src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo:  \
 	src/settings/plugins/ifupdown/$(am__dirstamp) \
 	src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
@@ -10593,13 +9494,20 @@ 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/test_clients_common-test-clients-common.$(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)$(clients_common_tests_test_general_LINK) $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_LDADD) $(LIBS)
+clients/common/tests/test-clients-common$(EXEEXT): $(clients_common_tests_test_clients_common_OBJECTS) $(clients_common_tests_test_clients_common_DEPENDENCIES) $(EXTRA_clients_common_tests_test_clients_common_DEPENDENCIES) clients/common/tests/$(am__dirstamp)
+	@rm -f clients/common/tests/test-clients-common$(EXEEXT)
+	$(AM_V_CCLD)$(clients_common_tests_test_clients_common_LINK) $(clients_common_tests_test_clients_common_OBJECTS) $(clients_common_tests_test_clients_common_LDADD) $(LIBS)
+clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.$(OBJEXT):  \
+	clients/common/tests/$(am__dirstamp) \
+	clients/common/tests/$(DEPDIR)/$(am__dirstamp)
+
+clients/common/tests/test-libnm-core-aux$(EXEEXT): $(clients_common_tests_test_libnm_core_aux_OBJECTS) $(clients_common_tests_test_libnm_core_aux_DEPENDENCIES) $(EXTRA_clients_common_tests_test_libnm_core_aux_DEPENDENCIES) clients/common/tests/$(am__dirstamp)
+	@rm -f clients/common/tests/test-libnm-core-aux$(EXEEXT)
+	$(AM_V_CCLD)$(clients_common_tests_test_libnm_core_aux_LINK) $(clients_common_tests_test_libnm_core_aux_OBJECTS) $(clients_common_tests_test_libnm_core_aux_LDADD) $(LIBS)
 clients/$(am__dirstamp):
 	@$(MKDIR_P) clients
 	@: > clients/$(am__dirstamp)
@@ -10736,9 +9644,6 @@ clients/tui/nmtui$(EXEEXT): $(clients_tui_nmtui_OBJECTS) $(clients_tui_nmtui_DEP
 dispatcher/nm_dispatcher-nm-dispatcher.$(OBJEXT):  \
 	dispatcher/$(am__dirstamp) \
 	dispatcher/$(DEPDIR)/$(am__dirstamp)
-dispatcher/nm_dispatcher-nmdbus-dispatcher.$(OBJEXT):  \
-	dispatcher/$(am__dirstamp) \
-	dispatcher/$(DEPDIR)/$(am__dirstamp)
 
 dispatcher/nm-dispatcher$(EXEEXT): $(dispatcher_nm_dispatcher_OBJECTS) $(dispatcher_nm_dispatcher_DEPENDENCIES) $(EXTRA_dispatcher_nm_dispatcher_DEPENDENCIES) dispatcher/$(am__dirstamp)
 	@rm -f dispatcher/nm-dispatcher$(EXEEXT)
@@ -10752,6 +9657,9 @@ dispatcher/tests/$(DEPDIR)/$(am__dirstamp):
 dispatcher/tests/test_dispatcher_envp-test-dispatcher-envp.$(OBJEXT):  \
 	dispatcher/tests/$(am__dirstamp) \
 	dispatcher/tests/$(DEPDIR)/$(am__dirstamp)
+dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.$(OBJEXT):  \
+	dispatcher/$(am__dirstamp) \
+	dispatcher/$(DEPDIR)/$(am__dirstamp)
 
 dispatcher/tests/test-dispatcher-envp$(EXEEXT): $(dispatcher_tests_test_dispatcher_envp_OBJECTS) $(dispatcher_tests_test_dispatcher_envp_DEPENDENCIES) $(EXTRA_dispatcher_tests_test_dispatcher_envp_DEPENDENCIES) dispatcher/tests/$(am__dirstamp)
 	@rm -f dispatcher/tests/test-dispatcher-envp$(EXEEXT)
@@ -10865,31 +9773,31 @@ libnm-core/tests/test_compare-test-compare.$(OBJEXT):  \
 libnm-core/tests/test-compare$(EXEEXT): $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_compare_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-compare$(EXEEXT)
 	$(AM_V_CCLD)$(libnm_core_tests_test_compare_LINK) $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.$(OBJEXT):  \
+libnm-core/tests/test_crypto-test-crypto.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-core/tests/test-crypto$(EXEEXT): $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_crypto_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-crypto$(EXEEXT)
 	$(AM_V_CCLD)$(libnm_core_tests_test_crypto_LINK) $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_general-test-general.$(OBJEXT):  \
+libnm-core/tests/test_general-test-general.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
-libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.$(OBJEXT):  \
+libnm-core/tests/test_general-nm-core-tests-enum-types.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-core/tests/test-general$(EXEEXT): $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_general_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-general$(EXEEXT)
 	$(AM_V_CCLD)$(libnm_core_tests_test_general_LINK) $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.$(OBJEXT):  \
+libnm-core/tests/test_keyfile-test-keyfile.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-core/tests/test-keyfile$(EXEEXT): $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_keyfile_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-keyfile$(EXEEXT)
 	$(AM_V_CCLD)$(libnm_core_tests_test_keyfile_LINK) $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT):  \
+libnm-core/tests/test_secrets-test-secrets.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
@@ -10903,115 +9811,29 @@ libnm-core/tests/test_setting-test-setting.$(OBJEXT):  \
 libnm-core/tests/test-setting$(EXEEXT): $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-setting$(EXEEXT)
 	$(AM_V_CCLD)$(libnm_core_tests_test_setting_LINK) $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT):  \
+libnm-core/tests/test_settings_defaults-test-settings-defaults.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
 libnm-core/tests/test-settings-defaults$(EXEEXT): $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_settings_defaults_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-settings-defaults$(EXEEXT)
 	$(AM_V_CCLD)$(libnm_core_tests_test_settings_defaults_LINK) $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_LDADD) $(LIBS)
-libnm-glib/libnm_glib_test-libnm-glib-test.$(OBJEXT):  \
-	libnm-glib/$(am__dirstamp) \
-	libnm-glib/$(DEPDIR)/$(am__dirstamp)
-
-libnm-glib/libnm-glib-test$(EXEEXT): $(libnm_glib_libnm_glib_test_OBJECTS) $(libnm_glib_libnm_glib_test_DEPENDENCIES) $(EXTRA_libnm_glib_libnm_glib_test_DEPENDENCIES) libnm-glib/$(am__dirstamp)
-	@rm -f libnm-glib/libnm-glib-test$(EXEEXT)
-	$(AM_V_CCLD)$(libnm_glib_libnm_glib_test_LINK) $(libnm_glib_libnm_glib_test_OBJECTS) $(libnm_glib_libnm_glib_test_LDADD) $(LIBS)
-shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT):  \
-	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/tests/$(am__dirstamp):
-	@$(MKDIR_P) libnm-glib/tests
-	@: > libnm-glib/tests/$(am__dirstamp)
-libnm-glib/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) libnm-glib/tests/$(DEPDIR)
-	@: > libnm-glib/tests/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.$(OBJEXT):  \
-	libnm-glib/tests/$(am__dirstamp) \
-	libnm-glib/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-glib/tests/test-nm-client$(EXEEXT): $(libnm_glib_tests_test_nm_client_OBJECTS) $(libnm_glib_tests_test_nm_client_DEPENDENCIES) $(EXTRA_libnm_glib_tests_test_nm_client_DEPENDENCIES) libnm-glib/tests/$(am__dirstamp)
-	@rm -f libnm-glib/tests/test-nm-client$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_glib_tests_test_nm_client_OBJECTS) $(libnm_glib_tests_test_nm_client_LDADD) $(LIBS)
-shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT):  \
-	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
-libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT):  \
-	libnm-glib/tests/$(am__dirstamp) \
-	libnm-glib/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-glib/tests/test-remote-settings-client$(EXEEXT): $(libnm_glib_tests_test_remote_settings_client_OBJECTS) $(libnm_glib_tests_test_remote_settings_client_DEPENDENCIES) $(EXTRA_libnm_glib_tests_test_remote_settings_client_DEPENDENCIES) libnm-glib/tests/$(am__dirstamp)
-	@rm -f libnm-glib/tests/test-remote-settings-client$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_glib_tests_test_remote_settings_client_OBJECTS) $(libnm_glib_tests_test_remote_settings_client_LDADD) $(LIBS)
-libnm-util/tests/$(am__dirstamp):
-	@$(MKDIR_P) libnm-util/tests
-	@: > libnm-util/tests/$(am__dirstamp)
-libnm-util/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) libnm-util/tests/$(DEPDIR)
-	@: > libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
-libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.$(OBJEXT):  \
-	libnm-util/tests/$(am__dirstamp) \
-	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-util/tests/test-crypto$(EXEEXT): $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_crypto_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
-	@rm -f libnm-util/tests/test-crypto$(EXEEXT)
-	$(AM_V_CCLD)$(libnm_util_tests_test_crypto_LINK) $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_LDADD) $(LIBS)
-libnm-util/tests/libnm_util_tests_test_general-test-general.$(OBJEXT):  \
-	libnm-util/tests/$(am__dirstamp) \
-	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-util/tests/test-general$(EXEEXT): $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_general_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
-	@rm -f libnm-util/tests/test-general$(EXEEXT)
-	$(AM_V_CCLD)$(libnm_util_tests_test_general_LINK) $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_LDADD) $(LIBS)
-libnm-util/tests/test_libnm_linking-test-libnm-linking.$(OBJEXT):  \
-	libnm-util/tests/$(am__dirstamp) \
-	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-util/tests/test-libnm-linking$(EXEEXT): $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_libnm_linking_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
-	@rm -f libnm-util/tests/test-libnm-linking$(EXEEXT)
-	$(AM_V_CCLD)$(libnm_util_tests_test_libnm_linking_LINK) $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_LDADD) $(LIBS)
-libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.$(OBJEXT):  \
-	libnm-util/tests/$(am__dirstamp) \
-	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-util/tests/test-secrets$(EXEEXT): $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_secrets_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
-	@rm -f libnm-util/tests/test-secrets$(EXEEXT)
-	$(AM_V_CCLD)$(libnm_util_tests_test_secrets_LINK) $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_LDADD) $(LIBS)
-libnm-util/tests/test_setting_8021x-test-setting-8021x.$(OBJEXT):  \
-	libnm-util/tests/$(am__dirstamp) \
-	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-util/tests/test-setting-8021x$(EXEEXT): $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_setting_8021x_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
-	@rm -f libnm-util/tests/test-setting-8021x$(EXEEXT)
-	$(AM_V_CCLD)$(libnm_util_tests_test_setting_8021x_LINK) $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_LDADD) $(LIBS)
-libnm-util/tests/test_setting_dcb-test-setting-dcb.$(OBJEXT):  \
-	libnm-util/tests/$(am__dirstamp) \
-	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-util/tests/test-setting-dcb$(EXEEXT): $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_setting_dcb_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
-	@rm -f libnm-util/tests/test-setting-dcb$(EXEEXT)
-	$(AM_V_CCLD)$(libnm_util_tests_test_setting_dcb_LINK) $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_LDADD) $(LIBS)
-libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT):  \
-	libnm-util/tests/$(am__dirstamp) \
-	libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-util/tests/test-settings-defaults$(EXEEXT): $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_settings_defaults_DEPENDENCIES) libnm-util/tests/$(am__dirstamp)
-	@rm -f libnm-util/tests/test-settings-defaults$(EXEEXT)
-	$(AM_V_CCLD)$(libnm_util_tests_test_settings_defaults_LINK) $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_LDADD) $(LIBS)
-shared/nm-utils/libnm_tests_test_general-nm-compat.$(OBJEXT):  \
+shared/nm-utils/libnm_tests_test_libnm-nm-compat.$(OBJEXT):  \
 	shared/nm-utils/$(am__dirstamp) \
 	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 libnm/tests/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) libnm/tests/$(DEPDIR)
 	@: > libnm/tests/$(DEPDIR)/$(am__dirstamp)
-libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT):  \
+libnm/tests/test_libnm-test-libnm.$(OBJEXT):  \
 	libnm/tests/$(am__dirstamp) \
 	libnm/tests/$(DEPDIR)/$(am__dirstamp)
 
-libnm/tests/test-general$(EXEEXT): $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_tests_test_general_DEPENDENCIES) libnm/tests/$(am__dirstamp)
-	@rm -f libnm/tests/test-general$(EXEEXT)
-	$(AM_V_CCLD)$(libnm_tests_test_general_LINK) $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_LDADD) $(LIBS)
+libnm/tests/test-libnm$(EXEEXT): $(libnm_tests_test_libnm_OBJECTS) $(libnm_tests_test_libnm_DEPENDENCIES) $(EXTRA_libnm_tests_test_libnm_DEPENDENCIES) libnm/tests/$(am__dirstamp)
+	@rm -f libnm/tests/test-libnm$(EXEEXT)
+	$(AM_V_CCLD)$(libnm_tests_test_libnm_LINK) $(libnm_tests_test_libnm_OBJECTS) $(libnm_tests_test_libnm_LDADD) $(LIBS)
 shared/libnm_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT):  \
 	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
-libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT):  \
+libnm/tests/test_nm_client-test-nm-client.$(OBJEXT):  \
 	libnm/tests/$(am__dirstamp) \
 	libnm/tests/$(DEPDIR)/$(am__dirstamp)
 
@@ -11020,7 +9842,7 @@ libnm/tests/test-nm-client$(EXEEXT): $(libnm_tests_test_nm_client_OBJECTS) $(lib
 	$(AM_V_CCLD)$(libnm_tests_test_nm_client_LINK) $(libnm_tests_test_nm_client_OBJECTS) $(libnm_tests_test_nm_client_LDADD) $(LIBS)
 shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT):  \
 	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
-libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT):  \
+libnm/tests/test_remote_settings_client-test-remote-settings-client.$(OBJEXT):  \
 	libnm/tests/$(am__dirstamp) \
 	libnm/tests/$(DEPDIR)/$(am__dirstamp)
 
@@ -11081,19 +9903,19 @@ src/devices/wifi/tests/$(am__dirstamp):
 src/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/devices/wifi/tests/$(DEPDIR)
 	@: > src/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.$(OBJEXT):  \
+src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.$(OBJEXT):  \
 	src/devices/wifi/tests/$(am__dirstamp) \
 	src/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.$(OBJEXT):  \
+src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.$(OBJEXT):  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.$(OBJEXT):  \
+src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.$(OBJEXT):  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
 
-src/devices/wifi/tests/test-general$(EXEEXT): $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_DEPENDENCIES) $(EXTRA_src_devices_wifi_tests_test_general_DEPENDENCIES) src/devices/wifi/tests/$(am__dirstamp)
-	@rm -f src/devices/wifi/tests/test-general$(EXEEXT)
-	$(AM_V_CCLD)$(src_devices_wifi_tests_test_general_LINK) $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_LDADD) $(LIBS)
+src/devices/wifi/tests/test-devices-wifi$(EXEEXT): $(src_devices_wifi_tests_test_devices_wifi_OBJECTS) $(src_devices_wifi_tests_test_devices_wifi_DEPENDENCIES) $(EXTRA_src_devices_wifi_tests_test_devices_wifi_DEPENDENCIES) src/devices/wifi/tests/$(am__dirstamp)
+	@rm -f src/devices/wifi/tests/test-devices-wifi$(EXEEXT)
+	$(AM_V_CCLD)$(src_devices_wifi_tests_test_devices_wifi_LINK) $(src_devices_wifi_tests_test_devices_wifi_OBJECTS) $(src_devices_wifi_tests_test_devices_wifi_LDADD) $(LIBS)
 src/dhcp/nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT):  \
 	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
 
@@ -11221,13 +10043,6 @@ src/platform/tests/test_cleanup_linux-test-cleanup.$(OBJEXT):  \
 src/platform/tests/test-cleanup-linux$(EXEEXT): $(src_platform_tests_test_cleanup_linux_OBJECTS) $(src_platform_tests_test_cleanup_linux_DEPENDENCIES) $(EXTRA_src_platform_tests_test_cleanup_linux_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
 	@rm -f src/platform/tests/test-cleanup-linux$(EXEEXT)
 	$(AM_V_CCLD)$(src_platform_tests_test_cleanup_linux_LINK) $(src_platform_tests_test_cleanup_linux_OBJECTS) $(src_platform_tests_test_cleanup_linux_LDADD) $(LIBS)
-src/platform/tests/src_platform_tests_test_general-test-general.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/platform/tests/test-general$(EXEEXT): $(src_platform_tests_test_general_OBJECTS) $(src_platform_tests_test_general_DEPENDENCIES) $(EXTRA_src_platform_tests_test_general_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
-	@rm -f src/platform/tests/test-general$(EXEEXT)
-	$(AM_V_CCLD)$(src_platform_tests_test_general_LINK) $(src_platform_tests_test_general_OBJECTS) $(src_platform_tests_test_general_LDADD) $(LIBS)
 src/platform/tests/test_link_fake-test-link.$(OBJEXT):  \
 	src/platform/tests/$(am__dirstamp) \
 	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
@@ -11249,6 +10064,13 @@ src/platform/tests/test_nmp_object-test-nmp-object.$(OBJEXT):  \
 src/platform/tests/test-nmp-object$(EXEEXT): $(src_platform_tests_test_nmp_object_OBJECTS) $(src_platform_tests_test_nmp_object_DEPENDENCIES) $(EXTRA_src_platform_tests_test_nmp_object_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
 	@rm -f src/platform/tests/test-nmp-object$(EXEEXT)
 	$(AM_V_CCLD)$(src_platform_tests_test_nmp_object_LINK) $(src_platform_tests_test_nmp_object_OBJECTS) $(src_platform_tests_test_nmp_object_LDADD) $(LIBS)
+src/platform/tests/test_platform_general-test-platform-general.$(OBJEXT):  \
+	src/platform/tests/$(am__dirstamp) \
+	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/platform/tests/test-platform-general$(EXEEXT): $(src_platform_tests_test_platform_general_OBJECTS) $(src_platform_tests_test_platform_general_DEPENDENCIES) $(EXTRA_src_platform_tests_test_platform_general_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
+	@rm -f src/platform/tests/test-platform-general$(EXEEXT)
+	$(AM_V_CCLD)$(src_platform_tests_test_platform_general_LINK) $(src_platform_tests_test_platform_general_OBJECTS) $(src_platform_tests_test_platform_general_LDADD) $(LIBS)
 src/platform/tests/test_route_fake-test-route.$(OBJEXT):  \
 	src/platform/tests/$(am__dirstamp) \
 	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
@@ -11263,19 +10085,6 @@ src/platform/tests/test_route_linux-test-route.$(OBJEXT):  \
 src/platform/tests/test-route-linux$(EXEEXT): $(src_platform_tests_test_route_linux_OBJECTS) $(src_platform_tests_test_route_linux_DEPENDENCIES) $(EXTRA_src_platform_tests_test_route_linux_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
 	@rm -f src/platform/tests/test-route-linux$(EXEEXT)
 	$(AM_V_CCLD)$(src_platform_tests_test_route_linux_LINK) $(src_platform_tests_test_route_linux_OBJECTS) $(src_platform_tests_test_route_linux_LDADD) $(LIBS)
-src/settings/plugins/ibft/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ibft/tests
-	@: > src/settings/plugins/ibft/tests/$(am__dirstamp)
-src/settings/plugins/ibft/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ibft/tests/$(DEPDIR)
-	@: > src/settings/plugins/ibft/tests/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ibft/tests/test_ibft-test-ibft.$(OBJEXT):  \
-	src/settings/plugins/ibft/tests/$(am__dirstamp) \
-	src/settings/plugins/ibft/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ibft/tests/test-ibft$(EXEEXT): $(src_settings_plugins_ibft_tests_test_ibft_OBJECTS) $(src_settings_plugins_ibft_tests_test_ibft_DEPENDENCIES) $(EXTRA_src_settings_plugins_ibft_tests_test_ibft_DEPENDENCIES) src/settings/plugins/ibft/tests/$(am__dirstamp)
-	@rm -f src/settings/plugins/ibft/tests/test-ibft$(EXEEXT)
-	$(AM_V_CCLD)$(src_settings_plugins_ibft_tests_test_ibft_LINK) $(src_settings_plugins_ibft_tests_test_ibft_OBJECTS) $(src_settings_plugins_ibft_tests_test_ibft_LDADD) $(LIBS)
 src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp):
 	@$(MKDIR_P) src/settings/plugins/ifcfg-rh/tests
 	@: > src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp)
@@ -11308,13 +10117,13 @@ src/settings/plugins/keyfile/tests/$(am__dirstamp):
 src/settings/plugins/keyfile/tests/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/settings/plugins/keyfile/tests/$(DEPDIR)
 	@: > src/settings/plugins/keyfile/tests/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.$(OBJEXT):  \
+src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.$(OBJEXT):  \
 	src/settings/plugins/keyfile/tests/$(am__dirstamp) \
 	src/settings/plugins/keyfile/tests/$(DEPDIR)/$(am__dirstamp)
 
-src/settings/plugins/keyfile/tests/test-keyfile$(EXEEXT): $(src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS) $(src_settings_plugins_keyfile_tests_test_keyfile_DEPENDENCIES) $(EXTRA_src_settings_plugins_keyfile_tests_test_keyfile_DEPENDENCIES) src/settings/plugins/keyfile/tests/$(am__dirstamp)
-	@rm -f src/settings/plugins/keyfile/tests/test-keyfile$(EXEEXT)
-	$(AM_V_CCLD)$(src_settings_plugins_keyfile_tests_test_keyfile_LINK) $(src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS) $(src_settings_plugins_keyfile_tests_test_keyfile_LDADD) $(LIBS)
+src/settings/plugins/keyfile/tests/test-keyfile-settings$(EXEEXT): $(src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS) $(src_settings_plugins_keyfile_tests_test_keyfile_settings_DEPENDENCIES) $(EXTRA_src_settings_plugins_keyfile_tests_test_keyfile_settings_DEPENDENCIES) src/settings/plugins/keyfile/tests/$(am__dirstamp)
+	@rm -f src/settings/plugins/keyfile/tests/test-keyfile-settings$(EXEEXT)
+	$(AM_V_CCLD)$(src_settings_plugins_keyfile_tests_test_keyfile_settings_LINK) $(src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS) $(src_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD) $(LIBS)
 src/supplicant/tests/$(am__dirstamp):
 	@$(MKDIR_P) src/supplicant/tests
 	@: > src/supplicant/tests/$(am__dirstamp)
@@ -11350,24 +10159,24 @@ src/tests/$(am__dirstamp):
 src/tests/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/tests/$(DEPDIR)
 	@: > src/tests/$(DEPDIR)/$(am__dirstamp)
+src/tests/test_core-test-core.$(OBJEXT): src/tests/$(am__dirstamp) \
+	src/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/tests/test-core$(EXEEXT): $(src_tests_test_core_OBJECTS) $(src_tests_test_core_DEPENDENCIES) $(EXTRA_src_tests_test_core_DEPENDENCIES) src/tests/$(am__dirstamp)
+	@rm -f src/tests/test-core$(EXEEXT)
+	$(AM_V_CCLD)$(src_tests_test_core_LINK) $(src_tests_test_core_OBJECTS) $(src_tests_test_core_LDADD) $(LIBS)
+src/tests/test_core_with_expect-test-core-with-expect.$(OBJEXT):  \
+	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/tests/test-core-with-expect$(EXEEXT): $(src_tests_test_core_with_expect_OBJECTS) $(src_tests_test_core_with_expect_DEPENDENCIES) $(EXTRA_src_tests_test_core_with_expect_DEPENDENCIES) src/tests/$(am__dirstamp)
+	@rm -f src/tests/test-core-with-expect$(EXEEXT)
+	$(AM_V_CCLD)$(src_tests_test_core_with_expect_LINK) $(src_tests_test_core_with_expect_OBJECTS) $(src_tests_test_core_with_expect_LDADD) $(LIBS)
 src/tests/test_dcb-test-dcb.$(OBJEXT): src/tests/$(am__dirstamp) \
 	src/tests/$(DEPDIR)/$(am__dirstamp)
 
 src/tests/test-dcb$(EXEEXT): $(src_tests_test_dcb_OBJECTS) $(src_tests_test_dcb_DEPENDENCIES) $(EXTRA_src_tests_test_dcb_DEPENDENCIES) src/tests/$(am__dirstamp)
 	@rm -f src/tests/test-dcb$(EXEEXT)
 	$(AM_V_CCLD)$(src_tests_test_dcb_LINK) $(src_tests_test_dcb_OBJECTS) $(src_tests_test_dcb_LDADD) $(LIBS)
-src/tests/src_tests_test_general-test-general.$(OBJEXT):  \
-	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-general$(EXEEXT): $(src_tests_test_general_OBJECTS) $(src_tests_test_general_DEPENDENCIES) $(EXTRA_src_tests_test_general_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-general$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_general_LINK) $(src_tests_test_general_OBJECTS) $(src_tests_test_general_LDADD) $(LIBS)
-src/tests/test_general_with_expect-test-general-with-expect.$(OBJEXT):  \
-	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-general-with-expect$(EXEEXT): $(src_tests_test_general_with_expect_OBJECTS) $(src_tests_test_general_with_expect_DEPENDENCIES) $(EXTRA_src_tests_test_general_with_expect_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-general-with-expect$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_general_with_expect_LINK) $(src_tests_test_general_with_expect_OBJECTS) $(src_tests_test_general_with_expect_LDADD) $(LIBS)
 src/tests/test_ip4_config-test-ip4-config.$(OBJEXT):  \
 	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
 
@@ -11453,16 +10262,8 @@ mostlyclean-compile:
 	-rm -f libnm-core/*.$(OBJEXT)
 	-rm -f libnm-core/*.lo
 	-rm -f libnm-core/tests/*.$(OBJEXT)
-	-rm -f libnm-glib/*.$(OBJEXT)
-	-rm -f libnm-glib/*.lo
-	-rm -f libnm-glib/tests/*.$(OBJEXT)
-	-rm -f libnm-util/*.$(OBJEXT)
-	-rm -f libnm-util/*.lo
-	-rm -f libnm-util/tests/*.$(OBJEXT)
 	-rm -f libnm/*.$(OBJEXT)
 	-rm -f libnm/*.lo
-	-rm -f libnm/fake-typelib/*.$(OBJEXT)
-	-rm -f libnm/fake-typelib/*.lo
 	-rm -f libnm/tests/*.$(OBJEXT)
 	-rm -f shared/*.$(OBJEXT)
 	-rm -f shared/*.lo
@@ -11474,8 +10275,14 @@ mostlyclean-compile:
 	-rm -f shared/n-acd/src/*.lo
 	-rm -f shared/n-acd/src/util/*.$(OBJEXT)
 	-rm -f shared/n-acd/src/util/*.lo
+	-rm -f shared/n-dhcp4/src/*.$(OBJEXT)
+	-rm -f shared/n-dhcp4/src/*.lo
+	-rm -f shared/n-dhcp4/src/util/*.$(OBJEXT)
+	-rm -f shared/n-dhcp4/src/util/*.lo
 	-rm -f shared/nm-glib-aux/*.$(OBJEXT)
 	-rm -f shared/nm-glib-aux/*.lo
+	-rm -f shared/nm-libnm-core-aux/*.$(OBJEXT)
+	-rm -f shared/nm-libnm-core-aux/*.lo
 	-rm -f shared/nm-libnm-core-intern/*.$(OBJEXT)
 	-rm -f shared/nm-libnm-core-intern/*.lo
 	-rm -f shared/nm-std-aux/*.$(OBJEXT)
@@ -11489,6 +10296,8 @@ mostlyclean-compile:
 	-rm -f shared/systemd/*.lo
 	-rm -f shared/systemd/src/basic/*.$(OBJEXT)
 	-rm -f shared/systemd/src/basic/*.lo
+	-rm -f shared/systemd/src/shared/*.$(OBJEXT)
+	-rm -f shared/systemd/src/shared/*.lo
 	-rm -f src/*.$(OBJEXT)
 	-rm -f src/*.lo
 	-rm -f src/devices/*.$(OBJEXT)
@@ -11533,9 +10342,6 @@ mostlyclean-compile:
 	-rm -f src/ppp/*.lo
 	-rm -f src/settings/*.$(OBJEXT)
 	-rm -f src/settings/*.lo
-	-rm -f src/settings/plugins/ibft/*.$(OBJEXT)
-	-rm -f src/settings/plugins/ibft/*.lo
-	-rm -f src/settings/plugins/ibft/tests/*.$(OBJEXT)
 	-rm -f src/settings/plugins/ifcfg-rh/*.$(OBJEXT)
 	-rm -f src/settings/plugins/ifcfg-rh/*.lo
 	-rm -f src/settings/plugins/ifcfg-rh/tests/*.$(OBJEXT)
@@ -11558,8 +10364,6 @@ mostlyclean-compile:
 	-rm -f src/systemd/src/libsystemd/sd-event/*.lo
 	-rm -f src/systemd/src/libsystemd/sd-id128/*.$(OBJEXT)
 	-rm -f src/systemd/src/libsystemd/sd-id128/*.lo
-	-rm -f src/systemd/src/shared/*.$(OBJEXT)
-	-rm -f src/systemd/src/shared/*.lo
 	-rm -f src/tests/*.$(OBJEXT)
 	-rm -f src/tests/config/*.$(OBJEXT)
 	-rm -f src/vpn/*.$(OBJEXT)
@@ -11584,7 +10388,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/tui/$(DEPDIR)/nmtui-nm-editor-bindings.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/tui/$(DEPDIR)/nmtui-nm-editor-utils.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/tui/$(DEPDIR)/nmtui-nmt-address-list.Po@am__quote@ # am--include-marker
@@ -11647,7 +10452,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@clients/tui/newt/$(DEPDIR)/libnmt_newt_a-nmt-newt-widget.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@dispatcher/$(DEPDIR)/libnm_dispatcher_core_la-nm-dispatcher-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@dispatcher/$(DEPDIR)/nm_dispatcher-nm-dispatcher.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@dispatcher/$(DEPDIR)/nm_dispatcher-nmdbus-dispatcher.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@dispatcher/$(DEPDIR)/tests_test_dispatcher_envp-nmdbus-dispatcher.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@dispatcher/tests/$(DEPDIR)/test_dispatcher_envp-test-dispatcher-envp.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connection-gdbus.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@examples/C/glib/$(DEPDIR)/add_connection_libnm-add-connection-libnm.Po@am__quote@ # am--include-marker
@@ -11741,6 +10546,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-match.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-olpc-mesh.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-bridge.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-interface.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-patch.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-port.Plo@am__quote@ # am--include-marker
@@ -11766,165 +10572,79 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-simple-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-editor-plugin.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-plugin-info.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/test_compare-test-compare.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/test_general-test-general.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/test_keyfile-test-keyfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/test_setting-test-setting.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libdeprecated_nm_glib_la-libnm_glib.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-access-point.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-active-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-client.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dbus-helpers.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-adsl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bond.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bridge.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-ethernet.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-generic.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-infiniband.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-modem.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-olpc-mesh.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-team.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-vlan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wimax.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp4-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp6-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-glib-enum-types.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip4-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip6-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object-cache.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-settings.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-secret-agent.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-types.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-vpn-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_la-nm-wimax-nsp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_test-libnm-glib-test.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-enum-types.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_nm_client-test-nm-client.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-crypto.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-crypto_gnutls.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-crypto_nss.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-param-spec-specialized.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-8021x.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-adsl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bluetooth.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bond.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-cdma.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-dcb.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-generic.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-gsm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-infiniband.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip4-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip6-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-olpc-mesh.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ppp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-pppoe.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-serial.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team-port.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vlan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vpn.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wimax.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wired.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless-security.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-setting.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-utils-enum-types.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libnm_util_la-nm-value-transforms.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libtest_crypto_la-crypto.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_gnutls.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_nss.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_crypto-test-crypto.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_general-test-general.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_secrets-test-secrets.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/tests/$(DEPDIR)/test_libnm_linking-test-libnm-linking.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/tests/$(DEPDIR)/test_setting_8021x-test-setting-8021x.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-util/tests/$(DEPDIR)/test_setting_dcb-test-setting-dcb.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-access-point.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-active-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-checkpoint.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-client.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-dbus-helpers.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-6lowpan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-adsl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-bond.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-bridge.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-bt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-dummy.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-ethernet.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-generic.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-infiniband.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-ip-tunnel.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-macsec.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-macvlan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-modem.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-olpc-mesh.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-ovs-interface.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-ovs-port.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-ppp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-team.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-tun.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-wpan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-dhcp-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-dhcp4-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-dhcp6-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-dns-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-access-point.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-active-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-checkpoint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-client.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-dbus-helpers.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-6lowpan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-adsl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-bond.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-bridge.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-bt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-dummy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-ethernet.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-generic.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-infiniband.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-ip-tunnel.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-macsec.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-macvlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-modem.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-olpc-mesh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-bridge.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-interface.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-port.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-ppp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-team.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-wimax.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-wireguard.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-wpan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-dhcp-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-dhcp4-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-dhcp6-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-dns-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-ip-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-ip4-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-ip6-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-libnm-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-object.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-remote-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-remote-settings.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-secret-agent-old.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-vpn-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-vpn-editor.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-vpn-plugin-old.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-vpn-service-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-wifi-p2p-peer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-wimax-nsp.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-enum-types.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-ip-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-ip4-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-ip6-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-object.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-remote-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-remote-settings.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-secret-agent-old.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-vpn-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/test_libnm-test-libnm.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/test_nm_client-test-nm-client.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/test_secret_agent-test-secret-agent.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po@am__quote@ # am--include-marker
@@ -11935,21 +10655,34 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-lease.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-probe.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-client.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-incoming.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-outgoing.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-socket.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-packet.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-socket.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-json-aux.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-keyfile-aux.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo@am__quote@ # am--include-marker
@@ -11961,6 +10694,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-format-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Plo@am__quote@ # am--include-marker
@@ -11980,10 +10714,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strxcpyx.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/NetworkManager-main.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo@am__quote@ # am--include-marker
@@ -12072,9 +10808,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/tests/$(DEPDIR)/src_devices_wifi_tests_test_general-test-general.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo@am__quote@ # am--include-marker
@@ -12083,6 +10819,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Plo@am__quote@ # am--include-marker
@@ -12121,7 +10859,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/monitor-monitor.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/src_platform_tests_test_general-test-general.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po@am__quote@ # am--include-marker
@@ -12129,6 +10866,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo@am__quote@ # am--include-marker
@@ -12142,37 +10880,34 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-plugin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ibft/$(DEPDIR)/libnms_ibft_core_la-nms-ibft-reader.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ibft/tests/$(DEPDIR)/test_ibft-test-ibft.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nm-inotify-helper.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-connection.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/keyfile/tests/$(DEPDIR)/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo@am__quote@ # am--include-marker
@@ -12196,10 +10931,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_general-test-general.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_core-test-core.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_dcb-test-dcb.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_systemd-test-systemd.Po@am__quote@ # am--include-marker
@@ -13066,6 +11800,13 @@ libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo: libnm-core/nm-setting-ovs-bri
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-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_la-nm-setting-ovs-dpdk.lo: libnm-core/nm-setting-ovs-dpdk.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo `test -f 'libnm-core/nm-setting-ovs-dpdk.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-dpdk.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-dpdk.c' object='libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo `test -f 'libnm-core/nm-setting-ovs-dpdk.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-dpdk.c
+
 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_la-nm-setting-ovs-interface.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-interface.Tpo -c -o 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_la-nm-setting-ovs-interface.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-interface.Plo
@@ -13234,13 +11975,6 @@ shared/libnm_core_libnm_core_la-nm-meta-setting.lo: shared/nm-meta-setting.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
 
-libnm-core/libnm_core_la-nm-crypto.lo: libnm-core/nm-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Tpo -c -o libnm-core/libnm_core_la-nm-crypto.lo `test -f 'libnm-core/nm-crypto.c' || echo '$(srcdir)/'`libnm-core/nm-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-crypto.c' object='libnm-core/libnm_core_la-nm-crypto.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-crypto.lo `test -f 'libnm-core/nm-crypto.c' || echo '$(srcdir)/'`libnm-core/nm-crypto.c
-
 libnm-core/libnm_core_la-nm-connection.lo: libnm-core/nm-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Tpo -c -o libnm-core/libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Plo
@@ -13248,6 +11982,13 @@ libnm-core/libnm_core_la-nm-connection.lo: libnm-core/nm-connection.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c
 
+libnm-core/libnm_core_la-nm-crypto.lo: libnm-core/nm-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Tpo -c -o libnm-core/libnm_core_la-nm-crypto.lo `test -f 'libnm-core/nm-crypto.c' || echo '$(srcdir)/'`libnm-core/nm-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-crypto.c' object='libnm-core/libnm_core_la-nm-crypto.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-crypto.lo `test -f 'libnm-core/nm-crypto.c' || echo '$(srcdir)/'`libnm-core/nm-crypto.c
+
 libnm-core/libnm_core_la-nm-dbus-utils.lo: libnm-core/nm-dbus-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-dbus-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Tpo -c -o libnm-core/libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Plo
@@ -13262,13 +12003,6 @@ libnm-core/libnm_core_la-nm-errors.lo: libnm-core/nm-errors.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
 
-libnm-core/libnm_core_la-nm-keyfile.lo: libnm-core/nm-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile.c' object='libnm-core/libnm_core_la-nm-keyfile.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
-
 libnm-core/libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo
@@ -13276,6 +12010,13 @@ libnm-core/libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-utils.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
 
+libnm-core/libnm_core_la-nm-keyfile.lo: libnm-core/nm-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile.c' object='libnm-core/libnm_core_la-nm-keyfile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
+
 libnm-core/libnm_core_la-nm-property-compare.lo: libnm-core/nm-property-compare.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-property-compare.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Tpo -c -o libnm-core/libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo
@@ -13297,6 +12038,13 @@ libnm-core/libnm_core_la-nm-simple-connection.lo: libnm-core/nm-simple-connectio
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-simple-connection.lo `test -f 'libnm-core/nm-simple-connection.c' || echo '$(srcdir)/'`libnm-core/nm-simple-connection.c
 
+libnm-core/libnm_core_la-nm-team-utils.lo: libnm-core/nm-team-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-team-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Tpo -c -o libnm-core/libnm_core_la-nm-team-utils.lo `test -f 'libnm-core/nm-team-utils.c' || echo '$(srcdir)/'`libnm-core/nm-team-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-team-utils.c' object='libnm-core/libnm_core_la-nm-team-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-team-utils.lo `test -f 'libnm-core/nm-team-utils.c' || echo '$(srcdir)/'`libnm-core/nm-team-utils.c
+
 libnm-core/libnm_core_la-nm-utils.lo: libnm-core/nm-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Tpo -c -o libnm-core/libnm_core_la-nm-utils.lo `test -f 'libnm-core/nm-utils.c' || echo '$(srcdir)/'`libnm-core/nm-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Plo
@@ -13346,894 +12094,369 @@ libnm-core/libnm_crypto_nss_la-nm-crypto-nss.lo: libnm-core/nm-crypto-nss.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_crypto_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_crypto_nss_la-nm-crypto-nss.lo `test -f 'libnm-core/nm-crypto-nss.c' || echo '$(srcdir)/'`libnm-core/nm-crypto-nss.c
 
-libnm-glib/libdeprecated_nm_glib_la-libnm_glib.lo: libnm-glib/libnm_glib.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libdeprecated_nm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libdeprecated_nm_glib_la-libnm_glib.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libdeprecated_nm_glib_la-libnm_glib.Tpo -c -o libnm-glib/libdeprecated_nm_glib_la-libnm_glib.lo `test -f 'libnm-glib/libnm_glib.c' || echo '$(srcdir)/'`libnm-glib/libnm_glib.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libdeprecated_nm_glib_la-libnm_glib.Tpo libnm-glib/$(DEPDIR)/libdeprecated_nm_glib_la-libnm_glib.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/libnm_glib.c' object='libnm-glib/libdeprecated_nm_glib_la-libnm_glib.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_glib_libdeprecated_nm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libdeprecated_nm_glib_la-libnm_glib.lo `test -f 'libnm-glib/libnm_glib.c' || echo '$(srcdir)/'`libnm-glib/libnm_glib.c
-
-libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin.lo: libnm-glib/nm-vpn-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_vpn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin.Tpo -c -o libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin.lo `test -f 'libnm-glib/nm-vpn-plugin.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin.Tpo libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-vpn-plugin.c' object='libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_vpn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin.lo `test -f 'libnm-glib/nm-vpn-plugin.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-plugin.c
-
-libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.lo: libnm-glib/nm-vpn-plugin-ui-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_glib_libnm_glib_vpn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.Tpo -c -o libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.lo `test -f 'libnm-glib/nm-vpn-plugin-ui-interface.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-plugin-ui-interface.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.Tpo libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-vpn-plugin-ui-interface.c' object='libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-ui-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_glib_libnm_glib_vpn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.lo `test -f 'libnm-glib/nm-vpn-plugin-ui-interface.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-plugin-ui-interface.c
-
-libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-utils.lo: libnm-glib/nm-vpn-plugin-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_glib_libnm_glib_vpn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-utils.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-utils.Tpo -c -o libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-utils.lo `test -f 'libnm-glib/nm-vpn-plugin-utils.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-plugin-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-utils.Tpo libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-vpn-plugin-utils.c' object='libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-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_glib_libnm_glib_vpn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_vpn_la-nm-vpn-plugin-utils.lo `test -f 'libnm-glib/nm-vpn-plugin-utils.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-plugin-utils.c
-
-libnm-glib/libnm_glib_vpn_la-nm-vpn-enum-types.lo: libnm-glib/nm-vpn-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_vpn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_vpn_la-nm-vpn-enum-types.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-enum-types.Tpo -c -o libnm-glib/libnm_glib_vpn_la-nm-vpn-enum-types.lo `test -f 'libnm-glib/nm-vpn-enum-types.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-enum-types.Tpo libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-enum-types.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-vpn-enum-types.c' object='libnm-glib/libnm_glib_vpn_la-nm-vpn-enum-types.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_glib_libnm_glib_vpn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_vpn_la-nm-vpn-enum-types.lo `test -f 'libnm-glib/nm-vpn-enum-types.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-enum-types.c
-
-libnm-glib/libnm_glib_la-nm-object.lo: libnm-glib/nm-object.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-object.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object.Tpo -c -o libnm-glib/libnm_glib_la-nm-object.lo `test -f 'libnm-glib/nm-object.c' || echo '$(srcdir)/'`libnm-glib/nm-object.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-object.c' object='libnm-glib/libnm_glib_la-nm-object.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-object.lo `test -f 'libnm-glib/nm-object.c' || echo '$(srcdir)/'`libnm-glib/nm-object.c
-
-libnm-glib/libnm_glib_la-nm-dbus-helpers.lo: libnm-glib/nm-dbus-helpers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-dbus-helpers.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dbus-helpers.Tpo -c -o libnm-glib/libnm_glib_la-nm-dbus-helpers.lo `test -f 'libnm-glib/nm-dbus-helpers.c' || echo '$(srcdir)/'`libnm-glib/nm-dbus-helpers.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dbus-helpers.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dbus-helpers.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-dbus-helpers.c' object='libnm-glib/libnm_glib_la-nm-dbus-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) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-dbus-helpers.lo `test -f 'libnm-glib/nm-dbus-helpers.c' || echo '$(srcdir)/'`libnm-glib/nm-dbus-helpers.c
-
-libnm-glib/libnm_glib_la-nm-client.lo: libnm-glib/nm-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-client.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-client.Tpo -c -o libnm-glib/libnm_glib_la-nm-client.lo `test -f 'libnm-glib/nm-client.c' || echo '$(srcdir)/'`libnm-glib/nm-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-client.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-client.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-client.c' object='libnm-glib/libnm_glib_la-nm-client.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-client.lo `test -f 'libnm-glib/nm-client.c' || echo '$(srcdir)/'`libnm-glib/nm-client.c
-
-libnm-glib/libnm_glib_la-nm-device.lo: libnm-glib/nm-device.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device.Tpo -c -o libnm-glib/libnm_glib_la-nm-device.lo `test -f 'libnm-glib/nm-device.c' || echo '$(srcdir)/'`libnm-glib/nm-device.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device.c' object='libnm-glib/libnm_glib_la-nm-device.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device.lo `test -f 'libnm-glib/nm-device.c' || echo '$(srcdir)/'`libnm-glib/nm-device.c
-
-libnm-glib/libnm_glib_la-nm-device-ethernet.lo: libnm-glib/nm-device-ethernet.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-ethernet.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-ethernet.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-ethernet.lo `test -f 'libnm-glib/nm-device-ethernet.c' || echo '$(srcdir)/'`libnm-glib/nm-device-ethernet.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-ethernet.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-ethernet.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-ethernet.c' object='libnm-glib/libnm_glib_la-nm-device-ethernet.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-ethernet.lo `test -f 'libnm-glib/nm-device-ethernet.c' || echo '$(srcdir)/'`libnm-glib/nm-device-ethernet.c
-
-libnm-glib/libnm_glib_la-nm-device-infiniband.lo: libnm-glib/nm-device-infiniband.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-infiniband.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-infiniband.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-infiniband.lo `test -f 'libnm-glib/nm-device-infiniband.c' || echo '$(srcdir)/'`libnm-glib/nm-device-infiniband.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-infiniband.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-infiniband.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-infiniband.c' object='libnm-glib/libnm_glib_la-nm-device-infiniband.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-infiniband.lo `test -f 'libnm-glib/nm-device-infiniband.c' || echo '$(srcdir)/'`libnm-glib/nm-device-infiniband.c
-
-libnm-glib/libnm_glib_la-nm-device-adsl.lo: libnm-glib/nm-device-adsl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-adsl.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-adsl.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-adsl.lo `test -f 'libnm-glib/nm-device-adsl.c' || echo '$(srcdir)/'`libnm-glib/nm-device-adsl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-adsl.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-adsl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-adsl.c' object='libnm-glib/libnm_glib_la-nm-device-adsl.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-adsl.lo `test -f 'libnm-glib/nm-device-adsl.c' || echo '$(srcdir)/'`libnm-glib/nm-device-adsl.c
-
-libnm-glib/libnm_glib_la-nm-device-wifi.lo: libnm-glib/nm-device-wifi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-wifi.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wifi.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-wifi.lo `test -f 'libnm-glib/nm-device-wifi.c' || echo '$(srcdir)/'`libnm-glib/nm-device-wifi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wifi.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wifi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-wifi.c' object='libnm-glib/libnm_glib_la-nm-device-wifi.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-wifi.lo `test -f 'libnm-glib/nm-device-wifi.c' || echo '$(srcdir)/'`libnm-glib/nm-device-wifi.c
-
-libnm-glib/libnm_glib_la-nm-device-bt.lo: libnm-glib/nm-device-bt.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-bt.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bt.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-bt.lo `test -f 'libnm-glib/nm-device-bt.c' || echo '$(srcdir)/'`libnm-glib/nm-device-bt.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bt.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-bt.c' object='libnm-glib/libnm_glib_la-nm-device-bt.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-bt.lo `test -f 'libnm-glib/nm-device-bt.c' || echo '$(srcdir)/'`libnm-glib/nm-device-bt.c
-
-libnm-glib/libnm_glib_la-nm-device-olpc-mesh.lo: libnm-glib/nm-device-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-olpc-mesh.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-olpc-mesh.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-olpc-mesh.lo `test -f 'libnm-glib/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`libnm-glib/nm-device-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-olpc-mesh.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-olpc-mesh.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-olpc-mesh.c' object='libnm-glib/libnm_glib_la-nm-device-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-olpc-mesh.lo `test -f 'libnm-glib/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`libnm-glib/nm-device-olpc-mesh.c
-
-libnm-glib/libnm_glib_la-nm-device-bond.lo: libnm-glib/nm-device-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-bond.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bond.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-bond.lo `test -f 'libnm-glib/nm-device-bond.c' || echo '$(srcdir)/'`libnm-glib/nm-device-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bond.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bond.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-bond.c' object='libnm-glib/libnm_glib_la-nm-device-bond.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-bond.lo `test -f 'libnm-glib/nm-device-bond.c' || echo '$(srcdir)/'`libnm-glib/nm-device-bond.c
-
-libnm-glib/libnm_glib_la-nm-device-team.lo: libnm-glib/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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-team.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-team.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-team.lo `test -f 'libnm-glib/nm-device-team.c' || echo '$(srcdir)/'`libnm-glib/nm-device-team.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-team.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-team.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-team.c' object='libnm-glib/libnm_glib_la-nm-device-team.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-team.lo `test -f 'libnm-glib/nm-device-team.c' || echo '$(srcdir)/'`libnm-glib/nm-device-team.c
-
-libnm-glib/libnm_glib_la-nm-device-bridge.lo: libnm-glib/nm-device-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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-bridge.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bridge.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-bridge.lo `test -f 'libnm-glib/nm-device-bridge.c' || echo '$(srcdir)/'`libnm-glib/nm-device-bridge.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bridge.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bridge.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-bridge.c' object='libnm-glib/libnm_glib_la-nm-device-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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-bridge.lo `test -f 'libnm-glib/nm-device-bridge.c' || echo '$(srcdir)/'`libnm-glib/nm-device-bridge.c
-
-libnm-glib/libnm_glib_la-nm-device-vlan.lo: libnm-glib/nm-device-vlan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-vlan.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-vlan.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-vlan.lo `test -f 'libnm-glib/nm-device-vlan.c' || echo '$(srcdir)/'`libnm-glib/nm-device-vlan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-vlan.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-vlan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-vlan.c' object='libnm-glib/libnm_glib_la-nm-device-vlan.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-vlan.lo `test -f 'libnm-glib/nm-device-vlan.c' || echo '$(srcdir)/'`libnm-glib/nm-device-vlan.c
-
-libnm-glib/libnm_glib_la-nm-device-generic.lo: libnm-glib/nm-device-generic.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-generic.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-generic.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-generic.lo `test -f 'libnm-glib/nm-device-generic.c' || echo '$(srcdir)/'`libnm-glib/nm-device-generic.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-generic.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-generic.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-generic.c' object='libnm-glib/libnm_glib_la-nm-device-generic.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-generic.lo `test -f 'libnm-glib/nm-device-generic.c' || echo '$(srcdir)/'`libnm-glib/nm-device-generic.c
-
-libnm-glib/libnm_glib_la-nm-access-point.lo: libnm-glib/nm-access-point.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-access-point.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-access-point.Tpo -c -o libnm-glib/libnm_glib_la-nm-access-point.lo `test -f 'libnm-glib/nm-access-point.c' || echo '$(srcdir)/'`libnm-glib/nm-access-point.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-access-point.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-access-point.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-access-point.c' object='libnm-glib/libnm_glib_la-nm-access-point.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-access-point.lo `test -f 'libnm-glib/nm-access-point.c' || echo '$(srcdir)/'`libnm-glib/nm-access-point.c
-
-libnm-glib/libnm_glib_la-nm-ip4-config.lo: libnm-glib/nm-ip4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-ip4-config.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip4-config.Tpo -c -o libnm-glib/libnm_glib_la-nm-ip4-config.lo `test -f 'libnm-glib/nm-ip4-config.c' || echo '$(srcdir)/'`libnm-glib/nm-ip4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip4-config.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip4-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-ip4-config.c' object='libnm-glib/libnm_glib_la-nm-ip4-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-ip4-config.lo `test -f 'libnm-glib/nm-ip4-config.c' || echo '$(srcdir)/'`libnm-glib/nm-ip4-config.c
-
-libnm-glib/libnm_glib_la-nm-device-modem.lo: libnm-glib/nm-device-modem.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-modem.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-modem.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-modem.lo `test -f 'libnm-glib/nm-device-modem.c' || echo '$(srcdir)/'`libnm-glib/nm-device-modem.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-modem.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-modem.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-modem.c' object='libnm-glib/libnm_glib_la-nm-device-modem.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-modem.lo `test -f 'libnm-glib/nm-device-modem.c' || echo '$(srcdir)/'`libnm-glib/nm-device-modem.c
-
-libnm-glib/libnm_glib_la-nm-vpn-connection.lo: libnm-glib/nm-vpn-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-vpn-connection.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-vpn-connection.Tpo -c -o libnm-glib/libnm_glib_la-nm-vpn-connection.lo `test -f 'libnm-glib/nm-vpn-connection.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-vpn-connection.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-vpn-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-vpn-connection.c' object='libnm-glib/libnm_glib_la-nm-vpn-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-vpn-connection.lo `test -f 'libnm-glib/nm-vpn-connection.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-connection.c
-
-libnm-glib/libnm_glib_la-nm-types.lo: libnm-glib/nm-types.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-types.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-types.Tpo -c -o libnm-glib/libnm_glib_la-nm-types.lo `test -f 'libnm-glib/nm-types.c' || echo '$(srcdir)/'`libnm-glib/nm-types.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-types.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-types.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-types.c' object='libnm-glib/libnm_glib_la-nm-types.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-types.lo `test -f 'libnm-glib/nm-types.c' || echo '$(srcdir)/'`libnm-glib/nm-types.c
-
-libnm-glib/libnm_glib_la-nm-object-cache.lo: libnm-glib/nm-object-cache.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-object-cache.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object-cache.Tpo -c -o libnm-glib/libnm_glib_la-nm-object-cache.lo `test -f 'libnm-glib/nm-object-cache.c' || echo '$(srcdir)/'`libnm-glib/nm-object-cache.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object-cache.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object-cache.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-object-cache.c' object='libnm-glib/libnm_glib_la-nm-object-cache.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-object-cache.lo `test -f 'libnm-glib/nm-object-cache.c' || echo '$(srcdir)/'`libnm-glib/nm-object-cache.c
-
-libnm-glib/libnm_glib_la-nm-active-connection.lo: libnm-glib/nm-active-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-active-connection.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-active-connection.Tpo -c -o libnm-glib/libnm_glib_la-nm-active-connection.lo `test -f 'libnm-glib/nm-active-connection.c' || echo '$(srcdir)/'`libnm-glib/nm-active-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-active-connection.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-active-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-active-connection.c' object='libnm-glib/libnm_glib_la-nm-active-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-active-connection.lo `test -f 'libnm-glib/nm-active-connection.c' || echo '$(srcdir)/'`libnm-glib/nm-active-connection.c
-
-libnm-glib/libnm_glib_la-nm-dhcp4-config.lo: libnm-glib/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) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-dhcp4-config.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp4-config.Tpo -c -o libnm-glib/libnm_glib_la-nm-dhcp4-config.lo `test -f 'libnm-glib/nm-dhcp4-config.c' || echo '$(srcdir)/'`libnm-glib/nm-dhcp4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp4-config.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp4-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-dhcp4-config.c' object='libnm-glib/libnm_glib_la-nm-dhcp4-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-dhcp4-config.lo `test -f 'libnm-glib/nm-dhcp4-config.c' || echo '$(srcdir)/'`libnm-glib/nm-dhcp4-config.c
-
-libnm-glib/libnm_glib_la-nm-ip6-config.lo: libnm-glib/nm-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-ip6-config.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip6-config.Tpo -c -o libnm-glib/libnm_glib_la-nm-ip6-config.lo `test -f 'libnm-glib/nm-ip6-config.c' || echo '$(srcdir)/'`libnm-glib/nm-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip6-config.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip6-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-ip6-config.c' object='libnm-glib/libnm_glib_la-nm-ip6-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-ip6-config.lo `test -f 'libnm-glib/nm-ip6-config.c' || echo '$(srcdir)/'`libnm-glib/nm-ip6-config.c
-
-libnm-glib/libnm_glib_la-nm-dhcp6-config.lo: libnm-glib/nm-dhcp6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-dhcp6-config.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp6-config.Tpo -c -o libnm-glib/libnm_glib_la-nm-dhcp6-config.lo `test -f 'libnm-glib/nm-dhcp6-config.c' || echo '$(srcdir)/'`libnm-glib/nm-dhcp6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp6-config.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp6-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-dhcp6-config.c' object='libnm-glib/libnm_glib_la-nm-dhcp6-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-dhcp6-config.lo `test -f 'libnm-glib/nm-dhcp6-config.c' || echo '$(srcdir)/'`libnm-glib/nm-dhcp6-config.c
-
-libnm-glib/libnm_glib_la-nm-remote-connection.lo: libnm-glib/nm-remote-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-remote-connection.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-connection.Tpo -c -o libnm-glib/libnm_glib_la-nm-remote-connection.lo `test -f 'libnm-glib/nm-remote-connection.c' || echo '$(srcdir)/'`libnm-glib/nm-remote-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-connection.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-remote-connection.c' object='libnm-glib/libnm_glib_la-nm-remote-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-remote-connection.lo `test -f 'libnm-glib/nm-remote-connection.c' || echo '$(srcdir)/'`libnm-glib/nm-remote-connection.c
-
-libnm-glib/libnm_glib_la-nm-remote-settings.lo: libnm-glib/nm-remote-settings.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-remote-settings.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-settings.Tpo -c -o libnm-glib/libnm_glib_la-nm-remote-settings.lo `test -f 'libnm-glib/nm-remote-settings.c' || echo '$(srcdir)/'`libnm-glib/nm-remote-settings.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-settings.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-settings.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-remote-settings.c' object='libnm-glib/libnm_glib_la-nm-remote-settings.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-remote-settings.lo `test -f 'libnm-glib/nm-remote-settings.c' || echo '$(srcdir)/'`libnm-glib/nm-remote-settings.c
-
-libnm-glib/libnm_glib_la-nm-secret-agent.lo: libnm-glib/nm-secret-agent.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-secret-agent.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-secret-agent.Tpo -c -o libnm-glib/libnm_glib_la-nm-secret-agent.lo `test -f 'libnm-glib/nm-secret-agent.c' || echo '$(srcdir)/'`libnm-glib/nm-secret-agent.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-secret-agent.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-secret-agent.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-secret-agent.c' object='libnm-glib/libnm_glib_la-nm-secret-agent.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-secret-agent.lo `test -f 'libnm-glib/nm-secret-agent.c' || echo '$(srcdir)/'`libnm-glib/nm-secret-agent.c
-
-libnm-glib/libnm_glib_la-nm-device-wimax.lo: libnm-glib/nm-device-wimax.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-device-wimax.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wimax.Tpo -c -o libnm-glib/libnm_glib_la-nm-device-wimax.lo `test -f 'libnm-glib/nm-device-wimax.c' || echo '$(srcdir)/'`libnm-glib/nm-device-wimax.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wimax.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wimax.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-device-wimax.c' object='libnm-glib/libnm_glib_la-nm-device-wimax.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-device-wimax.lo `test -f 'libnm-glib/nm-device-wimax.c' || echo '$(srcdir)/'`libnm-glib/nm-device-wimax.c
-
-libnm-glib/libnm_glib_la-nm-wimax-nsp.lo: libnm-glib/nm-wimax-nsp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-wimax-nsp.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-wimax-nsp.Tpo -c -o libnm-glib/libnm_glib_la-nm-wimax-nsp.lo `test -f 'libnm-glib/nm-wimax-nsp.c' || echo '$(srcdir)/'`libnm-glib/nm-wimax-nsp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-wimax-nsp.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-wimax-nsp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-wimax-nsp.c' object='libnm-glib/libnm_glib_la-nm-wimax-nsp.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-wimax-nsp.lo `test -f 'libnm-glib/nm-wimax-nsp.c' || echo '$(srcdir)/'`libnm-glib/nm-wimax-nsp.c
-
-libnm-glib/libnm_glib_la-nm-glib-enum-types.lo: libnm-glib/nm-glib-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-glib-enum-types.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-glib-enum-types.Tpo -c -o libnm-glib/libnm_glib_la-nm-glib-enum-types.lo `test -f 'libnm-glib/nm-glib-enum-types.c' || echo '$(srcdir)/'`libnm-glib/nm-glib-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-glib-enum-types.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-glib-enum-types.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/nm-glib-enum-types.c' object='libnm-glib/libnm_glib_la-nm-glib-enum-types.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_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-glib-enum-types.lo `test -f 'libnm-glib/nm-glib-enum-types.c' || echo '$(srcdir)/'`libnm-glib/nm-glib-enum-types.c
-
-libnm-util/libnm_util_la-crypto.lo: libnm-util/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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-crypto.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-crypto.Tpo -c -o libnm-util/libnm_util_la-crypto.lo `test -f 'libnm-util/crypto.c' || echo '$(srcdir)/'`libnm-util/crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-crypto.Tpo libnm-util/$(DEPDIR)/libnm_util_la-crypto.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/crypto.c' object='libnm-util/libnm_util_la-crypto.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-crypto.lo `test -f 'libnm-util/crypto.c' || echo '$(srcdir)/'`libnm-util/crypto.c
-
-libnm-util/libnm_util_la-nm-connection.lo: libnm-util/nm-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-connection.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-connection.Tpo -c -o libnm-util/libnm_util_la-nm-connection.lo `test -f 'libnm-util/nm-connection.c' || echo '$(srcdir)/'`libnm-util/nm-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-connection.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-connection.c' object='libnm-util/libnm_util_la-nm-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-connection.lo `test -f 'libnm-util/nm-connection.c' || echo '$(srcdir)/'`libnm-util/nm-connection.c
-
-libnm-util/libnm_util_la-nm-param-spec-specialized.lo: libnm-util/nm-param-spec-specialized.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-param-spec-specialized.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-param-spec-specialized.Tpo -c -o libnm-util/libnm_util_la-nm-param-spec-specialized.lo `test -f 'libnm-util/nm-param-spec-specialized.c' || echo '$(srcdir)/'`libnm-util/nm-param-spec-specialized.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-param-spec-specialized.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-param-spec-specialized.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-param-spec-specialized.c' object='libnm-util/libnm_util_la-nm-param-spec-specialized.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-param-spec-specialized.lo `test -f 'libnm-util/nm-param-spec-specialized.c' || echo '$(srcdir)/'`libnm-util/nm-param-spec-specialized.c
-
-libnm-util/libnm_util_la-nm-setting.lo: libnm-util/nm-setting.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting.Tpo -c -o libnm-util/libnm_util_la-nm-setting.lo `test -f 'libnm-util/nm-setting.c' || echo '$(srcdir)/'`libnm-util/nm-setting.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting.c' object='libnm-util/libnm_util_la-nm-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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting.lo `test -f 'libnm-util/nm-setting.c' || echo '$(srcdir)/'`libnm-util/nm-setting.c
-
-libnm-util/libnm_util_la-nm-setting-8021x.lo: libnm-util/nm-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-8021x.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-8021x.Tpo -c -o libnm-util/libnm_util_la-nm-setting-8021x.lo `test -f 'libnm-util/nm-setting-8021x.c' || echo '$(srcdir)/'`libnm-util/nm-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-8021x.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-8021x.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-8021x.c' object='libnm-util/libnm_util_la-nm-setting-8021x.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-8021x.lo `test -f 'libnm-util/nm-setting-8021x.c' || echo '$(srcdir)/'`libnm-util/nm-setting-8021x.c
-
-libnm-util/libnm_util_la-nm-setting-adsl.lo: libnm-util/nm-setting-adsl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-adsl.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-adsl.Tpo -c -o libnm-util/libnm_util_la-nm-setting-adsl.lo `test -f 'libnm-util/nm-setting-adsl.c' || echo '$(srcdir)/'`libnm-util/nm-setting-adsl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-adsl.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-adsl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-adsl.c' object='libnm-util/libnm_util_la-nm-setting-adsl.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-adsl.lo `test -f 'libnm-util/nm-setting-adsl.c' || echo '$(srcdir)/'`libnm-util/nm-setting-adsl.c
-
-libnm-util/libnm_util_la-nm-setting-bluetooth.lo: libnm-util/nm-setting-bluetooth.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-bluetooth.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bluetooth.Tpo -c -o libnm-util/libnm_util_la-nm-setting-bluetooth.lo `test -f 'libnm-util/nm-setting-bluetooth.c' || echo '$(srcdir)/'`libnm-util/nm-setting-bluetooth.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bluetooth.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bluetooth.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-bluetooth.c' object='libnm-util/libnm_util_la-nm-setting-bluetooth.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-bluetooth.lo `test -f 'libnm-util/nm-setting-bluetooth.c' || echo '$(srcdir)/'`libnm-util/nm-setting-bluetooth.c
-
-libnm-util/libnm_util_la-nm-setting-bond.lo: libnm-util/nm-setting-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-bond.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bond.Tpo -c -o libnm-util/libnm_util_la-nm-setting-bond.lo `test -f 'libnm-util/nm-setting-bond.c' || echo '$(srcdir)/'`libnm-util/nm-setting-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bond.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bond.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-bond.c' object='libnm-util/libnm_util_la-nm-setting-bond.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-bond.lo `test -f 'libnm-util/nm-setting-bond.c' || echo '$(srcdir)/'`libnm-util/nm-setting-bond.c
-
-libnm-util/libnm_util_la-nm-setting-team.lo: libnm-util/nm-setting-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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-team.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team.Tpo -c -o libnm-util/libnm_util_la-nm-setting-team.lo `test -f 'libnm-util/nm-setting-team.c' || echo '$(srcdir)/'`libnm-util/nm-setting-team.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-team.c' object='libnm-util/libnm_util_la-nm-setting-team.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-team.lo `test -f 'libnm-util/nm-setting-team.c' || echo '$(srcdir)/'`libnm-util/nm-setting-team.c
-
-libnm-util/libnm_util_la-nm-setting-team-port.lo: libnm-util/nm-setting-team-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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-team-port.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team-port.Tpo -c -o libnm-util/libnm_util_la-nm-setting-team-port.lo `test -f 'libnm-util/nm-setting-team-port.c' || echo '$(srcdir)/'`libnm-util/nm-setting-team-port.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team-port.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team-port.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-team-port.c' object='libnm-util/libnm_util_la-nm-setting-team-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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-team-port.lo `test -f 'libnm-util/nm-setting-team-port.c' || echo '$(srcdir)/'`libnm-util/nm-setting-team-port.c
-
-libnm-util/libnm_util_la-nm-setting-bridge.lo: libnm-util/nm-setting-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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-bridge.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge.Tpo -c -o libnm-util/libnm_util_la-nm-setting-bridge.lo `test -f 'libnm-util/nm-setting-bridge.c' || echo '$(srcdir)/'`libnm-util/nm-setting-bridge.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-bridge.c' object='libnm-util/libnm_util_la-nm-setting-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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-bridge.lo `test -f 'libnm-util/nm-setting-bridge.c' || echo '$(srcdir)/'`libnm-util/nm-setting-bridge.c
-
-libnm-util/libnm_util_la-nm-setting-bridge-port.lo: libnm-util/nm-setting-bridge-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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-bridge-port.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Tpo -c -o libnm-util/libnm_util_la-nm-setting-bridge-port.lo `test -f 'libnm-util/nm-setting-bridge-port.c' || echo '$(srcdir)/'`libnm-util/nm-setting-bridge-port.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-bridge-port.c' object='libnm-util/libnm_util_la-nm-setting-bridge-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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-bridge-port.lo `test -f 'libnm-util/nm-setting-bridge-port.c' || echo '$(srcdir)/'`libnm-util/nm-setting-bridge-port.c
-
-libnm-util/libnm_util_la-nm-setting-connection.lo: libnm-util/nm-setting-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-connection.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-connection.Tpo -c -o libnm-util/libnm_util_la-nm-setting-connection.lo `test -f 'libnm-util/nm-setting-connection.c' || echo '$(srcdir)/'`libnm-util/nm-setting-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-connection.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-connection.c' object='libnm-util/libnm_util_la-nm-setting-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-connection.lo `test -f 'libnm-util/nm-setting-connection.c' || echo '$(srcdir)/'`libnm-util/nm-setting-connection.c
-
-libnm-util/libnm_util_la-nm-setting-dcb.lo: libnm-util/nm-setting-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-dcb.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-dcb.Tpo -c -o libnm-util/libnm_util_la-nm-setting-dcb.lo `test -f 'libnm-util/nm-setting-dcb.c' || echo '$(srcdir)/'`libnm-util/nm-setting-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-dcb.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-dcb.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-dcb.c' object='libnm-util/libnm_util_la-nm-setting-dcb.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-dcb.lo `test -f 'libnm-util/nm-setting-dcb.c' || echo '$(srcdir)/'`libnm-util/nm-setting-dcb.c
-
-libnm-util/libnm_util_la-nm-setting-infiniband.lo: libnm-util/nm-setting-infiniband.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-infiniband.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-infiniband.Tpo -c -o libnm-util/libnm_util_la-nm-setting-infiniband.lo `test -f 'libnm-util/nm-setting-infiniband.c' || echo '$(srcdir)/'`libnm-util/nm-setting-infiniband.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-infiniband.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-infiniband.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-infiniband.c' object='libnm-util/libnm_util_la-nm-setting-infiniband.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-infiniband.lo `test -f 'libnm-util/nm-setting-infiniband.c' || echo '$(srcdir)/'`libnm-util/nm-setting-infiniband.c
-
-libnm-util/libnm_util_la-nm-setting-ip4-config.lo: libnm-util/nm-setting-ip4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-ip4-config.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip4-config.Tpo -c -o libnm-util/libnm_util_la-nm-setting-ip4-config.lo `test -f 'libnm-util/nm-setting-ip4-config.c' || echo '$(srcdir)/'`libnm-util/nm-setting-ip4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip4-config.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip4-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-ip4-config.c' object='libnm-util/libnm_util_la-nm-setting-ip4-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-ip4-config.lo `test -f 'libnm-util/nm-setting-ip4-config.c' || echo '$(srcdir)/'`libnm-util/nm-setting-ip4-config.c
-
-libnm-util/libnm_util_la-nm-setting-vlan.lo: libnm-util/nm-setting-vlan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-vlan.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vlan.Tpo -c -o libnm-util/libnm_util_la-nm-setting-vlan.lo `test -f 'libnm-util/nm-setting-vlan.c' || echo '$(srcdir)/'`libnm-util/nm-setting-vlan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vlan.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vlan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-vlan.c' object='libnm-util/libnm_util_la-nm-setting-vlan.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-vlan.lo `test -f 'libnm-util/nm-setting-vlan.c' || echo '$(srcdir)/'`libnm-util/nm-setting-vlan.c
-
-libnm-util/libnm_util_la-nm-setting-ip6-config.lo: libnm-util/nm-setting-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-ip6-config.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip6-config.Tpo -c -o libnm-util/libnm_util_la-nm-setting-ip6-config.lo `test -f 'libnm-util/nm-setting-ip6-config.c' || echo '$(srcdir)/'`libnm-util/nm-setting-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip6-config.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip6-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-ip6-config.c' object='libnm-util/libnm_util_la-nm-setting-ip6-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-ip6-config.lo `test -f 'libnm-util/nm-setting-ip6-config.c' || echo '$(srcdir)/'`libnm-util/nm-setting-ip6-config.c
-
-libnm-util/libnm_util_la-nm-setting-ppp.lo: libnm-util/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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-ppp.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ppp.Tpo -c -o libnm-util/libnm_util_la-nm-setting-ppp.lo `test -f 'libnm-util/nm-setting-ppp.c' || echo '$(srcdir)/'`libnm-util/nm-setting-ppp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ppp.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ppp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-ppp.c' object='libnm-util/libnm_util_la-nm-setting-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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-ppp.lo `test -f 'libnm-util/nm-setting-ppp.c' || echo '$(srcdir)/'`libnm-util/nm-setting-ppp.c
-
-libnm-util/libnm_util_la-nm-setting-pppoe.lo: libnm-util/nm-setting-pppoe.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-pppoe.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-pppoe.Tpo -c -o libnm-util/libnm_util_la-nm-setting-pppoe.lo `test -f 'libnm-util/nm-setting-pppoe.c' || echo '$(srcdir)/'`libnm-util/nm-setting-pppoe.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-pppoe.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-pppoe.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-pppoe.c' object='libnm-util/libnm_util_la-nm-setting-pppoe.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-pppoe.lo `test -f 'libnm-util/nm-setting-pppoe.c' || echo '$(srcdir)/'`libnm-util/nm-setting-pppoe.c
-
-libnm-util/libnm_util_la-nm-setting-serial.lo: libnm-util/nm-setting-serial.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-serial.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-serial.Tpo -c -o libnm-util/libnm_util_la-nm-setting-serial.lo `test -f 'libnm-util/nm-setting-serial.c' || echo '$(srcdir)/'`libnm-util/nm-setting-serial.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-serial.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-serial.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-serial.c' object='libnm-util/libnm_util_la-nm-setting-serial.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-serial.lo `test -f 'libnm-util/nm-setting-serial.c' || echo '$(srcdir)/'`libnm-util/nm-setting-serial.c
-
-libnm-util/libnm_util_la-nm-setting-generic.lo: libnm-util/nm-setting-generic.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-generic.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-generic.Tpo -c -o libnm-util/libnm_util_la-nm-setting-generic.lo `test -f 'libnm-util/nm-setting-generic.c' || echo '$(srcdir)/'`libnm-util/nm-setting-generic.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-generic.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-generic.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-generic.c' object='libnm-util/libnm_util_la-nm-setting-generic.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-generic.lo `test -f 'libnm-util/nm-setting-generic.c' || echo '$(srcdir)/'`libnm-util/nm-setting-generic.c
-
-libnm-util/libnm_util_la-nm-setting-gsm.lo: libnm-util/nm-setting-gsm.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-gsm.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-gsm.Tpo -c -o libnm-util/libnm_util_la-nm-setting-gsm.lo `test -f 'libnm-util/nm-setting-gsm.c' || echo '$(srcdir)/'`libnm-util/nm-setting-gsm.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-gsm.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-gsm.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-gsm.c' object='libnm-util/libnm_util_la-nm-setting-gsm.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-gsm.lo `test -f 'libnm-util/nm-setting-gsm.c' || echo '$(srcdir)/'`libnm-util/nm-setting-gsm.c
-
-libnm-util/libnm_util_la-nm-setting-cdma.lo: libnm-util/nm-setting-cdma.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-cdma.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-cdma.Tpo -c -o libnm-util/libnm_util_la-nm-setting-cdma.lo `test -f 'libnm-util/nm-setting-cdma.c' || echo '$(srcdir)/'`libnm-util/nm-setting-cdma.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-cdma.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-cdma.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-cdma.c' object='libnm-util/libnm_util_la-nm-setting-cdma.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-cdma.lo `test -f 'libnm-util/nm-setting-cdma.c' || echo '$(srcdir)/'`libnm-util/nm-setting-cdma.c
-
-libnm-util/libnm_util_la-nm-setting-olpc-mesh.lo: libnm-util/nm-setting-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-olpc-mesh.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-olpc-mesh.Tpo -c -o libnm-util/libnm_util_la-nm-setting-olpc-mesh.lo `test -f 'libnm-util/nm-setting-olpc-mesh.c' || echo '$(srcdir)/'`libnm-util/nm-setting-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-olpc-mesh.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-olpc-mesh.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-olpc-mesh.c' object='libnm-util/libnm_util_la-nm-setting-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-olpc-mesh.lo `test -f 'libnm-util/nm-setting-olpc-mesh.c' || echo '$(srcdir)/'`libnm-util/nm-setting-olpc-mesh.c
-
-libnm-util/libnm_util_la-nm-setting-wimax.lo: libnm-util/nm-setting-wimax.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-wimax.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wimax.Tpo -c -o libnm-util/libnm_util_la-nm-setting-wimax.lo `test -f 'libnm-util/nm-setting-wimax.c' || echo '$(srcdir)/'`libnm-util/nm-setting-wimax.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wimax.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wimax.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-wimax.c' object='libnm-util/libnm_util_la-nm-setting-wimax.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-wimax.lo `test -f 'libnm-util/nm-setting-wimax.c' || echo '$(srcdir)/'`libnm-util/nm-setting-wimax.c
-
-libnm-util/libnm_util_la-nm-setting-wired.lo: libnm-util/nm-setting-wired.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-wired.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wired.Tpo -c -o libnm-util/libnm_util_la-nm-setting-wired.lo `test -f 'libnm-util/nm-setting-wired.c' || echo '$(srcdir)/'`libnm-util/nm-setting-wired.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wired.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wired.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-wired.c' object='libnm-util/libnm_util_la-nm-setting-wired.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-wired.lo `test -f 'libnm-util/nm-setting-wired.c' || echo '$(srcdir)/'`libnm-util/nm-setting-wired.c
-
-libnm-util/libnm_util_la-nm-setting-wireless.lo: libnm-util/nm-setting-wireless.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-wireless.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless.Tpo -c -o libnm-util/libnm_util_la-nm-setting-wireless.lo `test -f 'libnm-util/nm-setting-wireless.c' || echo '$(srcdir)/'`libnm-util/nm-setting-wireless.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-wireless.c' object='libnm-util/libnm_util_la-nm-setting-wireless.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-wireless.lo `test -f 'libnm-util/nm-setting-wireless.c' || echo '$(srcdir)/'`libnm-util/nm-setting-wireless.c
-
-libnm-util/libnm_util_la-nm-setting-wireless-security.lo: libnm-util/nm-setting-wireless-security.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-wireless-security.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless-security.Tpo -c -o libnm-util/libnm_util_la-nm-setting-wireless-security.lo `test -f 'libnm-util/nm-setting-wireless-security.c' || echo '$(srcdir)/'`libnm-util/nm-setting-wireless-security.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless-security.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless-security.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-wireless-security.c' object='libnm-util/libnm_util_la-nm-setting-wireless-security.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-wireless-security.lo `test -f 'libnm-util/nm-setting-wireless-security.c' || echo '$(srcdir)/'`libnm-util/nm-setting-wireless-security.c
-
-libnm-util/libnm_util_la-nm-setting-vpn.lo: libnm-util/nm-setting-vpn.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-setting-vpn.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vpn.Tpo -c -o libnm-util/libnm_util_la-nm-setting-vpn.lo `test -f 'libnm-util/nm-setting-vpn.c' || echo '$(srcdir)/'`libnm-util/nm-setting-vpn.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vpn.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vpn.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-setting-vpn.c' object='libnm-util/libnm_util_la-nm-setting-vpn.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-setting-vpn.lo `test -f 'libnm-util/nm-setting-vpn.c' || echo '$(srcdir)/'`libnm-util/nm-setting-vpn.c
-
-libnm-util/libnm_util_la-nm-utils.lo: libnm-util/nm-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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-utils.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-utils.Tpo -c -o libnm-util/libnm_util_la-nm-utils.lo `test -f 'libnm-util/nm-utils.c' || echo '$(srcdir)/'`libnm-util/nm-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-utils.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-utils.c' object='libnm-util/libnm_util_la-nm-utils.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-access-point.lo: libnm/nm-access-point.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-access-point.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-access-point.Tpo -c -o libnm/liblibnm_la-nm-access-point.lo `test -f 'libnm/nm-access-point.c' || echo '$(srcdir)/'`libnm/nm-access-point.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-access-point.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-access-point.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-access-point.c' object='libnm/liblibnm_la-nm-access-point.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-utils.lo `test -f 'libnm-util/nm-utils.c' || echo '$(srcdir)/'`libnm-util/nm-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-access-point.lo `test -f 'libnm/nm-access-point.c' || echo '$(srcdir)/'`libnm/nm-access-point.c
 
-libnm-util/libnm_util_la-nm-value-transforms.lo: libnm-util/nm-value-transforms.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-value-transforms.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-value-transforms.Tpo -c -o libnm-util/libnm_util_la-nm-value-transforms.lo `test -f 'libnm-util/nm-value-transforms.c' || echo '$(srcdir)/'`libnm-util/nm-value-transforms.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-value-transforms.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-value-transforms.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-value-transforms.c' object='libnm-util/libnm_util_la-nm-value-transforms.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-active-connection.lo: libnm/nm-active-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-active-connection.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-active-connection.Tpo -c -o libnm/liblibnm_la-nm-active-connection.lo `test -f 'libnm/nm-active-connection.c' || echo '$(srcdir)/'`libnm/nm-active-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-active-connection.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-active-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-active-connection.c' object='libnm/liblibnm_la-nm-active-connection.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-value-transforms.lo `test -f 'libnm-util/nm-value-transforms.c' || echo '$(srcdir)/'`libnm-util/nm-value-transforms.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-active-connection.lo `test -f 'libnm/nm-active-connection.c' || echo '$(srcdir)/'`libnm/nm-active-connection.c
 
-libnm-util/libnm_util_la-crypto_gnutls.lo: libnm-util/crypto_gnutls.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-crypto_gnutls.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-crypto_gnutls.Tpo -c -o libnm-util/libnm_util_la-crypto_gnutls.lo `test -f 'libnm-util/crypto_gnutls.c' || echo '$(srcdir)/'`libnm-util/crypto_gnutls.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-crypto_gnutls.Tpo libnm-util/$(DEPDIR)/libnm_util_la-crypto_gnutls.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/crypto_gnutls.c' object='libnm-util/libnm_util_la-crypto_gnutls.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-checkpoint.lo: libnm/nm-checkpoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-checkpoint.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-checkpoint.Tpo -c -o libnm/liblibnm_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-checkpoint.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-checkpoint.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-checkpoint.c' object='libnm/liblibnm_la-nm-checkpoint.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-crypto_gnutls.lo `test -f 'libnm-util/crypto_gnutls.c' || echo '$(srcdir)/'`libnm-util/crypto_gnutls.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.c
 
-libnm-util/libnm_util_la-crypto_nss.lo: libnm-util/crypto_nss.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-crypto_nss.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-crypto_nss.Tpo -c -o libnm-util/libnm_util_la-crypto_nss.lo `test -f 'libnm-util/crypto_nss.c' || echo '$(srcdir)/'`libnm-util/crypto_nss.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-crypto_nss.Tpo libnm-util/$(DEPDIR)/libnm_util_la-crypto_nss.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/crypto_nss.c' object='libnm-util/libnm_util_la-crypto_nss.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-client.lo: libnm/nm-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-client.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-client.Tpo -c -o libnm/liblibnm_la-nm-client.lo `test -f 'libnm/nm-client.c' || echo '$(srcdir)/'`libnm/nm-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-client.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-client.c' object='libnm/liblibnm_la-nm-client.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_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-crypto_nss.lo `test -f 'libnm-util/crypto_nss.c' || echo '$(srcdir)/'`libnm-util/crypto_nss.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-client.lo `test -f 'libnm/nm-client.c' || echo '$(srcdir)/'`libnm/nm-client.c
 
-libnm-util/libnm_util_la-nm-utils-enum-types.lo: libnm-util/nm-utils-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-nm-utils-enum-types.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-nm-utils-enum-types.Tpo -c -o libnm-util/libnm_util_la-nm-utils-enum-types.lo `test -f 'libnm-util/nm-utils-enum-types.c' || echo '$(srcdir)/'`libnm-util/nm-utils-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-nm-utils-enum-types.Tpo libnm-util/$(DEPDIR)/libnm_util_la-nm-utils-enum-types.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/nm-utils-enum-types.c' object='libnm-util/libnm_util_la-nm-utils-enum-types.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-dbus-helpers.lo: libnm/nm-dbus-helpers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-dbus-helpers.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-dbus-helpers.Tpo -c -o libnm/liblibnm_la-nm-dbus-helpers.lo `test -f 'libnm/nm-dbus-helpers.c' || echo '$(srcdir)/'`libnm/nm-dbus-helpers.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-dbus-helpers.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-dbus-helpers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dbus-helpers.c' object='libnm/liblibnm_la-nm-dbus-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) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libnm_util_la-nm-utils-enum-types.lo `test -f 'libnm-util/nm-utils-enum-types.c' || echo '$(srcdir)/'`libnm-util/nm-utils-enum-types.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-dbus-helpers.lo `test -f 'libnm/nm-dbus-helpers.c' || echo '$(srcdir)/'`libnm/nm-dbus-helpers.c
 
-libnm-util/libtest_crypto_la-crypto.lo: libnm-util/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_util_libtest_crypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libtest_crypto_la-crypto.lo -MD -MP -MF libnm-util/$(DEPDIR)/libtest_crypto_la-crypto.Tpo -c -o libnm-util/libtest_crypto_la-crypto.lo `test -f 'libnm-util/crypto.c' || echo '$(srcdir)/'`libnm-util/crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libtest_crypto_la-crypto.Tpo libnm-util/$(DEPDIR)/libtest_crypto_la-crypto.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/crypto.c' object='libnm-util/libtest_crypto_la-crypto.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-6lowpan.lo: libnm/nm-device-6lowpan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-6lowpan.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-6lowpan.Tpo -c -o libnm/liblibnm_la-nm-device-6lowpan.lo `test -f 'libnm/nm-device-6lowpan.c' || echo '$(srcdir)/'`libnm/nm-device-6lowpan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-6lowpan.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-6lowpan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-6lowpan.c' object='libnm/liblibnm_la-nm-device-6lowpan.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libtest_crypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libtest_crypto_la-crypto.lo `test -f 'libnm-util/crypto.c' || echo '$(srcdir)/'`libnm-util/crypto.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-6lowpan.lo `test -f 'libnm/nm-device-6lowpan.c' || echo '$(srcdir)/'`libnm/nm-device-6lowpan.c
 
-libnm-util/libtest_crypto_la-crypto_gnutls.lo: libnm-util/crypto_gnutls.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libtest_crypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libtest_crypto_la-crypto_gnutls.lo -MD -MP -MF libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_gnutls.Tpo -c -o libnm-util/libtest_crypto_la-crypto_gnutls.lo `test -f 'libnm-util/crypto_gnutls.c' || echo '$(srcdir)/'`libnm-util/crypto_gnutls.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_gnutls.Tpo libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_gnutls.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/crypto_gnutls.c' object='libnm-util/libtest_crypto_la-crypto_gnutls.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-adsl.lo: libnm/nm-device-adsl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-adsl.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-adsl.Tpo -c -o libnm/liblibnm_la-nm-device-adsl.lo `test -f 'libnm/nm-device-adsl.c' || echo '$(srcdir)/'`libnm/nm-device-adsl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-adsl.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-adsl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-adsl.c' object='libnm/liblibnm_la-nm-device-adsl.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_util_libtest_crypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libtest_crypto_la-crypto_gnutls.lo `test -f 'libnm-util/crypto_gnutls.c' || echo '$(srcdir)/'`libnm-util/crypto_gnutls.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-adsl.lo `test -f 'libnm/nm-device-adsl.c' || echo '$(srcdir)/'`libnm/nm-device-adsl.c
 
-libnm-util/libtest_crypto_la-crypto_nss.lo: libnm-util/crypto_nss.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libtest_crypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libtest_crypto_la-crypto_nss.lo -MD -MP -MF libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_nss.Tpo -c -o libnm-util/libtest_crypto_la-crypto_nss.lo `test -f 'libnm-util/crypto_nss.c' || echo '$(srcdir)/'`libnm-util/crypto_nss.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_nss.Tpo libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_nss.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/crypto_nss.c' object='libnm-util/libtest_crypto_la-crypto_nss.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-bond.lo: libnm/nm-device-bond.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-bond.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-bond.Tpo -c -o libnm/liblibnm_la-nm-device-bond.lo `test -f 'libnm/nm-device-bond.c' || echo '$(srcdir)/'`libnm/nm-device-bond.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-bond.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-bond.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-bond.c' object='libnm/liblibnm_la-nm-device-bond.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_util_libtest_crypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/libtest_crypto_la-crypto_nss.lo `test -f 'libnm-util/crypto_nss.c' || echo '$(srcdir)/'`libnm-util/crypto_nss.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-bond.lo `test -f 'libnm/nm-device-bond.c' || echo '$(srcdir)/'`libnm/nm-device-bond.c
 
-libnm/libnm_utils_la-nm-libnm-utils.lo: libnm/nm-libnm-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_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_utils_la-nm-libnm-utils.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Tpo -c -o libnm/libnm_utils_la-nm-libnm-utils.lo `test -f 'libnm/nm-libnm-utils.c' || echo '$(srcdir)/'`libnm/nm-libnm-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Tpo libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-libnm-utils.c' object='libnm/libnm_utils_la-nm-libnm-utils.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-bridge.lo: libnm/nm-device-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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-bridge.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-bridge.Tpo -c -o libnm/liblibnm_la-nm-device-bridge.lo `test -f 'libnm/nm-device-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-bridge.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-bridge.c' object='libnm/liblibnm_la-nm-device-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_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_utils_la-nm-libnm-utils.lo `test -f 'libnm/nm-libnm-utils.c' || echo '$(srcdir)/'`libnm/nm-libnm-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-bridge.lo `test -f 'libnm/nm-device-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-bridge.c
 
-libnm/fake-typelib/libnm_utils_la-typelibs.lo: libnm/fake-typelib/typelibs.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/fake-typelib/libnm_utils_la-typelibs.lo -MD -MP -MF libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Tpo -c -o libnm/fake-typelib/libnm_utils_la-typelibs.lo `test -f 'libnm/fake-typelib/typelibs.c' || echo '$(srcdir)/'`libnm/fake-typelib/typelibs.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Tpo libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/fake-typelib/typelibs.c' object='libnm/fake-typelib/libnm_utils_la-typelibs.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-bt.lo: libnm/nm-device-bt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-bt.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-bt.Tpo -c -o libnm/liblibnm_la-nm-device-bt.lo `test -f 'libnm/nm-device-bt.c' || echo '$(srcdir)/'`libnm/nm-device-bt.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-bt.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-bt.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-bt.c' object='libnm/liblibnm_la-nm-device-bt.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/fake-typelib/libnm_utils_la-typelibs.lo `test -f 'libnm/fake-typelib/typelibs.c' || echo '$(srcdir)/'`libnm/fake-typelib/typelibs.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-bt.lo `test -f 'libnm/nm-device-bt.c' || echo '$(srcdir)/'`libnm/nm-device-bt.c
 
-libnm/libnm_la-nm-access-point.lo: libnm/nm-access-point.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-access-point.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-access-point.Tpo -c -o libnm/libnm_la-nm-access-point.lo `test -f 'libnm/nm-access-point.c' || echo '$(srcdir)/'`libnm/nm-access-point.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-access-point.Tpo libnm/$(DEPDIR)/libnm_la-nm-access-point.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-access-point.c' object='libnm/libnm_la-nm-access-point.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-dummy.lo: libnm/nm-device-dummy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-dummy.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-dummy.Tpo -c -o libnm/liblibnm_la-nm-device-dummy.lo `test -f 'libnm/nm-device-dummy.c' || echo '$(srcdir)/'`libnm/nm-device-dummy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-dummy.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-dummy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-dummy.c' object='libnm/liblibnm_la-nm-device-dummy.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_la-nm-access-point.lo `test -f 'libnm/nm-access-point.c' || echo '$(srcdir)/'`libnm/nm-access-point.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-dummy.lo `test -f 'libnm/nm-device-dummy.c' || echo '$(srcdir)/'`libnm/nm-device-dummy.c
 
-libnm/libnm_la-nm-active-connection.lo: libnm/nm-active-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-active-connection.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-active-connection.Tpo -c -o libnm/libnm_la-nm-active-connection.lo `test -f 'libnm/nm-active-connection.c' || echo '$(srcdir)/'`libnm/nm-active-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-active-connection.Tpo libnm/$(DEPDIR)/libnm_la-nm-active-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-active-connection.c' object='libnm/libnm_la-nm-active-connection.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-ethernet.lo: libnm/nm-device-ethernet.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-ethernet.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-ethernet.Tpo -c -o libnm/liblibnm_la-nm-device-ethernet.lo `test -f 'libnm/nm-device-ethernet.c' || echo '$(srcdir)/'`libnm/nm-device-ethernet.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-ethernet.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-ethernet.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ethernet.c' object='libnm/liblibnm_la-nm-device-ethernet.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_la-nm-active-connection.lo `test -f 'libnm/nm-active-connection.c' || echo '$(srcdir)/'`libnm/nm-active-connection.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-ethernet.lo `test -f 'libnm/nm-device-ethernet.c' || echo '$(srcdir)/'`libnm/nm-device-ethernet.c
 
-libnm/libnm_la-nm-checkpoint.lo: libnm/nm-checkpoint.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-checkpoint.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-checkpoint.Tpo -c -o libnm/libnm_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-checkpoint.Tpo libnm/$(DEPDIR)/libnm_la-nm-checkpoint.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-checkpoint.c' object='libnm/libnm_la-nm-checkpoint.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-generic.lo: libnm/nm-device-generic.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-generic.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-generic.Tpo -c -o libnm/liblibnm_la-nm-device-generic.lo `test -f 'libnm/nm-device-generic.c' || echo '$(srcdir)/'`libnm/nm-device-generic.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-generic.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-generic.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-generic.c' object='libnm/liblibnm_la-nm-device-generic.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_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-generic.lo `test -f 'libnm/nm-device-generic.c' || echo '$(srcdir)/'`libnm/nm-device-generic.c
 
-libnm/libnm_la-nm-client.lo: libnm/nm-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-client.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-client.Tpo -c -o libnm/libnm_la-nm-client.lo `test -f 'libnm/nm-client.c' || echo '$(srcdir)/'`libnm/nm-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-client.Tpo libnm/$(DEPDIR)/libnm_la-nm-client.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-client.c' object='libnm/libnm_la-nm-client.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-infiniband.lo: libnm/nm-device-infiniband.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-infiniband.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-infiniband.Tpo -c -o libnm/liblibnm_la-nm-device-infiniband.lo `test -f 'libnm/nm-device-infiniband.c' || echo '$(srcdir)/'`libnm/nm-device-infiniband.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-infiniband.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-infiniband.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-infiniband.c' object='libnm/liblibnm_la-nm-device-infiniband.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_la-nm-client.lo `test -f 'libnm/nm-client.c' || echo '$(srcdir)/'`libnm/nm-client.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-infiniband.lo `test -f 'libnm/nm-device-infiniband.c' || echo '$(srcdir)/'`libnm/nm-device-infiniband.c
 
-libnm/libnm_la-nm-dbus-helpers.lo: libnm/nm-dbus-helpers.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_la-nm-dbus-helpers.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-dbus-helpers.Tpo -c -o libnm/libnm_la-nm-dbus-helpers.lo `test -f 'libnm/nm-dbus-helpers.c' || echo '$(srcdir)/'`libnm/nm-dbus-helpers.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-dbus-helpers.Tpo libnm/$(DEPDIR)/libnm_la-nm-dbus-helpers.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dbus-helpers.c' object='libnm/libnm_la-nm-dbus-helpers.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-ip-tunnel.lo: libnm/nm-device-ip-tunnel.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-ip-tunnel.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-ip-tunnel.Tpo -c -o libnm/liblibnm_la-nm-device-ip-tunnel.lo `test -f 'libnm/nm-device-ip-tunnel.c' || echo '$(srcdir)/'`libnm/nm-device-ip-tunnel.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-ip-tunnel.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-ip-tunnel.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ip-tunnel.c' object='libnm/liblibnm_la-nm-device-ip-tunnel.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_la-nm-dbus-helpers.lo `test -f 'libnm/nm-dbus-helpers.c' || echo '$(srcdir)/'`libnm/nm-dbus-helpers.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-ip-tunnel.lo `test -f 'libnm/nm-device-ip-tunnel.c' || echo '$(srcdir)/'`libnm/nm-device-ip-tunnel.c
 
-libnm/libnm_la-nm-device-6lowpan.lo: libnm/nm-device-6lowpan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-6lowpan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-6lowpan.Tpo -c -o libnm/libnm_la-nm-device-6lowpan.lo `test -f 'libnm/nm-device-6lowpan.c' || echo '$(srcdir)/'`libnm/nm-device-6lowpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-6lowpan.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-6lowpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-6lowpan.c' object='libnm/libnm_la-nm-device-6lowpan.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-macsec.lo: libnm/nm-device-macsec.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-macsec.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-macsec.Tpo -c -o libnm/liblibnm_la-nm-device-macsec.lo `test -f 'libnm/nm-device-macsec.c' || echo '$(srcdir)/'`libnm/nm-device-macsec.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-macsec.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-macsec.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-macsec.c' object='libnm/liblibnm_la-nm-device-macsec.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_la-nm-device-6lowpan.lo `test -f 'libnm/nm-device-6lowpan.c' || echo '$(srcdir)/'`libnm/nm-device-6lowpan.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-macsec.lo `test -f 'libnm/nm-device-macsec.c' || echo '$(srcdir)/'`libnm/nm-device-macsec.c
 
-libnm/libnm_la-nm-device-adsl.lo: libnm/nm-device-adsl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-adsl.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-adsl.Tpo -c -o libnm/libnm_la-nm-device-adsl.lo `test -f 'libnm/nm-device-adsl.c' || echo '$(srcdir)/'`libnm/nm-device-adsl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-adsl.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-adsl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-adsl.c' object='libnm/libnm_la-nm-device-adsl.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-macvlan.lo: libnm/nm-device-macvlan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-macvlan.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-macvlan.Tpo -c -o libnm/liblibnm_la-nm-device-macvlan.lo `test -f 'libnm/nm-device-macvlan.c' || echo '$(srcdir)/'`libnm/nm-device-macvlan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-macvlan.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-macvlan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-macvlan.c' object='libnm/liblibnm_la-nm-device-macvlan.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_la-nm-device-adsl.lo `test -f 'libnm/nm-device-adsl.c' || echo '$(srcdir)/'`libnm/nm-device-adsl.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-macvlan.lo `test -f 'libnm/nm-device-macvlan.c' || echo '$(srcdir)/'`libnm/nm-device-macvlan.c
 
-libnm/libnm_la-nm-device-bond.lo: libnm/nm-device-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-bond.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-bond.Tpo -c -o libnm/libnm_la-nm-device-bond.lo `test -f 'libnm/nm-device-bond.c' || echo '$(srcdir)/'`libnm/nm-device-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-bond.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-bond.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-bond.c' object='libnm/libnm_la-nm-device-bond.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-modem.lo: libnm/nm-device-modem.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-modem.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-modem.Tpo -c -o libnm/liblibnm_la-nm-device-modem.lo `test -f 'libnm/nm-device-modem.c' || echo '$(srcdir)/'`libnm/nm-device-modem.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-modem.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-modem.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-modem.c' object='libnm/liblibnm_la-nm-device-modem.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_la-nm-device-bond.lo `test -f 'libnm/nm-device-bond.c' || echo '$(srcdir)/'`libnm/nm-device-bond.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-modem.lo `test -f 'libnm/nm-device-modem.c' || echo '$(srcdir)/'`libnm/nm-device-modem.c
 
-libnm/libnm_la-nm-device-bridge.lo: libnm/nm-device-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_la-nm-device-bridge.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-bridge.Tpo -c -o libnm/libnm_la-nm-device-bridge.lo `test -f 'libnm/nm-device-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-bridge.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-bridge.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-bridge.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-bridge.c' object='libnm/libnm_la-nm-device-bridge.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-olpc-mesh.lo: libnm/nm-device-olpc-mesh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-olpc-mesh.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-olpc-mesh.Tpo -c -o libnm/liblibnm_la-nm-device-olpc-mesh.lo `test -f 'libnm/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`libnm/nm-device-olpc-mesh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-olpc-mesh.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-olpc-mesh.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-olpc-mesh.c' object='libnm/liblibnm_la-nm-device-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-bridge.lo `test -f 'libnm/nm-device-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-bridge.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-olpc-mesh.lo `test -f 'libnm/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`libnm/nm-device-olpc-mesh.c
 
-libnm/libnm_la-nm-device-bt.lo: libnm/nm-device-bt.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_la-nm-device-bt.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-bt.Tpo -c -o libnm/libnm_la-nm-device-bt.lo `test -f 'libnm/nm-device-bt.c' || echo '$(srcdir)/'`libnm/nm-device-bt.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-bt.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-bt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-bt.c' object='libnm/libnm_la-nm-device-bt.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-ovs-bridge.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-bridge.Tpo -c -o libnm/liblibnm_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)/liblibnm_la-nm-device-ovs-bridge.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-bridge.c' object='libnm/liblibnm_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_la-nm-device-bt.lo `test -f 'libnm/nm-device-bt.c' || echo '$(srcdir)/'`libnm/nm-device-bt.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-ovs-bridge.lo `test -f 'libnm/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-bridge.c
 
-libnm/libnm_la-nm-device-dummy.lo: libnm/nm-device-dummy.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_la-nm-device-dummy.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-dummy.Tpo -c -o libnm/libnm_la-nm-device-dummy.lo `test -f 'libnm/nm-device-dummy.c' || echo '$(srcdir)/'`libnm/nm-device-dummy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-dummy.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-dummy.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-dummy.c' object='libnm/libnm_la-nm-device-dummy.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-ovs-interface.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-interface.Tpo -c -o libnm/liblibnm_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)/liblibnm_la-nm-device-ovs-interface.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-interface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-interface.c' object='libnm/liblibnm_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_la-nm-device-dummy.lo `test -f 'libnm/nm-device-dummy.c' || echo '$(srcdir)/'`libnm/nm-device-dummy.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-ovs-interface.lo `test -f 'libnm/nm-device-ovs-interface.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-interface.c
 
-libnm/libnm_la-nm-device-ethernet.lo: libnm/nm-device-ethernet.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_la-nm-device-ethernet.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-ethernet.Tpo -c -o libnm/libnm_la-nm-device-ethernet.lo `test -f 'libnm/nm-device-ethernet.c' || echo '$(srcdir)/'`libnm/nm-device-ethernet.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-ethernet.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-ethernet.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ethernet.c' object='libnm/libnm_la-nm-device-ethernet.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-ovs-port.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-port.Tpo -c -o libnm/liblibnm_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)/liblibnm_la-nm-device-ovs-port.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-port.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-port.c' object='libnm/liblibnm_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_la-nm-device-ethernet.lo `test -f 'libnm/nm-device-ethernet.c' || echo '$(srcdir)/'`libnm/nm-device-ethernet.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-ovs-port.lo `test -f 'libnm/nm-device-ovs-port.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-port.c
 
-libnm/libnm_la-nm-device-generic.lo: libnm/nm-device-generic.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-generic.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-generic.Tpo -c -o libnm/libnm_la-nm-device-generic.lo `test -f 'libnm/nm-device-generic.c' || echo '$(srcdir)/'`libnm/nm-device-generic.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-generic.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-generic.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-generic.c' object='libnm/libnm_la-nm-device-generic.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-ppp.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-ppp.Tpo -c -o libnm/liblibnm_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)/liblibnm_la-nm-device-ppp.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-ppp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ppp.c' object='libnm/liblibnm_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_la-nm-device-generic.lo `test -f 'libnm/nm-device-generic.c' || echo '$(srcdir)/'`libnm/nm-device-generic.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-ppp.lo `test -f 'libnm/nm-device-ppp.c' || echo '$(srcdir)/'`libnm/nm-device-ppp.c
 
-libnm/libnm_la-nm-device-infiniband.lo: libnm/nm-device-infiniband.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_la-nm-device-infiniband.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-infiniband.Tpo -c -o libnm/libnm_la-nm-device-infiniband.lo `test -f 'libnm/nm-device-infiniband.c' || echo '$(srcdir)/'`libnm/nm-device-infiniband.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-infiniband.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-infiniband.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-infiniband.c' object='libnm/libnm_la-nm-device-infiniband.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-team.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-team.Tpo -c -o libnm/liblibnm_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)/liblibnm_la-nm-device-team.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-team.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-team.c' object='libnm/liblibnm_la-nm-device-team.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_la-nm-device-infiniband.lo `test -f 'libnm/nm-device-infiniband.c' || echo '$(srcdir)/'`libnm/nm-device-infiniband.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-team.lo `test -f 'libnm/nm-device-team.c' || echo '$(srcdir)/'`libnm/nm-device-team.c
 
-libnm/libnm_la-nm-device-ip-tunnel.lo: libnm/nm-device-ip-tunnel.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_la-nm-device-ip-tunnel.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-ip-tunnel.Tpo -c -o libnm/libnm_la-nm-device-ip-tunnel.lo `test -f 'libnm/nm-device-ip-tunnel.c' || echo '$(srcdir)/'`libnm/nm-device-ip-tunnel.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-ip-tunnel.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-ip-tunnel.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ip-tunnel.c' object='libnm/libnm_la-nm-device-ip-tunnel.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-tun.lo: libnm/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) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-tun.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Tpo -c -o libnm/liblibnm_la-nm-device-tun.lo `test -f 'libnm/nm-device-tun.c' || echo '$(srcdir)/'`libnm/nm-device-tun.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-tun.c' object='libnm/liblibnm_la-nm-device-tun.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_la-nm-device-ip-tunnel.lo `test -f 'libnm/nm-device-ip-tunnel.c' || echo '$(srcdir)/'`libnm/nm-device-ip-tunnel.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-tun.lo `test -f 'libnm/nm-device-tun.c' || echo '$(srcdir)/'`libnm/nm-device-tun.c
 
-libnm/libnm_la-nm-device-macsec.lo: libnm/nm-device-macsec.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-macsec.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-macsec.Tpo -c -o libnm/libnm_la-nm-device-macsec.lo `test -f 'libnm/nm-device-macsec.c' || echo '$(srcdir)/'`libnm/nm-device-macsec.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-macsec.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-macsec.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-macsec.c' object='libnm/libnm_la-nm-device-macsec.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-vlan.lo: libnm/nm-device-vlan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-vlan.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Tpo -c -o libnm/liblibnm_la-nm-device-vlan.lo `test -f 'libnm/nm-device-vlan.c' || echo '$(srcdir)/'`libnm/nm-device-vlan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-vlan.c' object='libnm/liblibnm_la-nm-device-vlan.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_la-nm-device-macsec.lo `test -f 'libnm/nm-device-macsec.c' || echo '$(srcdir)/'`libnm/nm-device-macsec.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-vlan.lo `test -f 'libnm/nm-device-vlan.c' || echo '$(srcdir)/'`libnm/nm-device-vlan.c
 
-libnm/libnm_la-nm-device-macvlan.lo: libnm/nm-device-macvlan.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_la-nm-device-macvlan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-macvlan.Tpo -c -o libnm/libnm_la-nm-device-macvlan.lo `test -f 'libnm/nm-device-macvlan.c' || echo '$(srcdir)/'`libnm/nm-device-macvlan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-macvlan.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-macvlan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-macvlan.c' object='libnm/libnm_la-nm-device-macvlan.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-vxlan.lo: libnm/nm-device-vxlan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-vxlan.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Tpo -c -o libnm/liblibnm_la-nm-device-vxlan.lo `test -f 'libnm/nm-device-vxlan.c' || echo '$(srcdir)/'`libnm/nm-device-vxlan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-vxlan.c' object='libnm/liblibnm_la-nm-device-vxlan.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_la-nm-device-macvlan.lo `test -f 'libnm/nm-device-macvlan.c' || echo '$(srcdir)/'`libnm/nm-device-macvlan.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-vxlan.lo `test -f 'libnm/nm-device-vxlan.c' || echo '$(srcdir)/'`libnm/nm-device-vxlan.c
 
-libnm/libnm_la-nm-device-modem.lo: libnm/nm-device-modem.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_la-nm-device-modem.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-modem.Tpo -c -o libnm/libnm_la-nm-device-modem.lo `test -f 'libnm/nm-device-modem.c' || echo '$(srcdir)/'`libnm/nm-device-modem.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-modem.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-modem.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-modem.c' object='libnm/libnm_la-nm-device-modem.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-wifi-p2p.lo: libnm/nm-device-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-wifi-p2p.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Tpo -c -o libnm/liblibnm_la-nm-device-wifi-p2p.lo `test -f 'libnm/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`libnm/nm-device-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wifi-p2p.c' object='libnm/liblibnm_la-nm-device-wifi-p2p.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-modem.lo `test -f 'libnm/nm-device-modem.c' || echo '$(srcdir)/'`libnm/nm-device-modem.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-wifi-p2p.lo `test -f 'libnm/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`libnm/nm-device-wifi-p2p.c
 
-libnm/libnm_la-nm-device-olpc-mesh.lo: libnm/nm-device-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-olpc-mesh.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-olpc-mesh.Tpo -c -o libnm/libnm_la-nm-device-olpc-mesh.lo `test -f 'libnm/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`libnm/nm-device-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-olpc-mesh.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-olpc-mesh.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-olpc-mesh.c' object='libnm/libnm_la-nm-device-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-wifi.lo: libnm/nm-device-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-wifi.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Tpo -c -o libnm/liblibnm_la-nm-device-wifi.lo `test -f 'libnm/nm-device-wifi.c' || echo '$(srcdir)/'`libnm/nm-device-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wifi.c' object='libnm/liblibnm_la-nm-device-wifi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-olpc-mesh.lo `test -f 'libnm/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`libnm/nm-device-olpc-mesh.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-wifi.lo `test -f 'libnm/nm-device-wifi.c' || echo '$(srcdir)/'`libnm/nm-device-wifi.c
 
-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_la-nm-device-ovs-bridge.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Tpo -c -o 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_la-nm-device-ovs-bridge.Tpo libnm/$(DEPDIR)/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_la-nm-device-ovs-bridge.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-wimax.lo: libnm/nm-device-wimax.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-wimax.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-wimax.Tpo -c -o libnm/liblibnm_la-nm-device-wimax.lo `test -f 'libnm/nm-device-wimax.c' || echo '$(srcdir)/'`libnm/nm-device-wimax.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-wimax.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-wimax.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wimax.c' object='libnm/liblibnm_la-nm-device-wimax.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_la-nm-device-ovs-bridge.lo `test -f 'libnm/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-bridge.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-wimax.lo `test -f 'libnm/nm-device-wimax.c' || echo '$(srcdir)/'`libnm/nm-device-wimax.c
 
-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_la-nm-device-ovs-interface.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-ovs-interface.Tpo -c -o 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_la-nm-device-ovs-interface.Tpo libnm/$(DEPDIR)/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_la-nm-device-ovs-interface.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-wireguard.lo: libnm/nm-device-wireguard.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-wireguard.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-wireguard.Tpo -c -o libnm/liblibnm_la-nm-device-wireguard.lo `test -f 'libnm/nm-device-wireguard.c' || echo '$(srcdir)/'`libnm/nm-device-wireguard.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-wireguard.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-wireguard.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wireguard.c' object='libnm/liblibnm_la-nm-device-wireguard.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-ovs-interface.lo `test -f 'libnm/nm-device-ovs-interface.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-interface.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-wireguard.lo `test -f 'libnm/nm-device-wireguard.c' || echo '$(srcdir)/'`libnm/nm-device-wireguard.c
 
-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_la-nm-device-ovs-port.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-ovs-port.Tpo -c -o 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_la-nm-device-ovs-port.Tpo libnm/$(DEPDIR)/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_la-nm-device-ovs-port.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device-wpan.lo: libnm/nm-device-wpan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-wpan.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-wpan.Tpo -c -o libnm/liblibnm_la-nm-device-wpan.lo `test -f 'libnm/nm-device-wpan.c' || echo '$(srcdir)/'`libnm/nm-device-wpan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-wpan.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-wpan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wpan.c' object='libnm/liblibnm_la-nm-device-wpan.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-ovs-port.lo `test -f 'libnm/nm-device-ovs-port.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-port.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-wpan.lo `test -f 'libnm/nm-device-wpan.c' || echo '$(srcdir)/'`libnm/nm-device-wpan.c
 
-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_la-nm-device-ppp.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-ppp.Tpo -c -o 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_la-nm-device-ppp.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-ppp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ppp.c' object='libnm/libnm_la-nm-device-ppp.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-device.lo: libnm/nm-device.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device.Tpo -c -o libnm/liblibnm_la-nm-device.lo `test -f 'libnm/nm-device.c' || echo '$(srcdir)/'`libnm/nm-device.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device.c' object='libnm/liblibnm_la-nm-device.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_la-nm-device-ppp.lo `test -f 'libnm/nm-device-ppp.c' || echo '$(srcdir)/'`libnm/nm-device-ppp.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device.lo `test -f 'libnm/nm-device.c' || echo '$(srcdir)/'`libnm/nm-device.c
 
-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_la-nm-device-team.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-team.Tpo -c -o 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_la-nm-device-team.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-team.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-team.c' object='libnm/libnm_la-nm-device-team.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-dhcp-config.lo: libnm/nm-dhcp-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-dhcp-config.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-dhcp-config.Tpo -c -o libnm/liblibnm_la-nm-dhcp-config.lo `test -f 'libnm/nm-dhcp-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-dhcp-config.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-dhcp-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dhcp-config.c' object='libnm/liblibnm_la-nm-dhcp-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-team.lo `test -f 'libnm/nm-device-team.c' || echo '$(srcdir)/'`libnm/nm-device-team.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-dhcp-config.lo `test -f 'libnm/nm-dhcp-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp-config.c
 
-libnm/libnm_la-nm-device-tun.lo: libnm/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) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-tun.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-tun.Tpo -c -o libnm/libnm_la-nm-device-tun.lo `test -f 'libnm/nm-device-tun.c' || echo '$(srcdir)/'`libnm/nm-device-tun.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-tun.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-tun.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-tun.c' object='libnm/libnm_la-nm-device-tun.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-dhcp4-config.lo: libnm/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) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-dhcp4-config.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-dhcp4-config.Tpo -c -o libnm/liblibnm_la-nm-dhcp4-config.lo `test -f 'libnm/nm-dhcp4-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp4-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-dhcp4-config.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-dhcp4-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dhcp4-config.c' object='libnm/liblibnm_la-nm-dhcp4-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-tun.lo `test -f 'libnm/nm-device-tun.c' || echo '$(srcdir)/'`libnm/nm-device-tun.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-dhcp4-config.lo `test -f 'libnm/nm-dhcp4-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp4-config.c
 
-libnm/libnm_la-nm-device-vlan.lo: libnm/nm-device-vlan.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_la-nm-device-vlan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Tpo -c -o libnm/libnm_la-nm-device-vlan.lo `test -f 'libnm/nm-device-vlan.c' || echo '$(srcdir)/'`libnm/nm-device-vlan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-vlan.c' object='libnm/libnm_la-nm-device-vlan.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-dhcp6-config.lo: libnm/nm-dhcp6-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-dhcp6-config.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-dhcp6-config.Tpo -c -o libnm/liblibnm_la-nm-dhcp6-config.lo `test -f 'libnm/nm-dhcp6-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp6-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-dhcp6-config.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-dhcp6-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dhcp6-config.c' object='libnm/liblibnm_la-nm-dhcp6-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-vlan.lo `test -f 'libnm/nm-device-vlan.c' || echo '$(srcdir)/'`libnm/nm-device-vlan.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-dhcp6-config.lo `test -f 'libnm/nm-dhcp6-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp6-config.c
 
-libnm/libnm_la-nm-device-vxlan.lo: libnm/nm-device-vxlan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-vxlan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Tpo -c -o libnm/libnm_la-nm-device-vxlan.lo `test -f 'libnm/nm-device-vxlan.c' || echo '$(srcdir)/'`libnm/nm-device-vxlan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-vxlan.c' object='libnm/libnm_la-nm-device-vxlan.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-dns-manager.lo: libnm/nm-dns-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-dns-manager.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-dns-manager.Tpo -c -o libnm/liblibnm_la-nm-dns-manager.lo `test -f 'libnm/nm-dns-manager.c' || echo '$(srcdir)/'`libnm/nm-dns-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-dns-manager.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-dns-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dns-manager.c' object='libnm/liblibnm_la-nm-dns-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-vxlan.lo `test -f 'libnm/nm-device-vxlan.c' || echo '$(srcdir)/'`libnm/nm-device-vxlan.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-dns-manager.lo `test -f 'libnm/nm-dns-manager.c' || echo '$(srcdir)/'`libnm/nm-dns-manager.c
 
-libnm/libnm_la-nm-device-wifi-p2p.lo: libnm/nm-device-wifi-p2p.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-wifi-p2p.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Tpo -c -o libnm/libnm_la-nm-device-wifi-p2p.lo `test -f 'libnm/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`libnm/nm-device-wifi-p2p.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wifi-p2p.c' object='libnm/libnm_la-nm-device-wifi-p2p.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-ip-config.lo: libnm/nm-ip-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-ip-config.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-ip-config.Tpo -c -o libnm/liblibnm_la-nm-ip-config.lo `test -f 'libnm/nm-ip-config.c' || echo '$(srcdir)/'`libnm/nm-ip-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-ip-config.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-ip-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-ip-config.c' object='libnm/liblibnm_la-nm-ip-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-wifi-p2p.lo `test -f 'libnm/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`libnm/nm-device-wifi-p2p.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-ip-config.lo `test -f 'libnm/nm-ip-config.c' || echo '$(srcdir)/'`libnm/nm-ip-config.c
 
-libnm/libnm_la-nm-device-wifi.lo: libnm/nm-device-wifi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-wifi.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Tpo -c -o libnm/libnm_la-nm-device-wifi.lo `test -f 'libnm/nm-device-wifi.c' || echo '$(srcdir)/'`libnm/nm-device-wifi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wifi.c' object='libnm/libnm_la-nm-device-wifi.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-ip4-config.lo: libnm/nm-ip4-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-ip4-config.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-ip4-config.Tpo -c -o libnm/liblibnm_la-nm-ip4-config.lo `test -f 'libnm/nm-ip4-config.c' || echo '$(srcdir)/'`libnm/nm-ip4-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-ip4-config.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-ip4-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-ip4-config.c' object='libnm/liblibnm_la-nm-ip4-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-wifi.lo `test -f 'libnm/nm-device-wifi.c' || echo '$(srcdir)/'`libnm/nm-device-wifi.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-ip4-config.lo `test -f 'libnm/nm-ip4-config.c' || echo '$(srcdir)/'`libnm/nm-ip4-config.c
 
-libnm/libnm_la-nm-device-wimax.lo: libnm/nm-device-wimax.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_la-nm-device-wimax.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Tpo -c -o libnm/libnm_la-nm-device-wimax.lo `test -f 'libnm/nm-device-wimax.c' || echo '$(srcdir)/'`libnm/nm-device-wimax.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wimax.c' object='libnm/libnm_la-nm-device-wimax.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-ip6-config.lo: libnm/nm-ip6-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-ip6-config.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-ip6-config.Tpo -c -o libnm/liblibnm_la-nm-ip6-config.lo `test -f 'libnm/nm-ip6-config.c' || echo '$(srcdir)/'`libnm/nm-ip6-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-ip6-config.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-ip6-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-ip6-config.c' object='libnm/liblibnm_la-nm-ip6-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-wimax.lo `test -f 'libnm/nm-device-wimax.c' || echo '$(srcdir)/'`libnm/nm-device-wimax.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-ip6-config.lo `test -f 'libnm/nm-ip6-config.c' || echo '$(srcdir)/'`libnm/nm-ip6-config.c
 
-libnm/libnm_la-nm-device-wireguard.lo: libnm/nm-device-wireguard.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-wireguard.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Tpo -c -o libnm/libnm_la-nm-device-wireguard.lo `test -f 'libnm/nm-device-wireguard.c' || echo '$(srcdir)/'`libnm/nm-device-wireguard.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wireguard.c' object='libnm/libnm_la-nm-device-wireguard.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-libnm-utils.lo: libnm/nm-libnm-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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-libnm-utils.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-libnm-utils.Tpo -c -o libnm/liblibnm_la-nm-libnm-utils.lo `test -f 'libnm/nm-libnm-utils.c' || echo '$(srcdir)/'`libnm/nm-libnm-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-libnm-utils.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-libnm-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-libnm-utils.c' object='libnm/liblibnm_la-nm-libnm-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_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-wireguard.lo `test -f 'libnm/nm-device-wireguard.c' || echo '$(srcdir)/'`libnm/nm-device-wireguard.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-libnm-utils.lo `test -f 'libnm/nm-libnm-utils.c' || echo '$(srcdir)/'`libnm/nm-libnm-utils.c
 
-libnm/libnm_la-nm-device-wpan.lo: libnm/nm-device-wpan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-wpan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-wpan.Tpo -c -o libnm/libnm_la-nm-device-wpan.lo `test -f 'libnm/nm-device-wpan.c' || echo '$(srcdir)/'`libnm/nm-device-wpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-wpan.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-wpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wpan.c' object='libnm/libnm_la-nm-device-wpan.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-manager.lo: libnm/nm-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-manager.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-manager.Tpo -c -o libnm/liblibnm_la-nm-manager.lo `test -f 'libnm/nm-manager.c' || echo '$(srcdir)/'`libnm/nm-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-manager.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-manager.c' object='libnm/liblibnm_la-nm-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) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-wpan.lo `test -f 'libnm/nm-device-wpan.c' || echo '$(srcdir)/'`libnm/nm-device-wpan.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-manager.lo `test -f 'libnm/nm-manager.c' || echo '$(srcdir)/'`libnm/nm-manager.c
 
-libnm/libnm_la-nm-device.lo: libnm/nm-device.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device.Tpo -c -o libnm/libnm_la-nm-device.lo `test -f 'libnm/nm-device.c' || echo '$(srcdir)/'`libnm/nm-device.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device.Tpo libnm/$(DEPDIR)/libnm_la-nm-device.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device.c' object='libnm/libnm_la-nm-device.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-object.lo: libnm/nm-object.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-object.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-object.Tpo -c -o libnm/liblibnm_la-nm-object.lo `test -f 'libnm/nm-object.c' || echo '$(srcdir)/'`libnm/nm-object.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-object.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-object.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-object.c' object='libnm/liblibnm_la-nm-object.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device.lo `test -f 'libnm/nm-device.c' || echo '$(srcdir)/'`libnm/nm-device.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-object.lo `test -f 'libnm/nm-object.c' || echo '$(srcdir)/'`libnm/nm-object.c
 
-libnm/libnm_la-nm-dhcp-config.lo: libnm/nm-dhcp-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-dhcp-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-dhcp-config.Tpo -c -o libnm/libnm_la-nm-dhcp-config.lo `test -f 'libnm/nm-dhcp-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-dhcp-config.Tpo libnm/$(DEPDIR)/libnm_la-nm-dhcp-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dhcp-config.c' object='libnm/libnm_la-nm-dhcp-config.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-remote-connection.lo: libnm/nm-remote-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-remote-connection.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-remote-connection.Tpo -c -o libnm/liblibnm_la-nm-remote-connection.lo `test -f 'libnm/nm-remote-connection.c' || echo '$(srcdir)/'`libnm/nm-remote-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-remote-connection.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-remote-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-remote-connection.c' object='libnm/liblibnm_la-nm-remote-connection.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-dhcp-config.lo `test -f 'libnm/nm-dhcp-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-remote-connection.lo `test -f 'libnm/nm-remote-connection.c' || echo '$(srcdir)/'`libnm/nm-remote-connection.c
 
-libnm/libnm_la-nm-dhcp4-config.lo: libnm/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) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-dhcp4-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-dhcp4-config.Tpo -c -o libnm/libnm_la-nm-dhcp4-config.lo `test -f 'libnm/nm-dhcp4-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-dhcp4-config.Tpo libnm/$(DEPDIR)/libnm_la-nm-dhcp4-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dhcp4-config.c' object='libnm/libnm_la-nm-dhcp4-config.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-remote-settings.lo: libnm/nm-remote-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-remote-settings.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-remote-settings.Tpo -c -o libnm/liblibnm_la-nm-remote-settings.lo `test -f 'libnm/nm-remote-settings.c' || echo '$(srcdir)/'`libnm/nm-remote-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-remote-settings.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-remote-settings.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-remote-settings.c' object='libnm/liblibnm_la-nm-remote-settings.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_la-nm-dhcp4-config.lo `test -f 'libnm/nm-dhcp4-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp4-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-remote-settings.lo `test -f 'libnm/nm-remote-settings.c' || echo '$(srcdir)/'`libnm/nm-remote-settings.c
 
-libnm/libnm_la-nm-dhcp6-config.lo: libnm/nm-dhcp6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-dhcp6-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-dhcp6-config.Tpo -c -o libnm/libnm_la-nm-dhcp6-config.lo `test -f 'libnm/nm-dhcp6-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-dhcp6-config.Tpo libnm/$(DEPDIR)/libnm_la-nm-dhcp6-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dhcp6-config.c' object='libnm/libnm_la-nm-dhcp6-config.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-secret-agent-old.lo: libnm/nm-secret-agent-old.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-secret-agent-old.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-secret-agent-old.Tpo -c -o libnm/liblibnm_la-nm-secret-agent-old.lo `test -f 'libnm/nm-secret-agent-old.c' || echo '$(srcdir)/'`libnm/nm-secret-agent-old.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-secret-agent-old.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-secret-agent-old.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-secret-agent-old.c' object='libnm/liblibnm_la-nm-secret-agent-old.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_la-nm-dhcp6-config.lo `test -f 'libnm/nm-dhcp6-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp6-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-secret-agent-old.lo `test -f 'libnm/nm-secret-agent-old.c' || echo '$(srcdir)/'`libnm/nm-secret-agent-old.c
 
-libnm/libnm_la-nm-dns-manager.lo: libnm/nm-dns-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-dns-manager.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-dns-manager.Tpo -c -o libnm/libnm_la-nm-dns-manager.lo `test -f 'libnm/nm-dns-manager.c' || echo '$(srcdir)/'`libnm/nm-dns-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-dns-manager.Tpo libnm/$(DEPDIR)/libnm_la-nm-dns-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dns-manager.c' object='libnm/libnm_la-nm-dns-manager.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-vpn-connection.lo: libnm/nm-vpn-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-vpn-connection.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-vpn-connection.Tpo -c -o libnm/liblibnm_la-nm-vpn-connection.lo `test -f 'libnm/nm-vpn-connection.c' || echo '$(srcdir)/'`libnm/nm-vpn-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-vpn-connection.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-vpn-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-connection.c' object='libnm/liblibnm_la-nm-vpn-connection.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-dns-manager.lo `test -f 'libnm/nm-dns-manager.c' || echo '$(srcdir)/'`libnm/nm-dns-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-vpn-connection.lo `test -f 'libnm/nm-vpn-connection.c' || echo '$(srcdir)/'`libnm/nm-vpn-connection.c
 
-libnm/libnm_la-nm-ip-config.lo: libnm/nm-ip-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-ip-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-ip-config.Tpo -c -o libnm/libnm_la-nm-ip-config.lo `test -f 'libnm/nm-ip-config.c' || echo '$(srcdir)/'`libnm/nm-ip-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-ip-config.Tpo libnm/$(DEPDIR)/libnm_la-nm-ip-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-ip-config.c' object='libnm/libnm_la-nm-ip-config.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-vpn-editor.lo: libnm/nm-vpn-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-vpn-editor.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-vpn-editor.Tpo -c -o libnm/liblibnm_la-nm-vpn-editor.lo `test -f 'libnm/nm-vpn-editor.c' || echo '$(srcdir)/'`libnm/nm-vpn-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-vpn-editor.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-vpn-editor.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-editor.c' object='libnm/liblibnm_la-nm-vpn-editor.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_la-nm-ip-config.lo `test -f 'libnm/nm-ip-config.c' || echo '$(srcdir)/'`libnm/nm-ip-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-vpn-editor.lo `test -f 'libnm/nm-vpn-editor.c' || echo '$(srcdir)/'`libnm/nm-vpn-editor.c
 
-libnm/libnm_la-nm-ip4-config.lo: libnm/nm-ip4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-ip4-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-ip4-config.Tpo -c -o libnm/libnm_la-nm-ip4-config.lo `test -f 'libnm/nm-ip4-config.c' || echo '$(srcdir)/'`libnm/nm-ip4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-ip4-config.Tpo libnm/$(DEPDIR)/libnm_la-nm-ip4-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-ip4-config.c' object='libnm/libnm_la-nm-ip4-config.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-vpn-plugin-old.lo: libnm/nm-vpn-plugin-old.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-vpn-plugin-old.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-vpn-plugin-old.Tpo -c -o libnm/liblibnm_la-nm-vpn-plugin-old.lo `test -f 'libnm/nm-vpn-plugin-old.c' || echo '$(srcdir)/'`libnm/nm-vpn-plugin-old.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-vpn-plugin-old.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-vpn-plugin-old.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-plugin-old.c' object='libnm/liblibnm_la-nm-vpn-plugin-old.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_la-nm-ip4-config.lo `test -f 'libnm/nm-ip4-config.c' || echo '$(srcdir)/'`libnm/nm-ip4-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-vpn-plugin-old.lo `test -f 'libnm/nm-vpn-plugin-old.c' || echo '$(srcdir)/'`libnm/nm-vpn-plugin-old.c
 
-libnm/libnm_la-nm-ip6-config.lo: libnm/nm-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-ip6-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-ip6-config.Tpo -c -o libnm/libnm_la-nm-ip6-config.lo `test -f 'libnm/nm-ip6-config.c' || echo '$(srcdir)/'`libnm/nm-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-ip6-config.Tpo libnm/$(DEPDIR)/libnm_la-nm-ip6-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-ip6-config.c' object='libnm/libnm_la-nm-ip6-config.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-vpn-service-plugin.lo: libnm/nm-vpn-service-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-vpn-service-plugin.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-vpn-service-plugin.Tpo -c -o libnm/liblibnm_la-nm-vpn-service-plugin.lo `test -f 'libnm/nm-vpn-service-plugin.c' || echo '$(srcdir)/'`libnm/nm-vpn-service-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-vpn-service-plugin.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-vpn-service-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-service-plugin.c' object='libnm/liblibnm_la-nm-vpn-service-plugin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-ip6-config.lo `test -f 'libnm/nm-ip6-config.c' || echo '$(srcdir)/'`libnm/nm-ip6-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-vpn-service-plugin.lo `test -f 'libnm/nm-vpn-service-plugin.c' || echo '$(srcdir)/'`libnm/nm-vpn-service-plugin.c
 
-libnm/libnm_la-nm-manager.lo: libnm/nm-manager.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_la-nm-manager.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-manager.Tpo -c -o libnm/libnm_la-nm-manager.lo `test -f 'libnm/nm-manager.c' || echo '$(srcdir)/'`libnm/nm-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-manager.Tpo libnm/$(DEPDIR)/libnm_la-nm-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-manager.c' object='libnm/libnm_la-nm-manager.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-wifi-p2p-peer.lo: libnm/nm-wifi-p2p-peer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-wifi-p2p-peer.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-wifi-p2p-peer.Tpo -c -o libnm/liblibnm_la-nm-wifi-p2p-peer.lo `test -f 'libnm/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`libnm/nm-wifi-p2p-peer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-wifi-p2p-peer.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-wifi-p2p-peer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-wifi-p2p-peer.c' object='libnm/liblibnm_la-nm-wifi-p2p-peer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-manager.lo `test -f 'libnm/nm-manager.c' || echo '$(srcdir)/'`libnm/nm-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-wifi-p2p-peer.lo `test -f 'libnm/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`libnm/nm-wifi-p2p-peer.c
 
-libnm/libnm_la-nm-object.lo: libnm/nm-object.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_la-nm-object.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-object.Tpo -c -o libnm/libnm_la-nm-object.lo `test -f 'libnm/nm-object.c' || echo '$(srcdir)/'`libnm/nm-object.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-object.Tpo libnm/$(DEPDIR)/libnm_la-nm-object.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-object.c' object='libnm/libnm_la-nm-object.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/liblibnm_la-nm-wimax-nsp.lo: libnm/nm-wimax-nsp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-wimax-nsp.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-wimax-nsp.Tpo -c -o libnm/liblibnm_la-nm-wimax-nsp.lo `test -f 'libnm/nm-wimax-nsp.c' || echo '$(srcdir)/'`libnm/nm-wimax-nsp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-wimax-nsp.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-wimax-nsp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-wimax-nsp.c' object='libnm/liblibnm_la-nm-wimax-nsp.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_la-nm-object.lo `test -f 'libnm/nm-object.c' || echo '$(srcdir)/'`libnm/nm-object.c
-
-libnm/libnm_la-nm-remote-connection.lo: libnm/nm-remote-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-remote-connection.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-remote-connection.Tpo -c -o libnm/libnm_la-nm-remote-connection.lo `test -f 'libnm/nm-remote-connection.c' || echo '$(srcdir)/'`libnm/nm-remote-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-remote-connection.Tpo libnm/$(DEPDIR)/libnm_la-nm-remote-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-remote-connection.c' object='libnm/libnm_la-nm-remote-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-remote-connection.lo `test -f 'libnm/nm-remote-connection.c' || echo '$(srcdir)/'`libnm/nm-remote-connection.c
-
-libnm/libnm_la-nm-remote-settings.lo: libnm/nm-remote-settings.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_la-nm-remote-settings.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-remote-settings.Tpo -c -o libnm/libnm_la-nm-remote-settings.lo `test -f 'libnm/nm-remote-settings.c' || echo '$(srcdir)/'`libnm/nm-remote-settings.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-remote-settings.Tpo libnm/$(DEPDIR)/libnm_la-nm-remote-settings.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-remote-settings.c' object='libnm/libnm_la-nm-remote-settings.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_la-nm-remote-settings.lo `test -f 'libnm/nm-remote-settings.c' || echo '$(srcdir)/'`libnm/nm-remote-settings.c
-
-libnm/libnm_la-nm-secret-agent-old.lo: libnm/nm-secret-agent-old.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_la-nm-secret-agent-old.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-secret-agent-old.Tpo -c -o libnm/libnm_la-nm-secret-agent-old.lo `test -f 'libnm/nm-secret-agent-old.c' || echo '$(srcdir)/'`libnm/nm-secret-agent-old.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-secret-agent-old.Tpo libnm/$(DEPDIR)/libnm_la-nm-secret-agent-old.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-secret-agent-old.c' object='libnm/libnm_la-nm-secret-agent-old.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_la-nm-secret-agent-old.lo `test -f 'libnm/nm-secret-agent-old.c' || echo '$(srcdir)/'`libnm/nm-secret-agent-old.c
-
-libnm/libnm_la-nm-vpn-connection.lo: libnm/nm-vpn-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-vpn-connection.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-vpn-connection.Tpo -c -o libnm/libnm_la-nm-vpn-connection.lo `test -f 'libnm/nm-vpn-connection.c' || echo '$(srcdir)/'`libnm/nm-vpn-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-vpn-connection.Tpo libnm/$(DEPDIR)/libnm_la-nm-vpn-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-connection.c' object='libnm/libnm_la-nm-vpn-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-vpn-connection.lo `test -f 'libnm/nm-vpn-connection.c' || echo '$(srcdir)/'`libnm/nm-vpn-connection.c
-
-libnm/libnm_la-nm-vpn-editor.lo: libnm/nm-vpn-editor.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_la-nm-vpn-editor.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Tpo -c -o libnm/libnm_la-nm-vpn-editor.lo `test -f 'libnm/nm-vpn-editor.c' || echo '$(srcdir)/'`libnm/nm-vpn-editor.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Tpo libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-editor.c' object='libnm/libnm_la-nm-vpn-editor.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_la-nm-vpn-editor.lo `test -f 'libnm/nm-vpn-editor.c' || echo '$(srcdir)/'`libnm/nm-vpn-editor.c
-
-libnm/libnm_la-nm-vpn-plugin-old.lo: libnm/nm-vpn-plugin-old.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_la-nm-vpn-plugin-old.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Tpo -c -o libnm/libnm_la-nm-vpn-plugin-old.lo `test -f 'libnm/nm-vpn-plugin-old.c' || echo '$(srcdir)/'`libnm/nm-vpn-plugin-old.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Tpo libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-plugin-old.c' object='libnm/libnm_la-nm-vpn-plugin-old.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_la-nm-vpn-plugin-old.lo `test -f 'libnm/nm-vpn-plugin-old.c' || echo '$(srcdir)/'`libnm/nm-vpn-plugin-old.c
-
-libnm/libnm_la-nm-vpn-service-plugin.lo: libnm/nm-vpn-service-plugin.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_la-nm-vpn-service-plugin.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Tpo -c -o libnm/libnm_la-nm-vpn-service-plugin.lo `test -f 'libnm/nm-vpn-service-plugin.c' || echo '$(srcdir)/'`libnm/nm-vpn-service-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Tpo libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-service-plugin.c' object='libnm/libnm_la-nm-vpn-service-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-vpn-service-plugin.lo `test -f 'libnm/nm-vpn-service-plugin.c' || echo '$(srcdir)/'`libnm/nm-vpn-service-plugin.c
-
-libnm/libnm_la-nm-wifi-p2p-peer.lo: libnm/nm-wifi-p2p-peer.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-wifi-p2p-peer.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Tpo -c -o libnm/libnm_la-nm-wifi-p2p-peer.lo `test -f 'libnm/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`libnm/nm-wifi-p2p-peer.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Tpo libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-wifi-p2p-peer.c' object='libnm/libnm_la-nm-wifi-p2p-peer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-wifi-p2p-peer.lo `test -f 'libnm/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`libnm/nm-wifi-p2p-peer.c
-
-libnm/libnm_la-nm-wimax-nsp.lo: libnm/nm-wimax-nsp.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_la-nm-wimax-nsp.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Tpo -c -o libnm/libnm_la-nm-wimax-nsp.lo `test -f 'libnm/nm-wimax-nsp.c' || echo '$(srcdir)/'`libnm/nm-wimax-nsp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Tpo libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-wimax-nsp.c' object='libnm/libnm_la-nm-wimax-nsp.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_la-nm-wimax-nsp.lo `test -f 'libnm/nm-wimax-nsp.c' || echo '$(srcdir)/'`libnm/nm-wimax-nsp.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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-wimax-nsp.lo `test -f 'libnm/nm-wimax-nsp.c' || echo '$(srcdir)/'`libnm/nm-wimax-nsp.c
 
 libnm/libnm_la-nm-enum-types.lo: libnm/nm-enum-types.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-enum-types.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-enum-types.Tpo -c -o libnm/libnm_la-nm-enum-types.lo `test -f 'libnm/nm-enum-types.c' || echo '$(srcdir)/'`libnm/nm-enum-types.c
@@ -14257,11 +12480,11 @@ shared/c-rbtree/src/libcrbtree_la-c-rbtree.lo: shared/c-rbtree/src/c-rbtree.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) $(shared_libcrbtree_la_CPPFLAGS) $(CPPFLAGS) $(shared_libcrbtree_la_CFLAGS) $(CFLAGS) -c -o shared/c-rbtree/src/libcrbtree_la-c-rbtree.lo `test -f 'shared/c-rbtree/src/c-rbtree.c' || echo '$(srcdir)/'`shared/c-rbtree/src/c-rbtree.c
 
 shared/c-siphash/src/libcsiphash_la-c-siphash.lo: shared/c-siphash/src/c-siphash.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/c-siphash/src/libcsiphash_la-c-siphash.lo -MD -MP -MF shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Tpo -c -o shared/c-siphash/src/libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(shared_libcsiphash_la_CFLAGS) $(CFLAGS) -MT shared/c-siphash/src/libcsiphash_la-c-siphash.lo -MD -MP -MF shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Tpo -c -o shared/c-siphash/src/libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Tpo shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/c-siphash/src/c-siphash.c' object='shared/c-siphash/src/libcsiphash_la-c-siphash.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/c-siphash/src/libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(shared_libcsiphash_la_CFLAGS) $(CFLAGS) -c -o shared/c-siphash/src/libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c
 
 shared/n-acd/src/libnacd_la-n-acd.lo: shared/n-acd/src/n-acd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -MT shared/n-acd/src/libnacd_la-n-acd.lo -MD -MP -MF shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Tpo -c -o shared/n-acd/src/libnacd_la-n-acd.lo `test -f 'shared/n-acd/src/n-acd.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd.c
@@ -14298,6 +12521,76 @@ shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo: shared/n-acd/src/n-acd-bpf-fa
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -c -o shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo `test -f 'shared/n-acd/src/n-acd-bpf-fallback.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd-bpf-fallback.c
 
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-connection.lo: shared/n-dhcp4/src/n-dhcp4-c-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -MT shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-connection.lo -MD -MP -MF shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-connection.Tpo -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-connection.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-c-connection.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-c-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-connection.Tpo shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-dhcp4/src/n-dhcp4-c-connection.c' object='shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-connection.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-connection.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-c-connection.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-c-connection.c
+
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-lease.lo: shared/n-dhcp4/src/n-dhcp4-c-lease.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -MT shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-lease.lo -MD -MP -MF shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-lease.Tpo -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-lease.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-c-lease.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-c-lease.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-lease.Tpo shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-lease.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-dhcp4/src/n-dhcp4-c-lease.c' object='shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-lease.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-lease.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-c-lease.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-c-lease.c
+
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-probe.lo: shared/n-dhcp4/src/n-dhcp4-c-probe.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -MT shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-probe.lo -MD -MP -MF shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-probe.Tpo -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-probe.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-c-probe.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-c-probe.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-probe.Tpo shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-probe.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-dhcp4/src/n-dhcp4-c-probe.c' object='shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-probe.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-c-probe.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-c-probe.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-c-probe.c
+
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-client.lo: shared/n-dhcp4/src/n-dhcp4-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -MT shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-client.lo -MD -MP -MF shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-client.Tpo -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-client.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-client.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-client.Tpo shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-dhcp4/src/n-dhcp4-client.c' object='shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-client.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-client.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-client.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-client.c
+
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-incoming.lo: shared/n-dhcp4/src/n-dhcp4-incoming.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -MT shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-incoming.lo -MD -MP -MF shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-incoming.Tpo -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-incoming.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-incoming.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-incoming.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-incoming.Tpo shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-incoming.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-dhcp4/src/n-dhcp4-incoming.c' object='shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-incoming.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-incoming.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-incoming.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-incoming.c
+
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-outgoing.lo: shared/n-dhcp4/src/n-dhcp4-outgoing.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -MT shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-outgoing.lo -MD -MP -MF shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-outgoing.Tpo -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-outgoing.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-outgoing.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-outgoing.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-outgoing.Tpo shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-outgoing.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-dhcp4/src/n-dhcp4-outgoing.c' object='shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-outgoing.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-outgoing.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-outgoing.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-outgoing.c
+
+shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-socket.lo: shared/n-dhcp4/src/n-dhcp4-socket.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -MT shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-socket.lo -MD -MP -MF shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-socket.Tpo -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-socket.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-socket.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-socket.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-socket.Tpo shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-socket.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-dhcp4/src/n-dhcp4-socket.c' object='shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-socket.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -c -o shared/n-dhcp4/src/libndhcp4_la-n-dhcp4-socket.lo `test -f 'shared/n-dhcp4/src/n-dhcp4-socket.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/n-dhcp4-socket.c
+
+shared/n-dhcp4/src/util/libndhcp4_la-packet.lo: shared/n-dhcp4/src/util/packet.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -MT shared/n-dhcp4/src/util/libndhcp4_la-packet.lo -MD -MP -MF shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-packet.Tpo -c -o shared/n-dhcp4/src/util/libndhcp4_la-packet.lo `test -f 'shared/n-dhcp4/src/util/packet.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/util/packet.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-packet.Tpo shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-packet.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-dhcp4/src/util/packet.c' object='shared/n-dhcp4/src/util/libndhcp4_la-packet.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -c -o shared/n-dhcp4/src/util/libndhcp4_la-packet.lo `test -f 'shared/n-dhcp4/src/util/packet.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/util/packet.c
+
+shared/n-dhcp4/src/util/libndhcp4_la-socket.lo: shared/n-dhcp4/src/util/socket.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -MT shared/n-dhcp4/src/util/libndhcp4_la-socket.lo -MD -MP -MF shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-socket.Tpo -c -o shared/n-dhcp4/src/util/libndhcp4_la-socket.lo `test -f 'shared/n-dhcp4/src/util/socket.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/util/socket.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-socket.Tpo shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-socket.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-dhcp4/src/util/socket.c' object='shared/n-dhcp4/src/util/libndhcp4_la-socket.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libndhcp4_la_CPPFLAGS) $(CPPFLAGS) $(shared_libndhcp4_la_CFLAGS) $(CFLAGS) -c -o shared/n-dhcp4/src/util/libndhcp4_la-socket.lo `test -f 'shared/n-dhcp4/src/util/socket.c' || echo '$(srcdir)/'`shared/n-dhcp4/src/util/socket.c
+
+shared/nm-glib-aux/libnm_glib_aux_la-nm-dbus-aux.lo: shared/nm-glib-aux/nm-dbus-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-dbus-aux.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-dbus-aux.lo `test -f 'shared/nm-glib-aux/nm-dbus-aux.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-dbus-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-glib-aux/nm-dbus-aux.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-dbus-aux.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-dbus-aux.lo `test -f 'shared/nm-glib-aux/nm-dbus-aux.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-dbus-aux.c
+
 shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo: shared/nm-glib-aux/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) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo `test -f 'shared/nm-glib-aux/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-dedup-multi.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo
@@ -14333,6 +12626,20 @@ shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo: shared/nm-glib-aux/nm-io-ut
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo `test -f 'shared/nm-glib-aux/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-io-utils.c
 
+shared/nm-glib-aux/libnm_glib_aux_la-nm-json-aux.lo: shared/nm-glib-aux/nm-json-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-json-aux.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-json-aux.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-json-aux.lo `test -f 'shared/nm-glib-aux/nm-json-aux.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-json-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-json-aux.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-json-aux.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-glib-aux/nm-json-aux.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-json-aux.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-json-aux.lo `test -f 'shared/nm-glib-aux/nm-json-aux.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-json-aux.c
+
+shared/nm-glib-aux/libnm_glib_aux_la-nm-keyfile-aux.lo: shared/nm-glib-aux/nm-keyfile-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-keyfile-aux.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-keyfile-aux.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-keyfile-aux.lo `test -f 'shared/nm-glib-aux/nm-keyfile-aux.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-keyfile-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-keyfile-aux.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-keyfile-aux.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-glib-aux/nm-keyfile-aux.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-keyfile-aux.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-keyfile-aux.lo `test -f 'shared/nm-glib-aux/nm-keyfile-aux.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-keyfile-aux.c
+
 shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo: shared/nm-glib-aux/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) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo `test -f 'shared/nm-glib-aux/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-random-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Plo
@@ -14361,6 +12668,13 @@ shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo: shared/nm-glib-aux/nm-tim
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo `test -f 'shared/nm-glib-aux/nm-time-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-time-utils.c
 
+shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo: shared/nm-libnm-core-aux/nm-libnm-core-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo -MD -MP -MF shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Tpo -c -o shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo `test -f 'shared/nm-libnm-core-aux/nm-libnm-core-aux.c' || echo '$(srcdir)/'`shared/nm-libnm-core-aux/nm-libnm-core-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Tpo shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-libnm-core-aux/nm-libnm-core-aux.c' object='shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo `test -f 'shared/nm-libnm-core-aux/nm-libnm-core-aux.c' || echo '$(srcdir)/'`shared/nm-libnm-core-aux/nm-libnm-core-aux.c
+
 shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo: shared/nm-libnm-core-intern/nm-ethtool-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo -MD -MP -MF shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Tpo -c -o shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo `test -f 'shared/nm-libnm-core-intern/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-libnm-core-intern/nm-ethtool-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Tpo shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo
@@ -14459,6 +12773,13 @@ shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo: shared/systemd/src/b
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo `test -f 'shared/systemd/src/basic/fileio.c' || echo '$(srcdir)/'`shared/systemd/src/basic/fileio.c
 
+shared/systemd/src/basic/libnm_systemd_shared_la-format-util.lo: shared/systemd/src/basic/format-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-format-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-format-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-format-util.lo `test -f 'shared/systemd/src/basic/format-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/format-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-format-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-format-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/format-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-format-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-format-util.lo `test -f 'shared/systemd/src/basic/format-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/format-util.c
+
 shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo: shared/systemd/src/basic/fs-util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo `test -f 'shared/systemd/src/basic/fs-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/fs-util.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Plo
@@ -14592,6 +12913,13 @@ shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo: shared/systemd/src/bas
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo `test -f 'shared/systemd/src/basic/strv.c' || echo '$(srcdir)/'`shared/systemd/src/basic/strv.c
 
+shared/systemd/src/basic/libnm_systemd_shared_la-strxcpyx.lo: shared/systemd/src/basic/strxcpyx.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-strxcpyx.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strxcpyx.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-strxcpyx.lo `test -f 'shared/systemd/src/basic/strxcpyx.c' || echo '$(srcdir)/'`shared/systemd/src/basic/strxcpyx.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strxcpyx.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strxcpyx.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/strxcpyx.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-strxcpyx.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-strxcpyx.lo `test -f 'shared/systemd/src/basic/strxcpyx.c' || echo '$(srcdir)/'`shared/systemd/src/basic/strxcpyx.c
+
 shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo: shared/systemd/src/basic/time-util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo `test -f 'shared/systemd/src/basic/time-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/time-util.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Plo
@@ -14620,6 +12948,13 @@ shared/systemd/src/basic/libnm_systemd_shared_la-util.lo: shared/systemd/src/bas
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-util.lo `test -f 'shared/systemd/src/basic/util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/util.c
 
+shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo: shared/systemd/src/shared/dns-domain.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo -MD -MP -MF shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Tpo -c -o shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo `test -f 'shared/systemd/src/shared/dns-domain.c' || echo '$(srcdir)/'`shared/systemd/src/shared/dns-domain.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Tpo shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/shared/dns-domain.c' object='shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/shared/libnm_systemd_shared_la-dns-domain.lo `test -f 'shared/systemd/src/shared/dns-domain.c' || echo '$(srcdir)/'`shared/systemd/src/shared/dns-domain.c
+
 src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo: src/devices/adsl/nm-atm-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo -MD -MP -MF src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Tpo -c -o src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo `test -f 'src/devices/adsl/nm-atm-manager.c' || echo '$(srcdir)/'`src/devices/adsl/nm-atm-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Tpo src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo
@@ -15152,6 +13487,13 @@ src/settings/libNetworkManager_la-nm-settings-connection.lo: src/settings/nm-set
 @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/settings/libNetworkManager_la-nm-settings-connection.lo `test -f 'src/settings/nm-settings-connection.c' || echo '$(srcdir)/'`src/settings/nm-settings-connection.c
 
+src/settings/libNetworkManager_la-nm-settings-storage.lo: src/settings/nm-settings-storage.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/libNetworkManager_la-nm-settings-storage.lo -MD -MP -MF src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Tpo -c -o src/settings/libNetworkManager_la-nm-settings-storage.lo `test -f 'src/settings/nm-settings-storage.c' || echo '$(srcdir)/'`src/settings/nm-settings-storage.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Tpo src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/nm-settings-storage.c' object='src/settings/libNetworkManager_la-nm-settings-storage.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/settings/libNetworkManager_la-nm-settings-storage.lo `test -f 'src/settings/nm-settings-storage.c' || echo '$(srcdir)/'`src/settings/nm-settings-storage.c
+
 src/settings/libNetworkManager_la-nm-settings-plugin.lo: src/settings/nm-settings-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/libNetworkManager_la-nm-settings-plugin.lo -MD -MP -MF src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Tpo -c -o src/settings/libNetworkManager_la-nm-settings-plugin.lo `test -f 'src/settings/nm-settings-plugin.c' || echo '$(srcdir)/'`src/settings/nm-settings-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Tpo src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Plo
@@ -15166,12 +13508,19 @@ src/settings/libNetworkManager_la-nm-settings.lo: src/settings/nm-settings.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/settings/libNetworkManager_la-nm-settings.lo `test -f 'src/settings/nm-settings.c' || echo '$(srcdir)/'`src/settings/nm-settings.c
 
-src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-connection.lo: src/settings/plugins/keyfile/nms-keyfile-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-connection.lo -MD -MP -MF src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-connection.Tpo -c -o src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-connection.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-connection.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-connection.Tpo src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/keyfile/nms-keyfile-connection.c' object='src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-connection.lo' libtool=yes @AMDEPBACKSLASH@
+src/settings/libNetworkManager_la-nm-settings-utils.lo: src/settings/nm-settings-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/libNetworkManager_la-nm-settings-utils.lo -MD -MP -MF src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Tpo -c -o src/settings/libNetworkManager_la-nm-settings-utils.lo `test -f 'src/settings/nm-settings-utils.c' || echo '$(srcdir)/'`src/settings/nm-settings-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Tpo src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/nm-settings-utils.c' object='src/settings/libNetworkManager_la-nm-settings-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/libNetworkManager_la-nm-settings-utils.lo `test -f 'src/settings/nm-settings-utils.c' || echo '$(srcdir)/'`src/settings/nm-settings-utils.c
+
+src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo: src/settings/plugins/keyfile/nms-keyfile-storage.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/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo -MD -MP -MF src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Tpo -c -o src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-storage.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-storage.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Tpo src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/keyfile/nms-keyfile-storage.c' object='src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.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/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-connection.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-connection.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-connection.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-storage.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-storage.c
 
 src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo: src/settings/plugins/keyfile/nms-keyfile-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo -MD -MP -MF src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Tpo -c -o src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-plugin.c
@@ -15551,6 +13900,13 @@ src/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo: src/dhcp/nm-dhcp-client.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/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo `test -f 'src/dhcp/nm-dhcp-client.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-client.c
 
+src/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo: src/dhcp/nm-dhcp-nettools.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/libNetworkManagerBase_la-nm-dhcp-nettools.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Tpo -c -o src/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo `test -f 'src/dhcp/nm-dhcp-nettools.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-nettools.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Tpo src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-nettools.c' object='src/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.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/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo `test -f 'src/dhcp/nm-dhcp-nettools.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-nettools.c
+
 src/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo: src/dhcp/nm-dhcp-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Tpo -c -o src/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo `test -f 'src/dhcp/nm-dhcp-utils.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Tpo src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Plo
@@ -15558,6 +13914,13 @@ src/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo: src/dhcp/nm-dhcp-utils.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo `test -f 'src/dhcp/nm-dhcp-utils.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-utils.c
 
+src/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo: src/dhcp/nm-dhcp-options.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/libNetworkManagerBase_la-nm-dhcp-options.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Tpo -c -o src/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo `test -f 'src/dhcp/nm-dhcp-options.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-options.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Tpo src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-options.c' object='src/dhcp/libNetworkManagerBase_la-nm-dhcp-options.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/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo `test -f 'src/dhcp/nm-dhcp-options.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-options.c
+
 src/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo: src/dhcp/nm-dhcp-systemd.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/libNetworkManagerBase_la-nm-dhcp-systemd.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Tpo -c -o src/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo `test -f 'src/dhcp/nm-dhcp-systemd.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-systemd.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Tpo src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Plo
@@ -15621,6 +13984,13 @@ src/systemd/libnm_systemd_core_la-nm-sd.lo: src/systemd/nm-sd.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_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/libnm_systemd_core_la-nm-sd.lo `test -f 'src/systemd/nm-sd.c' || echo '$(srcdir)/'`src/systemd/nm-sd.c
 
+src/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo: src/systemd/nm-sd-utils-dhcp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo -MD -MP -MF src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Tpo -c -o src/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo `test -f 'src/systemd/nm-sd-utils-dhcp.c' || echo '$(srcdir)/'`src/systemd/nm-sd-utils-dhcp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Tpo src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/nm-sd-utils-dhcp.c' object='src/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.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_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo `test -f 'src/systemd/nm-sd-utils-dhcp.c' || echo '$(srcdir)/'`src/systemd/nm-sd-utils-dhcp.c
+
 src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo: src/systemd/sd-adapt-core/nm-sd-adapt-core.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo -MD -MP -MF src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Tpo -c -o src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo `test -f 'src/systemd/sd-adapt-core/nm-sd-adapt-core.c' || echo '$(srcdir)/'`src/systemd/sd-adapt-core/nm-sd-adapt-core.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Tpo src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo
@@ -15775,13 +14145,6 @@ src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo: src/syste
 @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_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo `test -f 'src/systemd/src/libsystemd/sd-id128/sd-id128.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/sd-id128.c
 
-src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo: src/systemd/src/shared/dns-domain.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo -MD -MP -MF src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Tpo -c -o src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo `test -f 'src/systemd/src/shared/dns-domain.c' || echo '$(srcdir)/'`src/systemd/src/shared/dns-domain.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Tpo src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/shared/dns-domain.c' object='src/systemd/src/shared/libnm_systemd_core_la-dns-domain.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_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo `test -f 'src/systemd/src/shared/dns-domain.c' || echo '$(srcdir)/'`src/systemd/src/shared/dns-domain.c
-
 src/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo: src/ppp/nm-ppp-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_ppp_libnm_ppp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo -MD -MP -MF src/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Tpo -c -o src/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo `test -f 'src/ppp/nm-ppp-manager.c' || echo '$(srcdir)/'`src/ppp/nm-ppp-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Tpo src/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Plo
@@ -15796,33 +14159,12 @@ src/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo: src/ppp/nm-pppd-plugin.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_ppp_nm_pppd_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo `test -f 'src/ppp/nm-pppd-plugin.c' || echo '$(srcdir)/'`src/ppp/nm-pppd-plugin.c
 
-src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-plugin.lo: src/settings/plugins/ibft/nms-ibft-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-plugin.lo -MD -MP -MF src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-plugin.Tpo -c -o src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-plugin.lo `test -f 'src/settings/plugins/ibft/nms-ibft-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/ibft/nms-ibft-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-plugin.Tpo src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ibft/nms-ibft-plugin.c' object='src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-plugin.lo `test -f 'src/settings/plugins/ibft/nms-ibft-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/ibft/nms-ibft-plugin.c
-
-src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-connection.lo: src/settings/plugins/ibft/nms-ibft-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-connection.lo -MD -MP -MF src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-connection.Tpo -c -o src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-connection.lo `test -f 'src/settings/plugins/ibft/nms-ibft-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ibft/nms-ibft-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-connection.Tpo src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ibft/nms-ibft-connection.c' object='src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-connection.lo' libtool=yes @AMDEPBACKSLASH@
+src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo: src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Tpo -c -o src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c' object='src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ibft/libnm_settings_plugin_ibft_la-nms-ibft-connection.lo `test -f 'src/settings/plugins/ibft/nms-ibft-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ibft/nms-ibft-connection.c
-
-src/settings/plugins/ibft/libnms_ibft_core_la-nms-ibft-reader.lo: src/settings/plugins/ibft/nms-ibft-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ibft_libnms_ibft_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ibft/libnms_ibft_core_la-nms-ibft-reader.lo -MD -MP -MF src/settings/plugins/ibft/$(DEPDIR)/libnms_ibft_core_la-nms-ibft-reader.Tpo -c -o src/settings/plugins/ibft/libnms_ibft_core_la-nms-ibft-reader.lo `test -f 'src/settings/plugins/ibft/nms-ibft-reader.c' || echo '$(srcdir)/'`src/settings/plugins/ibft/nms-ibft-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ibft/$(DEPDIR)/libnms_ibft_core_la-nms-ibft-reader.Tpo src/settings/plugins/ibft/$(DEPDIR)/libnms_ibft_core_la-nms-ibft-reader.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ibft/nms-ibft-reader.c' object='src/settings/plugins/ibft/libnms_ibft_core_la-nms-ibft-reader.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ibft_libnms_ibft_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ibft/libnms_ibft_core_la-nms-ibft-reader.lo `test -f 'src/settings/plugins/ibft/nms-ibft-reader.c' || echo '$(srcdir)/'`src/settings/plugins/ibft/nms-ibft-reader.c
-
-src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.lo: src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.Tpo -c -o src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c' object='src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
 
 src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo: src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Tpo -c -o src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
@@ -15845,13 +14187,6 @@ src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo: src/settings/plu
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo `test -f 'src/settings/plugins/ifcfg-rh/shvar.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/shvar.c
 
-src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nm-inotify-helper.lo: src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nm-inotify-helper.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nm-inotify-helper.Tpo -c -o src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nm-inotify-helper.lo `test -f 'src/settings/plugins/ifcfg-rh/nm-inotify-helper.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nm-inotify-helper.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nm-inotify-helper.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/nm-inotify-helper.c' object='src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nm-inotify-helper.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nm-inotify-helper.lo `test -f 'src/settings/plugins/ifcfg-rh/nm-inotify-helper.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
-
 src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo: src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Tpo -c -o src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo
@@ -15873,13 +14208,6 @@ src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo: sr
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
 
-src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo: src/settings/plugins/ifupdown/nms-ifupdown-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo -MD -MP -MF src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Tpo -c -o src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Tpo src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifupdown/nms-ifupdown-connection.c' object='src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-connection.c
-
 src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo: src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo -MD -MP -MF src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Tpo -c -o src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Tpo src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo
@@ -16041,19 +14369,33 @@ clients/common/cli_nmcli-nm-polkit-listener.obj: clients/common/nm-polkit-listen
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/cli_nmcli-nm-polkit-listener.obj `if test -f 'clients/common/nm-polkit-listener.c'; then $(CYGPATH_W) 'clients/common/nm-polkit-listener.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/nm-polkit-listener.c'; fi`
 
-clients/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@
+clients/common/tests/test_clients_common-test-clients-common.o: clients/common/tests/test-clients-common.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_tests_test_clients_common_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/tests/test_clients_common-test-clients-common.o -MD -MP -MF clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Tpo -c -o clients/common/tests/test_clients_common-test-clients-common.o `test -f 'clients/common/tests/test-clients-common.c' || echo '$(srcdir)/'`clients/common/tests/test-clients-common.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Tpo clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/tests/test-clients-common.c' object='clients/common/tests/test_clients_common-test-clients-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_common_tests_test_clients_common_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/tests/test_clients_common-test-clients-common.o `test -f 'clients/common/tests/test-clients-common.c' || echo '$(srcdir)/'`clients/common/tests/test-clients-common.c
+
+clients/common/tests/test_clients_common-test-clients-common.obj: clients/common/tests/test-clients-common.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_tests_test_clients_common_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/tests/test_clients_common-test-clients-common.obj -MD -MP -MF clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Tpo -c -o clients/common/tests/test_clients_common-test-clients-common.obj `if test -f 'clients/common/tests/test-clients-common.c'; then $(CYGPATH_W) 'clients/common/tests/test-clients-common.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/tests/test-clients-common.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Tpo clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/tests/test-clients-common.c' object='clients/common/tests/test_clients_common-test-clients-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_common_tests_test_clients_common_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/tests/test_clients_common-test-clients-common.obj `if test -f 'clients/common/tests/test-clients-common.c'; then $(CYGPATH_W) 'clients/common/tests/test-clients-common.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/tests/test-clients-common.c'; fi`
+
+clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.o: clients/common/tests/test-libnm-core-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_tests_test_libnm_core_aux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.o -MD -MP -MF clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Tpo -c -o clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.o `test -f 'clients/common/tests/test-libnm-core-aux.c' || echo '$(srcdir)/'`clients/common/tests/test-libnm-core-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Tpo clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/tests/test-libnm-core-aux.c' object='clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.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
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_tests_test_libnm_core_aux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.o `test -f 'clients/common/tests/test-libnm-core-aux.c' || echo '$(srcdir)/'`clients/common/tests/test-libnm-core-aux.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@
+clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.obj: clients/common/tests/test-libnm-core-aux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_tests_test_libnm_core_aux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.obj -MD -MP -MF clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Tpo -c -o clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.obj `if test -f 'clients/common/tests/test-libnm-core-aux.c'; then $(CYGPATH_W) 'clients/common/tests/test-libnm-core-aux.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/tests/test-libnm-core-aux.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Tpo clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/tests/test-libnm-core-aux.c' object='clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_tests_test_libnm_core_aux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/tests/test_libnm_core_aux-test-libnm-core-aux.obj `if test -f 'clients/common/tests/test-libnm-core-aux.c'; then $(CYGPATH_W) 'clients/common/tests/test-libnm-core-aux.c'; else $(CYGPATH_W) '$(srcdir)/clients/common/tests/test-libnm-core-aux.c'; fi`
 
 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/nm_online-nm-online.o -MD -MP -MF clients/$(DEPDIR)/nm_online-nm-online.Tpo -c -o clients/nm_online-nm-online.o `test -f 'clients/nm-online.c' || echo '$(srcdir)/'`clients/nm-online.c
@@ -16643,20 +14985,6 @@ dispatcher/nm_dispatcher-nm-dispatcher.obj: dispatcher/nm-dispatcher.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dispatcher_nm_dispatcher_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatcher/nm_dispatcher-nm-dispatcher.obj `if test -f 'dispatcher/nm-dispatcher.c'; then $(CYGPATH_W) 'dispatcher/nm-dispatcher.c'; else $(CYGPATH_W) '$(srcdir)/dispatcher/nm-dispatcher.c'; fi`
 
-dispatcher/nm_dispatcher-nmdbus-dispatcher.o: dispatcher/nmdbus-dispatcher.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dispatcher_nm_dispatcher_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatcher/nm_dispatcher-nmdbus-dispatcher.o -MD -MP -MF dispatcher/$(DEPDIR)/nm_dispatcher-nmdbus-dispatcher.Tpo -c -o dispatcher/nm_dispatcher-nmdbus-dispatcher.o `test -f 'dispatcher/nmdbus-dispatcher.c' || echo '$(srcdir)/'`dispatcher/nmdbus-dispatcher.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dispatcher/$(DEPDIR)/nm_dispatcher-nmdbus-dispatcher.Tpo dispatcher/$(DEPDIR)/nm_dispatcher-nmdbus-dispatcher.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dispatcher/nmdbus-dispatcher.c' object='dispatcher/nm_dispatcher-nmdbus-dispatcher.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) $(dispatcher_nm_dispatcher_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatcher/nm_dispatcher-nmdbus-dispatcher.o `test -f 'dispatcher/nmdbus-dispatcher.c' || echo '$(srcdir)/'`dispatcher/nmdbus-dispatcher.c
-
-dispatcher/nm_dispatcher-nmdbus-dispatcher.obj: dispatcher/nmdbus-dispatcher.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dispatcher_nm_dispatcher_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatcher/nm_dispatcher-nmdbus-dispatcher.obj -MD -MP -MF dispatcher/$(DEPDIR)/nm_dispatcher-nmdbus-dispatcher.Tpo -c -o dispatcher/nm_dispatcher-nmdbus-dispatcher.obj `if test -f 'dispatcher/nmdbus-dispatcher.c'; then $(CYGPATH_W) 'dispatcher/nmdbus-dispatcher.c'; else $(CYGPATH_W) '$(srcdir)/dispatcher/nmdbus-dispatcher.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dispatcher/$(DEPDIR)/nm_dispatcher-nmdbus-dispatcher.Tpo dispatcher/$(DEPDIR)/nm_dispatcher-nmdbus-dispatcher.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dispatcher/nmdbus-dispatcher.c' object='dispatcher/nm_dispatcher-nmdbus-dispatcher.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) $(dispatcher_nm_dispatcher_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatcher/nm_dispatcher-nmdbus-dispatcher.obj `if test -f 'dispatcher/nmdbus-dispatcher.c'; then $(CYGPATH_W) 'dispatcher/nmdbus-dispatcher.c'; else $(CYGPATH_W) '$(srcdir)/dispatcher/nmdbus-dispatcher.c'; fi`
-
 dispatcher/tests/test_dispatcher_envp-test-dispatcher-envp.o: dispatcher/tests/test-dispatcher-envp.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dispatcher_tests_test_dispatcher_envp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatcher/tests/test_dispatcher_envp-test-dispatcher-envp.o -MD -MP -MF dispatcher/tests/$(DEPDIR)/test_dispatcher_envp-test-dispatcher-envp.Tpo -c -o dispatcher/tests/test_dispatcher_envp-test-dispatcher-envp.o `test -f 'dispatcher/tests/test-dispatcher-envp.c' || echo '$(srcdir)/'`dispatcher/tests/test-dispatcher-envp.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dispatcher/tests/$(DEPDIR)/test_dispatcher_envp-test-dispatcher-envp.Tpo dispatcher/tests/$(DEPDIR)/test_dispatcher_envp-test-dispatcher-envp.Po
@@ -16671,6 +14999,20 @@ dispatcher/tests/test_dispatcher_envp-test-dispatcher-envp.obj: dispatcher/tests
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dispatcher_tests_test_dispatcher_envp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatcher/tests/test_dispatcher_envp-test-dispatcher-envp.obj `if test -f 'dispatcher/tests/test-dispatcher-envp.c'; then $(CYGPATH_W) 'dispatcher/tests/test-dispatcher-envp.c'; else $(CYGPATH_W) '$(srcdir)/dispatcher/tests/test-dispatcher-envp.c'; fi`
 
+dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.o: dispatcher/nmdbus-dispatcher.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dispatcher_tests_test_dispatcher_envp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.o -MD -MP -MF dispatcher/$(DEPDIR)/tests_test_dispatcher_envp-nmdbus-dispatcher.Tpo -c -o dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.o `test -f 'dispatcher/nmdbus-dispatcher.c' || echo '$(srcdir)/'`dispatcher/nmdbus-dispatcher.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dispatcher/$(DEPDIR)/tests_test_dispatcher_envp-nmdbus-dispatcher.Tpo dispatcher/$(DEPDIR)/tests_test_dispatcher_envp-nmdbus-dispatcher.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dispatcher/nmdbus-dispatcher.c' object='dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.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) $(dispatcher_tests_test_dispatcher_envp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.o `test -f 'dispatcher/nmdbus-dispatcher.c' || echo '$(srcdir)/'`dispatcher/nmdbus-dispatcher.c
+
+dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.obj: dispatcher/nmdbus-dispatcher.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dispatcher_tests_test_dispatcher_envp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.obj -MD -MP -MF dispatcher/$(DEPDIR)/tests_test_dispatcher_envp-nmdbus-dispatcher.Tpo -c -o dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.obj `if test -f 'dispatcher/nmdbus-dispatcher.c'; then $(CYGPATH_W) 'dispatcher/nmdbus-dispatcher.c'; else $(CYGPATH_W) '$(srcdir)/dispatcher/nmdbus-dispatcher.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dispatcher/$(DEPDIR)/tests_test_dispatcher_envp-nmdbus-dispatcher.Tpo dispatcher/$(DEPDIR)/tests_test_dispatcher_envp-nmdbus-dispatcher.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dispatcher/nmdbus-dispatcher.c' object='dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.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) $(dispatcher_tests_test_dispatcher_envp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatcher/tests_test_dispatcher_envp-nmdbus-dispatcher.obj `if test -f 'dispatcher/nmdbus-dispatcher.c'; then $(CYGPATH_W) 'dispatcher/nmdbus-dispatcher.c'; else $(CYGPATH_W) '$(srcdir)/dispatcher/nmdbus-dispatcher.c'; fi`
+
 examples/C/glib/add_connection_gdbus-add-connection-gdbus.o: examples/C/glib/add-connection-gdbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(examples_C_glib_add_connection_gdbus_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT examples/C/glib/add_connection_gdbus-add-connection-gdbus.o -MD -MP -MF examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connection-gdbus.Tpo -c -o examples/C/glib/add_connection_gdbus-add-connection-gdbus.o `test -f 'examples/C/glib/add-connection-gdbus.c' || echo '$(srcdir)/'`examples/C/glib/add-connection-gdbus.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connection-gdbus.Tpo examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connection-gdbus.Po
@@ -16797,75 +15139,75 @@ libnm-core/tests/test_compare-test-compare.obj: libnm-core/tests/test-compare.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_compare_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_compare-test-compare.obj `if test -f 'libnm-core/tests/test-compare.c'; then $(CYGPATH_W) 'libnm-core/tests/test-compare.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-compare.c'; fi`
 
-libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.o: libnm-core/tests/test-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Tpo -c -o libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.o `test -f 'libnm-core/tests/test-crypto.c' || echo '$(srcdir)/'`libnm-core/tests/test-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-crypto.c' object='libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.o' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_crypto-test-crypto.o: libnm-core/tests/test-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_crypto-test-crypto.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Tpo -c -o libnm-core/tests/test_crypto-test-crypto.o `test -f 'libnm-core/tests/test-crypto.c' || echo '$(srcdir)/'`libnm-core/tests/test-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Tpo libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-crypto.c' object='libnm-core/tests/test_crypto-test-crypto.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.o `test -f 'libnm-core/tests/test-crypto.c' || echo '$(srcdir)/'`libnm-core/tests/test-crypto.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_crypto-test-crypto.o `test -f 'libnm-core/tests/test-crypto.c' || echo '$(srcdir)/'`libnm-core/tests/test-crypto.c
 
-libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.obj: libnm-core/tests/test-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Tpo -c -o libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.obj `if test -f 'libnm-core/tests/test-crypto.c'; then $(CYGPATH_W) 'libnm-core/tests/test-crypto.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-crypto.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-crypto.c' object='libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.obj' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_crypto-test-crypto.obj: libnm-core/tests/test-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_crypto-test-crypto.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Tpo -c -o libnm-core/tests/test_crypto-test-crypto.obj `if test -f 'libnm-core/tests/test-crypto.c'; then $(CYGPATH_W) 'libnm-core/tests/test-crypto.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-crypto.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Tpo libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-crypto.c' object='libnm-core/tests/test_crypto-test-crypto.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.obj `if test -f 'libnm-core/tests/test-crypto.c'; then $(CYGPATH_W) 'libnm-core/tests/test-crypto.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-crypto.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_crypto-test-crypto.obj `if test -f 'libnm-core/tests/test-crypto.c'; then $(CYGPATH_W) 'libnm-core/tests/test-crypto.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-crypto.c'; fi`
 
-libnm-core/tests/libnm_core_tests_test_general-test-general.o: libnm-core/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_general-test-general.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Tpo -c -o libnm-core/tests/libnm_core_tests_test_general-test-general.o `test -f 'libnm-core/tests/test-general.c' || echo '$(srcdir)/'`libnm-core/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-general.c' object='libnm-core/tests/libnm_core_tests_test_general-test-general.o' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_general-test-general.o: libnm-core/tests/test-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_general-test-general.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_general-test-general.Tpo -c -o libnm-core/tests/test_general-test-general.o `test -f 'libnm-core/tests/test-general.c' || echo '$(srcdir)/'`libnm-core/tests/test-general.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_general-test-general.Tpo libnm-core/tests/$(DEPDIR)/test_general-test-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-general.c' object='libnm-core/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) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_general-test-general.o `test -f 'libnm-core/tests/test-general.c' || echo '$(srcdir)/'`libnm-core/tests/test-general.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_general-test-general.o `test -f 'libnm-core/tests/test-general.c' || echo '$(srcdir)/'`libnm-core/tests/test-general.c
 
-libnm-core/tests/libnm_core_tests_test_general-test-general.obj: libnm-core/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_general-test-general.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Tpo -c -o libnm-core/tests/libnm_core_tests_test_general-test-general.obj `if test -f 'libnm-core/tests/test-general.c'; then $(CYGPATH_W) 'libnm-core/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-general.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-general.c' object='libnm-core/tests/libnm_core_tests_test_general-test-general.obj' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_general-test-general.obj: libnm-core/tests/test-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_general-test-general.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_general-test-general.Tpo -c -o libnm-core/tests/test_general-test-general.obj `if test -f 'libnm-core/tests/test-general.c'; then $(CYGPATH_W) 'libnm-core/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-general.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_general-test-general.Tpo libnm-core/tests/$(DEPDIR)/test_general-test-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-general.c' object='libnm-core/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) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_general-test-general.obj `if test -f 'libnm-core/tests/test-general.c'; then $(CYGPATH_W) 'libnm-core/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-general.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_general-test-general.obj `if test -f 'libnm-core/tests/test-general.c'; then $(CYGPATH_W) 'libnm-core/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-general.c'; fi`
 
-libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.o: libnm-core/tests/nm-core-tests-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Tpo -c -o libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.o `test -f 'libnm-core/tests/nm-core-tests-enum-types.c' || echo '$(srcdir)/'`libnm-core/tests/nm-core-tests-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/nm-core-tests-enum-types.c' object='libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.o' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_general-nm-core-tests-enum-types.o: libnm-core/tests/nm-core-tests-enum-types.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_general-nm-core-tests-enum-types.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Tpo -c -o libnm-core/tests/test_general-nm-core-tests-enum-types.o `test -f 'libnm-core/tests/nm-core-tests-enum-types.c' || echo '$(srcdir)/'`libnm-core/tests/nm-core-tests-enum-types.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Tpo libnm-core/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/nm-core-tests-enum-types.c' object='libnm-core/tests/test_general-nm-core-tests-enum-types.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.o `test -f 'libnm-core/tests/nm-core-tests-enum-types.c' || echo '$(srcdir)/'`libnm-core/tests/nm-core-tests-enum-types.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_general-nm-core-tests-enum-types.o `test -f 'libnm-core/tests/nm-core-tests-enum-types.c' || echo '$(srcdir)/'`libnm-core/tests/nm-core-tests-enum-types.c
 
-libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.obj: libnm-core/tests/nm-core-tests-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Tpo -c -o libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.obj `if test -f 'libnm-core/tests/nm-core-tests-enum-types.c'; then $(CYGPATH_W) 'libnm-core/tests/nm-core-tests-enum-types.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/nm-core-tests-enum-types.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/nm-core-tests-enum-types.c' object='libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.obj' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_general-nm-core-tests-enum-types.obj: libnm-core/tests/nm-core-tests-enum-types.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_general-nm-core-tests-enum-types.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Tpo -c -o libnm-core/tests/test_general-nm-core-tests-enum-types.obj `if test -f 'libnm-core/tests/nm-core-tests-enum-types.c'; then $(CYGPATH_W) 'libnm-core/tests/nm-core-tests-enum-types.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/nm-core-tests-enum-types.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Tpo libnm-core/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/nm-core-tests-enum-types.c' object='libnm-core/tests/test_general-nm-core-tests-enum-types.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.obj `if test -f 'libnm-core/tests/nm-core-tests-enum-types.c'; then $(CYGPATH_W) 'libnm-core/tests/nm-core-tests-enum-types.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/nm-core-tests-enum-types.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_general-nm-core-tests-enum-types.obj `if test -f 'libnm-core/tests/nm-core-tests-enum-types.c'; then $(CYGPATH_W) 'libnm-core/tests/nm-core-tests-enum-types.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/nm-core-tests-enum-types.c'; fi`
 
-libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.o: libnm-core/tests/test-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Tpo -c -o libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.o `test -f 'libnm-core/tests/test-keyfile.c' || echo '$(srcdir)/'`libnm-core/tests/test-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-keyfile.c' object='libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.o' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_keyfile-test-keyfile.o: libnm-core/tests/test-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_keyfile-test-keyfile.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_keyfile-test-keyfile.Tpo -c -o libnm-core/tests/test_keyfile-test-keyfile.o `test -f 'libnm-core/tests/test-keyfile.c' || echo '$(srcdir)/'`libnm-core/tests/test-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_keyfile-test-keyfile.Tpo libnm-core/tests/$(DEPDIR)/test_keyfile-test-keyfile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-keyfile.c' object='libnm-core/tests/test_keyfile-test-keyfile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.o `test -f 'libnm-core/tests/test-keyfile.c' || echo '$(srcdir)/'`libnm-core/tests/test-keyfile.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_keyfile-test-keyfile.o `test -f 'libnm-core/tests/test-keyfile.c' || echo '$(srcdir)/'`libnm-core/tests/test-keyfile.c
 
-libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.obj: libnm-core/tests/test-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Tpo -c -o libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.obj `if test -f 'libnm-core/tests/test-keyfile.c'; then $(CYGPATH_W) 'libnm-core/tests/test-keyfile.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-keyfile.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-keyfile.c' object='libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.obj' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_keyfile-test-keyfile.obj: libnm-core/tests/test-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_keyfile-test-keyfile.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_keyfile-test-keyfile.Tpo -c -o libnm-core/tests/test_keyfile-test-keyfile.obj `if test -f 'libnm-core/tests/test-keyfile.c'; then $(CYGPATH_W) 'libnm-core/tests/test-keyfile.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-keyfile.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_keyfile-test-keyfile.Tpo libnm-core/tests/$(DEPDIR)/test_keyfile-test-keyfile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-keyfile.c' object='libnm-core/tests/test_keyfile-test-keyfile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.obj `if test -f 'libnm-core/tests/test-keyfile.c'; then $(CYGPATH_W) 'libnm-core/tests/test-keyfile.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-keyfile.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_keyfile-test-keyfile.obj `if test -f 'libnm-core/tests/test-keyfile.c'; then $(CYGPATH_W) 'libnm-core/tests/test-keyfile.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-keyfile.c'; fi`
 
-libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.o: libnm-core/tests/test-secrets.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Tpo -c -o libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.o `test -f 'libnm-core/tests/test-secrets.c' || echo '$(srcdir)/'`libnm-core/tests/test-secrets.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-secrets.c' object='libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.o' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_secrets-test-secrets.o: libnm-core/tests/test-secrets.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_secrets-test-secrets.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Tpo -c -o libnm-core/tests/test_secrets-test-secrets.o `test -f 'libnm-core/tests/test-secrets.c' || echo '$(srcdir)/'`libnm-core/tests/test-secrets.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Tpo libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-secrets.c' object='libnm-core/tests/test_secrets-test-secrets.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.o `test -f 'libnm-core/tests/test-secrets.c' || echo '$(srcdir)/'`libnm-core/tests/test-secrets.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_secrets-test-secrets.o `test -f 'libnm-core/tests/test-secrets.c' || echo '$(srcdir)/'`libnm-core/tests/test-secrets.c
 
-libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.obj: libnm-core/tests/test-secrets.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Tpo -c -o libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.obj `if test -f 'libnm-core/tests/test-secrets.c'; then $(CYGPATH_W) 'libnm-core/tests/test-secrets.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-secrets.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-secrets.c' object='libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.obj' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_secrets-test-secrets.obj: libnm-core/tests/test-secrets.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_secrets-test-secrets.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Tpo -c -o libnm-core/tests/test_secrets-test-secrets.obj `if test -f 'libnm-core/tests/test-secrets.c'; then $(CYGPATH_W) 'libnm-core/tests/test-secrets.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-secrets.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Tpo libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-secrets.c' object='libnm-core/tests/test_secrets-test-secrets.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.obj `if test -f 'libnm-core/tests/test-secrets.c'; then $(CYGPATH_W) 'libnm-core/tests/test-secrets.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-secrets.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_secrets-test-secrets.obj `if test -f 'libnm-core/tests/test-secrets.c'; then $(CYGPATH_W) 'libnm-core/tests/test-secrets.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-secrets.c'; fi`
 
 libnm-core/tests/test_setting-test-setting.o: libnm-core/tests/test-setting.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_setting-test-setting.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_setting-test-setting.Tpo -c -o libnm-core/tests/test_setting-test-setting.o `test -f 'libnm-core/tests/test-setting.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting.c
@@ -16881,215 +15223,47 @@ libnm-core/tests/test_setting-test-setting.obj: libnm-core/tests/test-setting.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_setting-test-setting.obj `if test -f 'libnm-core/tests/test-setting.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting.c'; fi`
 
-libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o: libnm-core/tests/test-settings-defaults.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Tpo -c -o libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o `test -f 'libnm-core/tests/test-settings-defaults.c' || echo '$(srcdir)/'`libnm-core/tests/test-settings-defaults.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-settings-defaults.c' object='libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o `test -f 'libnm-core/tests/test-settings-defaults.c' || echo '$(srcdir)/'`libnm-core/tests/test-settings-defaults.c
-
-libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.obj: libnm-core/tests/test-settings-defaults.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Tpo -c -o libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.obj `if test -f 'libnm-core/tests/test-settings-defaults.c'; then $(CYGPATH_W) 'libnm-core/tests/test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-settings-defaults.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-settings-defaults.c' object='libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.obj `if test -f 'libnm-core/tests/test-settings-defaults.c'; then $(CYGPATH_W) 'libnm-core/tests/test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-settings-defaults.c'; fi`
-
-libnm-glib/libnm_glib_test-libnm-glib-test.o: libnm-glib/libnm-glib-test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_libnm_glib_test_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_test-libnm-glib-test.o -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_test-libnm-glib-test.Tpo -c -o libnm-glib/libnm_glib_test-libnm-glib-test.o `test -f 'libnm-glib/libnm-glib-test.c' || echo '$(srcdir)/'`libnm-glib/libnm-glib-test.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_test-libnm-glib-test.Tpo libnm-glib/$(DEPDIR)/libnm_glib_test-libnm-glib-test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/libnm-glib-test.c' object='libnm-glib/libnm_glib_test-libnm-glib-test.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_libnm_glib_test_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_test-libnm-glib-test.o `test -f 'libnm-glib/libnm-glib-test.c' || echo '$(srcdir)/'`libnm-glib/libnm-glib-test.c
-
-libnm-glib/libnm_glib_test-libnm-glib-test.obj: libnm-glib/libnm-glib-test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_libnm_glib_test_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_test-libnm-glib-test.obj -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_test-libnm-glib-test.Tpo -c -o libnm-glib/libnm_glib_test-libnm-glib-test.obj `if test -f 'libnm-glib/libnm-glib-test.c'; then $(CYGPATH_W) 'libnm-glib/libnm-glib-test.c'; else $(CYGPATH_W) '$(srcdir)/libnm-glib/libnm-glib-test.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_test-libnm-glib-test.Tpo libnm-glib/$(DEPDIR)/libnm_glib_test-libnm-glib-test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/libnm-glib-test.c' object='libnm-glib/libnm_glib_test-libnm-glib-test.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_glib_libnm_glib_test_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_test-libnm-glib-test.obj `if test -f 'libnm-glib/libnm-glib-test.c'; then $(CYGPATH_W) 'libnm-glib/libnm-glib-test.c'; else $(CYGPATH_W) '$(srcdir)/libnm-glib/libnm-glib-test.c'; fi`
-
-shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.o: shared/nm-test-utils-impl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.o -MD -MP -MF shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Tpo -c -o shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.o `test -f 'shared/nm-test-utils-impl.c' || echo '$(srcdir)/'`shared/nm-test-utils-impl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Tpo shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-test-utils-impl.c' object='shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.o `test -f 'shared/nm-test-utils-impl.c' || echo '$(srcdir)/'`shared/nm-test-utils-impl.c
-
-shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.obj: shared/nm-test-utils-impl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.obj -MD -MP -MF shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Tpo -c -o shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.obj `if test -f 'shared/nm-test-utils-impl.c'; then $(CYGPATH_W) 'shared/nm-test-utils-impl.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-test-utils-impl.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Tpo shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-test-utils-impl.c' object='shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_glib_tests_test_nm_client-nm-test-utils-impl.obj `if test -f 'shared/nm-test-utils-impl.c'; then $(CYGPATH_W) 'shared/nm-test-utils-impl.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-test-utils-impl.c'; fi`
-
-libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.o: libnm-glib/tests/test-nm-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.o -MD -MP -MF libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_nm_client-test-nm-client.Tpo -c -o libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.o `test -f 'libnm-glib/tests/test-nm-client.c' || echo '$(srcdir)/'`libnm-glib/tests/test-nm-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_nm_client-test-nm-client.Tpo libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_nm_client-test-nm-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/tests/test-nm-client.c' object='libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.o `test -f 'libnm-glib/tests/test-nm-client.c' || echo '$(srcdir)/'`libnm-glib/tests/test-nm-client.c
-
-libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.obj: libnm-glib/tests/test-nm-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.obj -MD -MP -MF libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_nm_client-test-nm-client.Tpo -c -o libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.obj `if test -f 'libnm-glib/tests/test-nm-client.c'; then $(CYGPATH_W) 'libnm-glib/tests/test-nm-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm-glib/tests/test-nm-client.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_nm_client-test-nm-client.Tpo libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_nm_client-test-nm-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/tests/test-nm-client.c' object='libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/tests/libnm_glib_tests_test_nm_client-test-nm-client.obj `if test -f 'libnm-glib/tests/test-nm-client.c'; then $(CYGPATH_W) 'libnm-glib/tests/test-nm-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm-glib/tests/test-nm-client.c'; fi`
-
-shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.o: shared/nm-test-utils-impl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.o -MD -MP -MF shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Tpo -c -o shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.o `test -f 'shared/nm-test-utils-impl.c' || echo '$(srcdir)/'`shared/nm-test-utils-impl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Tpo shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-test-utils-impl.c' object='shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.o `test -f 'shared/nm-test-utils-impl.c' || echo '$(srcdir)/'`shared/nm-test-utils-impl.c
-
-shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.obj: shared/nm-test-utils-impl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.obj -MD -MP -MF shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Tpo -c -o shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.obj `if test -f 'shared/nm-test-utils-impl.c'; then $(CYGPATH_W) 'shared/nm-test-utils-impl.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-test-utils-impl.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Tpo shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-test-utils-impl.c' object='shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.obj `if test -f 'shared/nm-test-utils-impl.c'; then $(CYGPATH_W) 'shared/nm-test-utils-impl.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-test-utils-impl.c'; fi`
-
-libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.o: libnm-glib/tests/test-remote-settings-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.o -MD -MP -MF libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.Tpo -c -o libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.o `test -f 'libnm-glib/tests/test-remote-settings-client.c' || echo '$(srcdir)/'`libnm-glib/tests/test-remote-settings-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.Tpo libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/tests/test-remote-settings-client.c' object='libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.o `test -f 'libnm-glib/tests/test-remote-settings-client.c' || echo '$(srcdir)/'`libnm-glib/tests/test-remote-settings-client.c
-
-libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.obj: libnm-glib/tests/test-remote-settings-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.obj -MD -MP -MF libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.Tpo -c -o libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.obj `if test -f 'libnm-glib/tests/test-remote-settings-client.c'; then $(CYGPATH_W) 'libnm-glib/tests/test-remote-settings-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm-glib/tests/test-remote-settings-client.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.Tpo libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-glib/tests/test-remote-settings-client.c' object='libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/tests/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.obj `if test -f 'libnm-glib/tests/test-remote-settings-client.c'; then $(CYGPATH_W) 'libnm-glib/tests/test-remote-settings-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm-glib/tests/test-remote-settings-client.c'; fi`
-
-libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.o: libnm-util/tests/test-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.o -MD -MP -MF libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_crypto-test-crypto.Tpo -c -o libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.o `test -f 'libnm-util/tests/test-crypto.c' || echo '$(srcdir)/'`libnm-util/tests/test-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_crypto-test-crypto.Tpo libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_crypto-test-crypto.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-crypto.c' object='libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.o `test -f 'libnm-util/tests/test-crypto.c' || echo '$(srcdir)/'`libnm-util/tests/test-crypto.c
-
-libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.obj: libnm-util/tests/test-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.obj -MD -MP -MF libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_crypto-test-crypto.Tpo -c -o libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.obj `if test -f 'libnm-util/tests/test-crypto.c'; then $(CYGPATH_W) 'libnm-util/tests/test-crypto.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-crypto.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_crypto-test-crypto.Tpo libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_crypto-test-crypto.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-crypto.c' object='libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.obj `if test -f 'libnm-util/tests/test-crypto.c'; then $(CYGPATH_W) 'libnm-util/tests/test-crypto.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-crypto.c'; fi`
-
-libnm-util/tests/libnm_util_tests_test_general-test-general.o: libnm-util/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/libnm_util_tests_test_general-test-general.o -MD -MP -MF libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_general-test-general.Tpo -c -o libnm-util/tests/libnm_util_tests_test_general-test-general.o `test -f 'libnm-util/tests/test-general.c' || echo '$(srcdir)/'`libnm-util/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_general-test-general.Tpo libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-general.c' object='libnm-util/tests/libnm_util_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) $(libnm_util_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_general-test-general.o `test -f 'libnm-util/tests/test-general.c' || echo '$(srcdir)/'`libnm-util/tests/test-general.c
-
-libnm-util/tests/libnm_util_tests_test_general-test-general.obj: libnm-util/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/libnm_util_tests_test_general-test-general.obj -MD -MP -MF libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_general-test-general.Tpo -c -o libnm-util/tests/libnm_util_tests_test_general-test-general.obj `if test -f 'libnm-util/tests/test-general.c'; then $(CYGPATH_W) 'libnm-util/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-general.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_general-test-general.Tpo libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-general.c' object='libnm-util/tests/libnm_util_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) $(libnm_util_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_general-test-general.obj `if test -f 'libnm-util/tests/test-general.c'; then $(CYGPATH_W) 'libnm-util/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-general.c'; fi`
-
-libnm-util/tests/test_libnm_linking-test-libnm-linking.o: libnm-util/tests/test-libnm-linking.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_libnm_linking_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/test_libnm_linking-test-libnm-linking.o -MD -MP -MF libnm-util/tests/$(DEPDIR)/test_libnm_linking-test-libnm-linking.Tpo -c -o libnm-util/tests/test_libnm_linking-test-libnm-linking.o `test -f 'libnm-util/tests/test-libnm-linking.c' || echo '$(srcdir)/'`libnm-util/tests/test-libnm-linking.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/test_libnm_linking-test-libnm-linking.Tpo libnm-util/tests/$(DEPDIR)/test_libnm_linking-test-libnm-linking.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-libnm-linking.c' object='libnm-util/tests/test_libnm_linking-test-libnm-linking.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_libnm_linking_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/test_libnm_linking-test-libnm-linking.o `test -f 'libnm-util/tests/test-libnm-linking.c' || echo '$(srcdir)/'`libnm-util/tests/test-libnm-linking.c
-
-libnm-util/tests/test_libnm_linking-test-libnm-linking.obj: libnm-util/tests/test-libnm-linking.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_libnm_linking_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/test_libnm_linking-test-libnm-linking.obj -MD -MP -MF libnm-util/tests/$(DEPDIR)/test_libnm_linking-test-libnm-linking.Tpo -c -o libnm-util/tests/test_libnm_linking-test-libnm-linking.obj `if test -f 'libnm-util/tests/test-libnm-linking.c'; then $(CYGPATH_W) 'libnm-util/tests/test-libnm-linking.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-libnm-linking.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/test_libnm_linking-test-libnm-linking.Tpo libnm-util/tests/$(DEPDIR)/test_libnm_linking-test-libnm-linking.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-libnm-linking.c' object='libnm-util/tests/test_libnm_linking-test-libnm-linking.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_libnm_linking_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/test_libnm_linking-test-libnm-linking.obj `if test -f 'libnm-util/tests/test-libnm-linking.c'; then $(CYGPATH_W) 'libnm-util/tests/test-libnm-linking.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-libnm-linking.c'; fi`
-
-libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.o: libnm-util/tests/test-secrets.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.o -MD -MP -MF libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_secrets-test-secrets.Tpo -c -o libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.o `test -f 'libnm-util/tests/test-secrets.c' || echo '$(srcdir)/'`libnm-util/tests/test-secrets.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_secrets-test-secrets.Tpo libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_secrets-test-secrets.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-secrets.c' object='libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.o `test -f 'libnm-util/tests/test-secrets.c' || echo '$(srcdir)/'`libnm-util/tests/test-secrets.c
-
-libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.obj: libnm-util/tests/test-secrets.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.obj -MD -MP -MF libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_secrets-test-secrets.Tpo -c -o libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.obj `if test -f 'libnm-util/tests/test-secrets.c'; then $(CYGPATH_W) 'libnm-util/tests/test-secrets.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-secrets.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_secrets-test-secrets.Tpo libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_secrets-test-secrets.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-secrets.c' object='libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.obj `if test -f 'libnm-util/tests/test-secrets.c'; then $(CYGPATH_W) 'libnm-util/tests/test-secrets.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-secrets.c'; fi`
-
-libnm-util/tests/test_setting_8021x-test-setting-8021x.o: libnm-util/tests/test-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/test_setting_8021x-test-setting-8021x.o -MD -MP -MF libnm-util/tests/$(DEPDIR)/test_setting_8021x-test-setting-8021x.Tpo -c -o libnm-util/tests/test_setting_8021x-test-setting-8021x.o `test -f 'libnm-util/tests/test-setting-8021x.c' || echo '$(srcdir)/'`libnm-util/tests/test-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/test_setting_8021x-test-setting-8021x.Tpo libnm-util/tests/$(DEPDIR)/test_setting_8021x-test-setting-8021x.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-setting-8021x.c' object='libnm-util/tests/test_setting_8021x-test-setting-8021x.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/test_setting_8021x-test-setting-8021x.o `test -f 'libnm-util/tests/test-setting-8021x.c' || echo '$(srcdir)/'`libnm-util/tests/test-setting-8021x.c
-
-libnm-util/tests/test_setting_8021x-test-setting-8021x.obj: libnm-util/tests/test-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/test_setting_8021x-test-setting-8021x.obj -MD -MP -MF libnm-util/tests/$(DEPDIR)/test_setting_8021x-test-setting-8021x.Tpo -c -o libnm-util/tests/test_setting_8021x-test-setting-8021x.obj `if test -f 'libnm-util/tests/test-setting-8021x.c'; then $(CYGPATH_W) 'libnm-util/tests/test-setting-8021x.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-setting-8021x.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/test_setting_8021x-test-setting-8021x.Tpo libnm-util/tests/$(DEPDIR)/test_setting_8021x-test-setting-8021x.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-setting-8021x.c' object='libnm-util/tests/test_setting_8021x-test-setting-8021x.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/test_setting_8021x-test-setting-8021x.obj `if test -f 'libnm-util/tests/test-setting-8021x.c'; then $(CYGPATH_W) 'libnm-util/tests/test-setting-8021x.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-setting-8021x.c'; fi`
-
-libnm-util/tests/test_setting_dcb-test-setting-dcb.o: libnm-util/tests/test-setting-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/test_setting_dcb-test-setting-dcb.o -MD -MP -MF libnm-util/tests/$(DEPDIR)/test_setting_dcb-test-setting-dcb.Tpo -c -o libnm-util/tests/test_setting_dcb-test-setting-dcb.o `test -f 'libnm-util/tests/test-setting-dcb.c' || echo '$(srcdir)/'`libnm-util/tests/test-setting-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/test_setting_dcb-test-setting-dcb.Tpo libnm-util/tests/$(DEPDIR)/test_setting_dcb-test-setting-dcb.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-setting-dcb.c' object='libnm-util/tests/test_setting_dcb-test-setting-dcb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/test_setting_dcb-test-setting-dcb.o `test -f 'libnm-util/tests/test-setting-dcb.c' || echo '$(srcdir)/'`libnm-util/tests/test-setting-dcb.c
-
-libnm-util/tests/test_setting_dcb-test-setting-dcb.obj: libnm-util/tests/test-setting-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/test_setting_dcb-test-setting-dcb.obj -MD -MP -MF libnm-util/tests/$(DEPDIR)/test_setting_dcb-test-setting-dcb.Tpo -c -o libnm-util/tests/test_setting_dcb-test-setting-dcb.obj `if test -f 'libnm-util/tests/test-setting-dcb.c'; then $(CYGPATH_W) 'libnm-util/tests/test-setting-dcb.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-setting-dcb.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/test_setting_dcb-test-setting-dcb.Tpo libnm-util/tests/$(DEPDIR)/test_setting_dcb-test-setting-dcb.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-setting-dcb.c' object='libnm-util/tests/test_setting_dcb-test-setting-dcb.obj' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_settings_defaults-test-settings-defaults.o: libnm-core/tests/test-settings-defaults.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_settings_defaults-test-settings-defaults.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Tpo -c -o libnm-core/tests/test_settings_defaults-test-settings-defaults.o `test -f 'libnm-core/tests/test-settings-defaults.c' || echo '$(srcdir)/'`libnm-core/tests/test-settings-defaults.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Tpo libnm-core/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-settings-defaults.c' object='libnm-core/tests/test_settings_defaults-test-settings-defaults.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/test_setting_dcb-test-setting-dcb.obj `if test -f 'libnm-util/tests/test-setting-dcb.c'; then $(CYGPATH_W) 'libnm-util/tests/test-setting-dcb.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-setting-dcb.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_settings_defaults-test-settings-defaults.o `test -f 'libnm-core/tests/test-settings-defaults.c' || echo '$(srcdir)/'`libnm-core/tests/test-settings-defaults.c
 
-libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.o: libnm-util/tests/test-settings-defaults.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.o -MD -MP -MF libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Tpo -c -o libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.o `test -f 'libnm-util/tests/test-settings-defaults.c' || echo '$(srcdir)/'`libnm-util/tests/test-settings-defaults.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Tpo libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-settings-defaults.c' object='libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.o' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/test_settings_defaults-test-settings-defaults.obj: libnm-core/tests/test-settings-defaults.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/test_settings_defaults-test-settings-defaults.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Tpo -c -o libnm-core/tests/test_settings_defaults-test-settings-defaults.obj `if test -f 'libnm-core/tests/test-settings-defaults.c'; then $(CYGPATH_W) 'libnm-core/tests/test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-settings-defaults.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Tpo libnm-core/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-settings-defaults.c' object='libnm-core/tests/test_settings_defaults-test-settings-defaults.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.o `test -f 'libnm-util/tests/test-settings-defaults.c' || echo '$(srcdir)/'`libnm-util/tests/test-settings-defaults.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/test_settings_defaults-test-settings-defaults.obj `if test -f 'libnm-core/tests/test-settings-defaults.c'; then $(CYGPATH_W) 'libnm-core/tests/test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-settings-defaults.c'; fi`
 
-libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.obj: libnm-util/tests/test-settings-defaults.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.obj -MD -MP -MF libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Tpo -c -o libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.obj `if test -f 'libnm-util/tests/test-settings-defaults.c'; then $(CYGPATH_W) 'libnm-util/tests/test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-settings-defaults.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Tpo libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-util/tests/test-settings-defaults.c' object='libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.obj' libtool=no @AMDEPBACKSLASH@
+shared/nm-utils/libnm_tests_test_libnm-nm-compat.o: shared/nm-utils/nm-compat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_libnm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_tests_test_libnm-nm-compat.o -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Tpo -c -o shared/nm-utils/libnm_tests_test_libnm-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/libnm_tests_test_libnm-nm-compat.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.obj `if test -f 'libnm-util/tests/test-settings-defaults.c'; then $(CYGPATH_W) 'libnm-util/tests/test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-settings-defaults.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_libnm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_test_libnm-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c
 
-shared/nm-utils/libnm_tests_test_general-nm-compat.o: shared/nm-utils/nm-compat.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_tests_test_general-nm-compat.o -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/libnm_tests_test_general-nm-compat.o' libtool=no @AMDEPBACKSLASH@
+shared/nm-utils/libnm_tests_test_libnm-nm-compat.obj: shared/nm-utils/nm-compat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_libnm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_tests_test_libnm-nm-compat.obj -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Tpo -c -o shared/nm-utils/libnm_tests_test_libnm-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/libnm_tests_test_libnm-nm-compat.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_libnm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_test_libnm-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi`
 
-shared/nm-utils/libnm_tests_test_general-nm-compat.obj: shared/nm-utils/nm-compat.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_tests_test_general-nm-compat.obj -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/libnm_tests_test_general-nm-compat.obj' libtool=no @AMDEPBACKSLASH@
+libnm/tests/test_libnm-test-libnm.o: libnm/tests/test-libnm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_libnm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/test_libnm-test-libnm.o -MD -MP -MF libnm/tests/$(DEPDIR)/test_libnm-test-libnm.Tpo -c -o libnm/tests/test_libnm-test-libnm.o `test -f 'libnm/tests/test-libnm.c' || echo '$(srcdir)/'`libnm/tests/test-libnm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/test_libnm-test-libnm.Tpo libnm/tests/$(DEPDIR)/test_libnm-test-libnm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-libnm.c' object='libnm/tests/test_libnm-test-libnm.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_libnm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/test_libnm-test-libnm.o `test -f 'libnm/tests/test-libnm.c' || echo '$(srcdir)/'`libnm/tests/test-libnm.c
 
-libnm/tests/libnm_tests_test_general-test-general.o: libnm/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/libnm_tests_test_general-test-general.o -MD -MP -MF libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Tpo -c -o libnm/tests/libnm_tests_test_general-test-general.o `test -f 'libnm/tests/test-general.c' || echo '$(srcdir)/'`libnm/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Tpo libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-general.c' object='libnm/tests/libnm_tests_test_general-test-general.o' libtool=no @AMDEPBACKSLASH@
+libnm/tests/test_libnm-test-libnm.obj: libnm/tests/test-libnm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_libnm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/test_libnm-test-libnm.obj -MD -MP -MF libnm/tests/$(DEPDIR)/test_libnm-test-libnm.Tpo -c -o libnm/tests/test_libnm-test-libnm.obj `if test -f 'libnm/tests/test-libnm.c'; then $(CYGPATH_W) 'libnm/tests/test-libnm.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-libnm.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/test_libnm-test-libnm.Tpo libnm/tests/$(DEPDIR)/test_libnm-test-libnm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-libnm.c' object='libnm/tests/test_libnm-test-libnm.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/libnm_tests_test_general-test-general.o `test -f 'libnm/tests/test-general.c' || echo '$(srcdir)/'`libnm/tests/test-general.c
-
-libnm/tests/libnm_tests_test_general-test-general.obj: libnm/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/libnm_tests_test_general-test-general.obj -MD -MP -MF libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Tpo -c -o libnm/tests/libnm_tests_test_general-test-general.obj `if test -f 'libnm/tests/test-general.c'; then $(CYGPATH_W) 'libnm/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-general.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Tpo libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-general.c' object='libnm/tests/libnm_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) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/libnm_tests_test_general-test-general.obj `if test -f 'libnm/tests/test-general.c'; then $(CYGPATH_W) 'libnm/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-general.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_libnm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/test_libnm-test-libnm.obj `if test -f 'libnm/tests/test-libnm.c'; then $(CYGPATH_W) 'libnm/tests/test-libnm.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-libnm.c'; fi`
 
 shared/libnm_tests_test_nm_client-nm-test-utils-impl.o: shared/nm-test-utils-impl.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_tests_test_nm_client-nm-test-utils-impl.o -MD -MP -MF shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Tpo -c -o shared/libnm_tests_test_nm_client-nm-test-utils-impl.o `test -f 'shared/nm-test-utils-impl.c' || echo '$(srcdir)/'`shared/nm-test-utils-impl.c
@@ -17105,19 +15279,19 @@ shared/libnm_tests_test_nm_client-nm-test-utils-impl.obj: shared/nm-test-utils-i
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_tests_test_nm_client-nm-test-utils-impl.obj `if test -f 'shared/nm-test-utils-impl.c'; then $(CYGPATH_W) 'shared/nm-test-utils-impl.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-test-utils-impl.c'; fi`
 
-libnm/tests/libnm_tests_test_nm_client-test-nm-client.o: libnm/tests/test-nm-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/libnm_tests_test_nm_client-test-nm-client.o -MD -MP -MF libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Tpo -c -o libnm/tests/libnm_tests_test_nm_client-test-nm-client.o `test -f 'libnm/tests/test-nm-client.c' || echo '$(srcdir)/'`libnm/tests/test-nm-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Tpo libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-nm-client.c' object='libnm/tests/libnm_tests_test_nm_client-test-nm-client.o' libtool=no @AMDEPBACKSLASH@
+libnm/tests/test_nm_client-test-nm-client.o: libnm/tests/test-nm-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/test_nm_client-test-nm-client.o -MD -MP -MF libnm/tests/$(DEPDIR)/test_nm_client-test-nm-client.Tpo -c -o libnm/tests/test_nm_client-test-nm-client.o `test -f 'libnm/tests/test-nm-client.c' || echo '$(srcdir)/'`libnm/tests/test-nm-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/test_nm_client-test-nm-client.Tpo libnm/tests/$(DEPDIR)/test_nm_client-test-nm-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-nm-client.c' object='libnm/tests/test_nm_client-test-nm-client.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/libnm_tests_test_nm_client-test-nm-client.o `test -f 'libnm/tests/test-nm-client.c' || echo '$(srcdir)/'`libnm/tests/test-nm-client.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/test_nm_client-test-nm-client.o `test -f 'libnm/tests/test-nm-client.c' || echo '$(srcdir)/'`libnm/tests/test-nm-client.c
 
-libnm/tests/libnm_tests_test_nm_client-test-nm-client.obj: libnm/tests/test-nm-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/libnm_tests_test_nm_client-test-nm-client.obj -MD -MP -MF libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Tpo -c -o libnm/tests/libnm_tests_test_nm_client-test-nm-client.obj `if test -f 'libnm/tests/test-nm-client.c'; then $(CYGPATH_W) 'libnm/tests/test-nm-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-nm-client.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Tpo libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-nm-client.c' object='libnm/tests/libnm_tests_test_nm_client-test-nm-client.obj' libtool=no @AMDEPBACKSLASH@
+libnm/tests/test_nm_client-test-nm-client.obj: libnm/tests/test-nm-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/test_nm_client-test-nm-client.obj -MD -MP -MF libnm/tests/$(DEPDIR)/test_nm_client-test-nm-client.Tpo -c -o libnm/tests/test_nm_client-test-nm-client.obj `if test -f 'libnm/tests/test-nm-client.c'; then $(CYGPATH_W) 'libnm/tests/test-nm-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-nm-client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/test_nm_client-test-nm-client.Tpo libnm/tests/$(DEPDIR)/test_nm_client-test-nm-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-nm-client.c' object='libnm/tests/test_nm_client-test-nm-client.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/libnm_tests_test_nm_client-test-nm-client.obj `if test -f 'libnm/tests/test-nm-client.c'; then $(CYGPATH_W) 'libnm/tests/test-nm-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-nm-client.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_nm_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/test_nm_client-test-nm-client.obj `if test -f 'libnm/tests/test-nm-client.c'; then $(CYGPATH_W) 'libnm/tests/test-nm-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-nm-client.c'; fi`
 
 shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.o: shared/nm-test-utils-impl.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.o -MD -MP -MF shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Tpo -c -o shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.o `test -f 'shared/nm-test-utils-impl.c' || echo '$(srcdir)/'`shared/nm-test-utils-impl.c
@@ -17133,19 +15307,19 @@ shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.obj: shared/nm
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.obj `if test -f 'shared/nm-test-utils-impl.c'; then $(CYGPATH_W) 'shared/nm-test-utils-impl.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-test-utils-impl.c'; fi`
 
-libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.o: libnm/tests/test-remote-settings-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.o -MD -MP -MF libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Tpo -c -o libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.o `test -f 'libnm/tests/test-remote-settings-client.c' || echo '$(srcdir)/'`libnm/tests/test-remote-settings-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Tpo libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-remote-settings-client.c' object='libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.o' libtool=no @AMDEPBACKSLASH@
+libnm/tests/test_remote_settings_client-test-remote-settings-client.o: libnm/tests/test-remote-settings-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/test_remote_settings_client-test-remote-settings-client.o -MD -MP -MF libnm/tests/$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Tpo -c -o libnm/tests/test_remote_settings_client-test-remote-settings-client.o `test -f 'libnm/tests/test-remote-settings-client.c' || echo '$(srcdir)/'`libnm/tests/test-remote-settings-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Tpo libnm/tests/$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-remote-settings-client.c' object='libnm/tests/test_remote_settings_client-test-remote-settings-client.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.o `test -f 'libnm/tests/test-remote-settings-client.c' || echo '$(srcdir)/'`libnm/tests/test-remote-settings-client.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/test_remote_settings_client-test-remote-settings-client.o `test -f 'libnm/tests/test-remote-settings-client.c' || echo '$(srcdir)/'`libnm/tests/test-remote-settings-client.c
 
-libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.obj: libnm/tests/test-remote-settings-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.obj -MD -MP -MF libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Tpo -c -o libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.obj `if test -f 'libnm/tests/test-remote-settings-client.c'; then $(CYGPATH_W) 'libnm/tests/test-remote-settings-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-remote-settings-client.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Tpo libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-remote-settings-client.c' object='libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.obj' libtool=no @AMDEPBACKSLASH@
+libnm/tests/test_remote_settings_client-test-remote-settings-client.obj: libnm/tests/test-remote-settings-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/test_remote_settings_client-test-remote-settings-client.obj -MD -MP -MF libnm/tests/$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Tpo -c -o libnm/tests/test_remote_settings_client-test-remote-settings-client.obj `if test -f 'libnm/tests/test-remote-settings-client.c'; then $(CYGPATH_W) 'libnm/tests/test-remote-settings-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-remote-settings-client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Tpo libnm/tests/$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/tests/test-remote-settings-client.c' object='libnm/tests/test_remote_settings_client-test-remote-settings-client.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.obj `if test -f 'libnm/tests/test-remote-settings-client.c'; then $(CYGPATH_W) 'libnm/tests/test-remote-settings-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-remote-settings-client.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_remote_settings_client_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/test_remote_settings_client-test-remote-settings-client.obj `if test -f 'libnm/tests/test-remote-settings-client.c'; then $(CYGPATH_W) 'libnm/tests/test-remote-settings-client.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-remote-settings-client.c'; fi`
 
 shared/libnm_tests_test_secret_agent-nm-test-utils-impl.o: shared/nm-test-utils-impl.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_secret_agent_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_tests_test_secret_agent-nm-test-utils-impl.o -MD -MP -MF shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Tpo -c -o shared/libnm_tests_test_secret_agent-nm-test-utils-impl.o `test -f 'shared/nm-test-utils-impl.c' || echo '$(srcdir)/'`shared/nm-test-utils-impl.c
@@ -17231,47 +15405,47 @@ src/devices/tests/test_lldp-test-lldp.obj: src/devices/tests/test-lldp.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/test_lldp-test-lldp.obj `if test -f 'src/devices/tests/test-lldp.c'; then $(CYGPATH_W) 'src/devices/tests/test-lldp.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-lldp.c'; fi`
 
-src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.o: src/devices/wifi/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.o -MD -MP -MF src/devices/wifi/tests/$(DEPDIR)/src_devices_wifi_tests_test_general-test-general.Tpo -c -o src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.o `test -f 'src/devices/wifi/tests/test-general.c' || echo '$(srcdir)/'`src/devices/wifi/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/tests/$(DEPDIR)/src_devices_wifi_tests_test_general-test-general.Tpo src/devices/wifi/tests/$(DEPDIR)/src_devices_wifi_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/tests/test-general.c' object='src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.o' libtool=no @AMDEPBACKSLASH@
+src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.o: src/devices/wifi/tests/test-devices-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.o -MD -MP -MF src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Tpo -c -o src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.o `test -f 'src/devices/wifi/tests/test-devices-wifi.c' || echo '$(srcdir)/'`src/devices/wifi/tests/test-devices-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Tpo src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/tests/test-devices-wifi.c' object='src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.o `test -f 'src/devices/wifi/tests/test-general.c' || echo '$(srcdir)/'`src/devices/wifi/tests/test-general.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.o `test -f 'src/devices/wifi/tests/test-devices-wifi.c' || echo '$(srcdir)/'`src/devices/wifi/tests/test-devices-wifi.c
 
-src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.obj: src/devices/wifi/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.obj -MD -MP -MF src/devices/wifi/tests/$(DEPDIR)/src_devices_wifi_tests_test_general-test-general.Tpo -c -o src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.obj `if test -f 'src/devices/wifi/tests/test-general.c'; then $(CYGPATH_W) 'src/devices/wifi/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/tests/test-general.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/tests/$(DEPDIR)/src_devices_wifi_tests_test_general-test-general.Tpo src/devices/wifi/tests/$(DEPDIR)/src_devices_wifi_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/tests/test-general.c' object='src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.obj' libtool=no @AMDEPBACKSLASH@
+src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj: src/devices/wifi/tests/test-devices-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj -MD -MP -MF src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Tpo -c -o src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj `if test -f 'src/devices/wifi/tests/test-devices-wifi.c'; then $(CYGPATH_W) 'src/devices/wifi/tests/test-devices-wifi.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/tests/test-devices-wifi.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Tpo src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/tests/test-devices-wifi.c' object='src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests/src_devices_wifi_tests_test_general-test-general.obj `if test -f 'src/devices/wifi/tests/test-general.c'; then $(CYGPATH_W) 'src/devices/wifi/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/tests/test-general.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj `if test -f 'src/devices/wifi/tests/test-devices-wifi.c'; then $(CYGPATH_W) 'src/devices/wifi/tests/test-devices-wifi.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/tests/test-devices-wifi.c'; fi`
 
-src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.o: src/devices/wifi/nm-wifi-ap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.o -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Tpo -c -o src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.o `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-ap.c' object='src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.o' libtool=no @AMDEPBACKSLASH@
+src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.o: src/devices/wifi/nm-wifi-ap.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.o -MD -MP -MF src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Tpo -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.o `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Tpo src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-ap.c' object='src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.o `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.o `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
 
-src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.obj: src/devices/wifi/nm-wifi-ap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.obj -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Tpo -c -o src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.obj `if test -f 'src/devices/wifi/nm-wifi-ap.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-ap.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-ap.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-ap.c' object='src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.obj' libtool=no @AMDEPBACKSLASH@
+src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.obj: src/devices/wifi/nm-wifi-ap.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.obj -MD -MP -MF src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Tpo -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.obj `if test -f 'src/devices/wifi/nm-wifi-ap.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-ap.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-ap.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Tpo src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-ap.c' object='src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-ap.obj `if test -f 'src/devices/wifi/nm-wifi-ap.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-ap.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-ap.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-ap.obj `if test -f 'src/devices/wifi/nm-wifi-ap.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-ap.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-ap.c'; fi`
 
-src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.o: src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.o -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Tpo -c -o src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.o `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.o' libtool=no @AMDEPBACKSLASH@
+src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.o: src/devices/wifi/nm-wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.o -MD -MP -MF src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Tpo -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.o `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.o `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.o `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
 
-src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.obj: src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.obj -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Tpo -c -o src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.obj `if test -f 'src/devices/wifi/nm-wifi-utils.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.obj' libtool=no @AMDEPBACKSLASH@
+src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.obj: src/devices/wifi/nm-wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.obj -MD -MP -MF src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Tpo -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.obj `if test -f 'src/devices/wifi/nm-wifi-utils.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-utils.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.obj `if test -f 'src/devices/wifi/nm-wifi-utils.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-utils.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/tests_test_devices_wifi-nm-wifi-utils.obj `if test -f 'src/devices/wifi/nm-wifi-utils.c'; then $(CYGPATH_W) 'src/devices/wifi/nm-wifi-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wifi/nm-wifi-utils.c'; fi`
 
 src/dhcp/nm_dhcp_helper-nm-dhcp-helper.o: src/dhcp/nm-dhcp-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_dhcp_nm_dhcp_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/nm_dhcp_helper-nm-dhcp-helper.o -MD -MP -MF src/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Tpo -c -o src/dhcp/nm_dhcp_helper-nm-dhcp-helper.o `test -f 'src/dhcp/nm-dhcp-helper.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-helper.c
@@ -17483,20 +15657,6 @@ src/platform/tests/test_cleanup_linux-test-cleanup.obj: src/platform/tests/test-
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_cleanup_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_cleanup_linux-test-cleanup.obj `if test -f 'src/platform/tests/test-cleanup.c'; then $(CYGPATH_W) 'src/platform/tests/test-cleanup.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-cleanup.c'; fi`
 
-src/platform/tests/src_platform_tests_test_general-test-general.o: src/platform/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/src_platform_tests_test_general-test-general.o -MD -MP -MF src/platform/tests/$(DEPDIR)/src_platform_tests_test_general-test-general.Tpo -c -o src/platform/tests/src_platform_tests_test_general-test-general.o `test -f 'src/platform/tests/test-general.c' || echo '$(srcdir)/'`src/platform/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/src_platform_tests_test_general-test-general.Tpo src/platform/tests/$(DEPDIR)/src_platform_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-general.c' object='src/platform/tests/src_platform_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) $(src_platform_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/src_platform_tests_test_general-test-general.o `test -f 'src/platform/tests/test-general.c' || echo '$(srcdir)/'`src/platform/tests/test-general.c
-
-src/platform/tests/src_platform_tests_test_general-test-general.obj: src/platform/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/src_platform_tests_test_general-test-general.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/src_platform_tests_test_general-test-general.Tpo -c -o src/platform/tests/src_platform_tests_test_general-test-general.obj `if test -f 'src/platform/tests/test-general.c'; then $(CYGPATH_W) 'src/platform/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-general.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/src_platform_tests_test_general-test-general.Tpo src/platform/tests/$(DEPDIR)/src_platform_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-general.c' object='src/platform/tests/src_platform_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) $(src_platform_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/src_platform_tests_test_general-test-general.obj `if test -f 'src/platform/tests/test-general.c'; then $(CYGPATH_W) 'src/platform/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-general.c'; fi`
-
 src/platform/tests/test_link_fake-test-link.o: src/platform/tests/test-link.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_link_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_link_fake-test-link.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_link_fake-test-link.Tpo -c -o src/platform/tests/test_link_fake-test-link.o `test -f 'src/platform/tests/test-link.c' || echo '$(srcdir)/'`src/platform/tests/test-link.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_link_fake-test-link.Tpo src/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po
@@ -17539,6 +15699,20 @@ src/platform/tests/test_nmp_object-test-nmp-object.obj: src/platform/tests/test-
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_nmp_object_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_nmp_object-test-nmp-object.obj `if test -f 'src/platform/tests/test-nmp-object.c'; then $(CYGPATH_W) 'src/platform/tests/test-nmp-object.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-nmp-object.c'; fi`
 
+src/platform/tests/test_platform_general-test-platform-general.o: src/platform/tests/test-platform-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_platform_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_platform_general-test-platform-general.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Tpo -c -o src/platform/tests/test_platform_general-test-platform-general.o `test -f 'src/platform/tests/test-platform-general.c' || echo '$(srcdir)/'`src/platform/tests/test-platform-general.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Tpo src/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-platform-general.c' object='src/platform/tests/test_platform_general-test-platform-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) $(src_platform_tests_test_platform_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_platform_general-test-platform-general.o `test -f 'src/platform/tests/test-platform-general.c' || echo '$(srcdir)/'`src/platform/tests/test-platform-general.c
+
+src/platform/tests/test_platform_general-test-platform-general.obj: src/platform/tests/test-platform-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_platform_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_platform_general-test-platform-general.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Tpo -c -o src/platform/tests/test_platform_general-test-platform-general.obj `if test -f 'src/platform/tests/test-platform-general.c'; then $(CYGPATH_W) 'src/platform/tests/test-platform-general.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-platform-general.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Tpo src/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-platform-general.c' object='src/platform/tests/test_platform_general-test-platform-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) $(src_platform_tests_test_platform_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_platform_general-test-platform-general.obj `if test -f 'src/platform/tests/test-platform-general.c'; then $(CYGPATH_W) 'src/platform/tests/test-platform-general.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-platform-general.c'; fi`
+
 src/platform/tests/test_route_fake-test-route.o: src/platform/tests/test-route.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_route_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_route_fake-test-route.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_route_fake-test-route.Tpo -c -o src/platform/tests/test_route_fake-test-route.o `test -f 'src/platform/tests/test-route.c' || echo '$(srcdir)/'`src/platform/tests/test-route.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_route_fake-test-route.Tpo src/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po
@@ -17567,20 +15741,6 @@ src/platform/tests/test_route_linux-test-route.obj: src/platform/tests/test-rout
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_route_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_route_linux-test-route.obj `if test -f 'src/platform/tests/test-route.c'; then $(CYGPATH_W) 'src/platform/tests/test-route.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-route.c'; fi`
 
-src/settings/plugins/ibft/tests/test_ibft-test-ibft.o: src/settings/plugins/ibft/tests/test-ibft.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ibft/tests/test_ibft-test-ibft.o -MD -MP -MF src/settings/plugins/ibft/tests/$(DEPDIR)/test_ibft-test-ibft.Tpo -c -o src/settings/plugins/ibft/tests/test_ibft-test-ibft.o `test -f 'src/settings/plugins/ibft/tests/test-ibft.c' || echo '$(srcdir)/'`src/settings/plugins/ibft/tests/test-ibft.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ibft/tests/$(DEPDIR)/test_ibft-test-ibft.Tpo src/settings/plugins/ibft/tests/$(DEPDIR)/test_ibft-test-ibft.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ibft/tests/test-ibft.c' object='src/settings/plugins/ibft/tests/test_ibft-test-ibft.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ibft/tests/test_ibft-test-ibft.o `test -f 'src/settings/plugins/ibft/tests/test-ibft.c' || echo '$(srcdir)/'`src/settings/plugins/ibft/tests/test-ibft.c
-
-src/settings/plugins/ibft/tests/test_ibft-test-ibft.obj: src/settings/plugins/ibft/tests/test-ibft.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ibft/tests/test_ibft-test-ibft.obj -MD -MP -MF src/settings/plugins/ibft/tests/$(DEPDIR)/test_ibft-test-ibft.Tpo -c -o src/settings/plugins/ibft/tests/test_ibft-test-ibft.obj `if test -f 'src/settings/plugins/ibft/tests/test-ibft.c'; then $(CYGPATH_W) 'src/settings/plugins/ibft/tests/test-ibft.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ibft/tests/test-ibft.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ibft/tests/$(DEPDIR)/test_ibft-test-ibft.Tpo src/settings/plugins/ibft/tests/$(DEPDIR)/test_ibft-test-ibft.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ibft/tests/test-ibft.c' object='src/settings/plugins/ibft/tests/test_ibft-test-ibft.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ibft/tests/test_ibft-test-ibft.obj `if test -f 'src/settings/plugins/ibft/tests/test-ibft.c'; then $(CYGPATH_W) 'src/settings/plugins/ibft/tests/test-ibft.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ibft/tests/test-ibft.c'; fi`
-
 src/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.o: src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.o -MD -MP -MF src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Tpo -c -o src/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.o `test -f 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Tpo src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po
@@ -17609,19 +15769,19 @@ src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.obj: src/setting
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.obj `if test -f 'src/settings/plugins/ifupdown/tests/test-ifupdown.c'; then $(CYGPATH_W) 'src/settings/plugins/ifupdown/tests/test-ifupdown.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifupdown/tests/test-ifupdown.c'; fi`
 
-src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.o: src/settings/plugins/keyfile/tests/test-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.o -MD -MP -MF src/settings/plugins/keyfile/tests/$(DEPDIR)/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.Tpo -c -o src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.o `test -f 'src/settings/plugins/keyfile/tests/test-keyfile.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/tests/test-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/keyfile/tests/$(DEPDIR)/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.Tpo src/settings/plugins/keyfile/tests/$(DEPDIR)/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/keyfile/tests/test-keyfile.c' object='src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.o' libtool=no @AMDEPBACKSLASH@
+src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.o: src/settings/plugins/keyfile/tests/test-keyfile-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.o -MD -MP -MF src/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Tpo -c -o src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.o `test -f 'src/settings/plugins/keyfile/tests/test-keyfile-settings.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/tests/test-keyfile-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Tpo src/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/keyfile/tests/test-keyfile-settings.c' object='src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.o `test -f 'src/settings/plugins/keyfile/tests/test-keyfile.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/tests/test-keyfile.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.o `test -f 'src/settings/plugins/keyfile/tests/test-keyfile-settings.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/tests/test-keyfile-settings.c
 
-src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.obj: src/settings/plugins/keyfile/tests/test-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.obj -MD -MP -MF src/settings/plugins/keyfile/tests/$(DEPDIR)/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.Tpo -c -o src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.obj `if test -f 'src/settings/plugins/keyfile/tests/test-keyfile.c'; then $(CYGPATH_W) 'src/settings/plugins/keyfile/tests/test-keyfile.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/keyfile/tests/test-keyfile.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/keyfile/tests/$(DEPDIR)/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.Tpo src/settings/plugins/keyfile/tests/$(DEPDIR)/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/keyfile/tests/test-keyfile.c' object='src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.obj' libtool=no @AMDEPBACKSLASH@
+src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.obj: src/settings/plugins/keyfile/tests/test-keyfile-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.obj -MD -MP -MF src/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Tpo -c -o src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.obj `if test -f 'src/settings/plugins/keyfile/tests/test-keyfile-settings.c'; then $(CYGPATH_W) 'src/settings/plugins/keyfile/tests/test-keyfile-settings.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/keyfile/tests/test-keyfile-settings.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Tpo src/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/keyfile/tests/test-keyfile-settings.c' object='src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/keyfile/tests/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.obj `if test -f 'src/settings/plugins/keyfile/tests/test-keyfile.c'; then $(CYGPATH_W) 'src/settings/plugins/keyfile/tests/test-keyfile.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/keyfile/tests/test-keyfile.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.obj `if test -f 'src/settings/plugins/keyfile/tests/test-keyfile-settings.c'; then $(CYGPATH_W) 'src/settings/plugins/keyfile/tests/test-keyfile-settings.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/keyfile/tests/test-keyfile-settings.c'; fi`
 
 src/supplicant/tests/test_supplicant_config-test-supplicant-config.o: src/supplicant/tests/test-supplicant-config.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_supplicant_tests_test_supplicant_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/supplicant/tests/test_supplicant_config-test-supplicant-config.o -MD -MP -MF src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Tpo -c -o src/supplicant/tests/test_supplicant_config-test-supplicant-config.o `test -f 'src/supplicant/tests/test-supplicant-config.c' || echo '$(srcdir)/'`src/supplicant/tests/test-supplicant-config.c
@@ -17665,6 +15825,34 @@ src/tests/config/test_config-test-config.obj: src/tests/config/test-config.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/config/test_config-test-config.obj `if test -f 'src/tests/config/test-config.c'; then $(CYGPATH_W) 'src/tests/config/test-config.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/config/test-config.c'; fi`
 
+src/tests/test_core-test-core.o: src/tests/test-core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_core_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_core-test-core.o -MD -MP -MF src/tests/$(DEPDIR)/test_core-test-core.Tpo -c -o src/tests/test_core-test-core.o `test -f 'src/tests/test-core.c' || echo '$(srcdir)/'`src/tests/test-core.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_core-test-core.Tpo src/tests/$(DEPDIR)/test_core-test-core.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-core.c' object='src/tests/test_core-test-core.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_core_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_core-test-core.o `test -f 'src/tests/test-core.c' || echo '$(srcdir)/'`src/tests/test-core.c
+
+src/tests/test_core-test-core.obj: src/tests/test-core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_core_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_core-test-core.obj -MD -MP -MF src/tests/$(DEPDIR)/test_core-test-core.Tpo -c -o src/tests/test_core-test-core.obj `if test -f 'src/tests/test-core.c'; then $(CYGPATH_W) 'src/tests/test-core.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-core.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_core-test-core.Tpo src/tests/$(DEPDIR)/test_core-test-core.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-core.c' object='src/tests/test_core-test-core.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_core_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_core-test-core.obj `if test -f 'src/tests/test-core.c'; then $(CYGPATH_W) 'src/tests/test-core.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-core.c'; fi`
+
+src/tests/test_core_with_expect-test-core-with-expect.o: src/tests/test-core-with-expect.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_core_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_core_with_expect-test-core-with-expect.o -MD -MP -MF src/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Tpo -c -o src/tests/test_core_with_expect-test-core-with-expect.o `test -f 'src/tests/test-core-with-expect.c' || echo '$(srcdir)/'`src/tests/test-core-with-expect.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Tpo src/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-core-with-expect.c' object='src/tests/test_core_with_expect-test-core-with-expect.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_core_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_core_with_expect-test-core-with-expect.o `test -f 'src/tests/test-core-with-expect.c' || echo '$(srcdir)/'`src/tests/test-core-with-expect.c
+
+src/tests/test_core_with_expect-test-core-with-expect.obj: src/tests/test-core-with-expect.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_core_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_core_with_expect-test-core-with-expect.obj -MD -MP -MF src/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Tpo -c -o src/tests/test_core_with_expect-test-core-with-expect.obj `if test -f 'src/tests/test-core-with-expect.c'; then $(CYGPATH_W) 'src/tests/test-core-with-expect.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-core-with-expect.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Tpo src/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-core-with-expect.c' object='src/tests/test_core_with_expect-test-core-with-expect.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_core_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_core_with_expect-test-core-with-expect.obj `if test -f 'src/tests/test-core-with-expect.c'; then $(CYGPATH_W) 'src/tests/test-core-with-expect.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-core-with-expect.c'; fi`
+
 src/tests/test_dcb-test-dcb.o: src/tests/test-dcb.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_dcb-test-dcb.o -MD -MP -MF src/tests/$(DEPDIR)/test_dcb-test-dcb.Tpo -c -o src/tests/test_dcb-test-dcb.o `test -f 'src/tests/test-dcb.c' || echo '$(srcdir)/'`src/tests/test-dcb.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_dcb-test-dcb.Tpo src/tests/$(DEPDIR)/test_dcb-test-dcb.Po
@@ -17679,34 +15867,6 @@ src/tests/test_dcb-test-dcb.obj: src/tests/test-dcb.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_dcb-test-dcb.obj `if test -f 'src/tests/test-dcb.c'; then $(CYGPATH_W) 'src/tests/test-dcb.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-dcb.c'; fi`
 
-src/tests/src_tests_test_general-test-general.o: src/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_general-test-general.o -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_general-test-general.Tpo -c -o src/tests/src_tests_test_general-test-general.o `test -f 'src/tests/test-general.c' || echo '$(srcdir)/'`src/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_general-test-general.Tpo src/tests/$(DEPDIR)/src_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-general.c' object='src/tests/src_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) $(src_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_general-test-general.o `test -f 'src/tests/test-general.c' || echo '$(srcdir)/'`src/tests/test-general.c
-
-src/tests/src_tests_test_general-test-general.obj: src/tests/test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_general-test-general.obj -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_general-test-general.Tpo -c -o src/tests/src_tests_test_general-test-general.obj `if test -f 'src/tests/test-general.c'; then $(CYGPATH_W) 'src/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-general.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_general-test-general.Tpo src/tests/$(DEPDIR)/src_tests_test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-general.c' object='src/tests/src_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) $(src_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_general-test-general.obj `if test -f 'src/tests/test-general.c'; then $(CYGPATH_W) 'src/tests/test-general.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-general.c'; fi`
-
-src/tests/test_general_with_expect-test-general-with-expect.o: src/tests/test-general-with-expect.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_general_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_general_with_expect-test-general-with-expect.o -MD -MP -MF src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Tpo -c -o src/tests/test_general_with_expect-test-general-with-expect.o `test -f 'src/tests/test-general-with-expect.c' || echo '$(srcdir)/'`src/tests/test-general-with-expect.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Tpo src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-general-with-expect.c' object='src/tests/test_general_with_expect-test-general-with-expect.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_general_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_general_with_expect-test-general-with-expect.o `test -f 'src/tests/test-general-with-expect.c' || echo '$(srcdir)/'`src/tests/test-general-with-expect.c
-
-src/tests/test_general_with_expect-test-general-with-expect.obj: src/tests/test-general-with-expect.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_general_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_general_with_expect-test-general-with-expect.obj -MD -MP -MF src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Tpo -c -o src/tests/test_general_with_expect-test-general-with-expect.obj `if test -f 'src/tests/test-general-with-expect.c'; then $(CYGPATH_W) 'src/tests/test-general-with-expect.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-general-with-expect.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Tpo src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-general-with-expect.c' object='src/tests/test_general_with_expect-test-general-with-expect.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_general_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_general_with_expect-test-general-with-expect.obj `if test -f 'src/tests/test-general-with-expect.c'; then $(CYGPATH_W) 'src/tests/test-general-with-expect.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-general-with-expect.c'; fi`
-
 src/tests/test_ip4_config-test-ip4-config.o: src/tests/test-ip4-config.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_ip4_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_ip4_config-test-ip4-config.o -MD -MP -MF src/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Tpo -c -o src/tests/test_ip4_config-test-ip4-config.o `test -f 'src/tests/test-ip4-config.c' || echo '$(srcdir)/'`src/tests/test-ip4-config.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Tpo src/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po
@@ -17875,17 +16035,14 @@ clean-libtool:
 	-rm -rf libnm/.libs libnm/_libs
 	-rm -rf libnm-core/.libs libnm-core/_libs
 	-rm -rf libnm-core/tests/.libs libnm-core/tests/_libs
-	-rm -rf libnm-glib/.libs libnm-glib/_libs
-	-rm -rf libnm-glib/tests/.libs libnm-glib/tests/_libs
-	-rm -rf libnm-util/.libs libnm-util/_libs
-	-rm -rf libnm-util/tests/.libs libnm-util/tests/_libs
-	-rm -rf libnm/fake-typelib/.libs libnm/fake-typelib/_libs
 	-rm -rf libnm/tests/.libs libnm/tests/_libs
 	-rm -rf shared/.libs shared/_libs
 	-rm -rf shared/c-rbtree/src/.libs shared/c-rbtree/src/_libs
 	-rm -rf shared/c-siphash/src/.libs shared/c-siphash/src/_libs
 	-rm -rf shared/n-acd/src/.libs shared/n-acd/src/_libs
 	-rm -rf shared/n-acd/src/util/.libs shared/n-acd/src/util/_libs
+	-rm -rf shared/n-dhcp4/src/.libs shared/n-dhcp4/src/_libs
+	-rm -rf shared/n-dhcp4/src/util/.libs shared/n-dhcp4/src/util/_libs
 	-rm -rf shared/nm-glib-aux/.libs shared/nm-glib-aux/_libs
 	-rm -rf shared/nm-libnm-core-aux/.libs shared/nm-libnm-core-aux/_libs
 	-rm -rf shared/nm-libnm-core-intern/.libs shared/nm-libnm-core-intern/_libs
@@ -17895,6 +16052,7 @@ clean-libtool:
 	-rm -rf shared/nm-utils/tests/.libs shared/nm-utils/tests/_libs
 	-rm -rf shared/systemd/.libs shared/systemd/_libs
 	-rm -rf shared/systemd/src/basic/.libs shared/systemd/src/basic/_libs
+	-rm -rf shared/systemd/src/shared/.libs shared/systemd/src/shared/_libs
 	-rm -rf src/.libs src/_libs
 	-rm -rf src/devices/.libs src/devices/_libs
 	-rm -rf src/devices/adsl/.libs src/devices/adsl/_libs
@@ -17920,8 +16078,6 @@ clean-libtool:
 	-rm -rf src/platform/wpan/.libs src/platform/wpan/_libs
 	-rm -rf src/ppp/.libs src/ppp/_libs
 	-rm -rf src/settings/.libs src/settings/_libs
-	-rm -rf src/settings/plugins/ibft/.libs src/settings/plugins/ibft/_libs
-	-rm -rf src/settings/plugins/ibft/tests/.libs src/settings/plugins/ibft/tests/_libs
 	-rm -rf src/settings/plugins/ifcfg-rh/.libs src/settings/plugins/ifcfg-rh/_libs
 	-rm -rf src/settings/plugins/ifcfg-rh/tests/.libs src/settings/plugins/ifcfg-rh/tests/_libs
 	-rm -rf src/settings/plugins/ifupdown/.libs src/settings/plugins/ifupdown/_libs
@@ -17935,7 +16091,6 @@ clean-libtool:
 	-rm -rf src/systemd/src/libsystemd-network/.libs src/systemd/src/libsystemd-network/_libs
 	-rm -rf src/systemd/src/libsystemd/sd-event/.libs src/systemd/src/libsystemd/sd-event/_libs
 	-rm -rf src/systemd/src/libsystemd/sd-id128/.libs src/systemd/src/libsystemd/sd-id128/_libs
-	-rm -rf src/systemd/src/shared/.libs src/systemd/src/shared/_libs
 	-rm -rf src/tests/.libs src/tests/_libs
 	-rm -rf src/tests/config/.libs src/tests/config/_libs
 	-rm -rf src/vpn/.libs src/vpn/_libs
@@ -18387,90 +16542,6 @@ uninstall-vapiDATA:
 	@list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir)
-install-libdeprecatedHEADERS: $(libdeprecated_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(libdeprecated_HEADERS)'; test -n "$(libdeprecateddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdeprecateddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdeprecateddir)" || 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_HEADER) $$files '$(DESTDIR)$(libdeprecateddir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libdeprecateddir)" || exit $$?; \
-	done
-
-uninstall-libdeprecatedHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libdeprecated_HEADERS)'; test -n "$(libdeprecateddir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libdeprecateddir)'; $(am__uninstall_files_from_dir)
-install-libnm_glib_libnmincludeHEADERS: $(libnm_glib_libnminclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(libnm_glib_libnminclude_HEADERS)'; test -n "$(libnm_glib_libnmincludedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libnm_glib_libnmincludedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libnm_glib_libnmincludedir)" || 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_HEADER) $$files '$(DESTDIR)$(libnm_glib_libnmincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libnm_glib_libnmincludedir)" || exit $$?; \
-	done
-
-uninstall-libnm_glib_libnmincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libnm_glib_libnminclude_HEADERS)'; test -n "$(libnm_glib_libnmincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libnm_glib_libnmincludedir)'; $(am__uninstall_files_from_dir)
-install-libnm_glib_libnmvpnHEADERS: $(libnm_glib_libnmvpn_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(libnm_glib_libnmvpn_HEADERS)'; test -n "$(libnm_glib_libnmvpndir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libnm_glib_libnmvpndir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libnm_glib_libnmvpndir)" || 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_HEADER) $$files '$(DESTDIR)$(libnm_glib_libnmvpndir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libnm_glib_libnmvpndir)" || exit $$?; \
-	done
-
-uninstall-libnm_glib_libnmvpnHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libnm_glib_libnmvpn_HEADERS)'; test -n "$(libnm_glib_libnmvpndir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libnm_glib_libnmvpndir)'; $(am__uninstall_files_from_dir)
-install-libnm_util_libnm_util_includeHEADERS: $(libnm_util_libnm_util_include_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(libnm_util_libnm_util_include_HEADERS)'; test -n "$(libnm_util_libnm_util_includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libnm_util_libnm_util_includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libnm_util_libnm_util_includedir)" || 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_HEADER) $$files '$(DESTDIR)$(libnm_util_libnm_util_includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libnm_util_libnm_util_includedir)" || exit $$?; \
-	done
-
-uninstall-libnm_util_libnm_util_includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libnm_util_libnm_util_include_HEADERS)'; test -n "$(libnm_util_libnm_util_includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libnm_util_libnm_util_includedir)'; $(am__uninstall_files_from_dir)
 install-libnmincludeHEADERS: $(libnminclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	@list='$(libnminclude_HEADERS)'; test -n "$(libnmincludedir)" || list=; \
@@ -18492,69 +16563,6 @@ uninstall-libnmincludeHEADERS:
 	@list='$(libnminclude_HEADERS)'; test -n "$(libnmincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(libnmincludedir)'; $(am__uninstall_files_from_dir)
-install-nodist_libnm_glib_libnmincludeHEADERS: $(nodist_libnm_glib_libnminclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(nodist_libnm_glib_libnminclude_HEADERS)'; test -n "$(libnm_glib_libnmincludedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libnm_glib_libnmincludedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libnm_glib_libnmincludedir)" || 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_HEADER) $$files '$(DESTDIR)$(libnm_glib_libnmincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libnm_glib_libnmincludedir)" || exit $$?; \
-	done
-
-uninstall-nodist_libnm_glib_libnmincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_libnm_glib_libnminclude_HEADERS)'; test -n "$(libnm_glib_libnmincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libnm_glib_libnmincludedir)'; $(am__uninstall_files_from_dir)
-install-nodist_libnm_glib_libnmvpnHEADERS: $(nodist_libnm_glib_libnmvpn_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(nodist_libnm_glib_libnmvpn_HEADERS)'; test -n "$(libnm_glib_libnmvpndir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libnm_glib_libnmvpndir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libnm_glib_libnmvpndir)" || 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_HEADER) $$files '$(DESTDIR)$(libnm_glib_libnmvpndir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libnm_glib_libnmvpndir)" || exit $$?; \
-	done
-
-uninstall-nodist_libnm_glib_libnmvpnHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_libnm_glib_libnmvpn_HEADERS)'; test -n "$(libnm_glib_libnmvpndir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libnm_glib_libnmvpndir)'; $(am__uninstall_files_from_dir)
-install-nodist_libnm_util_libnm_util_includeHEADERS: $(nodist_libnm_util_libnm_util_include_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(nodist_libnm_util_libnm_util_include_HEADERS)'; test -n "$(libnm_util_libnm_util_includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libnm_util_libnm_util_includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libnm_util_libnm_util_includedir)" || 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_HEADER) $$files '$(DESTDIR)$(libnm_util_libnm_util_includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libnm_util_libnm_util_includedir)" || exit $$?; \
-	done
-
-uninstall-nodist_libnm_util_libnm_util_includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_libnm_util_libnm_util_include_HEADERS)'; test -n "$(libnm_util_libnm_util_includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libnm_util_libnm_util_includedir)'; $(am__uninstall_files_from_dir)
 install-nodist_libnmincludeHEADERS: $(nodist_libnminclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	@list='$(nodist_libnminclude_HEADERS)'; test -n "$(libnmincludedir)" || list=; \
@@ -18877,9 +16885,9 @@ libnm-core/tests/test-settings-defaults.log: libnm-core/tests/test-settings-defa
 	--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/tests/test-general.log: libnm/tests/test-general$(EXEEXT)
-	@p='libnm/tests/test-general$(EXEEXT)'; \
-	b='libnm/tests/test-general'; \
+libnm/tests/test-libnm.log: libnm/tests/test-libnm$(EXEEXT)
+	@p='libnm/tests/test-libnm$(EXEEXT)'; \
+	b='libnm/tests/test-libnm'; \
 	$(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) \
@@ -18933,16 +16941,9 @@ src/dhcp/tests/test-dhcp-utils.log: src/dhcp/tests/test-dhcp-utils$(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/settings/plugins/keyfile/tests/test-keyfile.log: src/settings/plugins/keyfile/tests/test-keyfile$(EXEEXT)
-	@p='src/settings/plugins/keyfile/tests/test-keyfile$(EXEEXT)'; \
-	b='src/settings/plugins/keyfile/tests/test-keyfile'; \
-	$(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/settings/plugins/ibft/tests/test-ibft.log: src/settings/plugins/ibft/tests/test-ibft$(EXEEXT)
-	@p='src/settings/plugins/ibft/tests/test-ibft$(EXEEXT)'; \
-	b='src/settings/plugins/ibft/tests/test-ibft'; \
+src/settings/plugins/keyfile/tests/test-keyfile-settings.log: src/settings/plugins/keyfile/tests/test-keyfile-settings$(EXEEXT)
+	@p='src/settings/plugins/keyfile/tests/test-keyfile-settings$(EXEEXT)'; \
+	b='src/settings/plugins/keyfile/tests/test-keyfile-settings'; \
 	$(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) \
@@ -18961,9 +16962,9 @@ src/settings/plugins/ifupdown/tests/test-ifupdown.log: src/settings/plugins/ifup
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/devices/wifi/tests/test-general.log: src/devices/wifi/tests/test-general$(EXEEXT)
-	@p='src/devices/wifi/tests/test-general$(EXEEXT)'; \
-	b='src/devices/wifi/tests/test-general'; \
+src/devices/wifi/tests/test-devices-wifi.log: src/devices/wifi/tests/test-devices-wifi$(EXEEXT)
+	@p='src/devices/wifi/tests/test-devices-wifi$(EXEEXT)'; \
+	b='src/devices/wifi/tests/test-devices-wifi'; \
 	$(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) \
@@ -18975,37 +16976,44 @@ src/dnsmasq/tests/test-dnsmasq-utils.log: src/dnsmasq/tests/test-dnsmasq-utils$(
 	--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/platform/tests/test-link-fake.log: src/platform/tests/test-link-fake$(EXEEXT)
-	@p='src/platform/tests/test-link-fake$(EXEEXT)'; \
-	b='src/platform/tests/test-link-fake'; \
+src/platform/tests/test-address-fake.log: src/platform/tests/test-address-fake$(EXEEXT)
+	@p='src/platform/tests/test-address-fake$(EXEEXT)'; \
+	b='src/platform/tests/test-address-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/platform/tests/test-link-linux.log: src/platform/tests/test-link-linux$(EXEEXT)
-	@p='src/platform/tests/test-link-linux$(EXEEXT)'; \
-	b='src/platform/tests/test-link-linux'; \
+src/platform/tests/test-address-linux.log: src/platform/tests/test-address-linux$(EXEEXT)
+	@p='src/platform/tests/test-address-linux$(EXEEXT)'; \
+	b='src/platform/tests/test-address-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/platform/tests/test-address-fake.log: src/platform/tests/test-address-fake$(EXEEXT)
-	@p='src/platform/tests/test-address-fake$(EXEEXT)'; \
-	b='src/platform/tests/test-address-fake'; \
+src/platform/tests/test-cleanup-fake.log: src/platform/tests/test-cleanup-fake$(EXEEXT)
+	@p='src/platform/tests/test-cleanup-fake$(EXEEXT)'; \
+	b='src/platform/tests/test-cleanup-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/platform/tests/test-address-linux.log: src/platform/tests/test-address-linux$(EXEEXT)
-	@p='src/platform/tests/test-address-linux$(EXEEXT)'; \
-	b='src/platform/tests/test-address-linux'; \
+src/platform/tests/test-cleanup-linux.log: src/platform/tests/test-cleanup-linux$(EXEEXT)
+	@p='src/platform/tests/test-cleanup-linux$(EXEEXT)'; \
+	b='src/platform/tests/test-cleanup-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/platform/tests/test-link-fake.log: src/platform/tests/test-link-fake$(EXEEXT)
+	@p='src/platform/tests/test-link-fake$(EXEEXT)'; \
+	b='src/platform/tests/test-link-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/platform/tests/test-general.log: src/platform/tests/test-general$(EXEEXT)
-	@p='src/platform/tests/test-general$(EXEEXT)'; \
-	b='src/platform/tests/test-general'; \
+src/platform/tests/test-link-linux.log: src/platform/tests/test-link-linux$(EXEEXT)
+	@p='src/platform/tests/test-link-linux$(EXEEXT)'; \
+	b='src/platform/tests/test-link-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) \
@@ -19017,6 +17025,13 @@ src/platform/tests/test-nmp-object.log: src/platform/tests/test-nmp-object$(EXEE
 	--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/platform/tests/test-platform-general.log: src/platform/tests/test-platform-general$(EXEEXT)
+	@p='src/platform/tests/test-platform-general$(EXEEXT)'; \
+	b='src/platform/tests/test-platform-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)
 src/platform/tests/test-route-fake.log: src/platform/tests/test-route-fake$(EXEEXT)
 	@p='src/platform/tests/test-route-fake$(EXEEXT)'; \
 	b='src/platform/tests/test-route-fake'; \
@@ -19031,20 +17046,6 @@ src/platform/tests/test-route-linux.log: src/platform/tests/test-route-linux$(EX
 	--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/platform/tests/test-cleanup-fake.log: src/platform/tests/test-cleanup-fake$(EXEEXT)
-	@p='src/platform/tests/test-cleanup-fake$(EXEEXT)'; \
-	b='src/platform/tests/test-cleanup-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/platform/tests/test-cleanup-linux.log: src/platform/tests/test-cleanup-linux$(EXEEXT)
-	@p='src/platform/tests/test-cleanup-linux$(EXEEXT)'; \
-	b='src/platform/tests/test-cleanup-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/devices/tests/test-lldp.log: src/devices/tests/test-lldp$(EXEEXT)
 	@p='src/devices/tests/test-lldp$(EXEEXT)'; \
 	b='src/devices/tests/test-lldp'; \
@@ -19080,16 +17081,16 @@ src/tests/config/test-config.log: src/tests/config/test-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-general.log: src/tests/test-general$(EXEEXT)
-	@p='src/tests/test-general$(EXEEXT)'; \
-	b='src/tests/test-general'; \
+src/tests/test-core.log: src/tests/test-core$(EXEEXT)
+	@p='src/tests/test-core$(EXEEXT)'; \
+	b='src/tests/test-core'; \
 	$(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-general-with-expect.log: src/tests/test-general-with-expect$(EXEEXT)
-	@p='src/tests/test-general-with-expect$(EXEEXT)'; \
-	b='src/tests/test-general-with-expect'; \
+src/tests/test-core-with-expect.log: src/tests/test-core-with-expect$(EXEEXT)
+	@p='src/tests/test-core-with-expect$(EXEEXT)'; \
+	b='src/tests/test-core-with-expect'; \
 	$(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) \
@@ -19143,58 +17144,16 @@ 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'; \
+clients/common/tests/test-clients-common.log: clients/common/tests/test-clients-common$(EXEEXT)
+	@p='clients/common/tests/test-clients-common$(EXEEXT)'; \
+	b='clients/common/tests/test-clients-common'; \
 	$(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'; \
-	$(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-crypto.log: libnm-util/tests/test-crypto$(EXEEXT)
-	@p='libnm-util/tests/test-crypto$(EXEEXT)'; \
-	b='libnm-util/tests/test-crypto'; \
-	$(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-secrets.log: libnm-util/tests/test-secrets$(EXEEXT)
-	@p='libnm-util/tests/test-secrets$(EXEEXT)'; \
-	b='libnm-util/tests/test-secrets'; \
-	$(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-general.log: libnm-util/tests/test-general$(EXEEXT)
-	@p='libnm-util/tests/test-general$(EXEEXT)'; \
-	b='libnm-util/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-setting-8021x.log: libnm-util/tests/test-setting-8021x$(EXEEXT)
-	@p='libnm-util/tests/test-setting-8021x$(EXEEXT)'; \
-	b='libnm-util/tests/test-setting-8021x'; \
-	$(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-setting-dcb.log: libnm-util/tests/test-setting-dcb$(EXEEXT)
-	@p='libnm-util/tests/test-setting-dcb$(EXEEXT)'; \
-	b='libnm-util/tests/test-setting-dcb'; \
-	$(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-glib/tests/test-remote-settings-client.log: libnm-glib/tests/test-remote-settings-client$(EXEEXT)
-	@p='libnm-glib/tests/test-remote-settings-client$(EXEEXT)'; \
-	b='libnm-glib/tests/test-remote-settings-client'; \
+clients/common/tests/test-libnm-core-aux.log: clients/common/tests/test-libnm-core-aux$(EXEEXT)
+	@p='clients/common/tests/test-libnm-core-aux$(EXEEXT)'; \
+	b='clients/common/tests/test-libnm-core-aux'; \
 	$(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) \
@@ -19418,7 +17377,7 @@ install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(pppd_plugindir)" "$(DESTDIR)$(libexecdir)" "$(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 \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(pppd_plugindir)" "$(DESTDIR)$(libexecdir)" "$(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)$(libnmincludedir)" "$(DESTDIR)$(libnmincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -19478,18 +17437,8 @@ distclean-generic:
 	-rm -f libnm-core/$(am__dirstamp)
 	-rm -f libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 	-rm -f libnm-core/tests/$(am__dirstamp)
-	-rm -f libnm-glib/$(DEPDIR)/$(am__dirstamp)
-	-rm -f libnm-glib/$(am__dirstamp)
-	-rm -f libnm-glib/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f libnm-glib/tests/$(am__dirstamp)
-	-rm -f libnm-util/$(DEPDIR)/$(am__dirstamp)
-	-rm -f libnm-util/$(am__dirstamp)
-	-rm -f libnm-util/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f libnm-util/tests/$(am__dirstamp)
 	-rm -f libnm/$(DEPDIR)/$(am__dirstamp)
 	-rm -f libnm/$(am__dirstamp)
-	-rm -f libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp)
-	-rm -f libnm/fake-typelib/$(am__dirstamp)
 	-rm -f libnm/tests/$(DEPDIR)/$(am__dirstamp)
 	-rm -f libnm/tests/$(am__dirstamp)
 	-rm -f shared/$(DEPDIR)/$(am__dirstamp)
@@ -19502,8 +17451,13 @@ distclean-generic:
 	-rm -f shared/n-acd/src/$(am__dirstamp)
 	-rm -f shared/n-acd/src/util/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/n-acd/src/util/$(am__dirstamp)
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/n-dhcp4/src/$(am__dirstamp)
+	-rm -f shared/n-dhcp4/src/util/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/n-dhcp4/src/util/$(am__dirstamp)
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-glib-aux/$(am__dirstamp)
+	-rm -f shared/nm-libnm-core-aux/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-libnm-core-aux/$(am__dirstamp)
 	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-libnm-core-intern/$(am__dirstamp)
@@ -19519,6 +17473,8 @@ distclean-generic:
 	-rm -f shared/systemd/$(am__dirstamp)
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/systemd/src/basic/$(am__dirstamp)
+	-rm -f shared/systemd/src/shared/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/systemd/src/shared/$(am__dirstamp)
 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/$(am__dirstamp)
 	-rm -f src/devices/$(DEPDIR)/$(am__dirstamp)
@@ -19569,10 +17525,6 @@ distclean-generic:
 	-rm -f src/ppp/$(am__dirstamp)
 	-rm -f src/settings/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/settings/$(am__dirstamp)
-	-rm -f src/settings/plugins/ibft/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/settings/plugins/ibft/$(am__dirstamp)
-	-rm -f src/settings/plugins/ibft/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/settings/plugins/ibft/tests/$(am__dirstamp)
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/settings/plugins/ifcfg-rh/$(am__dirstamp)
 	-rm -f src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp)
@@ -19599,8 +17551,6 @@ distclean-generic:
 	-rm -f src/systemd/src/libsystemd/sd-event/$(am__dirstamp)
 	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/systemd/src/libsystemd/sd-id128/$(am__dirstamp)
-	-rm -f src/systemd/src/shared/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/systemd/src/shared/$(am__dirstamp)
 	-rm -f src/tests/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/tests/$(am__dirstamp)
 	-rm -f src/tests/config/$(DEPDIR)/$(am__dirstamp)
@@ -19639,7 +17589,8 @@ distclean: distclean-recursive
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Plo
-	-rm -f clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Po
+	-rm -f clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Po
+	-rm -f clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Po
 	-rm -f clients/tui/$(DEPDIR)/nmtui-nm-editor-bindings.Po
 	-rm -f clients/tui/$(DEPDIR)/nmtui-nm-editor-utils.Po
 	-rm -f clients/tui/$(DEPDIR)/nmtui-nmt-address-list.Po
@@ -19702,7 +17653,7 @@ distclean: distclean-recursive
 	-rm -f clients/tui/newt/$(DEPDIR)/libnmt_newt_a-nmt-newt-widget.Po
 	-rm -f dispatcher/$(DEPDIR)/libnm_dispatcher_core_la-nm-dispatcher-utils.Plo
 	-rm -f dispatcher/$(DEPDIR)/nm_dispatcher-nm-dispatcher.Po
-	-rm -f dispatcher/$(DEPDIR)/nm_dispatcher-nmdbus-dispatcher.Po
+	-rm -f dispatcher/$(DEPDIR)/tests_test_dispatcher_envp-nmdbus-dispatcher.Po
 	-rm -f dispatcher/tests/$(DEPDIR)/test_dispatcher_envp-test-dispatcher-envp.Po
 	-rm -f examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connection-gdbus.Po
 	-rm -f examples/C/glib/$(DEPDIR)/add_connection_libnm-add-connection-libnm.Po
@@ -19796,6 +17747,7 @@ distclean: distclean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-match.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-olpc-mesh.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-bridge.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-interface.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-patch.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-port.Plo
@@ -19821,165 +17773,79 @@ distclean: distclean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-simple-connection.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-editor-plugin.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-plugin-info.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Po
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Po
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Po
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Po
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Po
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Po
 	-rm -f libnm-core/tests/$(DEPDIR)/test_compare-test-compare.Po
+	-rm -f libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Po
+	-rm -f libnm-core/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Po
+	-rm -f libnm-core/tests/$(DEPDIR)/test_general-test-general.Po
+	-rm -f libnm-core/tests/$(DEPDIR)/test_keyfile-test-keyfile.Po
+	-rm -f libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Po
 	-rm -f libnm-core/tests/$(DEPDIR)/test_setting-test-setting.Po
-	-rm -f libnm-glib/$(DEPDIR)/libdeprecated_nm_glib_la-libnm_glib.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-access-point.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-active-connection.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-client.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dbus-helpers.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-adsl.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bond.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bridge.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bt.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-ethernet.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-generic.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-infiniband.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-modem.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-olpc-mesh.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-team.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-vlan.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wifi.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wimax.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp4-config.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp6-config.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-glib-enum-types.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip4-config.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip6-config.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object-cache.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-connection.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-settings.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-secret-agent.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-types.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-vpn-connection.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-wimax-nsp.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_test-libnm-glib-test.Po
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-enum-types.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-utils.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin.Plo
-	-rm -f libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_nm_client-test-nm-client.Po
-	-rm -f libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.Po
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-crypto.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-crypto_gnutls.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-crypto_nss.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-connection.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-param-spec-specialized.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-8021x.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-adsl.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bluetooth.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bond.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-cdma.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-connection.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-dcb.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-generic.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-gsm.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-infiniband.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip4-config.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip6-config.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-olpc-mesh.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ppp.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-pppoe.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-serial.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team-port.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vlan.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vpn.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wimax.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wired.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless-security.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-utils-enum-types.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-utils.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-value-transforms.Plo
-	-rm -f libnm-util/$(DEPDIR)/libtest_crypto_la-crypto.Plo
-	-rm -f libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_gnutls.Plo
-	-rm -f libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_nss.Plo
-	-rm -f libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_crypto-test-crypto.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_general-test-general.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_secrets-test-secrets.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/test_libnm_linking-test-libnm-linking.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/test_setting_8021x-test-setting-8021x.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/test_setting_dcb-test-setting-dcb.Po
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-access-point.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-active-connection.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-checkpoint.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-client.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-dbus-helpers.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-6lowpan.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-adsl.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-bond.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-bridge.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-bt.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-dummy.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ethernet.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-generic.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-infiniband.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ip-tunnel.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-macsec.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-macvlan.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-modem.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-olpc-mesh.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ovs-interface.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ovs-port.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ppp.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-team.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-tun.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wpan.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-dhcp-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-dhcp4-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-dhcp6-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-dns-manager.Plo
+	-rm -f libnm-core/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-access-point.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-active-connection.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-checkpoint.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-client.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-dbus-helpers.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-6lowpan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-adsl.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-bond.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-bridge.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-bt.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-dummy.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ethernet.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-generic.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-infiniband.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ip-tunnel.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-macsec.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-macvlan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-modem.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-olpc-mesh.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-bridge.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-interface.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-port.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ppp.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-team.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wimax.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wireguard.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wpan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-dhcp-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-dhcp4-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-dhcp6-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-dns-manager.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-ip-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-ip4-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-ip6-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-libnm-utils.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-manager.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-object.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-remote-connection.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-remote-settings.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-secret-agent-old.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-vpn-connection.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-vpn-editor.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-vpn-plugin-old.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-vpn-service-plugin.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-wifi-p2p-peer.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-wimax-nsp.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-enum-types.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-ip-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-ip4-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-ip6-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-manager.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-object.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-remote-connection.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-remote-settings.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-secret-agent-old.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-connection.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Plo
-	-rm -f libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Plo
-	-rm -f libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po
-	-rm -f libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po
-	-rm -f libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po
+	-rm -f libnm/tests/$(DEPDIR)/test_libnm-test-libnm.Po
+	-rm -f libnm/tests/$(DEPDIR)/test_nm_client-test-nm-client.Po
+	-rm -f libnm/tests/$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Po
 	-rm -f libnm/tests/$(DEPDIR)/test_secret_agent-test-secret-agent.Po
 	-rm -f shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo
 	-rm -f shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo
-	-rm -f shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po
-	-rm -f shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po
@@ -19990,21 +17856,34 @@ distclean: distclean-recursive
 	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo
 	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo
 	-rm -f shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-connection.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-lease.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-probe.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-client.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-incoming.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-outgoing.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-socket.Plo
+	-rm -f shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-packet.Plo
+	-rm -f shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-socket.Plo
+	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Plo
+	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-json-aux.Plo
+	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-keyfile-aux.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo
+	-rm -f shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo
 	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo
 	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo
 	-rm -f shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo
 	-rm -f shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo
 	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Po
 	-rm -f shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
 	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo
 	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo
@@ -20016,6 +17895,7 @@ distclean: distclean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-format-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Plo
@@ -20035,10 +17915,12 @@ distclean: distclean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strxcpyx.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo
+	-rm -f shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo
 	-rm -f src/$(DEPDIR)/NetworkManager-main.Po
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
@@ -20127,9 +18009,9 @@ distclean: distclean-recursive
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po
-	-rm -f src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Po
-	-rm -f src/devices/wifi/tests/$(DEPDIR)/src_devices_wifi_tests_test_general-test-general.Po
+	-rm -f src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po
+	-rm -f src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po
+	-rm -f src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo
@@ -20138,6 +18020,8 @@ distclean: distclean-recursive
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo
 	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Plo
 	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Plo
+	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Plo
+	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Plo
 	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Plo
 	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Plo
 	-rm -f src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Plo
@@ -20176,7 +18060,6 @@ distclean: distclean-recursive
 	-rm -f src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo
 	-rm -f src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo
 	-rm -f src/platform/tests/$(DEPDIR)/monitor-monitor.Po
-	-rm -f src/platform/tests/$(DEPDIR)/src_platform_tests_test_general-test-general.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po
@@ -20184,6 +18067,7 @@ distclean: distclean-recursive
 	-rm -f src/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po
+	-rm -f src/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po
 	-rm -f src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo
@@ -20197,37 +18081,34 @@ distclean: distclean-recursive
 	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Plo
 	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Plo
 	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Plo
+	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Plo
+	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Plo
 	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Plo
-	-rm -f src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-connection.Plo
-	-rm -f src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-plugin.Plo
-	-rm -f src/settings/plugins/ibft/$(DEPDIR)/libnms_ibft_core_la-nms-ibft-reader.Plo
-	-rm -f src/settings/plugins/ibft/tests/$(DEPDIR)/test_ibft-test-ibft.Po
-	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo
+	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo
-	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nm-inotify-helper.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po
-	-rm -f src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo
 	-rm -f src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo
 	-rm -f src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo
 	-rm -f src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Plo
 	-rm -f src/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po
-	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-connection.Plo
 	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Plo
 	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Plo
+	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Plo
 	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Plo
 	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Plo
-	-rm -f src/settings/plugins/keyfile/tests/$(DEPDIR)/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.Po
+	-rm -f src/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Plo
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Plo
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo
 	-rm -f src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po
 	-rm -f src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo
+	-rm -f src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Plo
 	-rm -f src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo
 	-rm -f src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo
 	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo
@@ -20251,10 +18132,9 @@ distclean: distclean-recursive
 	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo
 	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo
 	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo
-	-rm -f src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Plo
-	-rm -f src/tests/$(DEPDIR)/src_tests_test_general-test-general.Po
+	-rm -f src/tests/$(DEPDIR)/test_core-test-core.Po
+	-rm -f src/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po
 	-rm -f src/tests/$(DEPDIR)/test_dcb-test-dcb.Po
-	-rm -f src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Po
 	-rm -f src/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po
 	-rm -f src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po
 	-rm -f src/tests/$(DEPDIR)/test_systemd-test-systemd.Po
@@ -20282,14 +18162,7 @@ info-am:
 
 install-data-am: install-dbusactivationDATA install-dbusinterfacesDATA \
 	install-dbusserviceDATA install-examplesDATA install-girDATA \
-	install-libdeprecatedHEADERS \
-	install-libnm_glib_libnmincludeHEADERS \
-	install-libnm_glib_libnmvpnHEADERS \
-	install-libnm_util_libnm_util_includeHEADERS \
 	install-libnmincludeHEADERS install-man \
-	install-nodist_libnm_glib_libnmincludeHEADERS \
-	install-nodist_libnm_glib_libnmvpnHEADERS \
-	install-nodist_libnm_util_libnm_util_includeHEADERS \
 	install-nodist_libnmincludeHEADERS install-pkgconfigDATA \
 	install-pluginLTLIBRARIES install-polkit_policyDATA \
 	install-pppd_pluginLTLIBRARIES install-serviceDATA \
@@ -20345,7 +18218,8 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Plo
-	-rm -f clients/common/tests/$(DEPDIR)/clients_common_tests_test_general-test-general.Po
+	-rm -f clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Po
+	-rm -f clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Po
 	-rm -f clients/tui/$(DEPDIR)/nmtui-nm-editor-bindings.Po
 	-rm -f clients/tui/$(DEPDIR)/nmtui-nm-editor-utils.Po
 	-rm -f clients/tui/$(DEPDIR)/nmtui-nmt-address-list.Po
@@ -20408,7 +18282,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f clients/tui/newt/$(DEPDIR)/libnmt_newt_a-nmt-newt-widget.Po
 	-rm -f dispatcher/$(DEPDIR)/libnm_dispatcher_core_la-nm-dispatcher-utils.Plo
 	-rm -f dispatcher/$(DEPDIR)/nm_dispatcher-nm-dispatcher.Po
-	-rm -f dispatcher/$(DEPDIR)/nm_dispatcher-nmdbus-dispatcher.Po
+	-rm -f dispatcher/$(DEPDIR)/tests_test_dispatcher_envp-nmdbus-dispatcher.Po
 	-rm -f dispatcher/tests/$(DEPDIR)/test_dispatcher_envp-test-dispatcher-envp.Po
 	-rm -f examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connection-gdbus.Po
 	-rm -f examples/C/glib/$(DEPDIR)/add_connection_libnm-add-connection-libnm.Po
@@ -20502,6 +18376,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-match.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-olpc-mesh.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-bridge.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-interface.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-patch.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-port.Plo
@@ -20527,165 +18402,79 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-simple-connection.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-editor-plugin.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-plugin-info.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_crypto-test-crypto.Po
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-nm-core-tests-enum-types.Po
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Po
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Po
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Po
-	-rm -f libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Po
 	-rm -f libnm-core/tests/$(DEPDIR)/test_compare-test-compare.Po
+	-rm -f libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Po
+	-rm -f libnm-core/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Po
+	-rm -f libnm-core/tests/$(DEPDIR)/test_general-test-general.Po
+	-rm -f libnm-core/tests/$(DEPDIR)/test_keyfile-test-keyfile.Po
+	-rm -f libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Po
 	-rm -f libnm-core/tests/$(DEPDIR)/test_setting-test-setting.Po
-	-rm -f libnm-glib/$(DEPDIR)/libdeprecated_nm_glib_la-libnm_glib.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-access-point.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-active-connection.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-client.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dbus-helpers.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-adsl.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bond.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bridge.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-bt.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-ethernet.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-generic.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-infiniband.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-modem.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-olpc-mesh.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-team.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-vlan.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wifi.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device-wimax.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-device.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp4-config.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-dhcp6-config.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-glib-enum-types.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip4-config.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-ip6-config.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object-cache.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-connection.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-remote-settings.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-secret-agent.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-types.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-vpn-connection.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_la-nm-wimax-nsp.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_test-libnm-glib-test.Po
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-enum-types.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin-utils.Plo
-	-rm -f libnm-glib/$(DEPDIR)/libnm_glib_vpn_la-nm-vpn-plugin.Plo
-	-rm -f libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_nm_client-test-nm-client.Po
-	-rm -f libnm-glib/tests/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-test-remote-settings-client.Po
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-crypto.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-crypto_gnutls.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-crypto_nss.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-connection.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-param-spec-specialized.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-8021x.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-adsl.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bluetooth.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bond.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge-port.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-bridge.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-cdma.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-connection.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-dcb.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-generic.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-gsm.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-infiniband.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip4-config.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ip6-config.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-olpc-mesh.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-ppp.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-pppoe.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-serial.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team-port.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-team.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vlan.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-vpn.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wimax.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wired.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless-security.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting-wireless.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-setting.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-utils-enum-types.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-utils.Plo
-	-rm -f libnm-util/$(DEPDIR)/libnm_util_la-nm-value-transforms.Plo
-	-rm -f libnm-util/$(DEPDIR)/libtest_crypto_la-crypto.Plo
-	-rm -f libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_gnutls.Plo
-	-rm -f libnm-util/$(DEPDIR)/libtest_crypto_la-crypto_nss.Plo
-	-rm -f libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_crypto-test-crypto.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_general-test-general.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_secrets-test-secrets.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/test_libnm_linking-test-libnm-linking.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/test_setting_8021x-test-setting-8021x.Po
-	-rm -f libnm-util/tests/$(DEPDIR)/test_setting_dcb-test-setting-dcb.Po
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-access-point.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-active-connection.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-checkpoint.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-client.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-dbus-helpers.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-6lowpan.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-adsl.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-bond.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-bridge.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-bt.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-dummy.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ethernet.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-generic.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-infiniband.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ip-tunnel.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-macsec.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-macvlan.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-modem.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-olpc-mesh.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ovs-interface.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ovs-port.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-ppp.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-team.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-tun.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wpan.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-dhcp-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-dhcp4-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-dhcp6-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-dns-manager.Plo
+	-rm -f libnm-core/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-access-point.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-active-connection.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-checkpoint.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-client.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-dbus-helpers.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-6lowpan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-adsl.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-bond.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-bridge.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-bt.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-dummy.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ethernet.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-generic.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-infiniband.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ip-tunnel.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-macsec.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-macvlan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-modem.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-olpc-mesh.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-bridge.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-interface.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ovs-port.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-ppp.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-team.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-tun.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vlan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wimax.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wireguard.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wpan.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-dhcp-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-dhcp4-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-dhcp6-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-dns-manager.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-ip-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-ip4-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-ip6-config.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-libnm-utils.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-manager.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-object.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-remote-connection.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-remote-settings.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-secret-agent-old.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-vpn-connection.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-vpn-editor.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-vpn-plugin-old.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-vpn-service-plugin.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-wifi-p2p-peer.Plo
+	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-wimax-nsp.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-enum-types.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-ip-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-ip4-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-ip6-config.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-manager.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-object.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-remote-connection.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-remote-settings.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-secret-agent-old.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-connection.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Plo
-	-rm -f libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Plo
-	-rm -f libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Plo
-	-rm -f libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po
-	-rm -f libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po
-	-rm -f libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po
+	-rm -f libnm/tests/$(DEPDIR)/test_libnm-test-libnm.Po
+	-rm -f libnm/tests/$(DEPDIR)/test_nm_client-test-nm-client.Po
+	-rm -f libnm/tests/$(DEPDIR)/test_remote_settings_client-test-remote-settings-client.Po
 	-rm -f libnm/tests/$(DEPDIR)/test_secret_agent-test-secret-agent.Po
 	-rm -f shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo
 	-rm -f shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo
-	-rm -f shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po
-	-rm -f shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po
@@ -20696,21 +18485,34 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo
 	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo
 	-rm -f shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-connection.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-lease.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-c-probe.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-client.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-incoming.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-outgoing.Plo
+	-rm -f shared/n-dhcp4/src/$(DEPDIR)/libndhcp4_la-n-dhcp4-socket.Plo
+	-rm -f shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-packet.Plo
+	-rm -f shared/n-dhcp4/src/util/$(DEPDIR)/libndhcp4_la-socket.Plo
+	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Plo
+	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-json-aux.Plo
+	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-keyfile-aux.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo
+	-rm -f shared/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo
 	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo
 	-rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo
 	-rm -f shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo
 	-rm -f shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo
 	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_test_libnm-nm-compat.Po
 	-rm -f shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
 	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo
 	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo
@@ -20722,6 +18524,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-format-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Plo
@@ -20741,10 +18544,12 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strxcpyx.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo
+	-rm -f shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo
 	-rm -f src/$(DEPDIR)/NetworkManager-main.Po
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
@@ -20833,9 +18638,9 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po
-	-rm -f src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Po
-	-rm -f src/devices/wifi/tests/$(DEPDIR)/src_devices_wifi_tests_test_general-test-general.Po
+	-rm -f src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-ap.Po
+	-rm -f src/devices/wifi/$(DEPDIR)/tests_test_devices_wifi-nm-wifi-utils.Po
+	-rm -f src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo
@@ -20844,6 +18649,8 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo
 	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Plo
 	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Plo
+	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Plo
+	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Plo
 	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Plo
 	-rm -f src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Plo
 	-rm -f src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Plo
@@ -20882,7 +18689,6 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo
 	-rm -f src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo
 	-rm -f src/platform/tests/$(DEPDIR)/monitor-monitor.Po
-	-rm -f src/platform/tests/$(DEPDIR)/src_platform_tests_test_general-test-general.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po
@@ -20890,6 +18696,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po
+	-rm -f src/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po
 	-rm -f src/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po
 	-rm -f src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo
@@ -20903,37 +18710,34 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Plo
 	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Plo
 	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Plo
+	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Plo
+	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Plo
 	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Plo
-	-rm -f src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-connection.Plo
-	-rm -f src/settings/plugins/ibft/$(DEPDIR)/libnm_settings_plugin_ibft_la-nms-ibft-plugin.Plo
-	-rm -f src/settings/plugins/ibft/$(DEPDIR)/libnms_ibft_core_la-nms-ibft-reader.Plo
-	-rm -f src/settings/plugins/ibft/tests/$(DEPDIR)/test_ibft-test-ibft.Po
-	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo
+	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo
-	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nm-inotify-helper.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Plo
 	-rm -f src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po
-	-rm -f src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo
 	-rm -f src/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo
 	-rm -f src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo
 	-rm -f src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Plo
 	-rm -f src/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po
-	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-connection.Plo
 	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Plo
 	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Plo
+	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Plo
 	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Plo
 	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Plo
-	-rm -f src/settings/plugins/keyfile/tests/$(DEPDIR)/src_settings_plugins_keyfile_tests_test_keyfile-test-keyfile.Po
+	-rm -f src/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Plo
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Plo
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo
 	-rm -f src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po
 	-rm -f src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo
+	-rm -f src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Plo
 	-rm -f src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo
 	-rm -f src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo
 	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo
@@ -20957,10 +18761,9 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo
 	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo
 	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo
-	-rm -f src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Plo
-	-rm -f src/tests/$(DEPDIR)/src_tests_test_general-test-general.Po
+	-rm -f src/tests/$(DEPDIR)/test_core-test-core.Po
+	-rm -f src/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po
 	-rm -f src/tests/$(DEPDIR)/test_dcb-test-dcb.Po
-	-rm -f src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Po
 	-rm -f src/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po
 	-rm -f src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po
 	-rm -f src/tests/$(DEPDIR)/test_systemd-test-systemd.Po
@@ -20990,20 +18793,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dbusactivationDATA \
 	uninstall-dbusinterfacesDATA uninstall-dbusserviceDATA \
 	uninstall-dist_libexecSCRIPTS uninstall-examplesDATA \
 	uninstall-girDATA uninstall-libLTLIBRARIES \
-	uninstall-libdeprecatedHEADERS uninstall-libexecPROGRAMS \
-	uninstall-libnm_glib_libnmincludeHEADERS \
-	uninstall-libnm_glib_libnmvpnHEADERS \
-	uninstall-libnm_util_libnm_util_includeHEADERS \
-	uninstall-libnmincludeHEADERS uninstall-man \
-	uninstall-nodist_libnm_glib_libnmincludeHEADERS \
-	uninstall-nodist_libnm_glib_libnmvpnHEADERS \
-	uninstall-nodist_libnm_util_libnm_util_includeHEADERS \
-	uninstall-nodist_libnmincludeHEADERS uninstall-pkgconfigDATA \
-	uninstall-pluginLTLIBRARIES uninstall-polkit_policyDATA \
-	uninstall-pppd_pluginLTLIBRARIES uninstall-sbinPROGRAMS \
-	uninstall-serviceDATA uninstall-systemdnmunitDATA \
-	uninstall-systemdsystemunitDATA uninstall-typelibDATA \
-	uninstall-udevrulesDATA uninstall-vapiDATA
+	uninstall-libexecPROGRAMS uninstall-libnmincludeHEADERS \
+	uninstall-man uninstall-nodist_libnmincludeHEADERS \
+	uninstall-pkgconfigDATA uninstall-pluginLTLIBRARIES \
+	uninstall-polkit_policyDATA uninstall-pppd_pluginLTLIBRARIES \
+	uninstall-sbinPROGRAMS 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 \
@@ -21033,17 +18830,10 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \
 	install-examplesDATA install-exec install-exec-am \
 	install-exec-hook install-girDATA install-html install-html-am \
 	install-info install-info-am install-libLTLIBRARIES \
-	install-libdeprecatedHEADERS install-libexecPROGRAMS \
-	install-libnm_glib_libnmincludeHEADERS \
-	install-libnm_glib_libnmvpnHEADERS \
-	install-libnm_util_libnm_util_includeHEADERS \
-	install-libnmincludeHEADERS install-man install-man1 \
-	install-man5 install-man7 install-man8 \
-	install-nodist_libnm_glib_libnmincludeHEADERS \
-	install-nodist_libnm_glib_libnmvpnHEADERS \
-	install-nodist_libnm_util_libnm_util_includeHEADERS \
-	install-nodist_libnmincludeHEADERS install-pdf install-pdf-am \
-	install-pkgconfigDATA install-pluginLTLIBRARIES \
+	install-libexecPROGRAMS install-libnmincludeHEADERS \
+	install-man install-man1 install-man5 install-man7 \
+	install-man8 install-nodist_libnmincludeHEADERS install-pdf \
+	install-pdf-am install-pkgconfigDATA install-pluginLTLIBRARIES \
 	install-polkit_policyDATA install-pppd_pluginLTLIBRARIES \
 	install-ps install-ps-am install-sbinPROGRAMS \
 	install-serviceDATA install-strip install-systemdnmunitDATA \
@@ -21057,21 +18847,15 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \
 	uninstall-dbusinterfacesDATA uninstall-dbusserviceDATA \
 	uninstall-dist_libexecSCRIPTS uninstall-examplesDATA \
 	uninstall-girDATA uninstall-hook uninstall-libLTLIBRARIES \
-	uninstall-libdeprecatedHEADERS uninstall-libexecPROGRAMS \
-	uninstall-libnm_glib_libnmincludeHEADERS \
-	uninstall-libnm_glib_libnmvpnHEADERS \
-	uninstall-libnm_util_libnm_util_includeHEADERS \
-	uninstall-libnmincludeHEADERS uninstall-man uninstall-man1 \
-	uninstall-man5 uninstall-man7 uninstall-man8 \
-	uninstall-nodist_libnm_glib_libnmincludeHEADERS \
-	uninstall-nodist_libnm_glib_libnmvpnHEADERS \
-	uninstall-nodist_libnm_util_libnm_util_includeHEADERS \
-	uninstall-nodist_libnmincludeHEADERS uninstall-pkgconfigDATA \
-	uninstall-pluginLTLIBRARIES uninstall-polkit_policyDATA \
-	uninstall-pppd_pluginLTLIBRARIES uninstall-sbinPROGRAMS \
-	uninstall-serviceDATA uninstall-systemdnmunitDATA \
-	uninstall-systemdsystemunitDATA uninstall-typelibDATA \
-	uninstall-udevrulesDATA uninstall-vapiDATA
+	uninstall-libexecPROGRAMS uninstall-libnmincludeHEADERS \
+	uninstall-man uninstall-man1 uninstall-man5 uninstall-man7 \
+	uninstall-man8 uninstall-nodist_libnmincludeHEADERS \
+	uninstall-pkgconfigDATA uninstall-pluginLTLIBRARIES \
+	uninstall-polkit_policyDATA uninstall-pppd_pluginLTLIBRARIES \
+	uninstall-sbinPROGRAMS uninstall-serviceDATA \
+	uninstall-systemdnmunitDATA uninstall-systemdsystemunitDATA \
+	uninstall-typelibDATA uninstall-udevrulesDATA \
+	uninstall-vapiDATA
 
 .PRECIOUS: Makefile
 
@@ -21098,15 +18882,13 @@ $(foreach vapi,$(VAPIGEN_VAPIS),$(eval $(call vapigen,$(vapi))))
 
 @NM_LOG_COMPILER@
 
-###############################################################################
-
-# with autotools, it is not easily possible to generate these defines
+# With autotools, it is not easily possible to generate these defines
 # from configure.ac.
 #
 # See https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
 #
 # With meson-only, they could just be set via config.h.meson
-config-extra.h: Makefile
+config-extra.h: config-extra.h.mk config.h
 	$(AM_V_GEN) \
 	echo "/* Generated by Makefile.am */"                    >$@ && \
 	echo "#define BINDIR            \"$(bindir)\""          >>$@ && \
@@ -21124,15 +18906,23 @@ config-extra.h: Makefile
 	echo "#define NM_BUILD_SRCDIR   \"$(abs_srcdir)\""      >>$@ && \
 	echo "#define PPPD_PLUGIN_DIR   \"$(PPPD_PLUGIN_DIR)\"" >>$@ && \
 	echo "#define PREFIX            \"$(prefix)\""          >>$@ && \
-	echo "#define RUNDIR            \"$(rundir)\""          >>$@ && \
 	echo "#define RUNSTATEDIR       \"$(runstatedir)\""     >>$@ && \
 	echo "#define SYSCONFDIR        \"$(sysconfdir)\""      >>$@ && \
 	true
 
-libnm-core/.dirstamp: config-extra.h
+$(libnm_core_lib_h_pub_mkenums):     config-extra.h
+libnm-core/.dirstamp:                config-extra.h
+shared/.dirstamp:                    config-extra.h
+shared/nm-glib-aux/.dirstamp:        config-extra.h
+shared/nm-std-aux/.dirstamp:         config-extra.h
+shared/nm-udev-aux/.dirstamp:        config-extra.h
+shared/systemd/.dirstamp:            config-extra.h
+shared/systemd/src/basic/.dirstamp:  config-extra.h
+shared/systemd/src/shared/.dirstamp: config-extra.h
+src/dhcp/.dirstamp:                  config-extra.h
 
 dist-configure-check:
-	@echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection --with-libnm-glib'. ***"
+	@echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection'. ***"
 	@false
 
 dist: $(dist_configure_check) $(dist_dependencies)
@@ -21202,7 +18992,8 @@ $(libnm_core_tests_test_secrets_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_core_tests_test_setting_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(libnm_libnm_utils_la_OBJECTS) : $(libnm_lib_h_pub_mkenums)
+$(libnm_liblibnm_la_OBJECTS) : $(libnm_lib_h_pub_mkenums)
+$(libnm_liblibnm_la_OBJECTS) : $(libnm_core_lib_h_pub_mkenums)
 
 $(dispatcher_nm_dispatcher_OBJECTS):                    $(libnm_lib_h_pub_mkenums)
 $(dispatcher_libnm_dispatcher_core_la_OBJECTS):         $(libnm_lib_h_pub_mkenums)
@@ -21217,15 +19008,6 @@ check-local-exports-libnm: libnm/libnm.la
 @HAVE_INTROSPECTION_TRUE@libnm/libnm.typelib: libnm/libnm.gir
 @HAVE_INTROSPECTION_TRUE@	$(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@
 
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir libnm/fake-typelib/.dirstamp
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	$(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
-
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir libnm/fake-typelib/.dirstamp
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	$(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
-
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(builddir)/libnm/fake-typelib --generate-source --manual-register
-
 @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-docs-overrides.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
 @HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus $@ $(filter-out $<,$^)
 
@@ -21258,7 +19040,7 @@ check-local-exports-libnm: libnm/libnm.la
 @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
 @HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh $@ $(filter-out $<,$^)
 
-$(libnm_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(libnm_tests_test_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -21300,16 +19082,7 @@ $(src_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 @WITH_PPP_TRUE@$(src_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
-@CONFIG_PLUGIN_IBFT_TRUE@$(src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
-@CONFIG_PLUGIN_IBFT_TRUE@$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
-@CONFIG_PLUGIN_IBFT_TRUE@$(src_settings_plugins_ibft_tests_test_ibft_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
-@CONFIG_PLUGIN_IBFT_TRUE@check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
-@CONFIG_PLUGIN_IBFT_TRUE@	$(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so)
+$(src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	@$(MKDIR_P) src/settings/plugins/ifcfg-rh/
@@ -21368,7 +19141,7 @@ check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la
 @WITH_WIFI_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver"
 @WITH_WIFI_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so)
 
-@WITH_WIFI_TRUE@$(src_devices_wifi_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@WITH_WIFI_TRUE@$(src_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 @WITH_TEAMDCTL_TRUE@check-local-devices-team: src/devices/team/libnm-device-plugin-team.la
 @WITH_TEAMDCTL_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver"
@@ -21380,17 +19153,17 @@ check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la
 
 $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_monitor_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_address_fake_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_address_linux_OBJECTS):    $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_cleanup_fake_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_cleanup_linux_OBJECTS):    $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_link_fake_OBJECTS):        $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_link_linux_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_nmp_object_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_route_fake_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_route_linux_OBJECTS):      $(libnm_core_lib_h_pub_mkenums)
 
 $(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -21405,8 +19178,8 @@ $(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_tests_test_core_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)
 
@@ -21422,8 +19195,6 @@ dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml
 
 dispatcher/nmdbus-dispatcher.c: dispatcher/nmdbus-dispatcher.h
 
-$(dispatcher_nm_dispatcher_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources)
-
 dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freedesktop.nm_dispatcher.service.in
 	@sed \
 	-e 's|@sbindir[@]|$(sbindir)|g' \
@@ -21433,10 +19204,16 @@ dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freed
 	$< >$@
 
 install-data-hook-dispatcher:
-	$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
-	$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-down.d
-	$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-up.d
-	$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/no-wait.d
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/pre-down.d
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/pre-up.d
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/no-wait.d
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/pre-down.d
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/pre-up.d
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/no-wait.d
+
+$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources)
 
 $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
@@ -21458,7 +19235,10 @@ $(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h)
 $(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp
 
-$(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(clients_common_tests_test_clients_common_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+
+$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(libnm_lib_h_pub_mkenums)
 
 @BUILD_NMCLI_TRUE@$(clients_cli_nmcli_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 @BUILD_NMCLI_TRUE@$(clients_cli_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenums)
@@ -21514,68 +19294,6 @@ data/server.conf: $(srcdir)/data/server.conf.in
 	@$(MKDIR_P) data/
 	$(AM_V_GEN) $(data_edit) $< >$@
 
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums)
-
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm-util/NetworkManager-1.0.gir: libnm-util/libnm-util.la
-
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm-util/NetworkManager-1.0.typelib: libnm-util/NetworkManager-1.0.gir
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	$(INTROSPECTION_COMPILER) "--includedir=$(srcdir)/libnm-util" "--includedir=$(builddir)/libnm-util" $< -o $@
-
-@WITH_LEGACY_LIBRARIES_TRUE@check-local-exports-libnm-util: libnm-util/libnm-util.la
-@WITH_LEGACY_LIBRARIES_TRUE@	$(srcdir)/tools/check-exports.sh "$(builddir)/libnm-util/.libs/libnm-util.so" "$(srcdir)/libnm-util/libnm-util.ver"
-
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_secrets_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_setting_8021x_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_setting_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_libnm_linking_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_glib_lib_h_pub_mkenums)
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_vpn_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_vpn_la_OBJECTS): $(libnm_glib_vpn_h_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm-glib/nm-vpn-plugin-glue.h: introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
-@WITH_LEGACY_LIBRARIES_TRUE@	$(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $<
-
-@WITH_LEGACY_LIBRARIES_TRUE@libnm-glib/nm-secret-agent-glue.h: introspection/org.freedesktop.NetworkManager.SecretAgent.xml
-@WITH_LEGACY_LIBRARIES_TRUE@	$(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $<
-
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_vpn_la_OBJECTS): libnm-glib/nm-vpn-plugin-glue.h
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_la_OBJECTS):     libnm-glib/nm-secret-agent-glue.h
-
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm-glib/NMClient-1.0.gir: libnm-glib/libnm-glib.la $(builddir)/libnm-util/NetworkManager-1.0.gir
-
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm-glib/NMClient-1.0.typelib: libnm-glib/NMClient-1.0.gir
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	$(INTROSPECTION_COMPILER) "--includedir=$(srcdir)/libnm-util" "--includedir=$(builddir)/libnm-util" $< -o $@
-
-@WITH_LEGACY_LIBRARIES_TRUE@check-local-exports-libnm-glib:
-@WITH_LEGACY_LIBRARIES_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/libnm-glib/.libs/libnm-glib.so $(srcdir)/libnm-glib/libnm-glib.ver
-
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@check-local-libnm-glib-nm-client: libnm-glib/tests/test-nm-client
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	false
-
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
-# tools/test-networkmanager-service.py uses libnm's typelib. Ensure it
-# is built first.
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_tests_test_nm_client_OBJECTS):              $(libnm_NM_1_0_typelib)
-@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib)
-
 ###############################################################################
 # man
 ###############################################################################
@@ -21605,8 +19323,6 @@ man/common.ent: man/common.ent.in
 @HAVE_DOCS_TRUE@	rm -f $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5;
 
 @ENABLE_VAPIGEN_TRUE@vapi/libnm.vapi:      $(builddir)/libnm/NM-1.0.gir                   vapi/libnm.deps      vapi/NM-1.0.metadata
-@ENABLE_VAPIGEN_TRUE@vapi/libnm-util.vapi: $(builddir)/libnm-util/NetworkManager-1.0.gir  vapi/libnm-util.deps vapi/NetworkManager-1.0.metadata
-@ENABLE_VAPIGEN_TRUE@vapi/libnm-glib.vapi: $(builddir)/libnm-glib/NMClient-1.0.gir        vapi/libnm-glib.deps vapi/NMClient-1.0.metadata       vapi/libnm-util.vapi
 $(examples_C_glib_add_connection_gdbus_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(examples_C_glib_add_connection_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(examples_C_glib_get_active_connections_gdbus_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -21637,6 +19353,7 @@ install-data-hook: $(install_data_hook)
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dnsmasq-shared.d
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/conf.d
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/VPN
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/system-connections
 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(nmstatedir)
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(plugindir)
 
@@ -21645,7 +19362,7 @@ uninstall-hook: $(uninstall_hook)
 ###############################################################################
 
 cscope:
-	cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients;
+	cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -sclients;
 
 ###############################################################################