New upstream version 1.29.90 upstream/1.29.90

1 files changed, 7740 insertions, 7196 deletions

diff --git a/Makefile.in b/Makefile.in
index a84c23da..7e095e5e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -135,18 +135,18 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = src/NetworkManager-all-sym$(EXEEXT) \
+noinst_PROGRAMS = src/core/NetworkManager-all-sym$(EXEEXT) \
 	clients/cli/generate-docs-nm-settings-nmcli$(EXEEXT) \
-	$(am__EXEEXT_19)
-check_PROGRAMS = $(am__EXEEXT_17)
-sbin_PROGRAMS = src/NetworkManager$(EXEEXT)
+	$(am__EXEEXT_20)
+check_PROGRAMS = $(am__EXEEXT_18)
+sbin_PROGRAMS = src/core/NetworkManager$(EXEEXT)
 bin_PROGRAMS = clients/nm-online$(EXEEXT) $(am__EXEEXT_1) \
 	$(am__EXEEXT_2)
-libexec_PROGRAMS = src/nm-iface-helper$(EXEEXT) \
-	src/initrd/nm-initrd-generator$(EXEEXT) \
-	src/dhcp/nm-dhcp-helper$(EXEEXT) \
-	dispatcher/nm-dispatcher$(EXEEXT) $(am__EXEEXT_18)
-TESTS = $(am__EXEEXT_12)
+libexec_PROGRAMS = src/core/nm-iface-helper$(EXEEXT) \
+	src/core/initrd/nm-initrd-generator$(EXEEXT) \
+	src/core/dhcp/nm-dhcp-helper$(EXEEXT) \
+	dispatcher/nm-dispatcher$(EXEEXT) $(am__EXEEXT_19)
+TESTS = $(am__EXEEXT_13)
 @HAVE_DOCS_TRUE@am__append_1 = \
 @HAVE_DOCS_TRUE@	docs/libnm \
 @HAVE_DOCS_TRUE@	docs/api
@@ -162,199 +162,207 @@ TESTS = $(am__EXEEXT_12)
 @HAVE_INTROSPECTION_TRUE@am__append_8 = libnm/NM-1.0.typelib
 @HAVE_INTROSPECTION_TRUE@am__append_9 = libnm/NM-1.0.gir
 @HAVE_INTROSPECTION_TRUE@am__append_10 = $(libnm_noinst_data)
-@HAVE_INTROSPECTION_TRUE@am__append_11 = $(libnm_noinst_data)
-@HAVE_INTROSPECTION_TRUE@am__append_12 = $(libnm_noinst_data) \
-@HAVE_INTROSPECTION_TRUE@	$(clients_common_settings_doc_h)
-@HAVE_INTROSPECTION_TRUE@am__append_13 = $(libnm_tests_programs_req_introspection)
-@HAVE_INTROSPECTION_FALSE@am__append_14 = $(libnm_tests_programs_req_introspection)
-@REQUIRE_ROOT_TESTS_TRUE@am__append_15 = -DREQUIRE_ROOT_TESTS=1
-@WITH_WEXT_TRUE@am__append_16 = \
-@WITH_WEXT_TRUE@	src/platform/wifi/nm-wifi-utils-wext.c \
-@WITH_WEXT_TRUE@	src/platform/wifi/nm-wifi-utils-wext.h
+@HAVE_INTROSPECTION_TRUE@am__append_11 = clients/cli/generate-docs-nm-settings-nmcli.xml.in \
+@HAVE_INTROSPECTION_TRUE@	$(libnm_noinst_data)
+@BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_12 = check-local-generate-docs-nm-settings-nmcli
+@BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_13 = clients/cli/generate-docs-nm-settings-nmcli.xml
+@HAVE_INTROSPECTION_TRUE@am__append_14 = $(libnm_noinst_data)
+@HAVE_INTROSPECTION_TRUE@am__append_15 = $(libnm_tests_programs_req_introspection)
+@HAVE_INTROSPECTION_FALSE@am__append_16 = $(libnm_tests_programs_req_introspection)
+@REQUIRE_ROOT_TESTS_TRUE@am__append_17 = -DREQUIRE_ROOT_TESTS=1
+@WITH_WEXT_TRUE@am__append_18 = \
+@WITH_WEXT_TRUE@	src/core/platform/wifi/nm-wifi-utils-wext.c \
+@WITH_WEXT_TRUE@	src/core/platform/wifi/nm-wifi-utils-wext.h
 
 
 ###############################################################################
-# src/ppp
+# src/core/ppp
 ###############################################################################
-@WITH_PPP_TRUE@am__append_17 = src/ppp/libnm-ppp-plugin.la
-@WITH_PPP_TRUE@am__append_18 = src/ppp/nm-pppd-plugin.la
+@WITH_PPP_TRUE@am__append_19 = src/core/ppp/libnm-ppp-plugin.la
+@WITH_PPP_TRUE@am__append_20 = src/core/ppp/nm-pppd-plugin.la
 
 ###############################################################################
-# src/settings/plugins/ifcfg-rh
+# src/core/settings/plugins/ifcfg-rh
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_19 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_20 = \
-@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_21 = src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_22 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_21 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_22 = check-local-symbols-settings-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_23 = $(nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_24 = check-local-symbols-settings-ifcfg-rh
 
 ###############################################################################
-# src/settings/plugins/ifcfg-rh/tests
+# src/core/settings/plugins/ifcfg-rh/tests
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_23 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_24 = \
-@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_25 = src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nm-ifup \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nm-ifdown
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_25 = install-data-hook-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = install-data-hook-ifcfg-rh
 
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
 
 ###############################################################################
-# src/settings/plugins/ifupdown
+# src/core/settings/plugins/ifupdown
 ###############################################################################
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_27 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_28 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_29 = check-local-symbols-settings-ifupdown
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_29 = src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_30 = src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_31 = check-local-symbols-settings-ifupdown
 
 ###############################################################################
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_30 = src/settings/plugins/ifupdown/tests/test-ifupdown
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_32 = src/core/settings/plugins/ifupdown/tests/test-ifupdown
 
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@am__append_31 =  \
-@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_32 = \
-@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_33 = check-local-devices-wwan \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_33 = src/core/devices/wwan/libnm-wwan.la \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/libnm-device-plugin-wwan.la \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/libnm-device-plugin-bluetooth.la
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_34 = \
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@	src/core/devices/wwan/nm-modem-ofono.c \
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@	src/core/devices/wwan/nm-modem-ofono.h
+
+@WITH_MODEM_MANAGER_1_TRUE@am__append_35 = check-local-devices-wwan \
 @WITH_MODEM_MANAGER_1_TRUE@	check-local-devices-bluetooth
-@WITH_MODEM_MANAGER_1_TRUE@am__append_34 = src/devices/wwan/tests/test-service-providers
+@WITH_MODEM_MANAGER_1_TRUE@am__append_36 = src/core/devices/wwan/tests/test-service-providers
 
 ###############################################################################
-# src/devices/bluetooth
+# src/core/devices/bluetooth
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@am__append_35 = src/devices/bluetooth/libnm-bluetooth-utils.la
-@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_MODEM_MANAGER_1_TRUE@am__append_37 = src/core/devices/bluetooth/libnm-bluetooth-utils.la
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_38 = \
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bluez5-dun.c \
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bluez5-dun.h \
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_37 = $(BLUEZ5_CFLAGS)
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_38 = $(BLUEZ5_LIBS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_39 = $(BLUEZ5_CFLAGS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = $(BLUEZ5_LIBS)
 
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@am__append_39 = \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/tests/nm-bt-test
+@WITH_MODEM_MANAGER_1_TRUE@am__append_41 = \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/tests/nm-bt-test
 
 
 ###############################################################################
-# src/devices/wifi
+# src/core/devices/wifi
 ###############################################################################
-@WITH_WIFI_TRUE@am__append_40 = src/devices/wifi/libnm-wifi-base.la
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_41 = \
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-iwd.c \
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-iwd.h \
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-iwd-manager.c \
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-iwd-manager.h \
+@WITH_WIFI_TRUE@am__append_42 = src/core/devices/wifi/libnm-wifi-base.la
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_43 = \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-iwd.c \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-iwd.h \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-iwd-manager.c \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-iwd-manager.h \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	$(NULL)
 
-@WITH_WIFI_TRUE@am__append_42 = src/devices/wifi/libnm-device-plugin-wifi.la
-@WITH_WIFI_TRUE@am__append_43 = check-local-devices-wifi
-@WITH_WIFI_TRUE@am__append_44 = src/devices/wifi/tests/test-devices-wifi
+@WITH_WIFI_TRUE@am__append_44 = src/core/devices/wifi/libnm-device-plugin-wifi.la
+@WITH_WIFI_TRUE@am__append_45 = check-local-devices-wifi
+@WITH_WIFI_TRUE@am__append_46 = src/core/devices/wifi/tests/test-devices-wifi
 
 ###############################################################################
-# src/devices/team
+# src/core/devices/team
 ###############################################################################
-@WITH_TEAMDCTL_TRUE@am__append_45 = src/devices/team/libnm-device-plugin-team.la
-@WITH_TEAMDCTL_TRUE@am__append_46 = check-local-devices-team
-@WITH_OPENVSWITCH_TRUE@am__append_47 = src/devices/ovs/libnm-device-plugin-ovs.la
-@HAVE_INTROSPECTION_TRUE@am__append_48 = check-local-settings-docs
-@HAVE_INTROSPECTION_TRUE@am__append_49 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_FALSE@am__append_50 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_TRUE@am__append_51 = clients/common/tests/test-clients-common
-@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_52 = clients/common/tests/test-clients-common
+@WITH_TEAMDCTL_TRUE@am__append_47 = src/core/devices/team/libnm-device-plugin-team.la
+@WITH_TEAMDCTL_TRUE@am__append_48 = check-local-devices-team
+@WITH_OPENVSWITCH_TRUE@am__append_49 = src/core/devices/ovs/libnm-device-plugin-ovs.la
+@BUILD_DOCS_TRUE@am__append_50 = $(clients_common_settings_doc_h)
+@BUILD_DOCS_TRUE@am__append_51 = check-local-settings-docs
+@HAVE_INTROSPECTION_TRUE@am__append_52 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_FALSE@am__append_53 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_TRUE@am__append_54 = clients/common/tests/test-clients-common
+@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_55 = clients/common/tests/test-clients-common
 
 ###############################################################################
 # clients/cli
 ###############################################################################
-@BUILD_NMCLI_TRUE@am__append_53 = clients/cli/nmcli
-@BUILD_NMCLI_TRUE@am__append_54 = install-data-hook-nmcli
-@BUILD_NMCLI_TRUE@am__append_55 = uninstall-hook-nmcli
+@BUILD_NMCLI_TRUE@am__append_56 = clients/cli/nmcli
+@BUILD_NMCLI_TRUE@am__append_57 = install-data-hook-nmcli
+@BUILD_NMCLI_TRUE@am__append_58 = uninstall-hook-nmcli
 
 ###############################################################################
 # clients/tui
 ###############################################################################
-@BUILD_NMTUI_TRUE@am__append_56 = clients/tui/newt/libnmt-newt.a
-@BUILD_NMTUI_TRUE@am__append_57 = clients/tui/nmtui
-@BUILD_NMTUI_TRUE@am__append_58 = install-exec-hook-nmtui
-@BUILD_NMTUI_TRUE@am__append_59 = uninstall-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_59 = clients/tui/newt/libnmt-newt.a
+@BUILD_NMTUI_TRUE@am__append_60 = clients/tui/nmtui
+@BUILD_NMTUI_TRUE@am__append_61 = install-exec-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_62 = uninstall-hook-nmtui
 
 ###############################################################################
 # clients/nm-cloud-setup
 ###############################################################################
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_60 = clients/cloud-setup/nm-cloud-setup
-@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_61 = \
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_63 = clients/cloud-setup/libnm-cloud-setup-core.a
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_64 = clients/cloud-setup/nm-cloud-setup
+@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_65 = \
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	clients/cloud-setup/nm-cloud-setup.service \
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	clients/cloud-setup/nm-cloud-setup.timer \
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	$(NULL)
 
-@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_62 = install-data-hook-cloud-setup
-@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_63 = uninstall-hook-cloud-setup
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_64 = \
+@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_66 = install-data-hook-cloud-setup
+@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_67 = uninstall-hook-cloud-setup
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_68 = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/90-nm-cloud-setup.sh \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/meson.build \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm-cloud-setup.service.in \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm-cloud-setup.timer \
+@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/tests/meson.build \
 @BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
 
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_65 = \
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_69 = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm-cloud-setup.service
 
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_70 = clients/cloud-setup/tests/test-cloud-setup-general
 
 ###############################################################################
 # data
 ###############################################################################
-@HAVE_SYSTEMD_TRUE@am__append_66 = \
+@HAVE_SYSTEMD_TRUE@am__append_71 = \
 @HAVE_SYSTEMD_TRUE@	data/NetworkManager.service \
 @HAVE_SYSTEMD_TRUE@	data/NetworkManager-wait-online.service \
 @HAVE_SYSTEMD_TRUE@	data/NetworkManager-dispatcher.service \
 @HAVE_SYSTEMD_TRUE@	$(NULL)
 
-@HAVE_INTROSPECTION_TRUE@am__append_67 = $(man_nm_settings_xml)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_68 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_69 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_70 = man/nm-settings-ifcfg-rh.5
-@WITH_OPENVSWITCH_TRUE@am__append_71 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_72 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_73 = man/nm-openvswitch.7
-@HAVE_DOCS_TRUE@am__append_74 = install-data-hook-man
-@HAVE_DOCS_TRUE@am__append_75 = uninstall-hook-man
-@HAVE_DOCS_TRUE@am__append_76 = $(man_pages) $(man_pages_autogen)
-@BUILD_DOCS_TRUE@am__append_77 = $(man_pages) $(man_pages_autogen)
+@HAVE_INTROSPECTION_TRUE@am__append_72 = $(man_nm_settings_xml)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_73 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_74 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_75 = man/nm-settings-ifcfg-rh.5
+@WITH_OPENVSWITCH_TRUE@am__append_76 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_77 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_78 = man/nm-openvswitch.7
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_79 = man/nm-cloud-setup.8
+@BUILD_NM_CLOUD_SETUP_FALSE@am__append_80 = man/nm-cloud-setup.8
+@BUILD_NM_CLOUD_SETUP_FALSE@am__append_81 = man/nm-cloud-setup.8
+@HAVE_DOCS_TRUE@am__append_82 = install-data-hook-man
+@HAVE_DOCS_TRUE@am__append_83 = uninstall-hook-man
+@HAVE_DOCS_TRUE@am__append_84 = $(man_pages) $(man_pages_autogen)
+@BUILD_DOCS_TRUE@am__append_85 = $(man_pages) $(man_pages_autogen)
 
 ###############################################################################
 # vapi
 ###############################################################################
-@ENABLE_VAPIGEN_TRUE@am__append_78 = \
+@ENABLE_VAPIGEN_TRUE@am__append_86 = \
 @ENABLE_VAPIGEN_TRUE@	vapi/libnm.vapi
 
-@ENABLE_VAPIGEN_TRUE@am__append_79 = \
+@ENABLE_VAPIGEN_TRUE@am__append_87 = \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS) \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS:.vapi=.deps)
 
-@ENABLE_VAPIGEN_TRUE@am__append_80 = $(VAPIGEN_VAPIS)
+@ENABLE_VAPIGEN_TRUE@am__append_88 = $(VAPIGEN_VAPIS)
 
 ###############################################################################
-@ENABLE_TESTS_TRUE@am__append_81 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_TRUE@am__append_82 = $(check_ltlibraries)
-@ENABLE_TESTS_FALSE@am__append_83 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_FALSE@am__append_84 = $(check_ltlibraries)
-@WITH_QT_TRUE@am__append_85 = \
+@ENABLE_TESTS_TRUE@am__append_89 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_TRUE@am__append_90 = $(check_ltlibraries)
+@ENABLE_TESTS_FALSE@am__append_91 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_FALSE@am__append_92 = $(check_ltlibraries)
+@WITH_QT_TRUE@am__append_93 = \
 @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_86 = \
+@WITH_QT_TRUE@am__append_94 = \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running.moc
 
-@WITH_PYTHON_BLACK_TRUE@am__append_87 = check-python-black
+@WITH_PYTHON_BLACK_TRUE@am__append_95 = check-python-black
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
@@ -380,7 +388,7 @@ 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 \
+CONFIG_CLEAN_FILES = libnm-core/nm-version-macros.h libnm/libnm.pc \
 	data/org.freedesktop.NetworkManager.policy.in \
 	NetworkManager.pc
 CONFIG_CLEAN_VPATH_FILES =
@@ -405,13 +413,15 @@ am__EXEEXT_4 = 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_IFCFG_RH_TRUE@am__EXEEXT_6 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__EXEEXT_7 = src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)
-@WITH_MODEM_MANAGER_1_TRUE@am__EXEEXT_8 = src/devices/wwan/tests/test-service-providers$(EXEEXT)
-@WITH_WIFI_TRUE@am__EXEEXT_9 = src/devices/wifi/tests/test-devices-wifi$(EXEEXT)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__EXEEXT_6 = src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__EXEEXT_7 = src/core/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)
+@WITH_MODEM_MANAGER_1_TRUE@am__EXEEXT_8 = src/core/devices/wwan/tests/test-service-providers$(EXEEXT)
+@WITH_WIFI_TRUE@am__EXEEXT_9 = src/core/devices/wifi/tests/test-devices-wifi$(EXEEXT)
 @HAVE_INTROSPECTION_TRUE@am__EXEEXT_10 = clients/common/tests/test-clients-common$(EXEEXT)
 @BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_11 = clients/common/tests/test-clients-common$(EXEEXT)
-am__EXEEXT_12 = shared/nm-glib-aux/tests/test-shared-general$(EXEEXT) \
+@BUILD_NM_CLOUD_SETUP_TRUE@am__EXEEXT_12 = clients/cloud-setup/tests/test-cloud-setup-general$(EXEEXT)
+am__EXEEXT_13 = shared/nm-platform/tests/test-nm-platform$(EXEEXT) \
+	shared/nm-glib-aux/tests/test-shared-general$(EXEEXT) \
 	$(am__EXEEXT_3) libnm-core/tests/test-compare$(EXEEXT) \
 	libnm-core/tests/test-crypto$(EXEEXT) \
 	libnm-core/tests/test-general$(EXEEXT) \
@@ -420,51 +430,55 @@ am__EXEEXT_12 = shared/nm-glib-aux/tests/test-shared-general$(EXEEXT) \
 	libnm-core/tests/test-setting$(EXEEXT) \
 	libnm-core/tests/test-settings-defaults$(EXEEXT) \
 	libnm/tests/test-libnm$(EXEEXT) $(am__EXEEXT_5) \
-	src/initrd/tests/test-dt-reader$(EXEEXT) \
-	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-settings$(EXEEXT) \
+	src/core/initrd/tests/test-dt-reader$(EXEEXT) \
+	src/core/initrd/tests/test-ibft-reader$(EXEEXT) \
+	src/core/initrd/tests/test-cmdline-reader$(EXEEXT) \
+	src/core/dhcp/tests/test-dhcp-dhclient$(EXEEXT) \
+	src/core/dhcp/tests/test-dhcp-utils$(EXEEXT) \
+	src/core/settings/plugins/keyfile/tests/test-keyfile-settings$(EXEEXT) \
 	$(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
-	$(am__EXEEXT_9) 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-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-tc-fake$(EXEEXT) \
-	src/platform/tests/test-tc-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-core$(EXEEXT) \
-	src/tests/test-core-with-expect$(EXEEXT) \
-	src/tests/test-dcb$(EXEEXT) src/tests/test-ip4-config$(EXEEXT) \
-	src/tests/test-ip6-config$(EXEEXT) \
-	src/tests/test-l3cfg$(EXEEXT) src/tests/test-systemd$(EXEEXT) \
-	src/tests/test-utils$(EXEEXT) \
-	src/tests/test-wired-defname$(EXEEXT) \
+	$(am__EXEEXT_9) \
+	src/core/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) \
+	src/core/platform/tests/test-address-fake$(EXEEXT) \
+	src/core/platform/tests/test-address-linux$(EXEEXT) \
+	src/core/platform/tests/test-cleanup-fake$(EXEEXT) \
+	src/core/platform/tests/test-cleanup-linux$(EXEEXT) \
+	src/core/platform/tests/test-link-fake$(EXEEXT) \
+	src/core/platform/tests/test-link-linux$(EXEEXT) \
+	src/core/platform/tests/test-nmp-object$(EXEEXT) \
+	src/core/platform/tests/test-platform-general$(EXEEXT) \
+	src/core/platform/tests/test-route-fake$(EXEEXT) \
+	src/core/platform/tests/test-route-linux$(EXEEXT) \
+	src/core/platform/tests/test-tc-fake$(EXEEXT) \
+	src/core/platform/tests/test-tc-linux$(EXEEXT) \
+	src/core/devices/tests/test-lldp$(EXEEXT) \
+	src/core/devices/tests/test-acd$(EXEEXT) \
+	src/core/ndisc/tests/test-ndisc-fake$(EXEEXT) \
+	src/core/supplicant/tests/test-supplicant-config$(EXEEXT) \
+	src/core/tests/config/test-config$(EXEEXT) \
+	src/core/tests/test-core$(EXEEXT) \
+	src/core/tests/test-core-with-expect$(EXEEXT) \
+	src/core/tests/test-dcb$(EXEEXT) \
+	src/core/tests/test-ip4-config$(EXEEXT) \
+	src/core/tests/test-ip6-config$(EXEEXT) \
+	src/core/tests/test-l3cfg$(EXEEXT) \
+	src/core/tests/test-systemd$(EXEEXT) \
+	src/core/tests/test-utils$(EXEEXT) \
+	src/core/tests/test-wired-defname$(EXEEXT) \
 	dispatcher/tests/test-dispatcher-envp$(EXEEXT) \
 	$(am__EXEEXT_10) $(am__EXEEXT_11) \
-	clients/common/tests/test-libnm-core-aux$(EXEEXT)
-@HAVE_INTROSPECTION_FALSE@am__EXEEXT_13 = $(am__EXEEXT_4)
-@WITH_MODEM_MANAGER_1_TRUE@am__EXEEXT_14 = src/devices/bluetooth/tests/nm-bt-test$(EXEEXT)
-@WITH_QT_TRUE@am__EXEEXT_15 =  \
+	clients/common/tests/test-libnm-core-aux$(EXEEXT) \
+	$(am__EXEEXT_12)
+@HAVE_INTROSPECTION_FALSE@am__EXEEXT_14 = $(am__EXEEXT_4)
+@WITH_MODEM_MANAGER_1_TRUE@am__EXEEXT_15 = src/core/devices/bluetooth/tests/nm-bt-test$(EXEEXT)
+@WITH_QT_TRUE@am__EXEEXT_16 =  \
 @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_16 = $(am__EXEEXT_13) $(am__EXEEXT_14) \
-	src/platform/tests/monitor$(EXEEXT) \
-	src/ndisc/tests/test-ndisc-linux$(EXEEXT) \
+am__EXEEXT_17 = $(am__EXEEXT_14) $(am__EXEEXT_15) \
+	src/core/platform/tests/monitor$(EXEEXT) \
+	src/core/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) \
@@ -473,10 +487,10 @@ am__EXEEXT_16 = $(am__EXEEXT_13) $(am__EXEEXT_14) \
 	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_15)
-@ENABLE_TESTS_FALSE@am__EXEEXT_17 = $(am__EXEEXT_12) $(am__EXEEXT_16)
-@BUILD_NM_CLOUD_SETUP_TRUE@am__EXEEXT_18 = clients/cloud-setup/nm-cloud-setup$(EXEEXT)
-@ENABLE_TESTS_TRUE@am__EXEEXT_19 = $(am__EXEEXT_12) $(am__EXEEXT_16)
+	$(am__EXEEXT_16)
+@ENABLE_TESTS_FALSE@am__EXEEXT_18 = $(am__EXEEXT_13) $(am__EXEEXT_17)
+@BUILD_NM_CLOUD_SETUP_TRUE@am__EXEEXT_19 = clients/cloud-setup/nm-cloud-setup$(EXEEXT)
+@ENABLE_TESTS_TRUE@am__EXEEXT_20 = $(am__EXEEXT_13) $(am__EXEEXT_17)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) \
 	$(sbin_PROGRAMS)
 LIBRARIES = $(noinst_LIBRARIES)
@@ -514,6 +528,30 @@ AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 = 
+clients_cloud_setup_libnm_cloud_setup_core_a_AR = $(AR) $(ARFLAGS)
+clients_cloud_setup_libnm_cloud_setup_core_a_LIBADD =
+am__clients_cloud_setup_libnm_cloud_setup_core_a_SOURCES_DIST =  \
+	clients/cloud-setup/nm-cloud-setup-utils.c \
+	clients/cloud-setup/nm-cloud-setup-utils.h \
+	clients/cloud-setup/nm-http-client.c \
+	clients/cloud-setup/nm-http-client.h \
+	clients/cloud-setup/nmcs-provider.c \
+	clients/cloud-setup/nmcs-provider.h \
+	clients/cloud-setup/nmcs-provider-ec2.c \
+	clients/cloud-setup/nmcs-provider-ec2.h \
+	clients/cloud-setup/nmcs-provider-gcp.c \
+	clients/cloud-setup/nmcs-provider-gcp.h \
+	clients/cloud-setup/nmcs-provider-azure.c \
+	clients/cloud-setup/nmcs-provider-azure.h
+am__dirstamp = $(am__leading_dot)dirstamp
+@BUILD_NM_CLOUD_SETUP_TRUE@am_clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS = clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.$(OBJEXT) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-client.$(OBJEXT) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.$(OBJEXT) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.$(OBJEXT) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.$(OBJEXT) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.$(OBJEXT)
+clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS =  \
+	$(am_clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS)
 clients_tui_newt_libnmt_newt_a_AR = $(AR) $(ARFLAGS)
 clients_tui_newt_libnmt_newt_a_LIBADD =
 am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST =  \
@@ -558,7 +596,6 @@ am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST =  \
 	clients/tui/newt/nmt-newt-utils.h \
 	clients/tui/newt/nmt-newt-widget.c \
 	clients/tui/newt/nmt-newt-widget.h
-am__dirstamp = $(am__leading_dot)dirstamp
 @BUILD_NMTUI_TRUE@am_clients_tui_newt_libnmt_newt_a_OBJECTS = clients/tui/newt/libnmt_newt_a-nmt-newt-button.$(OBJEXT) \
 @BUILD_NMTUI_TRUE@	clients/tui/newt/libnmt_newt_a-nmt-newt-button-box.$(OBJEXT) \
 @BUILD_NMTUI_TRUE@	clients/tui/newt/libnmt_newt_a-nmt-newt-checkbox.$(OBJEXT) \
@@ -600,7 +637,7 @@ am__v_lt_1 =
 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 \
+	clients/common/libnmc_la-nm-meta-setting-base-impl.lo \
 	clients/common/libnmc_la-nm-meta-setting-desc.lo \
 	clients/common/libnmc_la-nm-meta-setting-access.lo
 clients_common_libnmc_la_OBJECTS =  \
@@ -683,6 +720,7 @@ am__objects_3 = libnm-core/libnm_core_la-nm-setting-6lowpan.lo \
 	libnm-core/libnm_core_la-nm-setting-ethtool.lo \
 	libnm-core/libnm_core_la-nm-setting-generic.lo \
 	libnm-core/libnm_core_la-nm-setting-gsm.lo \
+	libnm-core/libnm_core_la-nm-setting-hostname.lo \
 	libnm-core/libnm_core_la-nm-setting-infiniband.lo \
 	libnm-core/libnm_core_la-nm-setting-ip-config.lo \
 	libnm-core/libnm_core_la-nm-setting-ip-tunnel.lo \
@@ -694,6 +732,7 @@ am__objects_3 = libnm-core/libnm_core_la-nm-setting-6lowpan.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-external-ids.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 \
@@ -707,6 +746,7 @@ am__objects_3 = libnm-core/libnm_core_la-nm-setting-6lowpan.lo \
 	libnm-core/libnm_core_la-nm-setting-team.lo \
 	libnm-core/libnm_core_la-nm-setting-tun.lo \
 	libnm-core/libnm_core_la-nm-setting-user.lo \
+	libnm-core/libnm_core_la-nm-setting-veth.lo \
 	libnm-core/libnm_core_la-nm-setting-vlan.lo \
 	libnm-core/libnm_core_la-nm-setting-vpn.lo \
 	libnm-core/libnm_core_la-nm-setting-vrf.lo \
@@ -719,11 +759,13 @@ am__objects_3 = libnm-core/libnm_core_la-nm-setting-6lowpan.lo \
 	libnm-core/libnm_core_la-nm-setting-wireless.lo \
 	libnm-core/libnm_core_la-nm-setting-wpan.lo
 am__objects_4 = $(am__objects_3) \
-	shared/libnm_core_libnm_core_la-nm-meta-setting.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-utils.lo \
+	libnm-core/libnm_core_la-nm-keyfile.lo \
+	libnm-core/libnm_core_la-nm-meta-setting-base-impl.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 \
@@ -773,18 +815,6 @@ 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 =
-libnm_core_nm_keyfile_libnm_keyfile_la_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_1)
-am_libnm_core_nm_keyfile_libnm_keyfile_la_OBJECTS =  \
-	libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo \
-	libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo
-libnm_core_nm_keyfile_libnm_keyfile_la_OBJECTS =  \
-	$(am_libnm_core_nm_keyfile_libnm_keyfile_la_OBJECTS)
-libnm_core_nm_keyfile_libnm_keyfile_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libnm_core_nm_keyfile_libnm_keyfile_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
 libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
 am_libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS = libnm-core/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo
@@ -797,7 +827,6 @@ libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_LINK =  \
 libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
 am_libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS = libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo \
-	libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo \
 	libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo
 libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS = $(am_libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS)
 libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_LINK =  \
@@ -805,11 +834,18 @@ libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_LINK =  \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-libnm_liblibnm_la_DEPENDENCIES =  \
+libnm_libnm_la_DEPENDENCIES = libnm/libnm_static.la
+am_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_2)
+libnm_libnm_la_OBJECTS = $(am_libnm_libnm_la_OBJECTS)
+libnm_libnm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libnm_libnm_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+libnm_libnm_static_la_DEPENDENCIES =  \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/libnm-core.la $(libnm_crypto_lib) \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
-	introspection/libnmdbus.la \
+	shared/nm-base/libnm-base.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 \
@@ -817,68 +853,64 @@ libnm_liblibnm_la_DEPENDENCIES =  \
 	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_6 = libnm/liblibnm_la-nm-client.lo \
-	libnm/liblibnm_la-nm-object.lo libnm/liblibnm_la-nm-device.lo \
-	libnm/liblibnm_la-nm-active-connection.lo \
-	libnm/liblibnm_la-nm-access-point.lo \
-	libnm/liblibnm_la-nm-checkpoint.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-vrf.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-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-remote-connection.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_6)
-am__objects_7 = libnm/liblibnm_la-nm-enum-types.lo
-nodist_libnm_liblibnm_la_OBJECTS = $(am__objects_2) $(am__objects_7)
-libnm_liblibnm_la_OBJECTS = $(am_libnm_liblibnm_la_OBJECTS) \
-	$(nodist_libnm_liblibnm_la_OBJECTS)
-libnm_libnm_la_DEPENDENCIES = libnm/liblibnm.la
-am_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_2)
-libnm_libnm_la_OBJECTS = $(am_libnm_libnm_la_OBJECTS)
-libnm_libnm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libnm_libnm_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
+am__objects_6 = libnm/libnm_static_la-nm-client.lo \
+	libnm/libnm_static_la-nm-object.lo \
+	libnm/libnm_static_la-nm-device.lo \
+	libnm/libnm_static_la-nm-active-connection.lo \
+	libnm/libnm_static_la-nm-access-point.lo \
+	libnm/libnm_static_la-nm-checkpoint.lo \
+	libnm/libnm_static_la-nm-dbus-helpers.lo \
+	libnm/libnm_static_la-nm-device-6lowpan.lo \
+	libnm/libnm_static_la-nm-device-adsl.lo \
+	libnm/libnm_static_la-nm-device-bond.lo \
+	libnm/libnm_static_la-nm-device-bridge.lo \
+	libnm/libnm_static_la-nm-device-bt.lo \
+	libnm/libnm_static_la-nm-device-dummy.lo \
+	libnm/libnm_static_la-nm-device-ethernet.lo \
+	libnm/libnm_static_la-nm-device-generic.lo \
+	libnm/libnm_static_la-nm-device-infiniband.lo \
+	libnm/libnm_static_la-nm-device-ip-tunnel.lo \
+	libnm/libnm_static_la-nm-device-macsec.lo \
+	libnm/libnm_static_la-nm-device-macvlan.lo \
+	libnm/libnm_static_la-nm-device-modem.lo \
+	libnm/libnm_static_la-nm-device-olpc-mesh.lo \
+	libnm/libnm_static_la-nm-device-ovs-bridge.lo \
+	libnm/libnm_static_la-nm-device-ovs-interface.lo \
+	libnm/libnm_static_la-nm-device-ovs-port.lo \
+	libnm/libnm_static_la-nm-device-ppp.lo \
+	libnm/libnm_static_la-nm-device-team.lo \
+	libnm/libnm_static_la-nm-device-tun.lo \
+	libnm/libnm_static_la-nm-device-veth.lo \
+	libnm/libnm_static_la-nm-device-vlan.lo \
+	libnm/libnm_static_la-nm-device-vrf.lo \
+	libnm/libnm_static_la-nm-device-vxlan.lo \
+	libnm/libnm_static_la-nm-device-wifi-p2p.lo \
+	libnm/libnm_static_la-nm-device-wifi.lo \
+	libnm/libnm_static_la-nm-device-wimax.lo \
+	libnm/libnm_static_la-nm-device-wireguard.lo \
+	libnm/libnm_static_la-nm-device-wpan.lo \
+	libnm/libnm_static_la-nm-dhcp-config.lo \
+	libnm/libnm_static_la-nm-dhcp4-config.lo \
+	libnm/libnm_static_la-nm-dhcp6-config.lo \
+	libnm/libnm_static_la-nm-dns-manager.lo \
+	libnm/libnm_static_la-nm-ip-config.lo \
+	libnm/libnm_static_la-nm-ip4-config.lo \
+	libnm/libnm_static_la-nm-ip6-config.lo \
+	libnm/libnm_static_la-nm-libnm-utils.lo \
+	libnm/libnm_static_la-nm-remote-connection.lo \
+	libnm/libnm_static_la-nm-secret-agent-old.lo \
+	libnm/libnm_static_la-nm-vpn-connection.lo \
+	libnm/libnm_static_la-nm-vpn-editor.lo \
+	libnm/libnm_static_la-nm-vpn-plugin-old.lo \
+	libnm/libnm_static_la-nm-vpn-service-plugin.lo \
+	libnm/libnm_static_la-nm-wifi-p2p-peer.lo \
+	libnm/libnm_static_la-nm-wimax-nsp.lo
+am_libnm_libnm_static_la_OBJECTS = $(am__objects_6)
+am__objects_7 = libnm/libnm_static_la-nm-enum-types.lo
+nodist_libnm_libnm_static_la_OBJECTS = $(am__objects_2) \
+	$(am__objects_7)
+libnm_libnm_static_la_OBJECTS = $(am_libnm_libnm_static_la_OBJECTS) \
+	$(nodist_libnm_libnm_static_la_OBJECTS)
 libnm_nm_libnm_aux_libnm_libnm_aux_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) libnm/libnm.la
 am_libnm_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS =  \
@@ -952,6 +984,15 @@ 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_base_libnm_base_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_shared_nm_base_libnm_base_la_OBJECTS =  \
+	shared/nm-base/libnm_base_la-nm-ethtool-base.lo
+shared_nm_base_libnm_base_la_OBJECTS =  \
+	$(am_shared_nm_base_libnm_base_la_OBJECTS)
+shared_nm_base_libnm_base_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(shared_nm_base_libnm_base_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 shared_nm_glib_aux_libnm_glib_aux_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
 am_shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS =  \
@@ -976,6 +1017,30 @@ shared_nm_glib_aux_libnm_glib_aux_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS) $(LDFLAGS) -o \
 	$@
+shared_nm_log_core_libnm_log_core_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_shared_nm_log_core_libnm_log_core_la_OBJECTS =  \
+	shared/nm-log-core/libnm_log_core_la-nm-logging.lo
+shared_nm_log_core_libnm_log_core_la_OBJECTS =  \
+	$(am_shared_nm_log_core_libnm_log_core_la_OBJECTS)
+shared_nm_log_core_libnm_log_core_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(shared_nm_log_core_libnm_log_core_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+shared_nm_platform_libnm_platform_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1)
+am_shared_nm_platform_libnm_platform_la_OBJECTS =  \
+	shared/nm-platform/libnm_platform_la-nm-netlink.lo \
+	shared/nm-platform/libnm_platform_la-nm-platform-utils.lo \
+	shared/nm-platform/libnm_platform_la-nmp-netns.lo
+shared_nm_platform_libnm_platform_la_OBJECTS =  \
+	$(am_shared_nm_platform_libnm_platform_la_OBJECTS)
+shared_nm_platform_libnm_platform_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(shared_nm_platform_libnm_platform_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
 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 \
@@ -1029,6 +1094,7 @@ am_shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
 	shared/systemd/src/basic/libnm_systemd_shared_la-prioq.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-ratelimit.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo \
 	shared/systemd/src/basic/libnm_systemd_shared_la-stat-util.lo \
@@ -1044,498 +1110,501 @@ am_shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
 	shared/systemd/src/shared/libnm_systemd_shared_la-web-util.lo
 shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
 	$(am_shared_systemd_libnm_systemd_shared_la_OBJECTS)
-src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES =  \
+src_core_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
-am_src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS = src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo \
-	src/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo
-src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS =  \
-	$(am_src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS)
-src_devices_adsl_libnm_device_plugin_adsl_la_LINK = $(LIBTOOL) \
+am_src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS = src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo \
+	src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo
+src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS = $(am_src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS)
+src_core_devices_adsl_libnm_device_plugin_adsl_la_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS) \
+	$(src_core_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_bluetooth_utils_la_DEPENDENCIES =  \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_bluetooth_utils_la_DEPENDENCIES =  \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_2)
-am__src_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES_DIST =  \
-	src/devices/bluetooth/nm-bluez-common.h \
-	src/devices/bluetooth/nm-bt-error.c \
-	src/devices/bluetooth/nm-bt-error.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_10 = src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo
-@WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS = src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo \
+am__src_core_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES_DIST =  \
+	src/core/devices/bluetooth/nm-bluez-common.h \
+	src/core/devices/bluetooth/nm-bt-error.c \
+	src/core/devices/bluetooth/nm-bt-error.h \
+	src/core/devices/bluetooth/nm-bluez5-dun.c \
+	src/core/devices/bluetooth/nm-bluez5-dun.h
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_10 = src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo
+@WITH_MODEM_MANAGER_1_TRUE@am_src_core_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS = src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_10)
-src_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS =  \
-	$(am_src_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS)
-@WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_bluetooth_utils_la_rpath =
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES = src/devices/bluetooth/libnm-bluetooth-utils.la \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
+src_core_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS = $(am_src_core_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS)
+@WITH_MODEM_MANAGER_1_TRUE@am_src_core_devices_bluetooth_libnm_bluetooth_utils_la_rpath =
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES = src/core/devices/bluetooth/libnm-bluetooth-utils.la \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1)
-am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST =  \
-	src/devices/bluetooth/nm-bluez-manager.c \
-	src/devices/bluetooth/nm-bluez-manager.h \
-	src/devices/bluetooth/nm-device-bt.c \
-	src/devices/bluetooth/nm-device-bt.h
-@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-device-bt.lo
-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 =  \
+am__src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST =  \
+	src/core/devices/bluetooth/nm-bluez-manager.c \
+	src/core/devices/bluetooth/nm-bluez-manager.h \
+	src/core/devices/bluetooth/nm-device-bt.c \
+	src/core/devices/bluetooth/nm-device-bt.h
+@WITH_MODEM_MANAGER_1_TRUE@am_src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo
+src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = $(am_src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS)
+src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK =  \
 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS) \
+	$(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_rpath =  \
+@WITH_MODEM_MANAGER_1_TRUE@am_src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_rpath =  \
 @WITH_MODEM_MANAGER_1_TRUE@	-rpath $(plugindir)
-@WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES =  \
+@WITH_OPENVSWITCH_TRUE@src_core_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES =  \
 @WITH_OPENVSWITCH_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_OPENVSWITCH_TRUE@	$(am__DEPENDENCIES_1)
-am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST =  \
-	src/devices/ovs/nm-ovsdb.c src/devices/ovs/nm-ovsdb.h \
-	src/devices/ovs/nm-ovs-factory.c \
-	src/devices/ovs/nm-device-ovs-interface.c \
-	src/devices/ovs/nm-device-ovs-interface.h \
-	src/devices/ovs/nm-device-ovs-port.c \
-	src/devices/ovs/nm-device-ovs-port.h \
-	src/devices/ovs/nm-device-ovs-bridge.c \
-	src/devices/ovs/nm-device-ovs-bridge.h
-@WITH_OPENVSWITCH_TRUE@am_src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS = src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo
-src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS =  \
-	$(am_src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS)
-src_devices_ovs_libnm_device_plugin_ovs_la_LINK = $(LIBTOOL) \
+am__src_core_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST =  \
+	src/core/devices/ovs/nm-ovsdb.c \
+	src/core/devices/ovs/nm-ovsdb.h \
+	src/core/devices/ovs/nm-ovs-factory.c \
+	src/core/devices/ovs/nm-device-ovs-interface.c \
+	src/core/devices/ovs/nm-device-ovs-interface.h \
+	src/core/devices/ovs/nm-device-ovs-port.c \
+	src/core/devices/ovs/nm-device-ovs-port.h \
+	src/core/devices/ovs/nm-device-ovs-bridge.c \
+	src/core/devices/ovs/nm-device-ovs-bridge.h
+@WITH_OPENVSWITCH_TRUE@am_src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS = src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo
+src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS =  \
+	$(am_src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS)
+src_core_devices_ovs_libnm_device_plugin_ovs_la_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS) \
+	$(src_core_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@WITH_OPENVSWITCH_TRUE@am_src_devices_ovs_libnm_device_plugin_ovs_la_rpath =  \
+@WITH_OPENVSWITCH_TRUE@am_src_core_devices_ovs_libnm_device_plugin_ovs_la_rpath =  \
 @WITH_OPENVSWITCH_TRUE@	-rpath $(plugindir)
-@WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_DEPENDENCIES =  \
+@WITH_TEAMDCTL_TRUE@src_core_devices_team_libnm_device_plugin_team_la_DEPENDENCIES =  \
 @WITH_TEAMDCTL_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_TEAMDCTL_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_TEAMDCTL_TRUE@	$(am__DEPENDENCIES_1)
-am__src_devices_team_libnm_device_plugin_team_la_SOURCES_DIST =  \
-	src/devices/team/nm-team-factory.c \
-	src/devices/team/nm-device-team.c \
-	src/devices/team/nm-device-team.h
-@WITH_TEAMDCTL_TRUE@am_src_devices_team_libnm_device_plugin_team_la_OBJECTS = src/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo \
-@WITH_TEAMDCTL_TRUE@	src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo
-src_devices_team_libnm_device_plugin_team_la_OBJECTS =  \
-	$(am_src_devices_team_libnm_device_plugin_team_la_OBJECTS)
-src_devices_team_libnm_device_plugin_team_la_LINK = $(LIBTOOL) \
+am__src_core_devices_team_libnm_device_plugin_team_la_SOURCES_DIST =  \
+	src/core/devices/team/nm-team-factory.c \
+	src/core/devices/team/nm-device-team.c \
+	src/core/devices/team/nm-device-team.h
+@WITH_TEAMDCTL_TRUE@am_src_core_devices_team_libnm_device_plugin_team_la_OBJECTS = src/core/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo \
+@WITH_TEAMDCTL_TRUE@	src/core/devices/team/libnm_device_plugin_team_la-nm-device-team.lo
+src_core_devices_team_libnm_device_plugin_team_la_OBJECTS = $(am_src_core_devices_team_libnm_device_plugin_team_la_OBJECTS)
+src_core_devices_team_libnm_device_plugin_team_la_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_team_libnm_device_plugin_team_la_LDFLAGS) \
+	$(src_core_devices_team_libnm_device_plugin_team_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@WITH_TEAMDCTL_TRUE@am_src_devices_team_libnm_device_plugin_team_la_rpath =  \
+@WITH_TEAMDCTL_TRUE@am_src_core_devices_team_libnm_device_plugin_team_la_rpath =  \
 @WITH_TEAMDCTL_TRUE@	-rpath $(plugindir)
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES =  \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm-wifi-base.la \
+@WITH_WIFI_TRUE@src_core_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES =  \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm-wifi-base.la \
 @WITH_WIFI_TRUE@	$(am__DEPENDENCIES_1)
-am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
-	src/devices/wifi/nm-wifi-factory.c
-@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo
-src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS =  \
-	$(am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS)
-src_devices_wifi_libnm_device_plugin_wifi_la_LINK = $(LIBTOOL) \
+am__src_core_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
+	src/core/devices/wifi/nm-wifi-factory.c
+@WITH_WIFI_TRUE@am_src_core_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = src/core/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo
+src_core_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = $(am_src_core_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS)
+src_core_devices_wifi_libnm_device_plugin_wifi_la_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS) \
+	$(src_core_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath =  \
+@WITH_WIFI_TRUE@am_src_core_devices_wifi_libnm_device_plugin_wifi_la_rpath =  \
 @WITH_WIFI_TRUE@	-rpath $(plugindir)
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_wifi_base_la_DEPENDENCIES =  \
+@WITH_WIFI_TRUE@src_core_devices_wifi_libnm_wifi_base_la_DEPENDENCIES =  \
 @WITH_WIFI_TRUE@	$(am__DEPENDENCIES_1)
-am__src_devices_wifi_libnm_wifi_base_la_SOURCES_DIST =  \
-	src/devices/wifi/nm-device-olpc-mesh.c \
-	src/devices/wifi/nm-device-olpc-mesh.h \
-	src/devices/wifi/nm-device-wifi-p2p.c \
-	src/devices/wifi/nm-device-wifi-p2p.h \
-	src/devices/wifi/nm-device-wifi.c \
-	src/devices/wifi/nm-device-wifi.h \
-	src/devices/wifi/nm-wifi-ap.c src/devices/wifi/nm-wifi-ap.h \
-	src/devices/wifi/nm-wifi-common.c \
-	src/devices/wifi/nm-wifi-common.h \
-	src/devices/wifi/nm-wifi-p2p-peer.c \
-	src/devices/wifi/nm-wifi-p2p-peer.h \
-	src/devices/wifi/nm-wifi-utils.c \
-	src/devices/wifi/nm-wifi-utils.h \
-	src/devices/wifi/nm-device-iwd.c \
-	src/devices/wifi/nm-device-iwd.h \
-	src/devices/wifi/nm-iwd-manager.c \
-	src/devices/wifi/nm-iwd-manager.h
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__objects_11 = src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo \
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo
-@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_wifi_base_la_OBJECTS = src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo \
+am__src_core_devices_wifi_libnm_wifi_base_la_SOURCES_DIST =  \
+	src/core/devices/wifi/nm-device-olpc-mesh.c \
+	src/core/devices/wifi/nm-device-olpc-mesh.h \
+	src/core/devices/wifi/nm-device-wifi-p2p.c \
+	src/core/devices/wifi/nm-device-wifi-p2p.h \
+	src/core/devices/wifi/nm-device-wifi.c \
+	src/core/devices/wifi/nm-device-wifi.h \
+	src/core/devices/wifi/nm-wifi-ap.c \
+	src/core/devices/wifi/nm-wifi-ap.h \
+	src/core/devices/wifi/nm-wifi-common.c \
+	src/core/devices/wifi/nm-wifi-common.h \
+	src/core/devices/wifi/nm-wifi-p2p-peer.c \
+	src/core/devices/wifi/nm-wifi-p2p-peer.h \
+	src/core/devices/wifi/nm-wifi-utils.c \
+	src/core/devices/wifi/nm-wifi-utils.h \
+	src/core/devices/wifi/nm-device-iwd.c \
+	src/core/devices/wifi/nm-device-iwd.h \
+	src/core/devices/wifi/nm-iwd-manager.c \
+	src/core/devices/wifi/nm-iwd-manager.h
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__objects_11 = src/core/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo
+@WITH_WIFI_TRUE@am_src_core_devices_wifi_libnm_wifi_base_la_OBJECTS = src/core/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo \
 @WITH_WIFI_TRUE@	$(am__objects_11)
-src_devices_wifi_libnm_wifi_base_la_OBJECTS =  \
-	$(am_src_devices_wifi_libnm_wifi_base_la_OBJECTS)
-@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_wifi_base_la_rpath =
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_DEPENDENCIES =  \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
+src_core_devices_wifi_libnm_wifi_base_la_OBJECTS =  \
+	$(am_src_core_devices_wifi_libnm_wifi_base_la_OBJECTS)
+@WITH_WIFI_TRUE@am_src_core_devices_wifi_libnm_wifi_base_la_rpath =
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_device_plugin_wwan_la_DEPENDENCIES = src/core/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1)
-am__src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST =  \
-	src/devices/wwan/nm-wwan-factory.c \
-	src/devices/wwan/nm-device-modem.c \
-	src/devices/wwan/nm-device-modem.h
-@WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS = src/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo
-src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS =  \
-	$(am_src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS)
-src_devices_wwan_libnm_device_plugin_wwan_la_LINK = $(LIBTOOL) \
+am__src_core_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST =  \
+	src/core/devices/wwan/nm-wwan-factory.c \
+	src/core/devices/wwan/nm-device-modem.c \
+	src/core/devices/wwan/nm-device-modem.h
+@WITH_MODEM_MANAGER_1_TRUE@am_src_core_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS = src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo
+src_core_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS = $(am_src_core_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS)
+src_core_devices_wwan_libnm_device_plugin_wwan_la_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS) \
+	$(src_core_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_device_plugin_wwan_la_rpath =  \
+@WITH_MODEM_MANAGER_1_TRUE@am_src_core_devices_wwan_libnm_device_plugin_wwan_la_rpath =  \
 @WITH_MODEM_MANAGER_1_TRUE@	-rpath $(plugindir)
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_DEPENDENCIES =  \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_wwan_la_DEPENDENCIES =  \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1)
-am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST =  \
-	src/devices/wwan/nm-modem-broadband.c \
-	src/devices/wwan/nm-modem-broadband.h \
-	src/devices/wwan/nm-modem-manager.c \
-	src/devices/wwan/nm-modem-manager.h \
-	src/devices/wwan/nm-modem.c src/devices/wwan/nm-modem.h \
-	src/devices/wwan/nm-service-providers.c \
-	src/devices/wwan/nm-service-providers.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_12 = 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@	src/devices/wwan/libnm_wwan_la-nm-service-providers.lo \
+am__src_core_devices_wwan_libnm_wwan_la_SOURCES_DIST =  \
+	src/core/devices/wwan/nm-modem-broadband.c \
+	src/core/devices/wwan/nm-modem-broadband.h \
+	src/core/devices/wwan/nm-modem-manager.c \
+	src/core/devices/wwan/nm-modem-manager.h \
+	src/core/devices/wwan/nm-modem.c \
+	src/core/devices/wwan/nm-modem.h \
+	src/core/devices/wwan/nm-service-providers.c \
+	src/core/devices/wwan/nm-service-providers.h \
+	src/core/devices/wwan/nm-modem-ofono.c \
+	src/core/devices/wwan/nm-modem-ofono.h
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_12 = src/core/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo
+@WITH_MODEM_MANAGER_1_TRUE@am_src_core_devices_wwan_libnm_wwan_la_OBJECTS = src/core/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/libnm_wwan_la-nm-modem-manager.lo \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/libnm_wwan_la-nm-modem.lo \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/libnm_wwan_la-nm-service-providers.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_12)
-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 \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_wwan_libnm_wwan_la_LDFLAGS) $(LDFLAGS) -o $@
-@WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_wwan_la_rpath =  \
+src_core_devices_wwan_libnm_wwan_la_OBJECTS =  \
+	$(am_src_core_devices_wwan_libnm_wwan_la_OBJECTS)
+src_core_devices_wwan_libnm_wwan_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_devices_wwan_libnm_wwan_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+@WITH_MODEM_MANAGER_1_TRUE@am_src_core_devices_wwan_libnm_wwan_la_rpath =  \
 @WITH_MODEM_MANAGER_1_TRUE@	-rpath $(plugindir)
-src_initrd_libnmi_core_la_LIBADD =
-am_src_initrd_libnmi_core_la_OBJECTS =  \
-	src/initrd/libnmi_core_la-nmi-cmdline-reader.lo \
-	src/initrd/libnmi_core_la-nmi-dt-reader.lo \
-	src/initrd/libnmi_core_la-nmi-ibft-reader.lo
-src_initrd_libnmi_core_la_OBJECTS =  \
-	$(am_src_initrd_libnmi_core_la_OBJECTS)
-src_libNetworkManager_la_DEPENDENCIES = src/libNetworkManagerBase.la \
+src_core_initrd_libnmi_core_la_LIBADD =
+am_src_core_initrd_libnmi_core_la_OBJECTS =  \
+	src/core/initrd/libnmi_core_la-nmi-cmdline-reader.lo \
+	src/core/initrd/libnmi_core_la-nmi-dt-reader.lo \
+	src/core/initrd/libnmi_core_la-nmi-ibft-reader.lo
+src_core_initrd_libnmi_core_la_OBJECTS =  \
+	$(am_src_core_initrd_libnmi_core_la_OBJECTS)
+src_core_libNetworkManager_la_DEPENDENCIES =  \
+	src/core/libNetworkManagerBase.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la $(libnm_crypto_lib) \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-platform/libnm-platform.la \
+	shared/nm-base/libnm-base.la \
+	shared/nm-log-core/libnm-log-core.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/nm-std-aux/libnm-std-aux.la \
+	src/core/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) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am_src_libNetworkManager_la_OBJECTS =  \
-	src/libNetworkManager_la-nm-checkpoint.lo \
-	src/libNetworkManager_la-nm-checkpoint-manager.lo \
-	src/devices/libNetworkManager_la-nm-acd-manager.lo \
-	src/devices/libNetworkManager_la-nm-lldp-listener.lo \
-	src/devices/libNetworkManager_la-nm-device.lo \
-	src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo \
-	src/devices/libNetworkManager_la-nm-device-factory.lo \
-	src/devices/libNetworkManager_la-nm-device-generic.lo \
-	src/devices/libNetworkManager_la-nm-device-6lowpan.lo \
-	src/devices/libNetworkManager_la-nm-device-bond.lo \
-	src/devices/libNetworkManager_la-nm-device-bridge.lo \
-	src/devices/libNetworkManager_la-nm-device-dummy.lo \
-	src/devices/libNetworkManager_la-nm-device-ethernet.lo \
-	src/devices/libNetworkManager_la-nm-device-infiniband.lo \
-	src/devices/libNetworkManager_la-nm-device-ip-tunnel.lo \
-	src/devices/libNetworkManager_la-nm-device-macsec.lo \
-	src/devices/libNetworkManager_la-nm-device-macvlan.lo \
-	src/devices/libNetworkManager_la-nm-device-ppp.lo \
-	src/devices/libNetworkManager_la-nm-device-tun.lo \
-	src/devices/libNetworkManager_la-nm-device-veth.lo \
-	src/devices/libNetworkManager_la-nm-device-vlan.lo \
-	src/devices/libNetworkManager_la-nm-device-vrf.lo \
-	src/devices/libNetworkManager_la-nm-device-vxlan.lo \
-	src/devices/libNetworkManager_la-nm-device-wireguard.lo \
-	src/devices/libNetworkManager_la-nm-device-wpan.lo \
-	src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo \
-	src/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo \
-	src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo \
-	src/dhcp/libNetworkManager_la-nm-dhcp-listener.lo \
-	src/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo \
-	src/dns/libNetworkManager_la-nm-dns-manager.lo \
-	src/dns/libNetworkManager_la-nm-dns-plugin.lo \
-	src/dns/libNetworkManager_la-nm-dns-dnsmasq.lo \
-	src/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo \
-	src/dns/libNetworkManager_la-nm-dns-unbound.lo \
-	src/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo \
-	src/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo \
-	src/ppp/libNetworkManager_la-nm-ppp-manager-call.lo \
-	src/libNetworkManager_la-nm-hostname-manager.lo \
-	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/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 \
-	src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo \
-	src/supplicant/libNetworkManager_la-nm-supplicant-config.lo \
-	src/supplicant/libNetworkManager_la-nm-supplicant-interface.lo \
-	src/supplicant/libNetworkManager_la-nm-supplicant-manager.lo \
-	src/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo \
-	src/vpn/libNetworkManager_la-nm-vpn-connection.lo \
-	src/vpn/libNetworkManager_la-nm-vpn-manager.lo \
-	src/libNetworkManager_la-nm-act-request.lo \
-	src/libNetworkManager_la-nm-active-connection.lo \
-	src/libNetworkManager_la-nm-audit-manager.lo \
-	src/libNetworkManager_la-nm-dbus-manager.lo \
-	src/libNetworkManager_la-nm-config.lo \
-	src/libNetworkManager_la-nm-config-data.lo \
-	src/libNetworkManager_la-nm-connectivity.lo \
-	src/libNetworkManager_la-nm-dcb.lo \
-	src/libNetworkManager_la-nm-dhcp-config.lo \
-	src/libNetworkManager_la-nm-dispatcher.lo \
-	src/libNetworkManager_la-nm-firewall-manager.lo \
-	src/libNetworkManager_la-nm-proxy-config.lo \
-	src/libNetworkManager_la-nm-auth-manager.lo \
-	src/libNetworkManager_la-nm-auth-utils.lo \
-	src/libNetworkManager_la-nm-manager.lo \
-	src/libNetworkManager_la-nm-pacrunner-manager.lo \
-	src/libNetworkManager_la-nm-policy.lo \
-	src/libNetworkManager_la-nm-rfkill-manager.lo \
-	src/libNetworkManager_la-nm-session-monitor.lo \
-	src/libNetworkManager_la-nm-keep-alive.lo \
-	src/libNetworkManager_la-nm-sleep-monitor.lo
-src_libNetworkManager_la_OBJECTS =  \
-	$(am_src_libNetworkManager_la_OBJECTS)
-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 \
-	src/NetworkManagerUtils.c src/NetworkManagerUtils.h \
-	src/platform/nm-netlink.c src/platform/nm-netlink.h \
-	src/platform/nmp-netns.c src/platform/nmp-netns.h \
-	src/platform/nmp-object.c src/platform/nmp-object.h \
-	src/platform/nm-platform-utils.c \
-	src/platform/nm-platform-utils.h src/platform/nm-platform.c \
-	src/platform/nm-platform.h src/platform/nm-platform-private.h \
-	src/platform/nm-linux-platform.c \
-	src/platform/nm-linux-platform.h \
-	src/platform/nmp-rules-manager.c \
-	src/platform/nmp-rules-manager.h \
-	src/platform/wifi/nm-wifi-utils-nl80211.c \
-	src/platform/wifi/nm-wifi-utils-nl80211.h \
-	src/platform/wifi/nm-wifi-utils-private.h \
-	src/platform/wifi/nm-wifi-utils.c \
-	src/platform/wifi/nm-wifi-utils.h \
-	src/platform/wpan/nm-wpan-utils.c \
-	src/platform/wpan/nm-wpan-utils.h src/ndisc/nm-lndp-ndisc.c \
-	src/ndisc/nm-lndp-ndisc.h src/ndisc/nm-ndisc.c \
-	src/ndisc/nm-ndisc.h src/ndisc/nm-ndisc-private.h \
-	src/nm-dbus-utils.c src/nm-dbus-utils.h src/nm-dbus-object.c \
-	src/nm-dbus-object.h src/nm-netns.c src/nm-netns.h \
-	src/nm-l3-config-data.c src/nm-l3-config-data.h src/nm-l3cfg.c \
-	src/nm-l3cfg.h src/nm-ip-config.c src/nm-ip-config.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-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_13 = 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 \
-	src/libNetworkManagerBase_la-NetworkManagerUtils.lo \
-	src/platform/libNetworkManagerBase_la-nm-netlink.lo \
-	src/platform/libNetworkManagerBase_la-nmp-netns.lo \
-	src/platform/libNetworkManagerBase_la-nmp-object.lo \
-	src/platform/libNetworkManagerBase_la-nm-platform-utils.lo \
-	src/platform/libNetworkManagerBase_la-nm-platform.lo \
-	src/platform/libNetworkManagerBase_la-nm-linux-platform.lo \
-	src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo \
-	src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo \
-	src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo \
-	src/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo \
-	src/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo \
-	src/ndisc/libNetworkManagerBase_la-nm-ndisc.lo \
-	src/libNetworkManagerBase_la-nm-dbus-utils.lo \
-	src/libNetworkManagerBase_la-nm-dbus-object.lo \
-	src/libNetworkManagerBase_la-nm-netns.lo \
-	src/libNetworkManagerBase_la-nm-l3-config-data.lo \
-	src/libNetworkManagerBase_la-nm-l3cfg.lo \
-	src/libNetworkManagerBase_la-nm-ip-config.lo \
-	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_13)
-src_libNetworkManagerBase_la_OBJECTS =  \
-	$(am_src_libNetworkManagerBase_la_OBJECTS)
-src_libNetworkManagerTest_la_DEPENDENCIES = src/libNetworkManager.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am_src_libNetworkManagerTest_la_OBJECTS =  \
-	src/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo \
-	src/platform/libNetworkManagerTest_la-nm-fake-platform.lo \
-	src/platform/tests/libNetworkManagerTest_la-test-common.lo
-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 =
-src_libnm_systemd_core_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+am_src_core_libNetworkManager_la_OBJECTS =  \
+	src/core/libNetworkManager_la-nm-checkpoint.lo \
+	src/core/libNetworkManager_la-nm-checkpoint-manager.lo \
+	src/core/devices/libNetworkManager_la-nm-acd-manager.lo \
+	src/core/devices/libNetworkManager_la-nm-lldp-listener.lo \
+	src/core/devices/libNetworkManager_la-nm-device.lo \
+	src/core/devices/libNetworkManager_la-nm-device-ethernet-utils.lo \
+	src/core/devices/libNetworkManager_la-nm-device-factory.lo \
+	src/core/devices/libNetworkManager_la-nm-device-generic.lo \
+	src/core/devices/libNetworkManager_la-nm-device-6lowpan.lo \
+	src/core/devices/libNetworkManager_la-nm-device-bond.lo \
+	src/core/devices/libNetworkManager_la-nm-device-bridge.lo \
+	src/core/devices/libNetworkManager_la-nm-device-dummy.lo \
+	src/core/devices/libNetworkManager_la-nm-device-ethernet.lo \
+	src/core/devices/libNetworkManager_la-nm-device-infiniband.lo \
+	src/core/devices/libNetworkManager_la-nm-device-ip-tunnel.lo \
+	src/core/devices/libNetworkManager_la-nm-device-macsec.lo \
+	src/core/devices/libNetworkManager_la-nm-device-macvlan.lo \
+	src/core/devices/libNetworkManager_la-nm-device-ppp.lo \
+	src/core/devices/libNetworkManager_la-nm-device-tun.lo \
+	src/core/devices/libNetworkManager_la-nm-device-veth.lo \
+	src/core/devices/libNetworkManager_la-nm-device-vlan.lo \
+	src/core/devices/libNetworkManager_la-nm-device-vrf.lo \
+	src/core/devices/libNetworkManager_la-nm-device-vxlan.lo \
+	src/core/devices/libNetworkManager_la-nm-device-wireguard.lo \
+	src/core/devices/libNetworkManager_la-nm-device-wpan.lo \
+	src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo \
+	src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo \
+	src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo \
+	src/core/dhcp/libNetworkManager_la-nm-dhcp-listener.lo \
+	src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo \
+	src/core/dns/libNetworkManager_la-nm-dns-manager.lo \
+	src/core/dns/libNetworkManager_la-nm-dns-plugin.lo \
+	src/core/dns/libNetworkManager_la-nm-dns-dnsmasq.lo \
+	src/core/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo \
+	src/core/dns/libNetworkManager_la-nm-dns-unbound.lo \
+	src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo \
+	src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo \
+	src/core/ppp/libNetworkManager_la-nm-ppp-manager-call.lo \
+	src/core/libNetworkManager_la-nm-hostname-manager.lo \
+	src/core/settings/libNetworkManager_la-nm-agent-manager.lo \
+	src/core/settings/libNetworkManager_la-nm-secret-agent.lo \
+	src/core/settings/libNetworkManager_la-nm-settings-connection.lo \
+	src/core/settings/libNetworkManager_la-nm-settings-storage.lo \
+	src/core/settings/libNetworkManager_la-nm-settings-plugin.lo \
+	src/core/settings/libNetworkManager_la-nm-settings.lo \
+	src/core/settings/libNetworkManager_la-nm-settings-utils.lo \
+	src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo \
+	src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo \
+	src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo \
+	src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo \
+	src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo \
+	src/core/supplicant/libNetworkManager_la-nm-supplicant-config.lo \
+	src/core/supplicant/libNetworkManager_la-nm-supplicant-interface.lo \
+	src/core/supplicant/libNetworkManager_la-nm-supplicant-manager.lo \
+	src/core/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo \
+	src/core/vpn/libNetworkManager_la-nm-vpn-connection.lo \
+	src/core/vpn/libNetworkManager_la-nm-vpn-manager.lo \
+	src/core/libNetworkManager_la-nm-act-request.lo \
+	src/core/libNetworkManager_la-nm-active-connection.lo \
+	src/core/libNetworkManager_la-nm-audit-manager.lo \
+	src/core/libNetworkManager_la-nm-dbus-manager.lo \
+	src/core/libNetworkManager_la-nm-config.lo \
+	src/core/libNetworkManager_la-nm-config-data.lo \
+	src/core/libNetworkManager_la-nm-connectivity.lo \
+	src/core/libNetworkManager_la-nm-dcb.lo \
+	src/core/libNetworkManager_la-nm-dhcp-config.lo \
+	src/core/libNetworkManager_la-nm-dispatcher.lo \
+	src/core/libNetworkManager_la-nm-firewall-manager.lo \
+	src/core/libNetworkManager_la-nm-proxy-config.lo \
+	src/core/libNetworkManager_la-nm-auth-manager.lo \
+	src/core/libNetworkManager_la-nm-auth-utils.lo \
+	src/core/libNetworkManager_la-nm-manager.lo \
+	src/core/libNetworkManager_la-nm-pacrunner-manager.lo \
+	src/core/libNetworkManager_la-nm-policy.lo \
+	src/core/libNetworkManager_la-nm-rfkill-manager.lo \
+	src/core/libNetworkManager_la-nm-session-monitor.lo \
+	src/core/libNetworkManager_la-nm-keep-alive.lo \
+	src/core/libNetworkManager_la-nm-sleep-monitor.lo
+src_core_libNetworkManager_la_OBJECTS =  \
+	$(am_src_core_libNetworkManager_la_OBJECTS)
+src_core_libNetworkManagerBase_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__src_core_libNetworkManagerBase_la_SOURCES_DIST =  \
+	src/core/nm-core-utils.c src/core/nm-core-utils.h \
+	src/core/NetworkManagerUtils.c src/core/NetworkManagerUtils.h \
+	src/core/platform/nmp-object.c src/core/platform/nmp-object.h \
+	src/core/platform/nm-platform.c \
+	src/core/platform/nm-platform.h \
+	src/core/platform/nm-platform-private.h \
+	src/core/platform/nm-linux-platform.c \
+	src/core/platform/nm-linux-platform.h \
+	src/core/platform/nmp-rules-manager.c \
+	src/core/platform/nmp-rules-manager.h \
+	src/core/platform/wifi/nm-wifi-utils-nl80211.c \
+	src/core/platform/wifi/nm-wifi-utils-nl80211.h \
+	src/core/platform/wifi/nm-wifi-utils-private.h \
+	src/core/platform/wifi/nm-wifi-utils.c \
+	src/core/platform/wifi/nm-wifi-utils.h \
+	src/core/platform/wpan/nm-wpan-utils.c \
+	src/core/platform/wpan/nm-wpan-utils.h \
+	src/core/ndisc/nm-lndp-ndisc.c src/core/ndisc/nm-lndp-ndisc.h \
+	src/core/ndisc/nm-ndisc.c src/core/ndisc/nm-ndisc.h \
+	src/core/ndisc/nm-ndisc-private.h src/core/nm-dbus-utils.c \
+	src/core/nm-dbus-utils.h src/core/nm-dbus-object.c \
+	src/core/nm-dbus-object.h src/core/nm-netns.c \
+	src/core/nm-netns.h src/core/nm-l3-config-data.c \
+	src/core/nm-l3-config-data.h src/core/nm-l3-ipv4ll.c \
+	src/core/nm-l3-ipv4ll.h src/core/nm-l3cfg.c \
+	src/core/nm-l3cfg.h src/core/nm-ip-config.c \
+	src/core/nm-ip-config.h src/core/nm-ip4-config.c \
+	src/core/nm-ip4-config.h src/core/nm-ip6-config.c \
+	src/core/nm-ip6-config.h src/core/dhcp/nm-dhcp-client.c \
+	src/core/dhcp/nm-dhcp-client.h \
+	src/core/dhcp/nm-dhcp-client-logging.h \
+	src/core/dhcp/nm-dhcp-nettools.c src/core/dhcp/nm-dhcp-utils.c \
+	src/core/dhcp/nm-dhcp-utils.h src/core/dhcp/nm-dhcp-options.c \
+	src/core/dhcp/nm-dhcp-options.h \
+	src/core/dhcp/nm-dhcp-systemd.c \
+	src/core/dhcp/nm-dhcp-manager.c \
+	src/core/dhcp/nm-dhcp-manager.h src/core/main-utils.c \
+	src/core/main-utils.h \
+	src/core/platform/wifi/nm-wifi-utils-wext.c \
+	src/core/platform/wifi/nm-wifi-utils-wext.h
+@WITH_WEXT_TRUE@am__objects_13 = src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo
+am_src_core_libNetworkManagerBase_la_OBJECTS =  \
+	src/core/libNetworkManagerBase_la-nm-core-utils.lo \
+	src/core/libNetworkManagerBase_la-NetworkManagerUtils.lo \
+	src/core/platform/libNetworkManagerBase_la-nmp-object.lo \
+	src/core/platform/libNetworkManagerBase_la-nm-platform.lo \
+	src/core/platform/libNetworkManagerBase_la-nm-linux-platform.lo \
+	src/core/platform/libNetworkManagerBase_la-nmp-rules-manager.lo \
+	src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo \
+	src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo \
+	src/core/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo \
+	src/core/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo \
+	src/core/ndisc/libNetworkManagerBase_la-nm-ndisc.lo \
+	src/core/libNetworkManagerBase_la-nm-dbus-utils.lo \
+	src/core/libNetworkManagerBase_la-nm-dbus-object.lo \
+	src/core/libNetworkManagerBase_la-nm-netns.lo \
+	src/core/libNetworkManagerBase_la-nm-l3-config-data.lo \
+	src/core/libNetworkManagerBase_la-nm-l3-ipv4ll.lo \
+	src/core/libNetworkManagerBase_la-nm-l3cfg.lo \
+	src/core/libNetworkManagerBase_la-nm-ip-config.lo \
+	src/core/libNetworkManagerBase_la-nm-ip4-config.lo \
+	src/core/libNetworkManagerBase_la-nm-ip6-config.lo \
+	src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo \
+	src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo \
+	src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo \
+	src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo \
+	src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo \
+	src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo \
+	src/core/libNetworkManagerBase_la-main-utils.lo \
+	$(am__objects_13)
+src_core_libNetworkManagerBase_la_OBJECTS =  \
+	$(am_src_core_libNetworkManagerBase_la_OBJECTS)
+src_core_libNetworkManagerTest_la_DEPENDENCIES =  \
+	src/core/libNetworkManager.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_src_core_libNetworkManagerTest_la_OBJECTS =  \
+	src/core/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo \
+	src/core/platform/libNetworkManagerTest_la-nm-fake-platform.lo \
+	src/core/platform/tests/libNetworkManagerTest_la-test-common.lo
+src_core_libNetworkManagerTest_la_OBJECTS =  \
+	$(am_src_core_libNetworkManagerTest_la_OBJECTS)
+@ENABLE_TESTS_FALSE@am_src_core_libNetworkManagerTest_la_rpath =
+@ENABLE_TESTS_TRUE@am_src_core_libNetworkManagerTest_la_rpath =
+src_core_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 \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo \
-	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo \
-	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_libnm_systemd_core_la_OBJECTS =  \
-	$(am_src_libnm_systemd_core_la_OBJECTS)
-@WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_DEPENDENCIES =  \
+am_src_core_libnm_systemd_core_la_OBJECTS =  \
+	src/core/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo \
+	src/core/systemd/libnm_systemd_core_la-nm-sd.lo \
+	src/core/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo \
+	src/core/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo \
+	src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo \
+	src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo \
+	src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo \
+	src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo \
+	src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo
+src_core_libnm_systemd_core_la_OBJECTS =  \
+	$(am_src_core_libnm_systemd_core_la_OBJECTS)
+@WITH_PPP_TRUE@src_core_ppp_libnm_ppp_plugin_la_DEPENDENCIES =  \
 @WITH_PPP_TRUE@	$(am__DEPENDENCIES_1)
-am__src_ppp_libnm_ppp_plugin_la_SOURCES_DIST =  \
-	src/ppp/nm-pppd-plugin.h src/ppp/nm-ppp-manager.c \
-	src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-plugin-api.h \
-	src/ppp/nm-ppp-status.h
-@WITH_PPP_TRUE@am_src_ppp_libnm_ppp_plugin_la_OBJECTS =  \
-@WITH_PPP_TRUE@	src/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo
-src_ppp_libnm_ppp_plugin_la_OBJECTS =  \
-	$(am_src_ppp_libnm_ppp_plugin_la_OBJECTS)
-src_ppp_libnm_ppp_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+am__src_core_ppp_libnm_ppp_plugin_la_SOURCES_DIST =  \
+	src/core/ppp/nm-pppd-plugin.h src/core/ppp/nm-ppp-manager.c \
+	src/core/ppp/nm-ppp-manager.h src/core/ppp/nm-ppp-plugin-api.h \
+	src/core/ppp/nm-ppp-status.h
+@WITH_PPP_TRUE@am_src_core_ppp_libnm_ppp_plugin_la_OBJECTS = src/core/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo
+src_core_ppp_libnm_ppp_plugin_la_OBJECTS =  \
+	$(am_src_core_ppp_libnm_ppp_plugin_la_OBJECTS)
+src_core_ppp_libnm_ppp_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_ppp_libnm_ppp_plugin_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@WITH_PPP_TRUE@am_src_ppp_libnm_ppp_plugin_la_rpath = -rpath \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_ppp_libnm_ppp_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
+@WITH_PPP_TRUE@am_src_core_ppp_libnm_ppp_plugin_la_rpath = -rpath \
 @WITH_PPP_TRUE@	$(plugindir)
-@WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_DEPENDENCIES =  \
+@WITH_PPP_TRUE@src_core_ppp_nm_pppd_plugin_la_DEPENDENCIES =  \
 @WITH_PPP_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__src_ppp_nm_pppd_plugin_la_SOURCES_DIST = src/ppp/nm-pppd-plugin.c \
-	src/ppp/nm-pppd-plugin.h src/ppp/nm-ppp-status.h
-@WITH_PPP_TRUE@am_src_ppp_nm_pppd_plugin_la_OBJECTS =  \
-@WITH_PPP_TRUE@	src/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo
-src_ppp_nm_pppd_plugin_la_OBJECTS =  \
-	$(am_src_ppp_nm_pppd_plugin_la_OBJECTS)
-src_ppp_nm_pppd_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+am__src_core_ppp_nm_pppd_plugin_la_SOURCES_DIST =  \
+	src/core/ppp/nm-pppd-plugin.c src/core/ppp/nm-pppd-plugin.h \
+	src/core/ppp/nm-ppp-status.h
+@WITH_PPP_TRUE@am_src_core_ppp_nm_pppd_plugin_la_OBJECTS = src/core/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo
+src_core_ppp_nm_pppd_plugin_la_OBJECTS =  \
+	$(am_src_core_ppp_nm_pppd_plugin_la_OBJECTS)
+src_core_ppp_nm_pppd_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_ppp_nm_pppd_plugin_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@WITH_PPP_TRUE@am_src_ppp_nm_pppd_plugin_la_rpath = -rpath \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_ppp_nm_pppd_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
+@WITH_PPP_TRUE@am_src_core_ppp_nm_pppd_plugin_la_rpath = -rpath \
 @WITH_PPP_TRUE@	$(pppd_plugindir)
-@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-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-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 =  \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES = src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
+am__src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES_DIST =  \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS = src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo
+src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS = $(am_src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS)
+src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LINK =  \
 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS) \
+	$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_rpath =  \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_rpath =  \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	-rpath $(plugindir)
-src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_LIBADD =
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS = src/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo
-src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_rpath =
-src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_LIBADD =
-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/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 \
-	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h \
-	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-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
-src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS = $(am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_rpath =
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES = src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
+src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_LIBADD =
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS = src/core/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo
+src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS = $(nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_rpath =
+src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_LIBADD =
+am__src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST =  \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
+	src/core/settings/plugins/ifcfg-rh/shvar.c \
+	src/core/settings/plugins/ifcfg-rh/shvar.h \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
+	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS = src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo
+src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS = $(am_src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_rpath =
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES = src/core/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-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-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 =  \
+am__src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST =  \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.h
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS = src/core/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo
+src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS = $(am_src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS)
+src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LINK =  \
 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS) \
+	$(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_rpath =  \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_rpath =  \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	-rpath $(plugindir)
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_DEPENDENCIES =  \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_DEPENDENCIES =  \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(am__DEPENDENCIES_1)
-am__src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES_DIST =  \
-	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
-	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
-	src/settings/plugins/ifupdown/nms-ifupdown-parser.c \
-	src/settings/plugins/ifupdown/nms-ifupdown-parser.h
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS = src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo
-src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS = $(am_src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS)
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_settings_plugins_ifupdown_libnms_ifupdown_core_la_rpath =
+am__src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES_DIST = src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c \
+	src/core/settings/plugins/ifupdown/nms-ifupdown-parser.h
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS = src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo
+src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS = $(am_src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_rpath =
 am_clients_cli_generate_docs_nm_settings_nmcli_OBJECTS = clients/cli/generate_docs_nm_settings_nmcli-generate-docs-nm-settings-nmcli.$(OBJEXT)
 clients_cli_generate_docs_nm_settings_nmcli_OBJECTS =  \
 	$(am_clients_cli_generate_docs_nm_settings_nmcli_OBJECTS)
@@ -1544,7 +1613,8 @@ clients_cli_generate_docs_nm_settings_nmcli_DEPENDENCIES =  \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
-	libnm/libnm.la shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-base/libnm-base.la libnm/libnm.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
 	$(am__DEPENDENCIES_1)
 clients_cli_generate_docs_nm_settings_nmcli_LINK = $(LIBTOOL) \
@@ -1576,6 +1646,7 @@ clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS)
 @BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
 @BUILD_NMCLI_TRUE@	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NMCLI_TRUE@	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NMCLI_TRUE@	shared/nm-base/libnm-base.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 \
@@ -1587,31 +1658,15 @@ clients_cli_nmcli_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_CFLAGS) $(CFLAGS) $(clients_cli_nmcli_LDFLAGS) $(LDFLAGS) \
 	-o $@
 am__clients_cloud_setup_nm_cloud_setup_SOURCES_DIST =  \
-	clients/cloud-setup/main.c \
-	clients/cloud-setup/nm-cloud-setup-utils.c \
-	clients/cloud-setup/nm-cloud-setup-utils.h \
-	clients/cloud-setup/nm-http-client.c \
-	clients/cloud-setup/nm-http-client.h \
-	clients/cloud-setup/nmcs-provider.c \
-	clients/cloud-setup/nmcs-provider.h \
-	clients/cloud-setup/nmcs-provider-ec2.c \
-	clients/cloud-setup/nmcs-provider-ec2.h \
-	clients/cloud-setup/nmcs-provider-gcp.c \
-	clients/cloud-setup/nmcs-provider-gcp.h \
-	clients/cloud-setup/nmcs-provider-azure.c \
-	clients/cloud-setup/nmcs-provider-azure.h
-@BUILD_NM_CLOUD_SETUP_TRUE@am_clients_cloud_setup_nm_cloud_setup_OBJECTS = clients/cloud-setup/nm_cloud_setup-main.$(OBJEXT) \
-@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.$(OBJEXT) \
-@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm_cloud_setup-nm-http-client.$(OBJEXT) \
-@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm_cloud_setup-nmcs-provider.$(OBJEXT) \
-@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.$(OBJEXT) \
-@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.$(OBJEXT) \
-@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.$(OBJEXT)
+	clients/cloud-setup/main.c
+@BUILD_NM_CLOUD_SETUP_TRUE@am_clients_cloud_setup_nm_cloud_setup_OBJECTS = clients/cloud-setup/nm_cloud_setup-main.$(OBJEXT)
 clients_cloud_setup_nm_cloud_setup_OBJECTS =  \
 	$(am_clients_cloud_setup_nm_cloud_setup_OBJECTS)
-@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_nm_cloud_setup_DEPENDENCIES = libnm/nm-libnm-aux/libnm-libnm-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_nm_cloud_setup_DEPENDENCIES = clients/cloud-setup/libnm-cloud-setup-core.a \
+@BUILD_NM_CLOUD_SETUP_TRUE@	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-base/libnm-base.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/libcsiphash.la \
@@ -1622,6 +1677,25 @@ clients_cloud_setup_nm_cloud_setup_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(clients_cloud_setup_nm_cloud_setup_LDFLAGS) $(LDFLAGS) -o $@
+clients_cloud_setup_tests_test_cloud_setup_general_SOURCES =  \
+	clients/cloud-setup/tests/test-cloud-setup-general.c
+clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS = clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.$(OBJEXT)
+@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_tests_test_cloud_setup_general_DEPENDENCIES = clients/cloud-setup/libnm-cloud-setup-core.a \
+@BUILD_NM_CLOUD_SETUP_TRUE@	libnm/nm-libnm-aux/libnm-libnm-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-base/libnm-base.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/libcsiphash.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	libnm/libnm.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(am__DEPENDENCIES_1)
+clients_cloud_setup_tests_test_cloud_setup_general_LINK = $(LIBTOOL) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(clients_cloud_setup_tests_test_cloud_setup_general_LDFLAGS) \
+	$(LDFLAGS) -o $@
 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)
@@ -1629,6 +1703,7 @@ clients_common_tests_test_clients_common_DEPENDENCIES =  \
 	clients/common/libnmc.la clients/common/libnmc-base.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-base/libnm-base.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)
@@ -1759,6 +1834,7 @@ clients_tui_nmtui_OBJECTS = $(am_clients_tui_nmtui_OBJECTS)
 @BUILD_NMTUI_TRUE@	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 @BUILD_NMTUI_TRUE@	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NMTUI_TRUE@	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NMTUI_TRUE@	shared/nm-base/libnm-base.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 \
@@ -1872,9 +1948,9 @@ libnm_core_tests_test_compare_OBJECTS =  \
 	libnm-core/tests/test_compare-test-compare.$(OBJEXT)
 am__DEPENDENCIES_3 =  \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la $(libnm_crypto_lib) \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-base/libnm-base.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
@@ -1945,7 +2021,7 @@ 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_4 = libnm/liblibnm.la $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_4 = libnm/libnm_static.la $(am__DEPENDENCIES_1)
 libnm_tests_test_libnm_DEPENDENCIES = $(am__DEPENDENCIES_4)
 libnm_tests_test_libnm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -2007,480 +2083,527 @@ shared_nm_glib_aux_tests_test_shared_general_LINK = $(LIBTOOL) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(shared_nm_glib_aux_tests_test_shared_general_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_src_NetworkManager_OBJECTS = src/NetworkManager-main.$(OBJEXT)
-src_NetworkManager_OBJECTS = $(am_src_NetworkManager_OBJECTS)
-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) \
+shared_nm_platform_tests_test_nm_platform_SOURCES =  \
+	shared/nm-platform/tests/test-nm-platform.c
+shared_nm_platform_tests_test_nm_platform_OBJECTS = shared/nm-platform/tests/test_nm_platform-test-nm-platform.$(OBJEXT)
+shared_nm_platform_tests_test_nm_platform_DEPENDENCIES =  \
+	shared/nm-platform/libnm-platform.la \
+	shared/nm-log-core/libnm-log-core.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la shared/libcsiphash.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+shared_nm_platform_tests_test_nm_platform_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(shared_nm_platform_tests_test_nm_platform_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_src_NetworkManager_all_sym_OBJECTS =  \
-	src/NetworkManager_all_sym-main.$(OBJEXT)
-src_NetworkManager_all_sym_OBJECTS =  \
-	$(am_src_NetworkManager_all_sym_OBJECTS)
-src_NetworkManager_all_sym_DEPENDENCIES = src/libNetworkManager.la \
+am_src_core_NetworkManager_OBJECTS =  \
+	src/core/NetworkManager-main.$(OBJEXT)
+src_core_NetworkManager_OBJECTS =  \
+	$(am_src_core_NetworkManager_OBJECTS)
+src_core_NetworkManager_DEPENDENCIES = src/core/libNetworkManager.la \
 	$(am__DEPENDENCIES_1)
-src_NetworkManager_all_sym_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+src_core_NetworkManager_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_NetworkManager_all_sym_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(src_core_NetworkManager_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_devices_bluetooth_tests_nm_bt_test_SOURCES =  \
-	src/devices/bluetooth/tests/nm-bt-test.c
-src_devices_bluetooth_tests_nm_bt_test_OBJECTS =  \
-	src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.$(OBJEXT)
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_tests_nm_bt_test_DEPENDENCIES = src/devices/bluetooth/libnm-bluetooth-utils.la \
-@WITH_MODEM_MANAGER_1_TRUE@	src/libNetworkManager.la \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1)
-src_devices_bluetooth_tests_nm_bt_test_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_bluetooth_tests_nm_bt_test_LDFLAGS) $(LDFLAGS) \
-	-o $@
-src_devices_tests_test_acd_SOURCES = src/devices/tests/test-acd.c
-src_devices_tests_test_acd_OBJECTS =  \
-	src/devices/tests/test_acd-test-acd.$(OBJEXT)
-src_devices_tests_test_acd_DEPENDENCIES =  \
-	src/libNetworkManagerTest.la
-src_devices_tests_test_acd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+am_src_core_NetworkManager_all_sym_OBJECTS =  \
+	src/core/NetworkManager_all_sym-main.$(OBJEXT)
+src_core_NetworkManager_all_sym_OBJECTS =  \
+	$(am_src_core_NetworkManager_all_sym_OBJECTS)
+src_core_NetworkManager_all_sym_DEPENDENCIES =  \
+	src/core/libNetworkManager.la $(am__DEPENDENCIES_1)
+src_core_NetworkManager_all_sym_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_devices_tests_test_acd_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_NetworkManager_all_sym_LDFLAGS) $(LDFLAGS) -o $@
+src_core_devices_bluetooth_tests_nm_bt_test_SOURCES =  \
+	src/core/devices/bluetooth/tests/nm-bt-test.c
+src_core_devices_bluetooth_tests_nm_bt_test_OBJECTS = src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-test.$(OBJEXT)
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_tests_nm_bt_test_DEPENDENCIES = src/core/devices/bluetooth/libnm-bluetooth-utils.la \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/libNetworkManager.la \
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1)
+src_core_devices_bluetooth_tests_nm_bt_test_LINK = $(LIBTOOL) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_devices_bluetooth_tests_nm_bt_test_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_devices_tests_test_lldp_SOURCES = src/devices/tests/test-lldp.c
-src_devices_tests_test_lldp_OBJECTS =  \
-	src/devices/tests/test_lldp-test-lldp.$(OBJEXT)
-src_devices_tests_test_lldp_DEPENDENCIES =  \
-	src/libNetworkManagerTest.la
-src_devices_tests_test_lldp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+src_core_devices_tests_test_acd_SOURCES =  \
+	src/core/devices/tests/test-acd.c
+src_core_devices_tests_test_acd_OBJECTS =  \
+	src/core/devices/tests/test_acd-test-acd.$(OBJEXT)
+src_core_devices_tests_test_acd_DEPENDENCIES =  \
+	src/core/libNetworkManagerTest.la
+src_core_devices_tests_test_acd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_devices_tests_test_acd_LDFLAGS) $(LDFLAGS) -o $@
+src_core_devices_tests_test_lldp_SOURCES =  \
+	src/core/devices/tests/test-lldp.c
+src_core_devices_tests_test_lldp_OBJECTS =  \
+	src/core/devices/tests/test_lldp-test-lldp.$(OBJEXT)
+src_core_devices_tests_test_lldp_DEPENDENCIES =  \
+	src/core/libNetworkManagerTest.la
+src_core_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) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_devices_tests_test_lldp_LDFLAGS) $(LDFLAGS) -o $@
+am__src_core_devices_wifi_tests_test_devices_wifi_SOURCES_DIST =  \
+	src/core/devices/wifi/tests/test-devices-wifi.c
+@WITH_WIFI_TRUE@am_src_core_devices_wifi_tests_test_devices_wifi_OBJECTS = src/core/devices/wifi/tests/test_devices_wifi-test-devices-wifi.$(OBJEXT)
+src_core_devices_wifi_tests_test_devices_wifi_OBJECTS =  \
+	$(am_src_core_devices_wifi_tests_test_devices_wifi_OBJECTS)
+@WITH_WIFI_TRUE@src_core_devices_wifi_tests_test_devices_wifi_DEPENDENCIES =  \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm-wifi-base.la \
+@WITH_WIFI_TRUE@	src/core/libNetworkManagerTest.la \
+@WITH_WIFI_TRUE@	src/core/libNetworkManagerBase.la
+src_core_devices_wifi_tests_test_devices_wifi_LINK = $(LIBTOOL) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_devices_wifi_tests_test_devices_wifi_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__src_devices_wifi_tests_test_devices_wifi_SOURCES_DIST =  \
-	src/devices/wifi/tests/test-devices-wifi.c
-@WITH_WIFI_TRUE@am_src_devices_wifi_tests_test_devices_wifi_OBJECTS = src/devices/wifi/tests/test_devices_wifi-test-devices-wifi.$(OBJEXT)
-src_devices_wifi_tests_test_devices_wifi_OBJECTS =  \
-	$(am_src_devices_wifi_tests_test_devices_wifi_OBJECTS)
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_DEPENDENCIES =  \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm-wifi-base.la \
-@WITH_WIFI_TRUE@	src/libNetworkManagerTest.la \
-@WITH_WIFI_TRUE@	src/libNetworkManagerBase.la
-src_devices_wifi_tests_test_devices_wifi_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_wifi_tests_test_devices_wifi_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am__src_devices_wwan_tests_test_service_providers_SOURCES_DIST =  \
-	src/devices/wwan/tests/test-service-providers.c \
-	src/devices/wwan/nm-service-providers.c \
-	src/devices/wwan/nm-service-providers.h
-@WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_tests_test_service_providers_OBJECTS = src/devices/wwan/tests/test_service_providers-test-service-providers.$(OBJEXT) \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/tests_test_service_providers-nm-service-providers.$(OBJEXT)
-src_devices_wwan_tests_test_service_providers_OBJECTS =  \
-	$(am_src_devices_wwan_tests_test_service_providers_OBJECTS)
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_tests_test_service_providers_DEPENDENCIES =  \
-@WITH_MODEM_MANAGER_1_TRUE@	src/libNetworkManagerTest.la \
+am__src_core_devices_wwan_tests_test_service_providers_SOURCES_DIST =  \
+	src/core/devices/wwan/tests/test-service-providers.c \
+	src/core/devices/wwan/nm-service-providers.c \
+	src/core/devices/wwan/nm-service-providers.h
+@WITH_MODEM_MANAGER_1_TRUE@am_src_core_devices_wwan_tests_test_service_providers_OBJECTS = src/core/devices/wwan/tests/test_service_providers-test-service-providers.$(OBJEXT) \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/tests_test_service_providers-nm-service-providers.$(OBJEXT)
+src_core_devices_wwan_tests_test_service_providers_OBJECTS = $(am_src_core_devices_wwan_tests_test_service_providers_OBJECTS)
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_tests_test_service_providers_DEPENDENCIES =  \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/libNetworkManagerTest.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(am__DEPENDENCIES_1)
-src_devices_wwan_tests_test_service_providers_LINK = $(LIBTOOL) \
+src_core_devices_wwan_tests_test_service_providers_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_devices_wwan_tests_test_service_providers_LDFLAGS) \
+	$(src_core_devices_wwan_tests_test_service_providers_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 =  \
-	$(am_src_dhcp_nm_dhcp_helper_OBJECTS)
-src_dhcp_nm_dhcp_helper_DEPENDENCIES = $(am__DEPENDENCIES_1)
-src_dhcp_nm_dhcp_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+am_src_core_dhcp_nm_dhcp_helper_OBJECTS =  \
+	src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT)
+src_core_dhcp_nm_dhcp_helper_OBJECTS =  \
+	$(am_src_core_dhcp_nm_dhcp_helper_OBJECTS)
+src_core_dhcp_nm_dhcp_helper_DEPENDENCIES = $(am__DEPENDENCIES_1)
+src_core_dhcp_nm_dhcp_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_dhcp_nm_dhcp_helper_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(src_core_dhcp_nm_dhcp_helper_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_dhcp_tests_test_dhcp_dhclient_SOURCES =  \
-	src/dhcp/tests/test-dhcp-dhclient.c
-src_dhcp_tests_test_dhcp_dhclient_OBJECTS = src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT)
-src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES =  \
-	$(src_dhcp_tests_ldadd)
-src_dhcp_tests_test_dhcp_dhclient_LINK = $(LIBTOOL) $(AM_V_lt) \
+src_core_dhcp_tests_test_dhcp_dhclient_SOURCES =  \
+	src/core/dhcp/tests/test-dhcp-dhclient.c
+src_core_dhcp_tests_test_dhcp_dhclient_OBJECTS = src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT)
+src_core_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES =  \
+	$(src_core_dhcp_tests_ldadd)
+src_core_dhcp_tests_test_dhcp_dhclient_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_dhcp_tests_test_dhcp_dhclient_LDFLAGS) $(LDFLAGS) -o $@
-src_dhcp_tests_test_dhcp_utils_SOURCES =  \
-	src/dhcp/tests/test-dhcp-utils.c
-src_dhcp_tests_test_dhcp_utils_OBJECTS =  \
-	src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.$(OBJEXT)
-src_dhcp_tests_test_dhcp_utils_DEPENDENCIES = $(src_dhcp_tests_ldadd)
-src_dhcp_tests_test_dhcp_utils_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(src_dhcp_tests_test_dhcp_utils_LDFLAGS) $(LDFLAGS) -o $@
-src_dnsmasq_tests_test_dnsmasq_utils_SOURCES =  \
-	src/dnsmasq/tests/test-dnsmasq-utils.c
-src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS = src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.$(OBJEXT)
-src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES =  \
-	src/libNetworkManagerTest.la
-src_dnsmasq_tests_test_dnsmasq_utils_LINK = $(LIBTOOL) $(AM_V_lt) \
+	$(src_core_dhcp_tests_test_dhcp_dhclient_LDFLAGS) $(LDFLAGS) \
+	-o $@
+src_core_dhcp_tests_test_dhcp_utils_SOURCES =  \
+	src/core/dhcp/tests/test-dhcp-utils.c
+src_core_dhcp_tests_test_dhcp_utils_OBJECTS =  \
+	src/core/dhcp/tests/test_dhcp_utils-test-dhcp-utils.$(OBJEXT)
+src_core_dhcp_tests_test_dhcp_utils_DEPENDENCIES =  \
+	$(src_core_dhcp_tests_ldadd)
+src_core_dhcp_tests_test_dhcp_utils_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS) $(LDFLAGS) -o \
+	$(src_core_dhcp_tests_test_dhcp_utils_LDFLAGS) $(LDFLAGS) -o \
 	$@
-am_src_initrd_nm_initrd_generator_OBJECTS =  \
-	src/initrd/nm_initrd_generator-nm-initrd-generator.$(OBJEXT)
-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 \
+src_core_dnsmasq_tests_test_dnsmasq_utils_SOURCES =  \
+	src/core/dnsmasq/tests/test-dnsmasq-utils.c
+src_core_dnsmasq_tests_test_dnsmasq_utils_OBJECTS = src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.$(OBJEXT)
+src_core_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES =  \
+	src/core/libNetworkManagerTest.la
+src_core_dnsmasq_tests_test_dnsmasq_utils_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_src_core_initrd_nm_initrd_generator_OBJECTS = src/core/initrd/nm_initrd_generator-nm-initrd-generator.$(OBJEXT)
+src_core_initrd_nm_initrd_generator_OBJECTS =  \
+	$(am_src_core_initrd_nm_initrd_generator_OBJECTS)
+src_core_initrd_nm_initrd_generator_DEPENDENCIES =  \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerBase.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la $(libnm_crypto_lib) \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-platform/libnm-platform.la \
+	shared/nm-base/libnm-base.la \
+	shared/nm-log-core/libnm-log-core.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 $(am__DEPENDENCIES_1)
-src_initrd_nm_initrd_generator_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(src_initrd_nm_initrd_generator_LDFLAGS) $(LDFLAGS) -o $@
-src_initrd_tests_test_cmdline_reader_SOURCES =  \
-	src/initrd/tests/test-cmdline-reader.c
-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/libcsiphash.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+src_core_initrd_nm_initrd_generator_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_initrd_nm_initrd_generator_LDFLAGS) $(LDFLAGS) -o \
+	$@
+src_core_initrd_tests_test_cmdline_reader_SOURCES =  \
+	src/core/initrd/tests/test-cmdline-reader.c
+src_core_initrd_tests_test_cmdline_reader_OBJECTS = src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.$(OBJEXT)
+src_core_initrd_tests_test_cmdline_reader_DEPENDENCIES =  \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerTest.la \
 	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) \
+src_core_initrd_tests_test_cmdline_reader_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_initrd_tests_test_cmdline_reader_LDFLAGS) $(LDFLAGS) -o \
-	$@
-src_initrd_tests_test_dt_reader_SOURCES =  \
-	src/initrd/tests/test-dt-reader.c
-src_initrd_tests_test_dt_reader_OBJECTS =  \
-	src/initrd/tests/test_dt_reader-test-dt-reader.$(OBJEXT)
-src_initrd_tests_test_dt_reader_DEPENDENCIES =  \
-	src/initrd/libnmi-core.la src/libNetworkManagerTest.la \
+	$(src_core_initrd_tests_test_cmdline_reader_LDFLAGS) \
+	$(LDFLAGS) -o $@
+src_core_initrd_tests_test_dt_reader_SOURCES =  \
+	src/core/initrd/tests/test-dt-reader.c
+src_core_initrd_tests_test_dt_reader_OBJECTS =  \
+	src/core/initrd/tests/test_dt_reader-test-dt-reader.$(OBJEXT)
+src_core_initrd_tests_test_dt_reader_DEPENDENCIES =  \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerTest.la \
 	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_dt_reader_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(src_initrd_tests_test_dt_reader_LDFLAGS) $(LDFLAGS) -o $@
-src_initrd_tests_test_ibft_reader_SOURCES =  \
-	src/initrd/tests/test-ibft-reader.c
-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 \
+src_core_initrd_tests_test_dt_reader_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_initrd_tests_test_dt_reader_LDFLAGS) $(LDFLAGS) -o \
+	$@
+src_core_initrd_tests_test_ibft_reader_SOURCES =  \
+	src/core/initrd/tests/test-ibft-reader.c
+src_core_initrd_tests_test_ibft_reader_OBJECTS = src/core/initrd/tests/test_ibft_reader-test-ibft-reader.$(OBJEXT)
+src_core_initrd_tests_test_ibft_reader_DEPENDENCIES =  \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerTest.la \
 	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) \
+src_core_initrd_tests_test_ibft_reader_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_initrd_tests_test_ibft_reader_LDFLAGS) $(LDFLAGS) -o $@
-src_ndisc_tests_test_ndisc_fake_SOURCES =  \
-	src/ndisc/tests/test-ndisc-fake.c
-src_ndisc_tests_test_ndisc_fake_OBJECTS =  \
-	src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.$(OBJEXT)
-am__DEPENDENCIES_5 = src/libNetworkManagerTest.la \
+	$(src_core_initrd_tests_test_ibft_reader_LDFLAGS) $(LDFLAGS) \
+	-o $@
+src_core_ndisc_tests_test_ndisc_fake_SOURCES =  \
+	src/core/ndisc/tests/test-ndisc-fake.c
+src_core_ndisc_tests_test_ndisc_fake_OBJECTS = src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.$(OBJEXT)
+am__DEPENDENCIES_5 = src/core/libNetworkManagerTest.la \
 	$(am__DEPENDENCIES_1)
-src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_5)
-src_ndisc_tests_test_ndisc_fake_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(src_ndisc_tests_test_ndisc_fake_LDFLAGS) $(LDFLAGS) -o $@
-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_5)
-src_ndisc_tests_test_ndisc_linux_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(src_ndisc_tests_test_ndisc_linux_LDFLAGS) $(LDFLAGS) -o $@
-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_core_ndisc_tests_test_ndisc_fake_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_5)
+src_core_ndisc_tests_test_ndisc_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_ndisc_tests_test_ndisc_fake_LDFLAGS) $(LDFLAGS) -o \
+	$@
+src_core_ndisc_tests_test_ndisc_linux_SOURCES =  \
+	src/core/ndisc/tests/test-ndisc-linux.c
+src_core_ndisc_tests_test_ndisc_linux_OBJECTS = src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.$(OBJEXT)
+src_core_ndisc_tests_test_ndisc_linux_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_5)
+src_core_ndisc_tests_test_ndisc_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_ndisc_tests_test_ndisc_linux_LDFLAGS) $(LDFLAGS) -o \
+	$@
+am_src_core_nm_iface_helper_OBJECTS =  \
+	src/core/nm_iface_helper-nm-iface-helper.$(OBJEXT)
+src_core_nm_iface_helper_OBJECTS =  \
+	$(am_src_core_nm_iface_helper_OBJECTS)
+src_core_nm_iface_helper_DEPENDENCIES =  \
+	src/core/libNetworkManagerBase.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la $(libnm_crypto_lib) \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-platform/libnm-platform.la \
+	shared/nm-base/libnm-base.la \
+	shared/nm-log-core/libnm-log-core.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/nm-std-aux/libnm-std-aux.la \
+	src/core/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)
-src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+src_core_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_nm_iface_helper_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(src_core_nm_iface_helper_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_platform_tests_monitor_SOURCES = src/platform/tests/monitor.c
-src_platform_tests_monitor_OBJECTS =  \
-	src/platform/tests/monitor-monitor.$(OBJEXT)
-am__DEPENDENCIES_6 = src/libNetworkManagerTest.la \
+src_core_platform_tests_monitor_SOURCES =  \
+	src/core/platform/tests/monitor.c
+src_core_platform_tests_monitor_OBJECTS =  \
+	src/core/platform/tests/monitor-monitor.$(OBJEXT)
+am__DEPENDENCIES_6 = src/core/libNetworkManagerTest.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_6)
-src_platform_tests_monitor_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+src_core_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_6)
+src_core_platform_tests_monitor_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_platform_tests_monitor_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_src_platform_tests_test_address_fake_OBJECTS =  \
-	src/platform/tests/test_address_fake-test-address.$(OBJEXT)
-src_platform_tests_test_address_fake_OBJECTS =  \
-	$(am_src_platform_tests_test_address_fake_OBJECTS)
-src_platform_tests_test_address_fake_DEPENDENCIES =  \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_platform_tests_monitor_LDFLAGS) $(LDFLAGS) -o $@
+am_src_core_platform_tests_test_address_fake_OBJECTS = src/core/platform/tests/test_address_fake-test-address.$(OBJEXT)
+src_core_platform_tests_test_address_fake_OBJECTS =  \
+	$(am_src_core_platform_tests_test_address_fake_OBJECTS)
+src_core_platform_tests_test_address_fake_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_6)
-src_platform_tests_test_address_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
+src_core_platform_tests_test_address_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_platform_tests_test_address_fake_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_src_platform_tests_test_address_linux_OBJECTS =  \
-	src/platform/tests/test_address_linux-test-address.$(OBJEXT)
-src_platform_tests_test_address_linux_OBJECTS =  \
-	$(am_src_platform_tests_test_address_linux_OBJECTS)
-src_platform_tests_test_address_linux_DEPENDENCIES =  \
+	$(src_core_platform_tests_test_address_fake_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_src_core_platform_tests_test_address_linux_OBJECTS = src/core/platform/tests/test_address_linux-test-address.$(OBJEXT)
+src_core_platform_tests_test_address_linux_OBJECTS =  \
+	$(am_src_core_platform_tests_test_address_linux_OBJECTS)
+src_core_platform_tests_test_address_linux_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_6)
-src_platform_tests_test_address_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_platform_tests_test_address_linux_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_src_platform_tests_test_cleanup_fake_OBJECTS =  \
-	src/platform/tests/test_cleanup_fake-test-cleanup.$(OBJEXT)
-src_platform_tests_test_cleanup_fake_OBJECTS =  \
-	$(am_src_platform_tests_test_cleanup_fake_OBJECTS)
-src_platform_tests_test_cleanup_fake_DEPENDENCIES =  \
+src_core_platform_tests_test_address_linux_LINK = $(LIBTOOL) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_platform_tests_test_address_linux_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_src_core_platform_tests_test_cleanup_fake_OBJECTS = src/core/platform/tests/test_cleanup_fake-test-cleanup.$(OBJEXT)
+src_core_platform_tests_test_cleanup_fake_OBJECTS =  \
+	$(am_src_core_platform_tests_test_cleanup_fake_OBJECTS)
+src_core_platform_tests_test_cleanup_fake_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_6)
-src_platform_tests_test_cleanup_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
+src_core_platform_tests_test_cleanup_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_platform_tests_test_cleanup_fake_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_src_platform_tests_test_cleanup_linux_OBJECTS =  \
-	src/platform/tests/test_cleanup_linux-test-cleanup.$(OBJEXT)
-src_platform_tests_test_cleanup_linux_OBJECTS =  \
-	$(am_src_platform_tests_test_cleanup_linux_OBJECTS)
-src_platform_tests_test_cleanup_linux_DEPENDENCIES =  \
+	$(src_core_platform_tests_test_cleanup_fake_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_src_core_platform_tests_test_cleanup_linux_OBJECTS = src/core/platform/tests/test_cleanup_linux-test-cleanup.$(OBJEXT)
+src_core_platform_tests_test_cleanup_linux_OBJECTS =  \
+	$(am_src_core_platform_tests_test_cleanup_linux_OBJECTS)
+src_core_platform_tests_test_cleanup_linux_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_6)
+src_core_platform_tests_test_cleanup_linux_LINK = $(LIBTOOL) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_platform_tests_test_cleanup_linux_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_src_core_platform_tests_test_link_fake_OBJECTS =  \
+	src/core/platform/tests/test_link_fake-test-link.$(OBJEXT)
+src_core_platform_tests_test_link_fake_OBJECTS =  \
+	$(am_src_core_platform_tests_test_link_fake_OBJECTS)
+src_core_platform_tests_test_link_fake_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_6)
-src_platform_tests_test_cleanup_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
+src_core_platform_tests_test_link_fake_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 \
-	$@
-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 =  \
+	$(src_core_platform_tests_test_link_fake_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_src_core_platform_tests_test_link_linux_OBJECTS =  \
+	src/core/platform/tests/test_link_linux-test-link.$(OBJEXT)
+src_core_platform_tests_test_link_linux_OBJECTS =  \
+	$(am_src_core_platform_tests_test_link_linux_OBJECTS)
+src_core_platform_tests_test_link_linux_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_6)
-src_platform_tests_test_link_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
+src_core_platform_tests_test_link_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_platform_tests_test_link_fake_LDFLAGS) $(LDFLAGS) -o $@
-am_src_platform_tests_test_link_linux_OBJECTS =  \
-	src/platform/tests/test_link_linux-test-link.$(OBJEXT)
-src_platform_tests_test_link_linux_OBJECTS =  \
-	$(am_src_platform_tests_test_link_linux_OBJECTS)
-src_platform_tests_test_link_linux_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_6)
-src_platform_tests_test_link_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
+	$(src_core_platform_tests_test_link_linux_LDFLAGS) $(LDFLAGS) \
+	-o $@
+src_core_platform_tests_test_nmp_object_SOURCES =  \
+	src/core/platform/tests/test-nmp-object.c
+src_core_platform_tests_test_nmp_object_OBJECTS = src/core/platform/tests/test_nmp_object-test-nmp-object.$(OBJEXT)
+src_core_platform_tests_test_nmp_object_DEPENDENCIES =  \
+	src/core/libNetworkManagerTest.la
+src_core_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_link_linux_LDFLAGS) $(LDFLAGS) -o $@
-src_platform_tests_test_nmp_object_SOURCES =  \
-	src/platform/tests/test-nmp-object.c
-src_platform_tests_test_nmp_object_OBJECTS =  \
-	src/platform/tests/test_nmp_object-test-nmp-object.$(OBJEXT)
-src_platform_tests_test_nmp_object_DEPENDENCIES =  \
-	src/libNetworkManagerTest.la
-src_platform_tests_test_nmp_object_LINK = $(LIBTOOL) $(AM_V_lt) \
+	$(src_core_platform_tests_test_nmp_object_LDFLAGS) $(LDFLAGS) \
+	-o $@
+src_core_platform_tests_test_platform_general_SOURCES =  \
+	src/core/platform/tests/test-platform-general.c
+src_core_platform_tests_test_platform_general_OBJECTS = src/core/platform/tests/test_platform_general-test-platform-general.$(OBJEXT)
+src_core_platform_tests_test_platform_general_DEPENDENCIES =  \
+	src/core/libNetworkManagerTest.la
+src_core_platform_tests_test_platform_general_LINK = $(LIBTOOL) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_platform_tests_test_platform_general_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_src_core_platform_tests_test_route_fake_OBJECTS =  \
+	src/core/platform/tests/test_route_fake-test-route.$(OBJEXT)
+src_core_platform_tests_test_route_fake_OBJECTS =  \
+	$(am_src_core_platform_tests_test_route_fake_OBJECTS)
+src_core_platform_tests_test_route_fake_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_6)
+src_core_platform_tests_test_route_fake_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) \
+	$(src_core_platform_tests_test_route_fake_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_src_core_platform_tests_test_route_linux_OBJECTS =  \
+	src/core/platform/tests/test_route_linux-test-route.$(OBJEXT)
+src_core_platform_tests_test_route_linux_OBJECTS =  \
+	$(am_src_core_platform_tests_test_route_linux_OBJECTS)
+src_core_platform_tests_test_route_linux_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_6)
+src_core_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_platform_general_LDFLAGS) $(LDFLAGS) \
+	$(src_core_platform_tests_test_route_linux_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_src_core_platform_tests_test_tc_fake_OBJECTS =  \
+	src/core/platform/tests/test_tc_fake-test-tc.$(OBJEXT)
+src_core_platform_tests_test_tc_fake_OBJECTS =  \
+	$(am_src_core_platform_tests_test_tc_fake_OBJECTS)
+src_core_platform_tests_test_tc_fake_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_6)
-src_platform_tests_test_route_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
+src_core_platform_tests_test_tc_fake_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_platform_tests_test_route_fake_LDFLAGS) $(LDFLAGS) -o $@
-am_src_platform_tests_test_route_linux_OBJECTS =  \
-	src/platform/tests/test_route_linux-test-route.$(OBJEXT)
-src_platform_tests_test_route_linux_OBJECTS =  \
-	$(am_src_platform_tests_test_route_linux_OBJECTS)
-src_platform_tests_test_route_linux_DEPENDENCIES =  \
+	$(src_core_platform_tests_test_tc_fake_LDFLAGS) $(LDFLAGS) -o \
+	$@
+am_src_core_platform_tests_test_tc_linux_OBJECTS =  \
+	src/core/platform/tests/test_tc_linux-test-tc.$(OBJEXT)
+src_core_platform_tests_test_tc_linux_OBJECTS =  \
+	$(am_src_core_platform_tests_test_tc_linux_OBJECTS)
+src_core_platform_tests_test_tc_linux_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_6)
-src_platform_tests_test_route_linux_LINK = $(LIBTOOL) $(AM_V_lt) \
+src_core_platform_tests_test_tc_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_core_platform_tests_test_tc_linux_LDFLAGS) $(LDFLAGS) -o \
 	$@
-am_src_platform_tests_test_tc_fake_OBJECTS =  \
-	src/platform/tests/test_tc_fake-test-tc.$(OBJEXT)
-src_platform_tests_test_tc_fake_OBJECTS =  \
-	$(am_src_platform_tests_test_tc_fake_OBJECTS)
-src_platform_tests_test_tc_fake_DEPENDENCIES = $(am__DEPENDENCIES_6)
-src_platform_tests_test_tc_fake_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(src_platform_tests_test_tc_fake_LDFLAGS) $(LDFLAGS) -o $@
-am_src_platform_tests_test_tc_linux_OBJECTS =  \
-	src/platform/tests/test_tc_linux-test-tc.$(OBJEXT)
-src_platform_tests_test_tc_linux_OBJECTS =  \
-	$(am_src_platform_tests_test_tc_linux_OBJECTS)
-src_platform_tests_test_tc_linux_DEPENDENCIES = $(am__DEPENDENCIES_6)
-src_platform_tests_test_tc_linux_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) \
-	$(src_platform_tests_test_tc_linux_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)
-src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS = $(am_src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES = src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/libNetworkManagerTest.la
-src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LINK = $(LIBTOOL) \
-	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS) \
+am__src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES_DIST =  \
+	src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS = src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.$(OBJEXT)
+src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS = $(am_src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES = src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/libNetworkManagerTest.la
+src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LINK =  \
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_settings_plugins_ifupdown_tests_test_ifupdown_SOURCES =  \
-	src/settings/plugins/ifupdown/tests/test-ifupdown.c
-src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS = src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.$(OBJEXT)
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_DEPENDENCIES = src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/libNetworkManagerTest.la \
+src_core_settings_plugins_ifupdown_tests_test_ifupdown_SOURCES =  \
+	src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
+src_core_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS = src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.$(OBJEXT)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_core_settings_plugins_ifupdown_tests_test_ifupdown_DEPENDENCIES = src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/libNetworkManagerTest.la \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(am__DEPENDENCIES_1)
-src_settings_plugins_ifupdown_tests_test_ifupdown_LINK = $(LIBTOOL) \
-	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS) \
+src_core_settings_plugins_ifupdown_tests_test_ifupdown_LINK =  \
+	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS) \
 	$(LDFLAGS) -o $@
-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_settings_LINK =  \
+src_core_settings_plugins_keyfile_tests_test_keyfile_settings_SOURCES = src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
+src_core_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS = src/core/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.$(OBJEXT)
+src_core_settings_plugins_keyfile_tests_test_keyfile_settings_DEPENDENCIES =  \
+	src/core/libNetworkManagerTest.la
+src_core_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) \
+	$(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_supplicant_tests_test_supplicant_config_SOURCES =  \
-	src/supplicant/tests/test-supplicant-config.c
-src_supplicant_tests_test_supplicant_config_OBJECTS = src/supplicant/tests/test_supplicant_config-test-supplicant-config.$(OBJEXT)
-src_supplicant_tests_test_supplicant_config_DEPENDENCIES =  \
-	src/libNetworkManagerTest.la
-src_supplicant_tests_test_supplicant_config_LINK = $(LIBTOOL) \
+src_core_supplicant_tests_test_supplicant_config_SOURCES =  \
+	src/core/supplicant/tests/test-supplicant-config.c
+src_core_supplicant_tests_test_supplicant_config_OBJECTS = src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.$(OBJEXT)
+src_core_supplicant_tests_test_supplicant_config_DEPENDENCIES =  \
+	src/core/libNetworkManagerTest.la
+src_core_supplicant_tests_test_supplicant_config_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_supplicant_tests_test_supplicant_config_LDFLAGS) \
+	$(src_core_supplicant_tests_test_supplicant_config_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_src_tests_config_test_config_OBJECTS =  \
-	src/tests/config/test_config-nm-test-device.$(OBJEXT) \
-	src/tests/config/test_config-test-config.$(OBJEXT)
-src_tests_config_test_config_OBJECTS =  \
-	$(am_src_tests_config_test_config_OBJECTS)
-src_tests_config_test_config_DEPENDENCIES =  \
-	src/libNetworkManagerTest.la
-src_tests_config_test_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+am_src_core_tests_config_test_config_OBJECTS =  \
+	src/core/tests/config/test_config-nm-test-device.$(OBJEXT) \
+	src/core/tests/config/test_config-test-config.$(OBJEXT)
+src_core_tests_config_test_config_OBJECTS =  \
+	$(am_src_core_tests_config_test_config_OBJECTS)
+src_core_tests_config_test_config_DEPENDENCIES =  \
+	src/core/libNetworkManagerTest.la
+src_core_tests_config_test_config_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_tests_config_test_config_LDFLAGS) $(LDFLAGS) -o $@
+src_core_tests_test_core_SOURCES = src/core/tests/test-core.c
+src_core_tests_test_core_OBJECTS =  \
+	src/core/tests/test_core-test-core.$(OBJEXT)
+src_core_tests_test_core_DEPENDENCIES = $(src_core_tests_ldadd)
+src_core_tests_test_core_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_tests_config_test_config_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(src_core_tests_test_core_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 \
+src_core_tests_test_core_with_expect_SOURCES =  \
+	src/core/tests/test-core-with-expect.c
+src_core_tests_test_core_with_expect_OBJECTS = src/core/tests/test_core_with_expect-test-core-with-expect.$(OBJEXT)
+src_core_tests_test_core_with_expect_DEPENDENCIES =  \
+	$(src_core_tests_ldadd)
+src_core_tests_test_core_with_expect_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_tests_test_core_with_expect_LDFLAGS) $(LDFLAGS) -o \
+	$@
+src_core_tests_test_dcb_SOURCES = src/core/tests/test-dcb.c
+src_core_tests_test_dcb_OBJECTS =  \
+	src/core/tests/test_dcb-test-dcb.$(OBJEXT)
+src_core_tests_test_dcb_DEPENDENCIES = $(src_core_tests_ldadd)
+src_core_tests_test_dcb_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_core_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(src_core_tests_test_dcb_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 \
+src_core_tests_test_ip4_config_SOURCES =  \
+	src/core/tests/test-ip4-config.c
+src_core_tests_test_ip4_config_OBJECTS =  \
+	src/core/tests/test_ip4_config-test-ip4-config.$(OBJEXT)
+src_core_tests_test_ip4_config_DEPENDENCIES = $(src_core_tests_ldadd)
+src_core_tests_test_ip4_config_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)
-src_tests_test_dcb_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(src_core_tests_test_ip4_config_LDFLAGS) $(LDFLAGS) -o $@
+src_core_tests_test_ip6_config_SOURCES =  \
+	src/core/tests/test-ip6-config.c
+src_core_tests_test_ip6_config_OBJECTS =  \
+	src/core/tests/test_ip6_config-test-ip6-config.$(OBJEXT)
+src_core_tests_test_ip6_config_DEPENDENCIES = $(src_core_tests_ldadd)
+src_core_tests_test_ip6_config_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_ip4_config_SOURCES = src/tests/test-ip4-config.c
-src_tests_test_ip4_config_OBJECTS =  \
-	src/tests/test_ip4_config-test-ip4-config.$(OBJEXT)
-src_tests_test_ip4_config_DEPENDENCIES = $(src_tests_ldadd)
-src_tests_test_ip4_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_ip4_config_LDFLAGS) \
-	$(LDFLAGS) -o $@
-src_tests_test_ip6_config_SOURCES = src/tests/test-ip6-config.c
-src_tests_test_ip6_config_OBJECTS =  \
-	src/tests/test_ip6_config-test-ip6-config.$(OBJEXT)
-src_tests_test_ip6_config_DEPENDENCIES = $(src_tests_ldadd)
-src_tests_test_ip6_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_ip6_config_LDFLAGS) \
-	$(LDFLAGS) -o $@
-src_tests_test_l3cfg_SOURCES = src/tests/test-l3cfg.c
-src_tests_test_l3cfg_OBJECTS =  \
-	src/tests/test_l3cfg-test-l3cfg.$(OBJEXT)
-src_tests_test_l3cfg_DEPENDENCIES = $(src_tests_ldadd)
-src_tests_test_l3cfg_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_tests_test_ip6_config_LDFLAGS) $(LDFLAGS) -o $@
+src_core_tests_test_l3cfg_SOURCES = src/core/tests/test-l3cfg.c
+src_core_tests_test_l3cfg_OBJECTS =  \
+	src/core/tests/test_l3cfg-test-l3cfg.$(OBJEXT)
+src_core_tests_test_l3cfg_DEPENDENCIES = $(src_core_tests_ldadd)
+src_core_tests_test_l3cfg_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_l3cfg_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(src_core_tests_test_l3cfg_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_tests_test_systemd_SOURCES = src/tests/test-systemd.c
-src_tests_test_systemd_OBJECTS =  \
-	src/tests/test_systemd-test-systemd.$(OBJEXT)
-src_tests_test_systemd_DEPENDENCIES = src/libnm-systemd-core.la \
+src_core_tests_test_systemd_SOURCES = src/core/tests/test-systemd.c
+src_core_tests_test_systemd_OBJECTS =  \
+	src/core/tests/test_systemd-test-systemd.$(OBJEXT)
+src_core_tests_test_systemd_DEPENDENCIES =  \
+	src/core/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la shared/libcsiphash.la \
 	$(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) \
-	$(LDFLAGS) -o $@
-src_tests_test_utils_SOURCES = src/tests/test-utils.c
-src_tests_test_utils_OBJECTS =  \
-	src/tests/test_utils-test-utils.$(OBJEXT)
-src_tests_test_utils_DEPENDENCIES = $(src_tests_ldadd)
-src_tests_test_utils_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+src_core_tests_test_systemd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_utils_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(src_core_tests_test_systemd_LDFLAGS) \
 	$(LDFLAGS) -o $@
-src_tests_test_wired_defname_SOURCES = src/tests/test-wired-defname.c
-src_tests_test_wired_defname_OBJECTS =  \
-	src/tests/test_wired_defname-test-wired-defname.$(OBJEXT)
-src_tests_test_wired_defname_DEPENDENCIES = $(src_tests_ldadd)
-src_tests_test_wired_defname_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+src_core_tests_test_utils_SOURCES = src/core/tests/test-utils.c
+src_core_tests_test_utils_OBJECTS =  \
+	src/core/tests/test_utils-test-utils.$(OBJEXT)
+src_core_tests_test_utils_DEPENDENCIES = $(src_core_tests_ldadd)
+src_core_tests_test_utils_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_wired_defname_LDFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS) $(src_core_tests_test_utils_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__dist_libexec_SCRIPTS_DIST = src/settings/plugins/ifcfg-rh/nm-ifup \
-	src/settings/plugins/ifcfg-rh/nm-ifdown
+src_core_tests_test_wired_defname_SOURCES =  \
+	src/core/tests/test-wired-defname.c
+src_core_tests_test_wired_defname_OBJECTS = src/core/tests/test_wired_defname-test-wired-defname.$(OBJEXT)
+src_core_tests_test_wired_defname_DEPENDENCIES =  \
+	$(src_core_tests_ldadd)
+src_core_tests_test_wired_defname_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_core_tests_test_wired_defname_LDFLAGS) $(LDFLAGS) -o $@
+am__dist_libexec_SCRIPTS_DIST =  \
+	src/core/settings/plugins/ifcfg-rh/nm-ifup \
+	src/core/settings/plugins/ifcfg-rh/nm-ifdown
 SCRIPTS = $(dist_libexec_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -2508,18 +2631,20 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	clients/cli/$(DEPDIR)/nmcli-polkit-agent.Po \
 	clients/cli/$(DEPDIR)/nmcli-settings.Po \
 	clients/cli/$(DEPDIR)/nmcli-utils.Po \
+	clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-cloud-setup-utils.Po \
+	clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-http-client.Po \
+	clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-azure.Po \
+	clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-ec2.Po \
+	clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-gcp.Po \
+	clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider.Po \
 	clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-main.Po \
-	clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-cloud-setup-utils.Po \
-	clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Po \
-	clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-azure.Po \
-	clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Po \
-	clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-gcp.Po \
-	clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Po \
+	clients/cloud-setup/tests/$(DEPDIR)/test_cloud_setup_general-test-cloud-setup-general.Po \
 	clients/common/$(DEPDIR)/libnmc_base_la-nm-client-utils.Plo \
 	clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Plo \
 	clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Plo \
 	clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo \
 	clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo \
+	clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-base-impl.Plo \
 	clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Plo \
 	clients/common/tests/$(DEPDIR)/test_clients_common-test-clients-common.Po \
 	clients/common/tests/$(DEPDIR)/test_libnm_core_aux-test-libnm-core-aux.Po \
@@ -2652,6 +2777,9 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Plo \
+	libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo \
+	libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo \
+	libnm-core/$(DEPDIR)/libnm_core_la-nm-meta-setting-base-impl.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Plo \
@@ -2667,6 +2795,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ethtool.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-generic.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-gsm.Plo \
+	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-hostname.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-config.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-tunnel.Plo \
@@ -2678,6 +2807,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	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-external-ids.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 \
@@ -2691,6 +2821,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tun.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Plo \
+	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-veth.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Plo \
@@ -2710,11 +2841,8 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	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/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Plo \
-	libnm-core/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Plo \
 	libnm-core/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo \
 	libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Plo \
-	libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo \
 	libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo \
 	libnm-core/tests/$(DEPDIR)/test_compare-test-compare.Po \
 	libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Po \
@@ -2724,65 +2852,64 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm-core/tests/$(DEPDIR)/test_secrets-test-secrets.Po \
 	libnm-core/tests/$(DEPDIR)/test_setting-test-setting.Po \
 	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-vrf.Plo \
-	libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo \
-	libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo \
-	libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo \
-	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-enum-types.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-object.Plo \
-	libnm/$(DEPDIR)/liblibnm_la-nm-remote-connection.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_static_la-nm-access-point.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-active-connection.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-checkpoint.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-client.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-dbus-helpers.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-6lowpan.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-adsl.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-bond.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-bridge.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-bt.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-dummy.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-ethernet.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-generic.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-infiniband.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-ip-tunnel.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-macsec.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-macvlan.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-modem.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-olpc-mesh.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-bridge.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-interface.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-port.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-ppp.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-team.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-tun.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-veth.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-vlan.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-vrf.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-vxlan.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi-p2p.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-wimax.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-wireguard.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device-wpan.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-device.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-dhcp-config.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-dhcp4-config.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-dhcp6-config.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-dns-manager.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-enum-types.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-ip-config.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-ip4-config.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-ip6-config.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-libnm-utils.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-object.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-remote-connection.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-secret-agent-old.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-vpn-connection.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-vpn-editor.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-vpn-plugin-old.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-vpn-service-plugin.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-wifi-p2p-peer.Plo \
+	libnm/$(DEPDIR)/libnm_static_la-nm-wimax-nsp.Plo \
 	libnm/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Plo \
 	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_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 \
@@ -2802,6 +2929,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	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-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.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 \
@@ -2818,6 +2946,11 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo \
 	shared/nm-glib-aux/tests/$(DEPDIR)/test_json_aux-test-json-aux.Po \
 	shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po \
+	shared/nm-log-core/$(DEPDIR)/libnm_log_core_la-nm-logging.Plo \
+	shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-netlink.Plo \
+	shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-platform-utils.Plo \
+	shared/nm-platform/$(DEPDIR)/libnm_platform_la-nmp-netns.Plo \
+	shared/nm-platform/tests/$(DEPDIR)/test_nm_platform-test-nm-platform.Po \
 	shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo \
 	shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-nm-std-utils.Plo \
 	shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo \
@@ -2848,6 +2981,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ratelimit.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo \
@@ -2861,235 +2995,232 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo \
 	shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo \
 	shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Plo \
-	src/$(DEPDIR)/NetworkManager-main.Po \
-	src/$(DEPDIR)/NetworkManager_all_sym-main.Po \
-	src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-nm-logging.Plo \
-	src/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-act-request.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-config-data.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-config.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-policy.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Plo \
-	src/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo \
-	src/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo \
-	src/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Plo \
-	src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo \
-	src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Plo \
-	src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Plo \
-	src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Plo \
-	src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Plo \
-	src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Plo \
-	src/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po \
-	src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo \
-	src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo \
-	src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo \
-	src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Plo \
-	src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Plo \
-	src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Plo \
-	src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo \
-	src/devices/tests/$(DEPDIR)/test_acd-test-acd.Po \
-	src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po \
-	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo \
-	src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo \
-	src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po \
-	src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo \
-	src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo \
-	src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo \
-	src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Plo \
-	src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Plo \
-	src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo \
-	src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Plo \
-	src/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po \
-	src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po \
-	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 \
-	src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Plo \
-	src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Plo \
-	src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Plo \
-	src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Plo \
-	src/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po \
-	src/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po \
-	src/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po \
-	src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Plo \
-	src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Plo \
-	src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Plo \
-	src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Plo \
-	src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Plo \
-	src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Plo \
-	src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Plo \
-	src/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po \
-	src/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Plo \
-	src/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Plo \
-	src/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Plo \
-	src/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po \
-	src/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po \
-	src/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po \
-	src/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po \
-	src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Plo \
-	src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Plo \
-	src/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Plo \
-	src/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po \
-	src/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po \
-	src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Plo \
-	src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-netlink.Plo \
-	src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform-utils.Plo \
-	src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo \
-	src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Plo \
-	src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo \
-	src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo \
-	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)/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 \
-	src/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.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/tests/$(DEPDIR)/test_tc_fake-test-tc.Po \
-	src/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po \
-	src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo \
-	src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Plo \
-	src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Plo \
-	src/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Plo \
-	src/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Plo \
-	src/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Plo \
-	src/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo \
-	src/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Plo \
-	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/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-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-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-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)/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 \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo \
-	src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo \
-	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/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_ip4_config-test-ip4-config.Po \
-	src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po \
-	src/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po \
-	src/tests/$(DEPDIR)/test_systemd-test-systemd.Po \
-	src/tests/$(DEPDIR)/test_utils-test-utils.Po \
-	src/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po \
-	src/tests/config/$(DEPDIR)/test_config-nm-test-device.Po \
-	src/tests/config/$(DEPDIR)/test_config-test-config.Po \
-	src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo \
-	src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo
+	src/core/$(DEPDIR)/NetworkManager-main.Po \
+	src/core/$(DEPDIR)/NetworkManager_all_sym-main.Po \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-ipv4ll.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Plo \
+	src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-act-request.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-config-data.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-config.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-policy.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Plo \
+	src/core/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo \
+	src/core/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo \
+	src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Plo \
+	src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo \
+	src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Plo \
+	src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Plo \
+	src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Plo \
+	src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Plo \
+	src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Plo \
+	src/core/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po \
+	src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo \
+	src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo \
+	src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo \
+	src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Plo \
+	src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Plo \
+	src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Plo \
+	src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo \
+	src/core/devices/tests/$(DEPDIR)/test_acd-test-acd.Po \
+	src/core/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po \
+	src/core/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo \
+	src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo \
+	src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo \
+	src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo \
+	src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo \
+	src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo \
+	src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo \
+	src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo \
+	src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo \
+	src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo \
+	src/core/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po \
+	src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo \
+	src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo \
+	src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo \
+	src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Plo \
+	src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Plo \
+	src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo \
+	src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Plo \
+	src/core/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po \
+	src/core/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po \
+	src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Plo \
+	src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Plo \
+	src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Plo \
+	src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Plo \
+	src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Plo \
+	src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Plo \
+	src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Plo \
+	src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Plo \
+	src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Plo \
+	src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Plo \
+	src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Plo \
+	src/core/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po \
+	src/core/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po \
+	src/core/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po \
+	src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Plo \
+	src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Plo \
+	src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Plo \
+	src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Plo \
+	src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Plo \
+	src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Plo \
+	src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Plo \
+	src/core/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po \
+	src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Plo \
+	src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Plo \
+	src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Plo \
+	src/core/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po \
+	src/core/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po \
+	src/core/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po \
+	src/core/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po \
+	src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Plo \
+	src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Plo \
+	src/core/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Plo \
+	src/core/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po \
+	src/core/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po \
+	src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Plo \
+	src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo \
+	src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo \
+	src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo \
+	src/core/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo \
+	src/core/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo \
+	src/core/platform/tests/$(DEPDIR)/monitor-monitor.Po \
+	src/core/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po \
+	src/core/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po \
+	src/core/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po \
+	src/core/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po \
+	src/core/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po \
+	src/core/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po \
+	src/core/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po \
+	src/core/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po \
+	src/core/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po \
+	src/core/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po \
+	src/core/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Po \
+	src/core/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po \
+	src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo \
+	src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Plo \
+	src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Plo \
+	src/core/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Plo \
+	src/core/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Plo \
+	src/core/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Plo \
+	src/core/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo \
+	src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Plo \
+	src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Plo \
+	src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Plo \
+	src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Plo \
+	src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Plo \
+	src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Plo \
+	src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Plo \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Plo \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Plo \
+	src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po \
+	src/core/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo \
+	src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo \
+	src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Plo \
+	src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po \
+	src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Plo \
+	src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Plo \
+	src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Plo \
+	src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Plo \
+	src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Plo \
+	src/core/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po \
+	src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Plo \
+	src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Plo \
+	src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo \
+	src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo \
+	src/core/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po \
+	src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo \
+	src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Plo \
+	src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo \
+	src/core/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo \
+	src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo \
+	src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo \
+	src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo \
+	src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo \
+	src/core/tests/$(DEPDIR)/test_core-test-core.Po \
+	src/core/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po \
+	src/core/tests/$(DEPDIR)/test_dcb-test-dcb.Po \
+	src/core/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po \
+	src/core/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po \
+	src/core/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po \
+	src/core/tests/$(DEPDIR)/test_systemd-test-systemd.Po \
+	src/core/tests/$(DEPDIR)/test_utils-test-utils.Po \
+	src/core/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po \
+	src/core/tests/config/$(DEPDIR)/test_config-nm-test-device.Po \
+	src/core/tests/config/$(DEPDIR)/test_config-test-config.Po \
+	src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo \
+	src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -3127,7 +3258,8 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
+SOURCES = $(clients_cloud_setup_libnm_cloud_setup_core_a_SOURCES) \
+	$(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(clients_common_libnmc_base_la_SOURCES) \
 	$(clients_common_libnmc_la_SOURCES) \
 	$(dispatcher_libnm_dispatcher_core_la_SOURCES) \
@@ -3136,45 +3268,48 @@ 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_core_nm_keyfile_libnm_keyfile_la_SOURCES) \
 	$(libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES) \
 	$(libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES) \
-	$(libnm_liblibnm_la_SOURCES) \
-	$(nodist_libnm_liblibnm_la_SOURCES) $(libnm_libnm_la_SOURCES) \
+	$(libnm_libnm_la_SOURCES) $(libnm_libnm_static_la_SOURCES) \
+	$(nodist_libnm_libnm_static_la_SOURCES) \
 	$(libnm_nm_libnm_aux_libnm_libnm_aux_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_base_libnm_base_la_SOURCES) \
 	$(shared_nm_glib_aux_libnm_glib_aux_la_SOURCES) \
+	$(shared_nm_log_core_libnm_log_core_la_SOURCES) \
+	$(shared_nm_platform_libnm_platform_la_SOURCES) \
 	$(shared_nm_std_aux_libnm_std_aux_la_SOURCES) \
 	$(shared_nm_udev_aux_libnm_udev_aux_la_SOURCES) \
 	$(shared_systemd_libnm_systemd_logging_stub_la_SOURCES) \
 	$(shared_systemd_libnm_systemd_shared_la_SOURCES) \
-	$(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \
-	$(src_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES) \
-	$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES) \
-	$(src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES) \
-	$(src_devices_team_libnm_device_plugin_team_la_SOURCES) \
-	$(src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES) \
-	$(src_devices_wifi_libnm_wifi_base_la_SOURCES) \
-	$(src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES) \
-	$(src_devices_wwan_libnm_wwan_la_SOURCES) \
-	$(src_initrd_libnmi_core_la_SOURCES) \
-	$(src_libNetworkManager_la_SOURCES) \
-	$(src_libNetworkManagerBase_la_SOURCES) \
-	$(src_libNetworkManagerTest_la_SOURCES) \
-	$(src_libnm_systemd_core_la_SOURCES) \
-	$(src_ppp_libnm_ppp_plugin_la_SOURCES) \
-	$(src_ppp_nm_pppd_plugin_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) \
+	$(src_core_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \
+	$(src_core_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES) \
+	$(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES) \
+	$(src_core_devices_ovs_libnm_device_plugin_ovs_la_SOURCES) \
+	$(src_core_devices_team_libnm_device_plugin_team_la_SOURCES) \
+	$(src_core_devices_wifi_libnm_device_plugin_wifi_la_SOURCES) \
+	$(src_core_devices_wifi_libnm_wifi_base_la_SOURCES) \
+	$(src_core_devices_wwan_libnm_device_plugin_wwan_la_SOURCES) \
+	$(src_core_devices_wwan_libnm_wwan_la_SOURCES) \
+	$(src_core_initrd_libnmi_core_la_SOURCES) \
+	$(src_core_libNetworkManager_la_SOURCES) \
+	$(src_core_libNetworkManagerBase_la_SOURCES) \
+	$(src_core_libNetworkManagerTest_la_SOURCES) \
+	$(src_core_libnm_systemd_core_la_SOURCES) \
+	$(src_core_ppp_libnm_ppp_plugin_la_SOURCES) \
+	$(src_core_ppp_nm_pppd_plugin_la_SOURCES) \
+	$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES) \
+	$(nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) \
+	$(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES) \
+	$(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES) \
+	$(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES) \
 	$(clients_cli_generate_docs_nm_settings_nmcli_SOURCES) \
 	$(clients_cli_nmcli_SOURCES) \
 	$(clients_cloud_setup_nm_cloud_setup_SOURCES) \
+	clients/cloud-setup/tests/test-cloud-setup-general.c \
 	clients/common/tests/test-clients-common.c \
 	clients/common/tests/test-libnm-core-aux.c clients/nm-online.c \
 	$(clients_tui_nmtui_SOURCES) \
@@ -3206,89 +3341,98 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(libnm_tests_test_secret_agent_SOURCES) \
 	shared/nm-glib-aux/tests/test-json-aux.c \
 	shared/nm-glib-aux/tests/test-shared-general.c \
-	$(src_NetworkManager_SOURCES) \
-	$(src_NetworkManager_all_sym_SOURCES) \
-	src/devices/bluetooth/tests/nm-bt-test.c \
-	src/devices/tests/test-acd.c src/devices/tests/test-lldp.c \
-	$(src_devices_wifi_tests_test_devices_wifi_SOURCES) \
-	$(src_devices_wwan_tests_test_service_providers_SOURCES) \
-	$(src_dhcp_nm_dhcp_helper_SOURCES) \
-	src/dhcp/tests/test-dhcp-dhclient.c \
-	src/dhcp/tests/test-dhcp-utils.c \
-	src/dnsmasq/tests/test-dnsmasq-utils.c \
-	$(src_initrd_nm_initrd_generator_SOURCES) \
-	src/initrd/tests/test-cmdline-reader.c \
-	src/initrd/tests/test-dt-reader.c \
-	src/initrd/tests/test-ibft-reader.c \
-	src/ndisc/tests/test-ndisc-fake.c \
-	src/ndisc/tests/test-ndisc-linux.c \
-	$(src_nm_iface_helper_SOURCES) src/platform/tests/monitor.c \
-	$(src_platform_tests_test_address_fake_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_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_platform_tests_test_tc_fake_SOURCES) \
-	$(src_platform_tests_test_tc_linux_SOURCES) \
-	$(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-settings.c \
-	src/supplicant/tests/test-supplicant-config.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-l3cfg.c src/tests/test-systemd.c \
-	src/tests/test-utils.c src/tests/test-wired-defname.c
-DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
+	shared/nm-platform/tests/test-nm-platform.c \
+	$(src_core_NetworkManager_SOURCES) \
+	$(src_core_NetworkManager_all_sym_SOURCES) \
+	src/core/devices/bluetooth/tests/nm-bt-test.c \
+	src/core/devices/tests/test-acd.c \
+	src/core/devices/tests/test-lldp.c \
+	$(src_core_devices_wifi_tests_test_devices_wifi_SOURCES) \
+	$(src_core_devices_wwan_tests_test_service_providers_SOURCES) \
+	$(src_core_dhcp_nm_dhcp_helper_SOURCES) \
+	src/core/dhcp/tests/test-dhcp-dhclient.c \
+	src/core/dhcp/tests/test-dhcp-utils.c \
+	src/core/dnsmasq/tests/test-dnsmasq-utils.c \
+	$(src_core_initrd_nm_initrd_generator_SOURCES) \
+	src/core/initrd/tests/test-cmdline-reader.c \
+	src/core/initrd/tests/test-dt-reader.c \
+	src/core/initrd/tests/test-ibft-reader.c \
+	src/core/ndisc/tests/test-ndisc-fake.c \
+	src/core/ndisc/tests/test-ndisc-linux.c \
+	$(src_core_nm_iface_helper_SOURCES) \
+	src/core/platform/tests/monitor.c \
+	$(src_core_platform_tests_test_address_fake_SOURCES) \
+	$(src_core_platform_tests_test_address_linux_SOURCES) \
+	$(src_core_platform_tests_test_cleanup_fake_SOURCES) \
+	$(src_core_platform_tests_test_cleanup_linux_SOURCES) \
+	$(src_core_platform_tests_test_link_fake_SOURCES) \
+	$(src_core_platform_tests_test_link_linux_SOURCES) \
+	src/core/platform/tests/test-nmp-object.c \
+	src/core/platform/tests/test-platform-general.c \
+	$(src_core_platform_tests_test_route_fake_SOURCES) \
+	$(src_core_platform_tests_test_route_linux_SOURCES) \
+	$(src_core_platform_tests_test_tc_fake_SOURCES) \
+	$(src_core_platform_tests_test_tc_linux_SOURCES) \
+	$(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES) \
+	src/core/settings/plugins/ifupdown/tests/test-ifupdown.c \
+	src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c \
+	src/core/supplicant/tests/test-supplicant-config.c \
+	$(src_core_tests_config_test_config_SOURCES) \
+	src/core/tests/test-core.c \
+	src/core/tests/test-core-with-expect.c \
+	src/core/tests/test-dcb.c src/core/tests/test-ip4-config.c \
+	src/core/tests/test-ip6-config.c src/core/tests/test-l3cfg.c \
+	src/core/tests/test-systemd.c src/core/tests/test-utils.c \
+	src/core/tests/test-wired-defname.c
+DIST_SOURCES = $(am__clients_cloud_setup_libnm_cloud_setup_core_a_SOURCES_DIST) \
+	$(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(clients_common_libnmc_base_la_SOURCES) \
 	$(clients_common_libnmc_la_SOURCES) \
 	$(dispatcher_libnm_dispatcher_core_la_SOURCES) \
 	$(libnm_core_libnm_core_la_SOURCES) \
 	$(am__libnm_core_libnm_crypto_gnutls_la_SOURCES_DIST) \
 	$(am__libnm_core_libnm_crypto_nss_la_SOURCES_DIST) \
-	$(libnm_core_nm_keyfile_libnm_keyfile_la_SOURCES) \
 	$(libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES) \
 	$(libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES) \
-	$(libnm_liblibnm_la_SOURCES) $(libnm_libnm_la_SOURCES) \
+	$(libnm_libnm_la_SOURCES) $(libnm_libnm_static_la_SOURCES) \
 	$(libnm_nm_libnm_aux_libnm_libnm_aux_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_base_libnm_base_la_SOURCES) \
 	$(shared_nm_glib_aux_libnm_glib_aux_la_SOURCES) \
+	$(shared_nm_log_core_libnm_log_core_la_SOURCES) \
+	$(shared_nm_platform_libnm_platform_la_SOURCES) \
 	$(shared_nm_std_aux_libnm_std_aux_la_SOURCES) \
 	$(shared_nm_udev_aux_libnm_udev_aux_la_SOURCES) \
 	$(shared_systemd_libnm_systemd_logging_stub_la_SOURCES) \
 	$(shared_systemd_libnm_systemd_shared_la_SOURCES) \
-	$(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \
-	$(am__src_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES_DIST) \
-	$(am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST) \
-	$(am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST) \
-	$(am__src_devices_team_libnm_device_plugin_team_la_SOURCES_DIST) \
-	$(am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST) \
-	$(am__src_devices_wifi_libnm_wifi_base_la_SOURCES_DIST) \
-	$(am__src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST) \
-	$(am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST) \
-	$(src_initrd_libnmi_core_la_SOURCES) \
-	$(src_libNetworkManager_la_SOURCES) \
-	$(am__src_libNetworkManagerBase_la_SOURCES_DIST) \
-	$(src_libNetworkManagerTest_la_SOURCES) \
-	$(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_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) \
+	$(src_core_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \
+	$(am__src_core_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES_DIST) \
+	$(am__src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST) \
+	$(am__src_core_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST) \
+	$(am__src_core_devices_team_libnm_device_plugin_team_la_SOURCES_DIST) \
+	$(am__src_core_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST) \
+	$(am__src_core_devices_wifi_libnm_wifi_base_la_SOURCES_DIST) \
+	$(am__src_core_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST) \
+	$(am__src_core_devices_wwan_libnm_wwan_la_SOURCES_DIST) \
+	$(src_core_initrd_libnmi_core_la_SOURCES) \
+	$(src_core_libNetworkManager_la_SOURCES) \
+	$(am__src_core_libNetworkManagerBase_la_SOURCES_DIST) \
+	$(src_core_libNetworkManagerTest_la_SOURCES) \
+	$(src_core_libnm_systemd_core_la_SOURCES) \
+	$(am__src_core_ppp_libnm_ppp_plugin_la_SOURCES_DIST) \
+	$(am__src_core_ppp_nm_pppd_plugin_la_SOURCES_DIST) \
+	$(am__src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES_DIST) \
+	$(am__src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST) \
+	$(am__src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST) \
+	$(am__src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES_DIST) \
 	$(clients_cli_generate_docs_nm_settings_nmcli_SOURCES) \
 	$(am__clients_cli_nmcli_SOURCES_DIST) \
 	$(am__clients_cloud_setup_nm_cloud_setup_SOURCES_DIST) \
+	clients/cloud-setup/tests/test-cloud-setup-general.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) \
@@ -3318,44 +3462,49 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(libnm_tests_test_secret_agent_SOURCES) \
 	shared/nm-glib-aux/tests/test-json-aux.c \
 	shared/nm-glib-aux/tests/test-shared-general.c \
-	$(src_NetworkManager_SOURCES) \
-	$(src_NetworkManager_all_sym_SOURCES) \
-	src/devices/bluetooth/tests/nm-bt-test.c \
-	src/devices/tests/test-acd.c src/devices/tests/test-lldp.c \
-	$(am__src_devices_wifi_tests_test_devices_wifi_SOURCES_DIST) \
-	$(am__src_devices_wwan_tests_test_service_providers_SOURCES_DIST) \
-	$(src_dhcp_nm_dhcp_helper_SOURCES) \
-	src/dhcp/tests/test-dhcp-dhclient.c \
-	src/dhcp/tests/test-dhcp-utils.c \
-	src/dnsmasq/tests/test-dnsmasq-utils.c \
-	$(src_initrd_nm_initrd_generator_SOURCES) \
-	src/initrd/tests/test-cmdline-reader.c \
-	src/initrd/tests/test-dt-reader.c \
-	src/initrd/tests/test-ibft-reader.c \
-	src/ndisc/tests/test-ndisc-fake.c \
-	src/ndisc/tests/test-ndisc-linux.c \
-	$(src_nm_iface_helper_SOURCES) src/platform/tests/monitor.c \
-	$(src_platform_tests_test_address_fake_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_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_platform_tests_test_tc_fake_SOURCES) \
-	$(src_platform_tests_test_tc_linux_SOURCES) \
-	$(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-settings.c \
-	src/supplicant/tests/test-supplicant-config.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-l3cfg.c src/tests/test-systemd.c \
-	src/tests/test-utils.c src/tests/test-wired-defname.c
+	shared/nm-platform/tests/test-nm-platform.c \
+	$(src_core_NetworkManager_SOURCES) \
+	$(src_core_NetworkManager_all_sym_SOURCES) \
+	src/core/devices/bluetooth/tests/nm-bt-test.c \
+	src/core/devices/tests/test-acd.c \
+	src/core/devices/tests/test-lldp.c \
+	$(am__src_core_devices_wifi_tests_test_devices_wifi_SOURCES_DIST) \
+	$(am__src_core_devices_wwan_tests_test_service_providers_SOURCES_DIST) \
+	$(src_core_dhcp_nm_dhcp_helper_SOURCES) \
+	src/core/dhcp/tests/test-dhcp-dhclient.c \
+	src/core/dhcp/tests/test-dhcp-utils.c \
+	src/core/dnsmasq/tests/test-dnsmasq-utils.c \
+	$(src_core_initrd_nm_initrd_generator_SOURCES) \
+	src/core/initrd/tests/test-cmdline-reader.c \
+	src/core/initrd/tests/test-dt-reader.c \
+	src/core/initrd/tests/test-ibft-reader.c \
+	src/core/ndisc/tests/test-ndisc-fake.c \
+	src/core/ndisc/tests/test-ndisc-linux.c \
+	$(src_core_nm_iface_helper_SOURCES) \
+	src/core/platform/tests/monitor.c \
+	$(src_core_platform_tests_test_address_fake_SOURCES) \
+	$(src_core_platform_tests_test_address_linux_SOURCES) \
+	$(src_core_platform_tests_test_cleanup_fake_SOURCES) \
+	$(src_core_platform_tests_test_cleanup_linux_SOURCES) \
+	$(src_core_platform_tests_test_link_fake_SOURCES) \
+	$(src_core_platform_tests_test_link_linux_SOURCES) \
+	src/core/platform/tests/test-nmp-object.c \
+	src/core/platform/tests/test-platform-general.c \
+	$(src_core_platform_tests_test_route_fake_SOURCES) \
+	$(src_core_platform_tests_test_route_linux_SOURCES) \
+	$(src_core_platform_tests_test_tc_fake_SOURCES) \
+	$(src_core_platform_tests_test_tc_linux_SOURCES) \
+	$(am__src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES_DIST) \
+	src/core/settings/plugins/ifupdown/tests/test-ifupdown.c \
+	src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c \
+	src/core/supplicant/tests/test-supplicant-config.c \
+	$(src_core_tests_config_test_config_SOURCES) \
+	src/core/tests/test-core.c \
+	src/core/tests/test-core-with-expect.c \
+	src/core/tests/test-dcb.c src/core/tests/test-ip4-config.c \
+	src/core/tests/test-ip6-config.c src/core/tests/test-l3cfg.c \
+	src/core/tests/test-systemd.c src/core/tests/test-utils.c \
+	src/core/tests/test-wired-defname.c
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -3602,9 +3751,9 @@ 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/libnm.pc.in \
-	$(top_srcdir)/shared/nm-version-macros.h.in ABOUT-NLS AUTHORS \
-	COPYING ChangeLog INSTALL NEWS README TODO build-aux/compile \
+	$(top_srcdir)/libnm-core/nm-version-macros.h.in \
+	$(top_srcdir)/libnm/libnm.pc.in ABOUT-NLS AUTHORS COPYING \
+	ChangeLog INSTALL NEWS README TODO build-aux/compile \
 	build-aux/config.guess build-aux/config.rpath \
 	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
 	build-aux/ltmain.sh build-aux/missing
@@ -3976,59 +4125,66 @@ AUTOMAKE_OPTIONS = subdir-objects
 ###############################################################################
 
 ###############################################################################
+
+###############################################################################
+
+###############################################################################
 noinst_LTLIBRARIES = shared/libcsiphash.la shared/libcrbtree.la \
 	shared/libnacd.la shared/libndhcp4.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-udev-aux/libnm-udev-aux.la \
+	shared/nm-base/libnm-base.la \
+	shared/nm-log-core/libnm-log-core.la \
+	shared/nm-platform/libnm-platform.la \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 	introspection/libnmdbus.la libnm-core/libnm-core.la \
-	$(libnm_crypto_lib) libnm/liblibnm.la \
-	src/libNetworkManagerBase.la src/libNetworkManager.la \
-	src/libnm-systemd-core.la $(NULL) \
-	shared/systemd/libnm-systemd-logging-stub.la \
+	$(libnm_crypto_lib) libnm/libnm_static.la \
+	src/core/libNetworkManagerBase.la \
+	src/core/libNetworkManager.la src/core/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_20) $(am__append_28) \
-	$(am__append_35) $(am__append_40) \
-	dispatcher/libnm-dispatcher-core.la $(am__append_82)
-check_LTLIBRARIES = $(am__append_84)
-noinst_LIBRARIES = $(am__append_56)
+	src/core/initrd/libnmi-core.la $(am__append_22) \
+	$(am__append_30) $(am__append_37) $(am__append_42) \
+	dispatcher/libnm-dispatcher-core.la $(am__append_90)
+check_LTLIBRARIES = $(am__append_92)
+noinst_LIBRARIES = $(am__append_59) $(am__append_63)
 noinst_DATA = $(am__append_10)
-dist_libexec_SCRIPTS = $(am__append_24)
+dist_libexec_SCRIPTS = $(am__append_26)
 
 ###############################################################################
 lib_LTLIBRARIES = libnm/libnm.la
 plugin_LTLIBRARIES = $(core_plugins)
 
 ###############################################################################
-# src/devices/adsl
+# src/core/devices/adsl
 ###############################################################################
-core_plugins = $(am__append_17) $(am__append_19) $(am__append_27) \
-	src/devices/adsl/libnm-device-plugin-adsl.la $(am__append_31) \
-	$(am__append_42) $(am__append_45) $(am__append_47)
+core_plugins = $(am__append_19) $(am__append_21) $(am__append_29) \
+	src/core/devices/adsl/libnm-device-plugin-adsl.la \
+	$(am__append_33) $(am__append_44) $(am__append_47) \
+	$(am__append_49)
 service_DATA = 
-man_MANS = $(am__append_76)
+man_MANS = $(am__append_84)
 examples_DATA = data/server.conf
 CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \
-	src/NetworkManager.ver $(am__append_21) \
+	src/core/NetworkManager.ver $(am__append_23) \
 	$(dispatcher_nmdbus_dispatcher_sources) \
 	dispatcher/org.freedesktop.nm_dispatcher.service \
-	$(am__append_65) clients/tests/test-client.log \
+	$(am__append_69) clients/tests/test-client.log \
 	data/NetworkManager-dispatcher.service \
 	data/NetworkManager-wait-online.service \
 	data/NetworkManager.service data/server.conf $(NULL) \
-	$(am__append_67) man/common.ent $(am__append_77) \
-	$(am__append_80) $(GLIB_GENERATED) $(INTROSPECTION_GIRS) \
+	$(am__append_72) man/common.ent $(am__append_85) \
+	$(am__append_88) $(GLIB_GENERATED) $(INTROSPECTION_GIRS) \
 	$(typelib_DATA) cscope.in.out cscope.out cscope.po.out $(NULL) \
-	$(am__append_86)
+	$(am__append_94)
 
 ###############################################################################
 DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
 	intltool-update $(polkit_policy_DATA) libnm/libnm.pc \
-	$(am__append_12)
+	$(am__append_13) $(am__append_14) $(am__append_50)
 
 ###############################################################################
 
@@ -4046,7 +4202,7 @@ DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
 ###############################################################################
 
 ###############################################################################
-# src/devices
+# src/core/devices
 ###############################################################################
 
 ###############################################################################
@@ -4057,14 +4213,13 @@ DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
 # examples
 ###############################################################################
 EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
+	shared/nm-platform/tests/meson.build $(NULL) \
 	libnm-core/nm-libnm-core-intern/README.md \
 	libnm-core/nm-libnm-core-aux/README.md \
 	libnm/nm-libnm-aux/README.md \
-	shared/nm-glib-aux/tests/meson.build $(NULL) \
+	shared/nm-glib-aux/tests/meson.build shared/README.md $(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 $(NULL) \
 	libnm-core/tests/certs/ca-no-ending-newline.pem \
 	libnm-core/tests/certs/pkcs8-decrypted.der \
@@ -4091,519 +4246,524 @@ EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
 	$(am__append_11) tools/generate-docs-nm-property-infos.pl \
 	tools/generate-docs-nm-settings-docs-merge.py \
 	tools/generate-docs-nm-settings-docs-gir.py libnm/meson.build \
-	libnm/nm-enum-types.c.template libnm/nm-enum-types.h.template \
-	$(NULL) 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 \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/index \
-	src/initrd/tests/sysfs/firmware/ibft/initiator/flags \
-	src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc \
-	src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs/firmware/ibft/target0/chap-type \
-	src/initrd/tests/sysfs/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs/firmware/ibft/target0/flags \
-	src/initrd/tests/sysfs/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs/firmware/ibft/target2/target-name \
-	src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc \
-	src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr \
-	src/initrd/tests/sysfs/firmware/ibft/target2/chap-type \
-	src/initrd/tests/sysfs/firmware/ibft/target2/index \
-	src/initrd/tests/sysfs/firmware/ibft/target2/lun \
-	src/initrd/tests/sysfs/firmware/ibft/target2/flags \
-	src/initrd/tests/sysfs/firmware/ibft/target2/port \
-	src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id \
-	src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id \
-	src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/index \
-	src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags \
-	src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-dhcp/class/net/eth0/address \
-	src/initrd/tests/sysfs-dhcp/class/net/eth1/address \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun \
-	src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address \
-	src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name \
-	src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath \
-	src/initrd/tests/sysfs-static/class/net/eth0/address \
-	src/initrd/tests/sysfs-static/class/net/eth1/address \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-static/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-static/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-static/firmware/ibft/target0/port \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns \
-	src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index \
-	src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name \
-	src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr \
-	src/initrd/tests/sysfs-static/firmware/ibft/target1/index \
-	src/initrd/tests/sysfs-static/firmware/ibft/target1/lun \
-	src/initrd/tests/sysfs-static/firmware/ibft/target1/port \
-	src/initrd/tests/sysfs-vlan/class/net/eth0/address \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun \
-	src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port $(NULL) \
-	src/org.freedesktop.NetworkManager.conf \
-	src/nm-test-utils-core.h src/meson.build src/dhcp/meson.build \
-	src/dhcp/tests/test-dhclient-duid.leases \
-	src/dhcp/tests/test-dhclient-commented-duid.leases \
-	src/dhcp/tests/meson.build src/ppp/meson.build \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 \
-	src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT \
-	src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \
-	src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \
-	src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
-	src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \
-	src/settings/plugins/keyfile/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 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \
-	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 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-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 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \
-	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 \
-	src/settings/plugins/ifcfg-rh/tests/meson.build \
-	src/settings/plugins/ifupdown/tests/test1 \
-	src/settings/plugins/ifupdown/tests/test2 \
-	src/settings/plugins/ifupdown/tests/test3 \
-	src/settings/plugins/ifupdown/tests/test4 \
-	src/settings/plugins/ifupdown/tests/test5 \
-	src/settings/plugins/ifupdown/tests/test6 \
-	src/settings/plugins/ifupdown/tests/test7 \
-	src/settings/plugins/ifupdown/tests/test8 \
-	src/settings/plugins/ifupdown/tests/test9 \
-	src/settings/plugins/ifupdown/tests/test11 \
-	src/settings/plugins/ifupdown/tests/test12 \
-	src/settings/plugins/ifupdown/tests/test13 \
-	src/settings/plugins/ifupdown/tests/test14 \
-	src/settings/plugins/ifupdown/tests/test15 \
-	src/settings/plugins/ifupdown/tests/test16 \
-	src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 \
-	src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 \
-	src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen \
-	src/settings/plugins/ifupdown/tests/test20-source-stanza \
-	src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \
-	src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \
-	src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \
-	src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \
-	src/settings/plugins/ifupdown/tests/test22-duplicate-stanzas \
-	src/settings/plugins/ifupdown/meson.build \
-	src/settings/plugins/ifupdown/tests/meson.build \
-	src/devices/meson.build src/devices/adsl/meson.build \
-	src/devices/wwan/libnm-wwan.ver src/devices/wwan/meson.build \
-	src/devices/wwan/tests/test-service-providers.xml $(NULL) \
-	src/devices/bluetooth/meson.build $(NULL) \
-	src/devices/wifi/meson.build $(NULL) \
-	src/devices/team/meson.build data/NetworkManager-ovs.conf \
-	src/devices/ovs/meson.build src/dnsmasq/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 \
-	src/tests/config/NetworkManager.conf \
-	src/tests/config/NetworkManager-warn.conf \
-	src/tests/config/NetworkManager.state \
-	src/tests/config/bad.conf \
-	src/tests/config/global-dns-invalid.conf \
-	src/tests/config/conf.d/00-overrides.conf \
-	src/tests/config/conf.d/10-more.conf \
-	src/tests/config/conf.d/20-config-enable-1.conf \
-	src/tests/config/conf.d/90-last.conf \
-	src/tests/config/meson.build src/tests/test-secret-agent.py \
-	src/tests/meson.build dispatcher/nm-dispatcher.conf \
+	$(NULL) libnm/tests/meson.build src/core/systemd/meson.build \
+	src/core/platform/linux/nl802154.h src/core/initrd/meson.build \
+	src/core/initrd/tests/meson.build \
+	src/core/initrd/tests/sysfs/class/net/eth0/address \
+	src/core/initrd/tests/sysfs/class/net/eth2/address \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet0/flags \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/isns-server \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/slp-server \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/index \
+	src/core/initrd/tests/sysfs/firmware/ibft/initiator/flags \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/chap-type \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/flags \
+	src/core/initrd/tests/sysfs/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/target-name \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/ip-addr \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/chap-type \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/index \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/lun \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/flags \
+	src/core/initrd/tests/sysfs/firmware/ibft/target2/port \
+	src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id \
+	src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id \
+	src/core/initrd/tests/sysfs/firmware/ibft/acpi_header/signature \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/mac \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/origin \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/index \
+	src/core/initrd/tests/sysfs/firmware/ibft/ethernet2/flags \
+	src/core/initrd/tests/sysfs-bad-dns1/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-bad-dns2/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-bad-gateway/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-dhcp/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-dhcp/class/net/eth1/address \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun \
+	src/core/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address \
+	src/core/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name \
+	src/core/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath \
+	src/core/initrd/tests/sysfs-static/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-static/class/net/eth1/address \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target0/port \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/target-name \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/index \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/lun \
+	src/core/initrd/tests/sysfs-static/firmware/ibft/target1/port \
+	src/core/initrd/tests/sysfs-vlan/class/net/eth0/address \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/index \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun \
+	src/core/initrd/tests/sysfs-vlan/firmware/ibft/target0/port \
+	$(NULL) src/core/org.freedesktop.NetworkManager.conf \
+	src/core/nm-test-utils-core.h src/core/meson.build \
+	src/core/dhcp/meson.build \
+	src/core/dhcp/tests/test-dhclient-duid.leases \
+	src/core/dhcp/tests/test-dhclient-commented-duid.leases \
+	src/core/dhcp/tests/meson.build src/core/ppp/meson.build \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT \
+	src/core/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \
+	src/core/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \
+	src/core/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
+	src/core/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \
+	src/core/settings/plugins/keyfile/tests/meson.build \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-suite-b-192-tls \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-802-1x-password-raw \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 \
+	$(NULL) src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \
+	src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \
+	src/core/settings/plugins/ifcfg-rh/meson.build \
+	src/core/settings/plugins/ifcfg-rh/tests/meson.build \
+	src/core/settings/plugins/ifupdown/tests/test1 \
+	src/core/settings/plugins/ifupdown/tests/test2 \
+	src/core/settings/plugins/ifupdown/tests/test3 \
+	src/core/settings/plugins/ifupdown/tests/test4 \
+	src/core/settings/plugins/ifupdown/tests/test5 \
+	src/core/settings/plugins/ifupdown/tests/test6 \
+	src/core/settings/plugins/ifupdown/tests/test7 \
+	src/core/settings/plugins/ifupdown/tests/test8 \
+	src/core/settings/plugins/ifupdown/tests/test9 \
+	src/core/settings/plugins/ifupdown/tests/test11 \
+	src/core/settings/plugins/ifupdown/tests/test12 \
+	src/core/settings/plugins/ifupdown/tests/test13 \
+	src/core/settings/plugins/ifupdown/tests/test14 \
+	src/core/settings/plugins/ifupdown/tests/test15 \
+	src/core/settings/plugins/ifupdown/tests/test16 \
+	src/core/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 \
+	src/core/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 \
+	src/core/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen \
+	src/core/settings/plugins/ifupdown/tests/test20-source-stanza \
+	src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \
+	src/core/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \
+	src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza \
+	src/core/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \
+	src/core/settings/plugins/ifupdown/tests/test22-duplicate-stanzas \
+	src/core/settings/plugins/ifupdown/meson.build \
+	src/core/settings/plugins/ifupdown/tests/meson.build \
+	src/core/devices/meson.build src/core/devices/adsl/meson.build \
+	src/core/devices/wwan/libnm-wwan.ver \
+	src/core/devices/wwan/meson.build \
+	src/core/devices/wwan/tests/test-service-providers.xml $(NULL) \
+	src/core/devices/bluetooth/meson.build $(NULL) \
+	src/core/devices/wifi/meson.build $(NULL) \
+	src/core/devices/team/meson.build data/NetworkManager-ovs.conf \
+	src/core/devices/ovs/meson.build \
+	src/core/dnsmasq/tests/meson.build \
+	src/core/platform/tests/meson.build $(NULL) \
+	src/core/devices/tests/meson.build \
+	src/core/ndisc/tests/meson.build \
+	src/core/supplicant/tests/certs/test-ca-cert.pem \
+	src/core/supplicant/tests/certs/test-cert.p12 \
+	src/core/supplicant/tests/meson.build \
+	src/core/tests/config/NetworkManager.conf \
+	src/core/tests/config/NetworkManager-warn.conf \
+	src/core/tests/config/NetworkManager.state \
+	src/core/tests/config/bad.conf \
+	src/core/tests/config/global-dns-invalid.conf \
+	src/core/tests/config/conf.d/00-overrides.conf \
+	src/core/tests/config/conf.d/10-more.conf \
+	src/core/tests/config/conf.d/20-config-enable-1.conf \
+	src/core/tests/config/conf.d/90-last.conf \
+	src/core/tests/config/meson.build \
+	src/core/tests/test-secret-agent.py src/core/tests/meson.build \
+	dispatcher/nm-dispatcher.conf \
 	dispatcher/org.freedesktop.nm_dispatcher.service.in \
 	dispatcher/nm-dispatcher.xml dispatcher/meson.build \
 	dispatcher/tests/dispatcher-connectivity-full \
@@ -4624,7 +4784,7 @@ EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
 	clients/cli/nmcli-completion clients/cli/meson.build \
 	clients/common/settings-docs.xsl clients/common/meson.build \
 	clients/common/tests/meson.build clients/tui/meson.build \
-	clients/tui/newt/meson.build $(am__append_64) \
+	clients/tui/newt/meson.build $(am__append_68) \
 	clients/tests/test-client.py \
 	clients/tests/test-client.check-on-disk/test_001.expected \
 	clients/tests/test-client.check-on-disk/test_002.expected \
@@ -4637,34 +4797,35 @@ EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
 	data/NetworkManager-wait-online.service.in \
 	data/NetworkManager.service.in data/meson.build \
 	data/nm-shared.xml data/server.conf.in $(NULL) \
-	$(am__append_69) $(am__append_72) 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) $(NULL) \
-	man/meson.build vapi/NM-1.0.metadata vapi/libnm.deps \
-	vapi/meson.build CONTRIBUTING COPYING.LGPL COPYING.GFDL \
-	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 \
-	lsan.suppressions 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 \
+	$(am__append_74) $(am__append_77) $(am__append_80) \
+	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) $(NULL) man/meson.build \
+	vapi/NM-1.0.metadata vapi/libnm.deps vapi/meson.build \
+	CONTRIBUTING COPYING.LGPL COPYING.GFDL 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/core/ppp/nm-ppp-plugin.ver \
+	Makefile.glib autogen.sh lsan.suppressions \
+	valgrind.suppressions meson.build meson_options.txt \
+	config.h.meson config-extra.h.meson docs/meson.build \
+	po/meson.build 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 \
 	shared/nm-utils/nm-vpn-editor-plugin-call.h \
 	shared/nm-utils/nm-vpn-plugin-macros.h \
 	shared/nm-utils/nm-vpn-plugin-utils.c \
-	shared/nm-utils/nm-vpn-plugin-utils.h \
-	shared/nm-version-macros.h.in shared/meson.build \
+	shared/nm-utils/nm-vpn-plugin-utils.h shared/meson.build \
+	libnm-core/nm-version-macros.h.in \
 	tools/check-config-options.sh tools/check-docs.sh \
-	tools/check-exports.sh tools/check-settings-docs.sh \
+	tools/check-exports.sh tools/check-compare-generated.sh \
+	tools/check-gitlab-ci.sh tools/check-tree.sh \
 	tools/create-exports-NetworkManager.sh tools/debug-helper.py \
 	tools/meson-post-install.sh tools/run-nm-test.sh \
 	tools/test-networkmanager-service.py \
 	tools/test-sudo-wrapper.sh tools/enums-to-docbook.pl \
-	src/settings/plugins/meson.build $(NULL) \
+	src/core/settings/plugins/meson.build $(NULL) \
 	examples/C/glib/meson.build \
 	examples/C/qt/add-connection-wired.cpp \
 	examples/C/qt/list-connections.cpp \
@@ -4708,7 +4869,9 @@ EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
 	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-keyfile.py \
 	examples/python/gi/nm-update2.py examples/python/gi/nm-wg-set \
+	examples/python/gi/ovs-external-ids.py \
 	examples/python/gi/setting-user-data.py \
 	examples/python/gi/show-wifi-networks.py \
 	examples/python/gi/update-ip4-method.py \
@@ -4719,18 +4882,18 @@ EXTRA_DIST = shared/c-stdaux/src/c-stdaux.h $(NULL) \
 	examples/shell/get-hostname.sh examples/shell/list-devices.sh \
 	examples/shell/disconnect-device.sh \
 	examples/shell/active-wifi.sh $(NULL)
-EXTRA_LTLIBRARIES = $(am__append_50)
+EXTRA_LTLIBRARIES = $(am__append_53)
 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_70) $(am__append_73) \
-	$(man_pages) $(man_pages_autogen)
+	libnm-core/nm-dbus-types.xml $(am__append_75) $(am__append_78) \
+	$(am__append_81) $(man_pages) $(man_pages_autogen)
 dist_configure_check = $(am__append_2)
-install_data_hook = install-data-hook-dirs $(am__append_25) \
-	install-data-hook-dispatcher $(am__append_54) $(am__append_62) \
-	$(am__append_74)
-install_exec_hook = $(am__append_58)
-uninstall_hook = $(am__append_55) $(am__append_59) $(am__append_63) \
-	$(am__append_75)
+install_data_hook = install-data-hook-dirs $(am__append_27) \
+	install-data-hook-dispatcher $(am__append_57) $(am__append_66) \
+	$(am__append_82)
+install_exec_hook = $(am__append_61)
+uninstall_hook = $(am__append_58) $(am__append_62) $(am__append_67) \
+	$(am__append_83)
 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) \
@@ -4740,9 +4903,11 @@ GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \
 	$(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums)
 man_pages = man/NetworkManager.8 man/NetworkManager.conf.5 \
 	man/nm-online.1 man/nm-initrd-generator.8 man/nmcli-examples.7 \
-	man/nmcli.1 man/nmtui.1 $(am__append_71)
+	man/nmcli.1 man/nmtui.1 $(am__append_76) $(am__append_79)
 man_pages_autogen = man/nm-settings-dbus.5 man/nm-settings-keyfile.5 \
-	man/nm-settings-nmcli.5 $(NULL) $(am__append_68)
+	man/nm-settings-nmcli.5 $(NULL) $(am__append_73)
+
+###############################################################################
 
 ###############################################################################
 
@@ -4751,19 +4916,19 @@ man_pages_autogen = man/nm-settings-dbus.5 man/nm-settings-keyfile.5 \
 ###############################################################################
 
 ###############################################################################
-# src/settings/plugins/keyfile/tests
+# src/core/settings/plugins/keyfile/tests
 ###############################################################################
 
 ###############################################################################
-# src/dnsmasq/tests
+# src/core/dnsmasq/tests
 ###############################################################################
 
 ###############################################################################
-# src/supplicant/tests
+# src/core/supplicant/tests
 ###############################################################################
 
 ###############################################################################
-# src/tests/config
+# src/core/tests/config
 ###############################################################################
 
 ###############################################################################
@@ -4771,44 +4936,47 @@ man_pages_autogen = man/nm-settings-dbus.5 man/nm-settings-keyfile.5 \
 ###############################################################################
 
 ###############################################################################
-check_programs = shared/nm-glib-aux/tests/test-shared-general \
-	$(am__append_5) 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 \
+check_programs = shared/nm-platform/tests/test-nm-platform \
+	shared/nm-glib-aux/tests/test-shared-general $(am__append_5) \
+	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/test-libnm \
-	$(am__append_13) src/initrd/tests/test-dt-reader \
-	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-settings \
-	$(am__append_23) $(am__append_30) $(am__append_34) \
-	$(am__append_44) src/dnsmasq/tests/test-dnsmasq-utils \
-	src/platform/tests/test-address-fake \
-	src/platform/tests/test-address-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 \
-	src/platform/tests/test-tc-fake \
-	src/platform/tests/test-tc-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-core \
-	src/tests/test-core-with-expect src/tests/test-dcb \
-	src/tests/test-ip4-config src/tests/test-ip6-config \
-	src/tests/test-l3cfg src/tests/test-systemd \
-	src/tests/test-utils src/tests/test-wired-defname $(NULL) \
-	dispatcher/tests/test-dispatcher-envp $(am__append_51) \
-	$(am__append_52) clients/common/tests/test-libnm-core-aux
-check_programs_norun = $(am__append_14) $(am__append_39) \
-	src/platform/tests/monitor src/ndisc/tests/test-ndisc-linux \
+	$(am__append_15) src/core/initrd/tests/test-dt-reader \
+	src/core/initrd/tests/test-ibft-reader \
+	src/core/initrd/tests/test-cmdline-reader \
+	src/core/dhcp/tests/test-dhcp-dhclient \
+	src/core/dhcp/tests/test-dhcp-utils \
+	src/core/settings/plugins/keyfile/tests/test-keyfile-settings \
+	$(am__append_25) $(am__append_32) $(am__append_36) \
+	$(am__append_46) src/core/dnsmasq/tests/test-dnsmasq-utils \
+	src/core/platform/tests/test-address-fake \
+	src/core/platform/tests/test-address-linux \
+	src/core/platform/tests/test-cleanup-fake \
+	src/core/platform/tests/test-cleanup-linux \
+	src/core/platform/tests/test-link-fake \
+	src/core/platform/tests/test-link-linux \
+	src/core/platform/tests/test-nmp-object \
+	src/core/platform/tests/test-platform-general \
+	src/core/platform/tests/test-route-fake \
+	src/core/platform/tests/test-route-linux \
+	src/core/platform/tests/test-tc-fake \
+	src/core/platform/tests/test-tc-linux $(NULL) \
+	src/core/devices/tests/test-lldp \
+	src/core/devices/tests/test-acd \
+	src/core/ndisc/tests/test-ndisc-fake \
+	src/core/supplicant/tests/test-supplicant-config \
+	src/core/tests/config/test-config src/core/tests/test-core \
+	src/core/tests/test-core-with-expect src/core/tests/test-dcb \
+	src/core/tests/test-ip4-config src/core/tests/test-ip6-config \
+	src/core/tests/test-l3cfg src/core/tests/test-systemd \
+	src/core/tests/test-utils src/core/tests/test-wired-defname \
+	$(NULL) dispatcher/tests/test-dispatcher-envp $(am__append_54) \
+	$(am__append_55) clients/common/tests/test-libnm-core-aux \
+	$(am__append_70)
+check_programs_norun = $(am__append_16) $(am__append_41) \
+	src/core/platform/tests/monitor \
+	src/core/ndisc/tests/test-ndisc-linux \
 	examples/C/glib/add-connection-gdbus \
 	examples/C/glib/add-connection-libnm \
 	examples/C/glib/get-active-connections-gdbus \
@@ -4816,7 +4984,7 @@ check_programs_norun = $(am__append_14) $(am__append_39) \
 	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_85)
+	examples/C/glib/monitor-nm-state-gdbus $(am__append_93)
 
 ###############################################################################
 
@@ -4825,20 +4993,20 @@ check_programs_norun = $(am__append_14) $(am__append_39) \
 ###############################################################################
 check_ltlibraries = $(am__append_6) $(am__append_7) \
 	libnm/tests/libnm-vpn-plugin-utils-test.la \
-	src/libNetworkManagerTest.la clients/common/libnmc-base.la \
-	$(am__append_49)
-check_local = check-docs check-local-exports-libnm \
-	check-config-options $(am__append_22) $(am__append_29) \
-	check-local-devices-adsl $(am__append_33) $(am__append_43) \
-	$(am__append_46) $(am__append_48) \
-	check-local-clients-tests-test-client $(am__append_87) \
-	check-po-msgfmt
-VAPIGEN_VAPIS = $(am__append_78)
-dbusservice_DATA = $(am__append_26) dispatcher/nm-dispatcher.conf \
-	src/org.freedesktop.NetworkManager.conf
+	src/core/libNetworkManagerTest.la \
+	clients/common/libnmc-base.la $(am__append_52)
+check_local = check-docs check-local-exports-libnm $(am__append_12) \
+	check-config-options $(am__append_24) $(am__append_31) \
+	check-local-devices-adsl $(am__append_35) $(am__append_45) \
+	$(am__append_48) $(am__append_51) \
+	check-local-clients-tests-test-client check-local-gitlab-ci \
+	$(am__append_95) check-tree check-po-msgfmt
+VAPIGEN_VAPIS = $(am__append_86)
+dbusservice_DATA = $(am__append_28) dispatcher/nm-dispatcher.conf \
+	src/core/org.freedesktop.NetworkManager.conf
 dbusactivation_DATA =  \
 	dispatcher/org.freedesktop.nm_dispatcher.service
-systemdsystemunit_DATA = $(am__append_61) $(am__append_66)
+systemdsystemunit_DATA = $(am__append_65) $(am__append_71)
 INTROSPECTION_GIRS = $(am__append_9)
 INTROSPECTION_SCANNER_ARGS = 
 INTROSPECTION_COMPILER_ARGS = 
@@ -4853,9 +5021,9 @@ nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnm/libnm.pc
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
-pppd_plugin_LTLIBRARIES = $(am__append_18)
+pppd_plugin_LTLIBRARIES = $(am__append_20)
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(am__append_79)
+vapi_DATA = $(am__append_87)
 examplesdir = $(docdir)/examples
 rundir = $(runstatedir)/NetworkManager
 statedir = $(localstatedir)/lib/NetworkManager
@@ -4879,8 +5047,8 @@ set_sanitizer_env = \
 	fi
 
 check_so_symbols = \
-	$(call set_sanitizer_env,$(1),$(builddir)/src/NetworkManager); \
-	LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null
+	$(call set_sanitizer_env,$(1),$(builddir)/src/core/NetworkManager); \
+	LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/core/NetworkManager --version >/dev/null
 
 
 ###############################################################################
@@ -5030,7 +5198,6 @@ shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION='0' \
 	$(NULL)
 
 shared_nm_std_aux_libnm_std_aux_la_SOURCES = \
@@ -5038,6 +5205,8 @@ shared_nm_std_aux_libnm_std_aux_la_SOURCES = \
 	shared/nm-std-aux/c-list-util.c \
 	shared/nm-std-aux/c-list-util.h \
 	shared/nm-std-aux/nm-dbus-compat.h \
+	shared/nm-std-aux/nm-default-std.h \
+	shared/nm-std-aux/nm-networkmanager-compilation.h \
 	shared/nm-std-aux/nm-std-aux.h \
 	shared/nm-std-aux/nm-std-utils.c \
 	shared/nm-std-aux/nm-std-utils.h \
@@ -5058,7 +5227,6 @@ shared_nm_glib_aux_cppflags = \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
 	$(NULL)
 
 shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \
@@ -5071,10 +5239,14 @@ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
 	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-default-glib-i18n-lib.h \
+	shared/nm-glib-aux/nm-default-glib-i18n-prog.h \
+	shared/nm-glib-aux/nm-default-glib.h \
 	shared/nm-glib-aux/nm-enum-utils.c \
 	shared/nm-glib-aux/nm-enum-utils.h \
 	shared/nm-glib-aux/nm-errno.c \
 	shared/nm-glib-aux/nm-errno.h \
+	shared/nm-glib-aux/nm-gassert-patch.h \
 	shared/nm-glib-aux/nm-glib.h \
 	shared/nm-glib-aux/nm-hash-utils.c \
 	shared/nm-glib-aux/nm-hash-utils.h \
@@ -5133,6 +5305,99 @@ shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
 
+shared_nm_base_libnm_base_la_CPPFLAGS = \
+	$(shared_nm_glib_aux_cppflags) \
+	$(NULL)
+
+shared_nm_base_libnm_base_la_SOURCES = \
+	shared/nm-base/nm-base.h \
+	shared/nm-base/nm-ethtool-base.c \
+	shared/nm-base/nm-ethtool-base.h \
+	shared/nm-base/nm-ethtool-utils-base.h \
+	$(NULL)
+
+shared_nm_base_libnm_base_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_base_libnm_base_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(NULL)
+
+shared_nm_log_core_libnm_log_core_la_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(SYSTEMD_JOURNAL_CFLAGS) \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	$(NULL)
+
+shared_nm_log_core_libnm_log_core_la_SOURCES = \
+	shared/nm-log-core/nm-logging.c \
+	shared/nm-log-core/nm-logging.h \
+	$(NULL)
+
+shared_nm_log_core_libnm_log_core_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_log_core_libnm_log_core_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(SYSTEMD_JOURNAL_LIBS) \
+	$(NULL)
+
+shared_nm_platform_libnm_platform_la_CPPFLAGS = \
+	$(shared_nm_glib_aux_cppflags) \
+	$(NULL)
+
+shared_nm_platform_libnm_platform_la_SOURCES = \
+	shared/nm-platform/nm-netlink.c \
+	shared/nm-platform/nm-netlink.h \
+	shared/nm-platform/nm-platform-utils.c \
+	shared/nm-platform/nm-platform-utils.h \
+	shared/nm-platform/nmp-base.h \
+	shared/nm-platform/nmp-netns.c \
+	shared/nm-platform/nmp-netns.h \
+	$(NULL)
+
+shared_nm_platform_libnm_platform_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_platform_libnm_platform_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(NULL)
+
+shared_nm_platform_tests_test_nm_platform_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	-DG_LOG_DOMAIN=\""test"\" \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SYSTEMD_JOURNAL_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
+
+shared_nm_platform_tests_test_nm_platform_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_EXEC_LDFLAGS) \
+	$(NULL)
+
+shared_nm_platform_tests_test_nm_platform_LDADD = \
+	shared/nm-platform/libnm-platform.la \
+	shared/nm-log-core/libnm-log-core.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	shared/nm-std-aux/libnm-std-aux.la \
+	shared/libcsiphash.la \
+	$(SYSTEMD_JOURNAL_LIBS) \
+	$(GLIB_LIBS) \
+	$(NULL)
+
 libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
@@ -5143,15 +5408,12 @@ libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
 	$(NULL)
 
 libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \
 	libnm-core/nm-libnm-core-intern/nm-auth-subject.c \
 	libnm-core/nm-libnm-core-intern/nm-auth-subject.h \
 	libnm-core/nm-libnm-core-intern/nm-common-macros.h \
-	libnm-core/nm-libnm-core-intern/nm-ethtool-utils.c \
-	libnm-core/nm-libnm-core-intern/nm-ethtool-utils.h \
 	libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c \
 	libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h \
 	$(NULL)
@@ -5175,7 +5437,6 @@ libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
 	$(NULL)
 
 libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \
@@ -5193,35 +5454,6 @@ libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-libnm_core_nm_keyfile_libnm_keyfile_la_CPPFLAGS = \
-	$(dflt_cppflags) \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
-	$(CODE_COVERAGE_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(SANITIZER_LIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
-	$(NULL)
-
-libnm_core_nm_keyfile_libnm_keyfile_la_SOURCES = \
-	libnm-core/nm-keyfile/nm-keyfile-internal.h \
-	libnm-core/nm-keyfile/nm-keyfile-utils.c \
-	libnm-core/nm-keyfile/nm-keyfile-utils.h \
-	libnm-core/nm-keyfile/nm-keyfile.c \
-	$(NULL)
-
-libnm_core_nm_keyfile_libnm_keyfile_la_LDFLAGS = \
-	$(CODE_COVERAGE_LDFLAGS) \
-	$(SANITIZER_LIB_LDFLAGS) \
-	$(NULL)
-
-libnm_core_nm_keyfile_libnm_keyfile_la_LIBADD = \
-	$(GLIB_LIBS) \
-	$(NULL)
-
 libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
@@ -5234,7 +5466,6 @@ libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""libnmc"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(NULL)
 
 libnm_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \
@@ -5255,8 +5486,7 @@ libnm_nm_libnm_aux_libnm_libnm_aux_la_LIBADD = \
 shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
@@ -5278,8 +5508,7 @@ shared_nm_glib_aux_tests_test_shared_general_LDADD = \
 @WITH_JANSSON_TRUE@shared_nm_glib_aux_tests_test_json_aux_CPPFLAGS = \
 @WITH_JANSSON_TRUE@	$(dflt_cppflags) \
 @WITH_JANSSON_TRUE@	-I$(srcdir)/shared \
-@WITH_JANSSON_TRUE@	-DNETWORKMANAGER_COMPILATION_TEST \
-@WITH_JANSSON_TRUE@	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
+@WITH_JANSSON_TRUE@	-DG_LOG_DOMAIN=\""test"\" \
 @WITH_JANSSON_TRUE@	$(CODE_COVERAGE_CFLAGS) \
 @WITH_JANSSON_TRUE@	$(GLIB_CFLAGS) \
 @WITH_JANSSON_TRUE@	$(JANSSON_CFLAGS) \
@@ -5512,11 +5741,11 @@ dbusinterfaces_DATA = \
 
 ###############################################################################
 libnm_core_lib_h_pub_real = \
-	shared/nm-version-macros.h \
 	libnm-core/nm-connection.h \
 	libnm-core/nm-core-types.h \
 	libnm-core/nm-dbus-interface.h \
 	libnm-core/nm-errors.h \
+	libnm-core/nm-keyfile.h \
 	libnm-core/nm-setting-6lowpan.h \
 	libnm-core/nm-setting-8021x.h \
 	libnm-core/nm-setting-adsl.h \
@@ -5531,6 +5760,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-ethtool.h \
 	libnm-core/nm-setting-generic.h \
 	libnm-core/nm-setting-gsm.h \
+	libnm-core/nm-setting-hostname.h \
 	libnm-core/nm-setting-infiniband.h \
 	libnm-core/nm-setting-ip-config.h \
 	libnm-core/nm-setting-ip-tunnel.h \
@@ -5542,6 +5772,7 @@ libnm_core_lib_h_pub_real = \
 	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-external-ids.h \
 	libnm-core/nm-setting-ovs-interface.h \
 	libnm-core/nm-setting-ovs-patch.h \
 	libnm-core/nm-setting-ovs-port.h \
@@ -5555,6 +5786,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-team.h \
 	libnm-core/nm-setting-tun.h \
 	libnm-core/nm-setting-user.h \
+	libnm-core/nm-setting-veth.h \
 	libnm-core/nm-setting-vlan.h \
 	libnm-core/nm-setting-vpn.h \
 	libnm-core/nm-setting-vrf.h \
@@ -5569,6 +5801,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting.h \
 	libnm-core/nm-simple-connection.h \
 	libnm-core/nm-utils.h \
+	libnm-core/nm-version-macros.h \
 	libnm-core/nm-version.h \
 	libnm-core/nm-vpn-dbus-interface.h \
 	libnm-core/nm-vpn-editor-plugin.h \
@@ -5580,12 +5813,16 @@ libnm_core_lib_h_pub_mkenums = \
 	$(NULL)
 
 libnm_core_lib_h_priv = \
-	shared/nm-meta-setting.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-default-libnm-core.h \
+	libnm-core/nm-keyfile-internal.h \
+	libnm-core/nm-keyfile-utils.h \
+	libnm-core/nm-meta-setting-base-impl.h \
+	libnm-core/nm-meta-setting-base.h \
 	libnm-core/nm-property-compare.h \
 	libnm-core/nm-setting-private.h \
 	libnm-core/nm-team-utils.h \
@@ -5607,6 +5844,7 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-ethtool.c \
 	libnm-core/nm-setting-generic.c \
 	libnm-core/nm-setting-gsm.c \
+	libnm-core/nm-setting-hostname.c \
 	libnm-core/nm-setting-infiniband.c \
 	libnm-core/nm-setting-ip-config.c \
 	libnm-core/nm-setting-ip-tunnel.c \
@@ -5618,6 +5856,7 @@ libnm_core_lib_c_settings_real = \
 	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-external-ids.c \
 	libnm-core/nm-setting-ovs-interface.c \
 	libnm-core/nm-setting-ovs-patch.c \
 	libnm-core/nm-setting-ovs-port.c \
@@ -5631,6 +5870,7 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-team.c \
 	libnm-core/nm-setting-tun.c \
 	libnm-core/nm-setting-user.c \
+	libnm-core/nm-setting-veth.c \
 	libnm-core/nm-setting-vlan.c \
 	libnm-core/nm-setting-vpn.c \
 	libnm-core/nm-setting-vrf.c \
@@ -5646,11 +5886,13 @@ libnm_core_lib_c_settings_real = \
 
 libnm_core_lib_c_real = \
 	$(libnm_core_lib_c_settings_real) \
-	shared/nm-meta-setting.c \
 	libnm-core/nm-connection.c \
 	libnm-core/nm-crypto.c \
 	libnm-core/nm-dbus-utils.c \
 	libnm-core/nm-errors.c \
+	libnm-core/nm-keyfile-utils.c \
+	libnm-core/nm-keyfile.c \
+	libnm-core/nm-meta-setting-base-impl.c \
 	libnm-core/nm-property-compare.c \
 	libnm-core/nm-setting.c \
 	libnm-core/nm-simple-connection.c \
@@ -5678,11 +5920,10 @@ dflt_cppflags_libnm_core = \
 	$(NULL)
 
 nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real)
-nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
+nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "libnm-core/nm-default-libnm-core.h"\n'
 libnm_core_libnm_core_la_CPPFLAGS = \
 	$(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
 	$(NULL)
 
 libnm_core_libnm_core_la_SOURCES = \
@@ -5733,13 +5974,12 @@ libnm_core_libnm_core_la_LDFLAGS = \
 @HAVE_CRYPTO_NSS_TRUE@	$(NSS_LIBS)
 
 nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h
-nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#include "nm-default.h"\n'
+nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#include "libnm-core/nm-default-libnm-core.h"\n'
 libnm_core_tests_cppflags = \
 	-I$(srcdir)/libnm-core/tests \
 	-I$(builddir)/libnm-core/tests \
 	$(dflt_cppflags_libnm_core) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
@@ -5762,10 +6002,10 @@ nodist_libnm_core_tests_test_general_SOURCES = \
 
 libnm_core_tests_ldadd = \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-base/libnm-base.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
@@ -5795,7 +6035,6 @@ libnm_core_tests_test_settings_defaults_LDFLAGS = $(libnm_core_tests_ldflags)
 
 ###############################################################################
 libnm_lib_h_pub_real = \
-	shared/nm-version-macros.h \
 	libnm/NetworkManager.h \
 	libnm/nm-access-point.h \
 	libnm/nm-active-connection.h \
@@ -5822,6 +6061,7 @@ libnm_lib_h_pub_real = \
 	libnm/nm-device-ppp.h \
 	libnm/nm-device-team.h \
 	libnm/nm-device-tun.h \
+	libnm/nm-device-veth.h \
 	libnm/nm-device-vlan.h \
 	libnm/nm-device-vrf.h \
 	libnm/nm-device-vxlan.h \
@@ -5832,6 +6072,7 @@ libnm_lib_h_pub_real = \
 	libnm/nm-device-wpan.h \
 	libnm/nm-device.h \
 	libnm/nm-dhcp-config.h \
+	libnm/nm-ethtool-utils.h \
 	libnm/nm-ip-config.h \
 	libnm/nm-object.h \
 	libnm/nm-remote-connection.h \
@@ -5848,14 +6089,16 @@ libnm_lib_h_pub_mkenums = \
 	libnm/nm-enum-types.h
 
 libnm_lib_h_priv = \
-	libnm/nm-libnm-utils.h \
 	libnm/nm-dbus-helpers.h \
+	libnm/nm-default-client.h \
+	libnm/nm-default-libnm.h \
 	libnm/nm-device-private.h \
 	libnm/nm-dhcp4-config.h \
 	libnm/nm-dhcp6-config.h \
 	libnm/nm-dns-manager.h \
 	libnm/nm-ip4-config.h \
 	libnm/nm-ip6-config.h \
+	libnm/nm-libnm-utils.h \
 	libnm/nm-object-private.h \
 	libnm/nm-remote-connection-private.h \
 	$(NULL)
@@ -5889,6 +6132,7 @@ libnm_lib_c_real = \
 	libnm/nm-device-ppp.c \
 	libnm/nm-device-team.c \
 	libnm/nm-device-tun.c \
+	libnm/nm-device-veth.c \
 	libnm/nm-device-vlan.c \
 	libnm/nm-device-vrf.c \
 	libnm/nm-device-vxlan.c \
@@ -5923,28 +6167,28 @@ libnm_lib_cppflags = \
 	-I$(builddir)/libnm \
 	$(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
 	$(NULL)
 
-libnm_liblibnm_la_CPPFLAGS = \
+libnm_libnm_static_la_CPPFLAGS = \
 	$(INTROSPECTION_CFLAGS) \
 	$(libnm_lib_cppflags) \
 	$(NULL)
 
-libnm_liblibnm_la_SOURCES = \
+libnm_libnm_static_la_SOURCES = \
 	$(libnm_lib_c_real) \
 	$(NULL)
 
-nodist_libnm_liblibnm_la_SOURCES = \
+nodist_libnm_libnm_static_la_SOURCES = \
 	$(libnm_lib_h_pub_mkenums) \
 	$(libnm_lib_c_mkenums) \
 	$(NULL)
 
-libnm_liblibnm_la_LIBADD = \
+libnm_libnm_static_la_LIBADD = \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-base/libnm-base.la \
 	introspection/libnmdbus.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/systemd/libnm-systemd-shared.la \
@@ -5962,8 +6206,8 @@ nm_enum_types_sources = \
 	$(libnm_lib_h_pub_mkenums) \
 	$(libnm_lib_h_pub_real)
 
-nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
-nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
+nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include "nm-core-enum-types.h"\n'
+nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "libnm/nm-default-libnm.h"\n'
 libnm_libnm_la_CPPFLAGS = \
 	$(libnm_lib_cppflags) \
 	$(LIBUDEV_CFLAGS) \
@@ -5979,7 +6223,7 @@ EXTRA_libnm_libnm_la_DEPENDENCIES = \
 	libnm/libnm.ver
 
 libnm_libnm_la_LIBADD = \
-	libnm/liblibnm.la \
+	libnm/libnm_static.la \
 	$(NULL)
 
 libnm_libnm_la_LDFLAGS = \
@@ -5992,7 +6236,11 @@ libnm_NM_1_0_typelib = $(am__append_8)
 @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
-@HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_CFLAGS = $(libnm_libnm_la_CPPFLAGS)
+@HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_CFLAGS = \
+@HAVE_INTROSPECTION_TRUE@	$(libnm_libnm_la_CPPFLAGS) \
+@HAVE_INTROSPECTION_TRUE@	-DNETWORKMANAGER_COMPILATION \
+@HAVE_INTROSPECTION_TRUE@	$(NULL)
+
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_LIBS = libnm/libnm.la
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_FILES = \
 @HAVE_INTROSPECTION_TRUE@	$(libnm_core_lib_h_pub_mkenums) \
@@ -6026,13 +6274,12 @@ libnm_tests_cppflags = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	$(dflt_cppflags_libnm_core) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
 libnm_tests_ldadd = \
-	libnm/liblibnm.la \
+	libnm/libnm_static.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -6086,8 +6333,7 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
 	-I$(builddir)/libnm \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(NULL)
 
 libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
@@ -6096,25 +6342,24 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
 
 
 ###############################################################################
-# src/
+# src/core/
 ###############################################################################
-src_cppflags_base = \
-	-I$(srcdir)/src \
+src_core_cppflags_base = \
+	-I$(srcdir)/src/core \
 	$(dflt_cppflags_libnm_core) \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
-src_cppflags_base_test = \
-	$(src_cppflags_base) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
+src_core_cppflags_base_test = \
+	$(src_core_cppflags_base) \
 	$(NULL)
 
-src_cppflags_device_plugin = \
-	$(src_cppflags_base)
+src_core_cppflags_device_plugin = \
+	$(src_core_cppflags_base)
 
-src_cppflags = \
-	$(src_cppflags_base) \
+src_core_cppflags = \
+	$(src_core_cppflags_base) \
 	\
 	$(LIBNDP_CFLAGS) \
 	$(LIBPSL_CFLAGS) \
@@ -6126,9 +6371,8 @@ src_cppflags = \
 	\
 	$(NULL)
 
-src_cppflags_test = $(src_cppflags) -DNETWORKMANAGER_COMPILATION_TEST \
-	$(NULL) $(am__append_15)
-src_ldflags = $(CODE_COVERAGE_LDFLAGS)
+src_core_cppflags_test = $(src_core_cppflags) $(NULL) $(am__append_17)
+src_core_ldflags = $(CODE_COVERAGE_LDFLAGS)
 
 ###############################################################################
 libsystemd_cppflags = \
@@ -6146,7 +6390,6 @@ libsystemd_cppflags = \
 
 shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \
 	$(libsystemd_cppflags) \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(NULL)
 
@@ -6161,11 +6404,11 @@ shared_systemd_libnm_systemd_logging_stub_la_LIBADD = \
 
 shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \
 	$(libsystemd_cppflags) \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(NULL)
 
 shared_systemd_libnm_systemd_shared_la_SOURCES = \
+	shared/systemd/nm-default-systemd-shared.h \
 	shared/systemd/nm-sd-utils-shared.c \
 	shared/systemd/nm-sd-utils-shared.h \
 	shared/systemd/sd-adapt-shared/architecture.h \
@@ -6179,6 +6422,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/sd-adapt-shared/errno-list.h \
 	shared/systemd/sd-adapt-shared/glob-util.h \
 	shared/systemd/sd-adapt-shared/gunicode.h \
+	shared/systemd/sd-adapt-shared/idn-util.h \
 	shared/systemd/sd-adapt-shared/ioprio.h \
 	shared/systemd/sd-adapt-shared/locale-util.h \
 	shared/systemd/sd-adapt-shared/memfd-util.h \
@@ -6191,7 +6435,6 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/sd-adapt-shared/mkdir.h \
 	shared/systemd/sd-adapt-shared/namespace-util.h \
 	shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
-	shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
 	shared/systemd/sd-adapt-shared/nulstr-util.h \
 	shared/systemd/sd-adapt-shared/raw-clone.h \
 	shared/systemd/sd-adapt-shared/rlimit-util.h \
@@ -6257,6 +6500,8 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/process-util.h \
 	shared/systemd/src/basic/random-util.c \
 	shared/systemd/src/basic/random-util.h \
+	shared/systemd/src/basic/ratelimit.c \
+	shared/systemd/src/basic/ratelimit.h \
 	shared/systemd/src/basic/set.h \
 	shared/systemd/src/basic/signal-util.c \
 	shared/systemd/src/basic/signal-util.h \
@@ -6287,6 +6532,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/util.h \
 	shared/systemd/src/shared/dns-domain.c \
 	shared/systemd/src/shared/dns-domain.h \
+	shared/systemd/src/shared/log-link.h \
 	shared/systemd/src/shared/web-util.c \
 	shared/systemd/src/shared/web-util.h \
 	$(NULL)
@@ -6298,333 +6544,342 @@ shared_systemd_libnm_systemd_shared_la_LIBADD = \
 
 
 ###############################################################################
-src_libnm_systemd_core_la_cppflags = \
+src_core_libnm_systemd_core_la_cppflags = \
 	$(libsystemd_cppflags) \
 	-I$(srcdir)/libnm-core \
 	-I$(builddir)/libnm-core \
-	-I$(srcdir)/src \
-	-I$(srcdir)/src/systemd/sd-adapt-core \
-	-I$(srcdir)/src/systemd/src/systemd \
-	-I$(srcdir)/src/systemd/src/libsystemd-network \
-	-I$(srcdir)/src/systemd/src/libsystemd/sd-event \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
+	-I$(srcdir)/src/core \
+	-I$(srcdir)/src/core/systemd/sd-adapt-core \
+	-I$(srcdir)/src/core/systemd/src/systemd \
+	-I$(srcdir)/src/core/systemd/src/libsystemd-network \
+	-I$(srcdir)/src/core/systemd/src/libsystemd/sd-event \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	$(NULL)
 
-src_libnm_systemd_core_la_libadd = \
+src_core_libnm_systemd_core_la_libadd = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
-src_libnm_systemd_core_la_SOURCES = \
-	src/systemd/nm-sd-utils-core.c \
-	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 \
-	src/systemd/sd-adapt-core/khash.h \
-	src/systemd/sd-adapt-core/nm-sd-adapt-core.c \
-	src/systemd/sd-adapt-core/nm-sd-adapt-core.h \
-	src/systemd/sd-adapt-core/sd-daemon.h \
-	src/systemd/sd-adapt-core/sd-device.h \
-	src/systemd/sd-adapt-core/udev-util.h \
-	src/systemd/src/libsystemd-network/arp-util.c \
-	src/systemd/src/libsystemd-network/arp-util.h \
-	src/systemd/src/libsystemd-network/dhcp-identifier.c \
-	src/systemd/src/libsystemd-network/dhcp-identifier.h \
-	src/systemd/src/libsystemd-network/dhcp-internal.h \
-	src/systemd/src/libsystemd-network/dhcp-lease-internal.h \
-	src/systemd/src/libsystemd-network/dhcp-network.c \
-	src/systemd/src/libsystemd-network/dhcp-option.c \
-	src/systemd/src/libsystemd-network/dhcp-packet.c \
-	src/systemd/src/libsystemd-network/dhcp-protocol.h \
-	src/systemd/src/libsystemd-network/dhcp6-internal.h \
-	src/systemd/src/libsystemd-network/dhcp6-lease-internal.h \
-	src/systemd/src/libsystemd-network/dhcp6-network.c \
-	src/systemd/src/libsystemd-network/dhcp6-option.c \
-	src/systemd/src/libsystemd-network/dhcp6-protocol.h \
-	src/systemd/src/libsystemd-network/lldp-internal.h \
-	src/systemd/src/libsystemd-network/lldp-neighbor.c \
-	src/systemd/src/libsystemd-network/lldp-neighbor.h \
-	src/systemd/src/libsystemd-network/lldp-network.c \
-	src/systemd/src/libsystemd-network/lldp-network.h \
-	src/systemd/src/libsystemd-network/network-internal.c \
-	src/systemd/src/libsystemd-network/network-internal.h \
-	src/systemd/src/libsystemd-network/sd-dhcp-client.c \
-	src/systemd/src/libsystemd-network/sd-dhcp-lease.c \
-	src/systemd/src/libsystemd-network/sd-dhcp6-client.c \
-	src/systemd/src/libsystemd-network/sd-dhcp6-lease.c \
-	src/systemd/src/libsystemd-network/sd-ipv4acd.c \
-	src/systemd/src/libsystemd-network/sd-ipv4ll.c \
-	src/systemd/src/libsystemd-network/sd-lldp.c \
-	src/systemd/src/libsystemd/sd-event/event-source.h \
-	src/systemd/src/libsystemd/sd-event/event-util.c \
-	src/systemd/src/libsystemd/sd-event/event-util.h \
-	src/systemd/src/libsystemd/sd-event/sd-event.c \
-	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/systemd/_sd-common.h \
-	src/systemd/src/systemd/sd-dhcp-client.h \
-	src/systemd/src/systemd/sd-dhcp-lease.h \
-	src/systemd/src/systemd/sd-dhcp-option.h \
-	src/systemd/src/systemd/sd-dhcp6-client.h \
-	src/systemd/src/systemd/sd-dhcp6-lease.h \
-	src/systemd/src/systemd/sd-dhcp6-option.h \
-	src/systemd/src/systemd/sd-event.h \
-	src/systemd/src/systemd/sd-id128.h \
-	src/systemd/src/systemd/sd-ipv4acd.h \
-	src/systemd/src/systemd/sd-ipv4ll.h \
-	src/systemd/src/systemd/sd-lldp.h \
-	src/systemd/src/systemd/sd-ndisc.h \
+src_core_libnm_systemd_core_la_SOURCES = \
+	src/core/systemd/nm-default-systemd.h \
+	src/core/systemd/nm-sd-utils-core.c \
+	src/core/systemd/nm-sd-utils-core.h \
+	src/core/systemd/nm-sd.c \
+	src/core/systemd/nm-sd.h \
+	src/core/systemd/nm-sd-utils-dhcp.h \
+	src/core/systemd/nm-sd-utils-dhcp.c \
+	src/core/systemd/sd-adapt-core/condition.h \
+	src/core/systemd/sd-adapt-core/conf-parser.h \
+	src/core/systemd/sd-adapt-core/device-util.h \
+	src/core/systemd/sd-adapt-core/khash.h \
+	src/core/systemd/sd-adapt-core/network-util.h \
+	src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c \
+	src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h \
+	src/core/systemd/sd-adapt-core/sd-daemon.h \
+	src/core/systemd/sd-adapt-core/sd-device.h \
+	src/core/systemd/sd-adapt-core/udev-util.h \
+	src/core/systemd/src/libsystemd-network/arp-util.c \
+	src/core/systemd/src/libsystemd-network/arp-util.h \
+	src/core/systemd/src/libsystemd-network/dhcp-identifier.c \
+	src/core/systemd/src/libsystemd-network/dhcp-identifier.h \
+	src/core/systemd/src/libsystemd-network/dhcp-internal.h \
+	src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h \
+	src/core/systemd/src/libsystemd-network/dhcp-network.c \
+	src/core/systemd/src/libsystemd-network/dhcp-option.c \
+	src/core/systemd/src/libsystemd-network/dhcp-packet.c \
+	src/core/systemd/src/libsystemd-network/dhcp-protocol.h \
+	src/core/systemd/src/libsystemd-network/dhcp6-internal.h \
+	src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h \
+	src/core/systemd/src/libsystemd-network/dhcp6-network.c \
+	src/core/systemd/src/libsystemd-network/dhcp6-option.c \
+	src/core/systemd/src/libsystemd-network/dhcp6-protocol.h \
+	src/core/systemd/src/libsystemd-network/lldp-internal.h \
+	src/core/systemd/src/libsystemd-network/lldp-neighbor.c \
+	src/core/systemd/src/libsystemd-network/lldp-neighbor.h \
+	src/core/systemd/src/libsystemd-network/lldp-network.c \
+	src/core/systemd/src/libsystemd-network/lldp-network.h \
+	src/core/systemd/src/libsystemd-network/network-internal.c \
+	src/core/systemd/src/libsystemd-network/network-internal.h \
+	src/core/systemd/src/libsystemd-network/sd-dhcp-client.c \
+	src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c \
+	src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c \
+	src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c \
+	src/core/systemd/src/libsystemd-network/sd-ipv4acd.c \
+	src/core/systemd/src/libsystemd-network/sd-ipv4ll.c \
+	src/core/systemd/src/libsystemd-network/sd-lldp.c \
+	src/core/systemd/src/libsystemd/sd-event/event-source.h \
+	src/core/systemd/src/libsystemd/sd-event/event-util.c \
+	src/core/systemd/src/libsystemd/sd-event/event-util.h \
+	src/core/systemd/src/libsystemd/sd-event/sd-event.c \
+	src/core/systemd/src/libsystemd/sd-id128/id128-util.c \
+	src/core/systemd/src/libsystemd/sd-id128/id128-util.h \
+	src/core/systemd/src/libsystemd/sd-id128/sd-id128.c \
+	src/core/systemd/src/systemd/_sd-common.h \
+	src/core/systemd/src/systemd/sd-dhcp-client.h \
+	src/core/systemd/src/systemd/sd-dhcp-lease.h \
+	src/core/systemd/src/systemd/sd-dhcp-option.h \
+	src/core/systemd/src/systemd/sd-dhcp6-client.h \
+	src/core/systemd/src/systemd/sd-dhcp6-lease.h \
+	src/core/systemd/src/systemd/sd-dhcp6-option.h \
+	src/core/systemd/src/systemd/sd-event.h \
+	src/core/systemd/src/systemd/sd-id128.h \
+	src/core/systemd/src/systemd/sd-ipv4acd.h \
+	src/core/systemd/src/systemd/sd-ipv4ll.h \
+	src/core/systemd/src/systemd/sd-lldp.h \
+	src/core/systemd/src/systemd/sd-ndisc.h \
 	$(NULL)
 
-src_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_la_cppflags)
-src_libnm_systemd_core_la_LIBADD = \
+src_core_libnm_systemd_core_la_CPPFLAGS = $(src_core_libnm_systemd_core_la_cppflags)
+src_core_libnm_systemd_core_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 
 ###############################################################################
-src_libNetworkManagerBase_la_CPPFLAGS = \
+src_core_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 \
-	src/platform/nm-netlink.c src/platform/nm-netlink.h \
-	src/platform/nmp-netns.c src/platform/nmp-netns.h \
-	src/platform/nmp-object.c src/platform/nmp-object.h \
-	src/platform/nm-platform-utils.c \
-	src/platform/nm-platform-utils.h src/platform/nm-platform.c \
-	src/platform/nm-platform.h src/platform/nm-platform-private.h \
-	src/platform/nm-linux-platform.c \
-	src/platform/nm-linux-platform.h \
-	src/platform/nmp-rules-manager.c \
-	src/platform/nmp-rules-manager.h \
-	src/platform/wifi/nm-wifi-utils-nl80211.c \
-	src/platform/wifi/nm-wifi-utils-nl80211.h \
-	src/platform/wifi/nm-wifi-utils-private.h \
-	src/platform/wifi/nm-wifi-utils.c \
-	src/platform/wifi/nm-wifi-utils.h \
-	src/platform/wpan/nm-wpan-utils.c \
-	src/platform/wpan/nm-wpan-utils.h src/ndisc/nm-lndp-ndisc.c \
-	src/ndisc/nm-lndp-ndisc.h src/ndisc/nm-ndisc.c \
-	src/ndisc/nm-ndisc.h src/ndisc/nm-ndisc-private.h \
-	src/nm-dbus-utils.c src/nm-dbus-utils.h src/nm-dbus-object.c \
-	src/nm-dbus-object.h src/nm-netns.c src/nm-netns.h \
-	src/nm-l3-config-data.c src/nm-l3-config-data.h src/nm-l3cfg.c \
-	src/nm-l3cfg.h src/nm-ip-config.c src/nm-ip-config.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-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_16)
-src_libNetworkManagerBase_la_LIBADD = \
+	$(src_core_cppflags)
+
+src_core_libNetworkManagerBase_la_SOURCES = src/core/nm-core-utils.c \
+	src/core/nm-core-utils.h src/core/NetworkManagerUtils.c \
+	src/core/NetworkManagerUtils.h src/core/platform/nmp-object.c \
+	src/core/platform/nmp-object.h src/core/platform/nm-platform.c \
+	src/core/platform/nm-platform.h \
+	src/core/platform/nm-platform-private.h \
+	src/core/platform/nm-linux-platform.c \
+	src/core/platform/nm-linux-platform.h \
+	src/core/platform/nmp-rules-manager.c \
+	src/core/platform/nmp-rules-manager.h \
+	src/core/platform/wifi/nm-wifi-utils-nl80211.c \
+	src/core/platform/wifi/nm-wifi-utils-nl80211.h \
+	src/core/platform/wifi/nm-wifi-utils-private.h \
+	src/core/platform/wifi/nm-wifi-utils.c \
+	src/core/platform/wifi/nm-wifi-utils.h \
+	src/core/platform/wpan/nm-wpan-utils.c \
+	src/core/platform/wpan/nm-wpan-utils.h \
+	src/core/ndisc/nm-lndp-ndisc.c src/core/ndisc/nm-lndp-ndisc.h \
+	src/core/ndisc/nm-ndisc.c src/core/ndisc/nm-ndisc.h \
+	src/core/ndisc/nm-ndisc-private.h src/core/nm-dbus-utils.c \
+	src/core/nm-dbus-utils.h src/core/nm-dbus-object.c \
+	src/core/nm-dbus-object.h src/core/nm-netns.c \
+	src/core/nm-netns.h src/core/nm-l3-config-data.c \
+	src/core/nm-l3-config-data.h src/core/nm-l3-ipv4ll.c \
+	src/core/nm-l3-ipv4ll.h src/core/nm-l3cfg.c \
+	src/core/nm-l3cfg.h src/core/nm-ip-config.c \
+	src/core/nm-ip-config.h src/core/nm-ip4-config.c \
+	src/core/nm-ip4-config.h src/core/nm-ip6-config.c \
+	src/core/nm-ip6-config.h src/core/dhcp/nm-dhcp-client.c \
+	src/core/dhcp/nm-dhcp-client.h \
+	src/core/dhcp/nm-dhcp-client-logging.h \
+	src/core/dhcp/nm-dhcp-nettools.c src/core/dhcp/nm-dhcp-utils.c \
+	src/core/dhcp/nm-dhcp-utils.h src/core/dhcp/nm-dhcp-options.c \
+	src/core/dhcp/nm-dhcp-options.h \
+	src/core/dhcp/nm-dhcp-systemd.c \
+	src/core/dhcp/nm-dhcp-manager.c \
+	src/core/dhcp/nm-dhcp-manager.h src/core/main-utils.c \
+	src/core/main-utils.h $(NULL) $(am__append_18)
+src_core_libNetworkManagerBase_la_LIBADD = \
 	$(GLIB_LIBS) \
-	$(SYSTEMD_JOURNAL_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
 
 
 ###############################################################################
-src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
-src_libNetworkManager_la_SOURCES = \
+src_core_libNetworkManager_la_CPPFLAGS = $(src_core_cppflags)
+src_core_libNetworkManager_la_SOURCES = \
+	\
+	src/core/nm-default-daemon.h \
 	\
-	src/nm-checkpoint.c \
-	src/nm-checkpoint.h \
-	src/nm-checkpoint-manager.c \
-	src/nm-checkpoint-manager.h \
+	src/core/nm-checkpoint.c \
+	src/core/nm-checkpoint.h \
+	src/core/nm-checkpoint-manager.c \
+	src/core/nm-checkpoint-manager.h \
 	\
-	src/devices/nm-acd-manager.c \
-	src/devices/nm-acd-manager.h \
-	src/devices/nm-lldp-listener.c \
-	src/devices/nm-lldp-listener.h \
-	src/devices/nm-device.c \
-	src/devices/nm-device.h \
-	src/devices/nm-device-ethernet-utils.c \
-	src/devices/nm-device-ethernet-utils.h \
-	src/devices/nm-device-factory.c \
-	src/devices/nm-device-factory.h \
-	src/devices/nm-device-generic.c \
-	src/devices/nm-device-generic.h \
-	src/devices/nm-device-logging.h \
-	src/devices/nm-device-private.h \
+	src/core/devices/nm-acd-manager.c \
+	src/core/devices/nm-acd-manager.h \
+	src/core/devices/nm-lldp-listener.c \
+	src/core/devices/nm-lldp-listener.h \
+	src/core/devices/nm-device.c \
+	src/core/devices/nm-device.h \
+	src/core/devices/nm-device-ethernet-utils.c \
+	src/core/devices/nm-device-ethernet-utils.h \
+	src/core/devices/nm-device-factory.c \
+	src/core/devices/nm-device-factory.h \
+	src/core/devices/nm-device-generic.c \
+	src/core/devices/nm-device-generic.h \
+	src/core/devices/nm-device-logging.h \
+	src/core/devices/nm-device-private.h \
 	\
-	src/devices/nm-device-6lowpan.c \
-	src/devices/nm-device-6lowpan.h \
-	src/devices/nm-device-bond.c \
-	src/devices/nm-device-bond.h \
-	src/devices/nm-device-bridge.c \
-	src/devices/nm-device-bridge.h \
-	src/devices/nm-device-dummy.c \
-	src/devices/nm-device-dummy.h \
-	src/devices/nm-device-ethernet.c \
-	src/devices/nm-device-ethernet.h \
-	src/devices/nm-device-infiniband.c \
-	src/devices/nm-device-infiniband.h \
-	src/devices/nm-device-ip-tunnel.c \
-	src/devices/nm-device-ip-tunnel.h \
-	src/devices/nm-device-macsec.c \
-	src/devices/nm-device-macsec.h \
-	src/devices/nm-device-macvlan.c \
-	src/devices/nm-device-macvlan.h \
-	src/devices/nm-device-ppp.c \
-	src/devices/nm-device-ppp.h \
-	src/devices/nm-device-tun.c \
-	src/devices/nm-device-tun.h \
-	src/devices/nm-device-veth.c \
-	src/devices/nm-device-veth.h \
-	src/devices/nm-device-vlan.c \
-	src/devices/nm-device-vlan.h \
-	src/devices/nm-device-vrf.c \
-	src/devices/nm-device-vrf.h \
-	src/devices/nm-device-vxlan.c \
-	src/devices/nm-device-vxlan.h \
-	src/devices/nm-device-wireguard.c \
-	src/devices/nm-device-wireguard.h \
-	src/devices/nm-device-wpan.c \
-	src/devices/nm-device-wpan.h \
+	src/core/devices/nm-device-6lowpan.c \
+	src/core/devices/nm-device-6lowpan.h \
+	src/core/devices/nm-device-bond.c \
+	src/core/devices/nm-device-bond.h \
+	src/core/devices/nm-device-bridge.c \
+	src/core/devices/nm-device-bridge.h \
+	src/core/devices/nm-device-dummy.c \
+	src/core/devices/nm-device-dummy.h \
+	src/core/devices/nm-device-ethernet.c \
+	src/core/devices/nm-device-ethernet.h \
+	src/core/devices/nm-device-infiniband.c \
+	src/core/devices/nm-device-infiniband.h \
+	src/core/devices/nm-device-ip-tunnel.c \
+	src/core/devices/nm-device-ip-tunnel.h \
+	src/core/devices/nm-device-macsec.c \
+	src/core/devices/nm-device-macsec.h \
+	src/core/devices/nm-device-macvlan.c \
+	src/core/devices/nm-device-macvlan.h \
+	src/core/devices/nm-device-ppp.c \
+	src/core/devices/nm-device-ppp.h \
+	src/core/devices/nm-device-tun.c \
+	src/core/devices/nm-device-tun.h \
+	src/core/devices/nm-device-veth.c \
+	src/core/devices/nm-device-veth.h \
+	src/core/devices/nm-device-vlan.c \
+	src/core/devices/nm-device-vlan.h \
+	src/core/devices/nm-device-vrf.c \
+	src/core/devices/nm-device-vrf.h \
+	src/core/devices/nm-device-vxlan.c \
+	src/core/devices/nm-device-vxlan.h \
+	src/core/devices/nm-device-wireguard.c \
+	src/core/devices/nm-device-wireguard.h \
+	src/core/devices/nm-device-wpan.c \
+	src/core/devices/nm-device-wpan.h \
 	\
-	src/dhcp/nm-dhcp-dhcpcanon.c \
-	src/dhcp/nm-dhcp-dhclient.c \
-	src/dhcp/nm-dhcp-dhcpcd.c \
-	src/dhcp/nm-dhcp-helper-api.h \
-	src/dhcp/nm-dhcp-listener.c \
-	src/dhcp/nm-dhcp-listener.h \
-	src/dhcp/nm-dhcp-dhclient-utils.c \
-	src/dhcp/nm-dhcp-dhclient-utils.h \
+	src/core/dhcp/nm-dhcp-dhcpcanon.c \
+	src/core/dhcp/nm-dhcp-dhclient.c \
+	src/core/dhcp/nm-dhcp-dhcpcd.c \
+	src/core/dhcp/nm-dhcp-helper-api.h \
+	src/core/dhcp/nm-dhcp-listener.c \
+	src/core/dhcp/nm-dhcp-listener.h \
+	src/core/dhcp/nm-dhcp-dhclient-utils.c \
+	src/core/dhcp/nm-dhcp-dhclient-utils.h \
 	\
-	src/dns/nm-dns-manager.c \
-	src/dns/nm-dns-manager.h \
-	src/dns/nm-dns-plugin.c \
-	src/dns/nm-dns-plugin.h \
-	src/dns/nm-dns-dnsmasq.c \
-	src/dns/nm-dns-dnsmasq.h \
-	src/dns/nm-dns-systemd-resolved.c \
-	src/dns/nm-dns-systemd-resolved.h \
-	src/dns/nm-dns-unbound.c \
-	src/dns/nm-dns-unbound.h \
+	src/core/dns/nm-dns-manager.c \
+	src/core/dns/nm-dns-manager.h \
+	src/core/dns/nm-dns-plugin.c \
+	src/core/dns/nm-dns-plugin.h \
+	src/core/dns/nm-dns-dnsmasq.c \
+	src/core/dns/nm-dns-dnsmasq.h \
+	src/core/dns/nm-dns-systemd-resolved.c \
+	src/core/dns/nm-dns-systemd-resolved.h \
+	src/core/dns/nm-dns-unbound.c \
+	src/core/dns/nm-dns-unbound.h \
 	\
-	src/dnsmasq/nm-dnsmasq-manager.c \
-	src/dnsmasq/nm-dnsmasq-manager.h \
-	src/dnsmasq/nm-dnsmasq-utils.c \
-	src/dnsmasq/nm-dnsmasq-utils.h \
+	src/core/dnsmasq/nm-dnsmasq-manager.c \
+	src/core/dnsmasq/nm-dnsmasq-manager.h \
+	src/core/dnsmasq/nm-dnsmasq-utils.c \
+	src/core/dnsmasq/nm-dnsmasq-utils.h \
 	\
-	src/ppp/nm-ppp-manager-call.c \
-	src/ppp/nm-ppp-manager-call.h \
-	src/ppp/nm-ppp-manager.h \
-	src/ppp/nm-ppp-status.h \
+	src/core/ppp/nm-ppp-manager-call.c \
+	src/core/ppp/nm-ppp-manager-call.h \
+	src/core/ppp/nm-ppp-manager.h \
+	src/core/ppp/nm-ppp-status.h \
 	\
-	src/nm-hostname-manager.c \
-	src/nm-hostname-manager.h \
+	src/core/nm-hostname-manager.c \
+	src/core/nm-hostname-manager.h \
 	\
-	src/settings/nm-agent-manager.c \
-	src/settings/nm-agent-manager.h \
-	src/settings/nm-secret-agent.c \
-	src/settings/nm-secret-agent.h \
-	src/settings/nm-settings-connection.c \
-	src/settings/nm-settings-connection.h \
-	src/settings/nm-settings-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/core/settings/nm-agent-manager.c \
+	src/core/settings/nm-agent-manager.h \
+	src/core/settings/nm-secret-agent.c \
+	src/core/settings/nm-secret-agent.h \
+	src/core/settings/nm-settings-connection.c \
+	src/core/settings/nm-settings-connection.h \
+	src/core/settings/nm-settings-storage.c \
+	src/core/settings/nm-settings-storage.h \
+	src/core/settings/nm-settings-plugin.c \
+	src/core/settings/nm-settings-plugin.h \
+	src/core/settings/nm-settings.c \
+	src/core/settings/nm-settings.h \
+	src/core/settings/nm-settings-utils.c \
+	src/core/settings/nm-settings-utils.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 \
-	src/settings/plugins/keyfile/nms-keyfile-reader.h \
-	src/settings/plugins/keyfile/nms-keyfile-utils.c \
-	src/settings/plugins/keyfile/nms-keyfile-utils.h \
-	src/settings/plugins/keyfile/nms-keyfile-writer.c \
-	src/settings/plugins/keyfile/nms-keyfile-writer.h \
+	src/core/settings/plugins/keyfile/nms-keyfile-storage.c \
+	src/core/settings/plugins/keyfile/nms-keyfile-storage.h \
+	src/core/settings/plugins/keyfile/nms-keyfile-plugin.c \
+	src/core/settings/plugins/keyfile/nms-keyfile-plugin.h \
+	src/core/settings/plugins/keyfile/nms-keyfile-reader.c \
+	src/core/settings/plugins/keyfile/nms-keyfile-reader.h \
+	src/core/settings/plugins/keyfile/nms-keyfile-utils.c \
+	src/core/settings/plugins/keyfile/nms-keyfile-utils.h \
+	src/core/settings/plugins/keyfile/nms-keyfile-writer.c \
+	src/core/settings/plugins/keyfile/nms-keyfile-writer.h \
 	\
-	src/supplicant/nm-supplicant-config.c \
-	src/supplicant/nm-supplicant-config.h \
-	src/supplicant/nm-supplicant-interface.c \
-	src/supplicant/nm-supplicant-interface.h \
-	src/supplicant/nm-supplicant-manager.c \
-	src/supplicant/nm-supplicant-manager.h \
-	src/supplicant/nm-supplicant-settings-verify.c \
-	src/supplicant/nm-supplicant-settings-verify.h \
-	src/supplicant/nm-supplicant-types.h \
+	src/core/supplicant/nm-supplicant-config.c \
+	src/core/supplicant/nm-supplicant-config.h \
+	src/core/supplicant/nm-supplicant-interface.c \
+	src/core/supplicant/nm-supplicant-interface.h \
+	src/core/supplicant/nm-supplicant-manager.c \
+	src/core/supplicant/nm-supplicant-manager.h \
+	src/core/supplicant/nm-supplicant-settings-verify.c \
+	src/core/supplicant/nm-supplicant-settings-verify.h \
+	src/core/supplicant/nm-supplicant-types.h \
 	\
-	src/vpn/nm-vpn-connection.c \
-	src/vpn/nm-vpn-connection.h \
-	src/vpn/nm-vpn-manager.c \
-	src/vpn/nm-vpn-manager.h \
+	src/core/vpn/nm-vpn-connection.c \
+	src/core/vpn/nm-vpn-connection.h \
+	src/core/vpn/nm-vpn-manager.c \
+	src/core/vpn/nm-vpn-manager.h \
 	\
-	src/nm-act-request.c \
-	src/nm-act-request.h \
-	src/nm-active-connection.c \
-	src/nm-active-connection.h \
-	src/nm-audit-manager.c \
-	src/nm-audit-manager.h \
-	src/nm-dbus-manager.c \
-	src/nm-dbus-manager.h \
-	src/nm-config.c \
-	src/nm-config.h \
-	src/nm-config-data.c \
-	src/nm-config-data.h \
-	src/nm-connectivity.c \
-	src/nm-connectivity.h \
-	src/nm-dcb.c \
-	src/nm-dcb.h \
-	src/nm-dhcp-config.c \
-	src/nm-dhcp-config.h \
-	src/nm-dispatcher.c \
-	src/nm-dispatcher.h \
-	src/nm-firewall-manager.c \
-	src/nm-firewall-manager.h \
-	src/nm-proxy-config.c \
-	src/nm-proxy-config.h \
-	src/nm-auth-manager.c \
-	src/nm-auth-manager.h \
-	src/nm-auth-utils.c \
-	src/nm-auth-utils.h \
-	src/nm-manager.c \
-	src/nm-manager.h \
-	src/nm-pacrunner-manager.c \
-	src/nm-pacrunner-manager.h \
-	src/nm-policy.c \
-	src/nm-policy.h \
-	src/nm-rfkill-manager.c \
-	src/nm-rfkill-manager.h \
-	src/nm-session-monitor.h \
-	src/nm-session-monitor.c \
-	src/nm-keep-alive.c \
-	src/nm-keep-alive.h \
-	src/nm-sleep-monitor.c \
-	src/nm-sleep-monitor.h \
-	src/nm-types.h \
+	src/core/nm-act-request.c \
+	src/core/nm-act-request.h \
+	src/core/nm-active-connection.c \
+	src/core/nm-active-connection.h \
+	src/core/nm-audit-manager.c \
+	src/core/nm-audit-manager.h \
+	src/core/nm-dbus-manager.c \
+	src/core/nm-dbus-manager.h \
+	src/core/nm-config.c \
+	src/core/nm-config.h \
+	src/core/nm-config-data.c \
+	src/core/nm-config-data.h \
+	src/core/nm-connectivity.c \
+	src/core/nm-connectivity.h \
+	src/core/nm-dcb.c \
+	src/core/nm-dcb.h \
+	src/core/nm-dhcp-config.c \
+	src/core/nm-dhcp-config.h \
+	src/core/nm-dispatcher.c \
+	src/core/nm-dispatcher.h \
+	src/core/nm-firewall-manager.c \
+	src/core/nm-firewall-manager.h \
+	src/core/nm-proxy-config.c \
+	src/core/nm-proxy-config.h \
+	src/core/nm-auth-manager.c \
+	src/core/nm-auth-manager.h \
+	src/core/nm-auth-utils.c \
+	src/core/nm-auth-utils.h \
+	src/core/nm-manager.c \
+	src/core/nm-manager.h \
+	src/core/nm-pacrunner-manager.c \
+	src/core/nm-pacrunner-manager.h \
+	src/core/nm-policy.c \
+	src/core/nm-policy.h \
+	src/core/nm-rfkill-manager.c \
+	src/core/nm-rfkill-manager.h \
+	src/core/nm-session-monitor.h \
+	src/core/nm-session-monitor.c \
+	src/core/nm-keep-alive.c \
+	src/core/nm-keep-alive.h \
+	src/core/nm-sleep-monitor.c \
+	src/core/nm-sleep-monitor.h \
+	src/core/nm-types.h \
 	\
 	$(NULL)
 
-src_libNetworkManager_la_LIBADD = \
-	src/libNetworkManagerBase.la \
+src_core_libNetworkManager_la_LIBADD = \
+	src/core/libNetworkManagerBase.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-platform/libnm-platform.la \
+	shared/nm-base/libnm-base.la \
+	shared/nm-log-core/libnm-log-core.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 \
+	src/core/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/libnacd.la \
 	shared/libndhcp4.la \
@@ -6633,6 +6888,7 @@ src_libNetworkManager_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(SYSTEMD_LOGIN_LIBS) \
+	$(SYSTEMD_JOURNAL_LIBS) \
 	$(LIBNDP_LIBS) \
 	$(DL_LIBS) \
 	$(SELINUX_LIBS) \
@@ -6641,113 +6897,118 @@ src_libNetworkManager_la_LIBADD = \
 	$(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
-src_libNetworkManagerTest_la_CPPFLAGS = $(src_cppflags_test)
-src_libNetworkManagerTest_la_SOURCES = \
-	src/ndisc/nm-fake-ndisc.c \
-	src/ndisc/nm-fake-ndisc.h \
-	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_core_tests_cppflags_fake = $(src_core_cppflags_test) -DSETUP=nm_fake_platform_setup
+src_core_tests_cppflags_linux = $(src_core_cppflags_test) -DSETUP=nm_linux_platform_setup
+src_core_libNetworkManagerTest_la_CPPFLAGS = $(src_core_cppflags_test)
+src_core_libNetworkManagerTest_la_SOURCES = \
+	src/core/ndisc/nm-fake-ndisc.c \
+	src/core/ndisc/nm-fake-ndisc.h \
+	src/core/platform/nm-fake-platform.c \
+	src/core/platform/nm-fake-platform.h \
+	src/core/platform/tests/test-common.c \
+	src/core/platform/tests/test-common.h \
 	$(NULL)
 
-src_libNetworkManagerTest_la_LIBADD = \
-	src/libNetworkManager.la \
+src_core_libNetworkManagerTest_la_LIBADD = \
+	src/core/libNetworkManager.la \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
 
-src_NetworkManager_all_sym_CPPFLAGS = $(src_cppflags)
-src_NetworkManager_all_sym_SOURCES = \
-	src/main.c
+src_core_NetworkManager_all_sym_CPPFLAGS = $(src_core_cppflags)
+src_core_NetworkManager_all_sym_SOURCES = \
+	src/core/main.c
 
-src_NetworkManager_all_sym_LDADD = \
-	src/libNetworkManager.la \
+src_core_NetworkManager_all_sym_LDADD = \
+	src/core/libNetworkManager.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src_NetworkManager_all_sym_LDFLAGS = \
+src_core_NetworkManager_all_sym_LDFLAGS = \
 	-rdynamic \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-EXTRA_src_NetworkManager_DEPENDENCIES = \
-	src/NetworkManager.ver
+EXTRA_src_core_NetworkManager_DEPENDENCIES = \
+	src/core/NetworkManager.ver
 
-src_NetworkManager_CPPFLAGS = $(src_cppflags)
-src_NetworkManager_SOURCES = \
-	src/main.c
+src_core_NetworkManager_CPPFLAGS = $(src_core_cppflags)
+src_core_NetworkManager_SOURCES = \
+	src/core/main.c
 
-src_NetworkManager_LDADD = \
-	src/libNetworkManager.la \
+src_core_NetworkManager_LDADD = \
+	src/core/libNetworkManager.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src_NetworkManager_LDFLAGS = \
+src_core_NetworkManager_LDFLAGS = \
 	-rdynamic \
-	-Wl,--version-script="src/NetworkManager.ver" \
+	-Wl,--version-script="src/core/NetworkManager.ver" \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
 
 ###############################################################################
-src_nm_iface_helper_CPPFLAGS = $(src_cppflags)
-src_nm_iface_helper_SOURCES = \
-	src/nm-iface-helper.c
+src_core_nm_iface_helper_CPPFLAGS = $(src_core_cppflags)
+src_core_nm_iface_helper_SOURCES = \
+	src/core/nm-iface-helper.c
 
-src_nm_iface_helper_LDADD = \
-	src/libNetworkManagerBase.la \
+src_core_nm_iface_helper_LDADD = \
+	src/core/libNetworkManagerBase.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-platform/libnm-platform.la \
+	shared/nm-base/libnm-base.la \
+	shared/nm-log-core/libnm-log-core.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 \
+	src/core/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/libnacd.la \
 	shared/libndhcp4.la \
 	shared/libcrbtree.la \
 	shared/libcsiphash.la \
+	$(SYSTEMD_JOURNAL_LIBS) \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(LIBNDP_LIBS) \
 	$(DL_LIBS) \
 	$(NULL)
 
-src_nm_iface_helper_LDFLAGS = \
+src_core_nm_iface_helper_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_initrd_libnmi_core_la_CPPFLAGS = \
-	$(src_cppflags)
+src_core_initrd_libnmi_core_la_CPPFLAGS = \
+	$(src_core_cppflags)
 
-src_initrd_libnmi_core_la_SOURCES = \
-	src/initrd/nm-initrd-generator.h \
-	src/initrd/nmi-cmdline-reader.c \
-	src/initrd/nmi-dt-reader.c \
-	src/initrd/nmi-ibft-reader.c \
+src_core_initrd_libnmi_core_la_SOURCES = \
+	src/core/initrd/nm-initrd-generator.h \
+	src/core/initrd/nmi-cmdline-reader.c \
+	src/core/initrd/nmi-dt-reader.c \
+	src/core/initrd/nmi-ibft-reader.c \
 	$(NULL)
 
-src_initrd_nm_initrd_generator_CPPFLAGS = \
-	$(src_cppflags)
+src_core_initrd_nm_initrd_generator_CPPFLAGS = \
+	$(src_core_cppflags)
 
-src_initrd_nm_initrd_generator_SOURCES = \
-	src/initrd/nm-initrd-generator.c
+src_core_initrd_nm_initrd_generator_SOURCES = \
+	src/core/initrd/nm-initrd-generator.c
 
-src_initrd_nm_initrd_generator_LDADD = \
-	src/initrd/libnmi-core.la \
-	src/libNetworkManagerBase.la \
+src_core_initrd_nm_initrd_generator_LDADD = \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerBase.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
-	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-platform/libnm-platform.la \
+	shared/nm-base/libnm-base.la \
+	shared/nm-log-core/libnm-log-core.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 \
@@ -6756,447 +7017,445 @@ src_initrd_nm_initrd_generator_LDADD = \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libndhcp4.la \
 	shared/libcsiphash.la \
+	$(SYSTEMD_JOURNAL_LIBS) \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src_initrd_nm_initrd_generator_LDFLAGS = \
+src_core_initrd_nm_initrd_generator_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_initrd_tests_test_dt_reader_CPPFLAGS = \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \
-	$(src_cppflags)
+src_core_initrd_tests_test_dt_reader_CPPFLAGS = \
+	$(src_core_cppflags) \
+	$(NULL)
 
-src_initrd_tests_test_dt_reader_LDFLAGS = \
+src_core_initrd_tests_test_dt_reader_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
-	$(SANITIZER_EXEC_LDFLAGS)
+	$(SANITIZER_EXEC_LDFLAGS) \
+	$(NULL)
 
-src_initrd_tests_test_dt_reader_LDADD = \
-	src/initrd/libnmi-core.la \
-	src/libNetworkManagerTest.la \
+src_core_initrd_tests_test_dt_reader_LDADD = \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerTest.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src_initrd_tests_test_ibft_reader_CPPFLAGS = \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \
-	$(src_cppflags)
+src_core_initrd_tests_test_ibft_reader_CPPFLAGS = \
+	$(src_core_cppflags) \
+	$(NULL)
 
-src_initrd_tests_test_ibft_reader_LDFLAGS = \
+src_core_initrd_tests_test_ibft_reader_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
-	$(SANITIZER_EXEC_LDFLAGS)
+	$(SANITIZER_EXEC_LDFLAGS) \
+	$(NULL)
 
-src_initrd_tests_test_ibft_reader_LDADD = \
-	src/initrd/libnmi-core.la \
-	src/libNetworkManagerTest.la \
+src_core_initrd_tests_test_ibft_reader_LDADD = \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerTest.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src_initrd_tests_test_cmdline_reader_CPPFLAGS = \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \
-	$(src_cppflags)
+src_core_initrd_tests_test_cmdline_reader_CPPFLAGS = \
+	$(src_core_cppflags) \
+	$(NULL)
 
-src_initrd_tests_test_cmdline_reader_LDFLAGS = \
+src_core_initrd_tests_test_cmdline_reader_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_initrd_tests_test_cmdline_reader_LDADD = \
-	src/initrd/libnmi-core.la \
-	src/libNetworkManagerTest.la \
+src_core_initrd_tests_test_cmdline_reader_LDADD = \
+	src/core/initrd/libnmi-core.la \
+	src/core/libNetworkManagerTest.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src_dhcp_nm_dhcp_helper_CPPFLAGS = \
+src_core_dhcp_nm_dhcp_helper_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
 	$(GLIB_CFLAGS) \
 	$(NULL)
 
-src_dhcp_nm_dhcp_helper_SOURCES = \
-	src/dhcp/nm-dhcp-helper.c \
-	src/dhcp/nm-dhcp-helper-api.h \
+src_core_dhcp_nm_dhcp_helper_SOURCES = \
+	src/core/dhcp/nm-dhcp-helper.c \
+	src/core/dhcp/nm-dhcp-helper-api.h \
 	$(NULL)
 
-src_dhcp_nm_dhcp_helper_LDFLAGS = \
+src_core_dhcp_nm_dhcp_helper_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
 
-src_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS)
+src_core_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS)
 
 ###############################################################################
-# src/dhcp/tests
+# src/core/dhcp/tests
 ###############################################################################
-src_dhcp_tests_cppflags = $(src_cppflags_test)
-src_dhcp_tests_ldadd = \
-	src/libNetworkManagerTest.la
-
-src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_tests_cppflags)
-src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags)
-src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd)
-src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd)
-src_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_tests_ldflags)
-src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags)
-@WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_CPPFLAGS = \
+src_core_dhcp_tests_cppflags = $(src_core_cppflags_test)
+src_core_dhcp_tests_ldadd = \
+	src/core/libNetworkManagerTest.la
+
+src_core_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_core_dhcp_tests_cppflags)
+src_core_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_core_dhcp_tests_cppflags)
+src_core_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_core_dhcp_tests_ldadd)
+src_core_dhcp_tests_test_dhcp_utils_LDADD = $(src_core_dhcp_tests_ldadd)
+src_core_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_core_tests_ldflags)
+src_core_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_core_tests_ldflags)
+@WITH_PPP_TRUE@src_core_ppp_nm_pppd_plugin_la_CPPFLAGS = \
 @WITH_PPP_TRUE@	$(dflt_cppflags) \
 @WITH_PPP_TRUE@	-I$(srcdir)/shared \
 @WITH_PPP_TRUE@	-I$(builddir)/shared \
 @WITH_PPP_TRUE@	-I$(srcdir)/libnm-core \
 @WITH_PPP_TRUE@	-DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \
-@WITH_PPP_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
 @WITH_PPP_TRUE@	$(GLIB_CFLAGS)
 
-@WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_SOURCES = \
-@WITH_PPP_TRUE@	src/ppp/nm-pppd-plugin.c \
-@WITH_PPP_TRUE@	src/ppp/nm-pppd-plugin.h \
-@WITH_PPP_TRUE@	src/ppp/nm-ppp-status.h
+@WITH_PPP_TRUE@src_core_ppp_nm_pppd_plugin_la_SOURCES = \
+@WITH_PPP_TRUE@	src/core/ppp/nm-pppd-plugin.c \
+@WITH_PPP_TRUE@	src/core/ppp/nm-pppd-plugin.h \
+@WITH_PPP_TRUE@	src/core/ppp/nm-ppp-status.h
 
-@WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_LDFLAGS = \
+@WITH_PPP_TRUE@src_core_ppp_nm_pppd_plugin_la_LDFLAGS = \
 @WITH_PPP_TRUE@	-module -avoid-version
 
-@WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_LIBADD = \
+@WITH_PPP_TRUE@src_core_ppp_nm_pppd_plugin_la_LIBADD = \
 @WITH_PPP_TRUE@	$(GLIB_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_core_ppp_libnm_ppp_plugin_la_SOURCES = \
+@WITH_PPP_TRUE@	src/core/ppp/nm-pppd-plugin.h \
+@WITH_PPP_TRUE@	src/core/ppp/nm-ppp-manager.c \
+@WITH_PPP_TRUE@	src/core/ppp/nm-ppp-manager.h \
+@WITH_PPP_TRUE@	src/core/ppp/nm-ppp-plugin-api.h \
+@WITH_PPP_TRUE@	src/core/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@EXTRA_src_core_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \
+@WITH_PPP_TRUE@	src/core/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@src_core_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_core_cppflags_base)
+@WITH_PPP_TRUE@src_core_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/core/ppp/nm-ppp-plugin.ver" \
 @WITH_PPP_TRUE@	$(NULL)
 
-@WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LIBADD = \
+@WITH_PPP_TRUE@src_core_ppp_libnm_ppp_plugin_la_LIBADD = \
 @WITH_PPP_TRUE@	$(GLIB_LIBS) \
 @WITH_PPP_TRUE@	$(NULL)
 
-src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_cppflags_test)
-src_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \
+src_core_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_core_cppflags_test)
+src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \
-	src/libNetworkManagerTest.la
+src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \
+	src/core/libNetworkManagerTest.la
 
 
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags_base)) \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_core_cppflags_base)) \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(INTROSPECTION_EXTRA_CFLAGS) \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(NULL)
 
 
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
-@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/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_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/shvar.c \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/shvar.h \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/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_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_core_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-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_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/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 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_core_cppflags_base)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	-module -avoid-version \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-settings.ver" \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_cppflags_base_test)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_core_cppflags_base_test)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(GLIB_LIBS) \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(CODE_COVERAGE_LDFLAGS) \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/libNetworkManagerTest.la
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/libNetworkManagerTest.la
 
 
 # make target dependencies can't have colons in their names, which ends up
 # meaning that we can't add the alias files to EXTRA_DIST. They are instead
 # dist'ed via dist-hook-settings-ifcfg-rh below.
-src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
-
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-parser.c \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-parser.h \
+src_core_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 \
+	src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
+
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/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@src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_core_cppflags_base)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \
 @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-plugin.c \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/nms-ifupdown-plugin.h \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/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@src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_core_cppflags_base)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_core_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@	$(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@src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la \
 @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 = \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_core_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_core_cppflags_base_test)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_core_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(CODE_COVERAGE_LDFLAGS) \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/libNetworkManagerTest.la \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@src_core_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/core/libNetworkManagerTest.la \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(GLIB_LIBS) \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(NULL)
 
-src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
-	src/devices/adsl/nm-atm-manager.c \
-	src/devices/adsl/nm-device-adsl.c \
-	src/devices/adsl/nm-device-adsl.h
+src_core_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
+	src/core/devices/adsl/nm-atm-manager.c \
+	src/core/devices/adsl/nm-device-adsl.c \
+	src/core/devices/adsl/nm-device-adsl.h
 
-src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_cppflags_device_plugin)
-src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \
+src_core_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_core_cppflags_device_plugin)
+src_core_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \
 	-module -avoid-version \
 	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
-src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
+src_core_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 	$(LIBUDEV_LIBS)
 
 
 ###############################################################################
-# src/devices/wwan
+# src/core/devices/wwan
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_cppflags = \
-@WITH_MODEM_MANAGER_1_TRUE@	$(src_cppflags_device_plugin) \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_cppflags = \
+@WITH_MODEM_MANAGER_1_TRUE@	$(src_core_cppflags_device_plugin) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(MM_GLIB_CFLAGS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_SOURCES = src/devices/wwan/nm-modem-broadband.c \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem-broadband.h \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem-manager.c \
-@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@	src/devices/wwan/nm-service-providers.c \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-service-providers.h \
-@WITH_MODEM_MANAGER_1_TRUE@	$(NULL) $(am__append_32)
-@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@src_core_devices_wwan_libnm_wwan_la_SOURCES = src/core/devices/wwan/nm-modem-broadband.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-modem-broadband.h \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-modem-manager.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-modem-manager.h \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-modem.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-modem.h \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-service-providers.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-service-providers.h \
+@WITH_MODEM_MANAGER_1_TRUE@	$(NULL) $(am__append_34)
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_core_devices_wwan_cppflags)
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_wwan_la_LDFLAGS = \
 @WITH_MODEM_MANAGER_1_TRUE@	-avoid-version \
-@WITH_MODEM_MANAGER_1_TRUE@	-Wl,--version-script="$(srcdir)/src/devices/wwan/libnm-wwan.ver"
+@WITH_MODEM_MANAGER_1_TRUE@	-Wl,--version-script="$(srcdir)/src/core/devices/wwan/libnm-wwan.ver"
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_LIBADD = \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_wwan_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(LIBSYSTEMD_LIBS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(MM_GLIB_LIBS)
 
-@WITH_MODEM_MANAGER_1_TRUE@EXTRA_src_devices_wwan_libnm_wwan_la_DEPENDENCIES = \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.ver
+@WITH_MODEM_MANAGER_1_TRUE@EXTRA_src_core_devices_wwan_libnm_wwan_la_DEPENDENCIES = \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/libnm-wwan.ver
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES = \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-wwan-factory.c \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-device-modem.c \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-device-modem.h
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_device_plugin_wwan_la_SOURCES = \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-wwan-factory.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-device-modem.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-device-modem.h
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags)
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS = \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS = $(src_core_devices_wwan_cppflags)
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_device_plugin_wwan_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_wwan_libnm_device_plugin_wwan_la_LIBADD = \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS)
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_tests_test_service_providers_SOURCES = \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/tests/test-service-providers.c \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-service-providers.c \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-service-providers.h \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_tests_test_service_providers_SOURCES = \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/tests/test-service-providers.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-service-providers.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-service-providers.h \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_tests_test_service_providers_CPPFLAGS = \
-@WITH_MODEM_MANAGER_1_TRUE@	$(src_cppflags_base_test) \
-@WITH_MODEM_MANAGER_1_TRUE@	-I$(srcdir)/src/devices/wwan \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_tests_test_service_providers_CPPFLAGS = \
+@WITH_MODEM_MANAGER_1_TRUE@	$(src_core_cppflags_base_test) \
+@WITH_MODEM_MANAGER_1_TRUE@	-I$(srcdir)/src/core/devices/wwan \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_tests_test_service_providers_LDFLAGS = \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_tests_test_service_providers_LDFLAGS = \
 @WITH_MODEM_MANAGER_1_TRUE@	$(SANITIZER_EXEC_LDFLAGS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_tests_test_service_providers_LDADD = \
-@WITH_MODEM_MANAGER_1_TRUE@	src/libNetworkManagerTest.la \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_tests_test_service_providers_LDADD = \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/libNetworkManagerTest.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES = src/devices/bluetooth/nm-bluez-common.h \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bt-error.c \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bt-error.h \
-@WITH_MODEM_MANAGER_1_TRUE@	$(NULL) $(am__append_36)
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS =  \
-@WITH_MODEM_MANAGER_1_TRUE@	$(src_cppflags_base) $(NULL) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_37)
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD =  \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES = src/core/devices/bluetooth/nm-bluez-common.h \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bt-error.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bt-error.h \
+@WITH_MODEM_MANAGER_1_TRUE@	$(NULL) $(am__append_38)
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS =  \
+@WITH_MODEM_MANAGER_1_TRUE@	$(src_core_cppflags_base) $(NULL) \
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_39)
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD =  \
 @WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) $(NULL) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_38)
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bluez-manager.c \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bluez-manager.h \
-@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_40)
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bluez-manager.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bluez-manager.h \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-device-bt.c \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-device-bt.h \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_cppflags_device_plugin)
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_core_cppflags_device_plugin)
+@WITH_MODEM_MANAGER_1_TRUE@src_core_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/bluetooth/libnm-bluetooth-utils.la \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/libnm-bluetooth-utils.la \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_tests_nm_bt_test_CPPFLAGS = \
-@WITH_MODEM_MANAGER_1_TRUE@	$(src_cppflags_test) \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_tests_nm_bt_test_CPPFLAGS = \
+@WITH_MODEM_MANAGER_1_TRUE@	$(src_core_cppflags_test) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_tests_nm_bt_test_LDFLAGS = \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_tests_nm_bt_test_LDFLAGS = \
 @WITH_MODEM_MANAGER_1_TRUE@	$(SANITIZER_EXEC_LDFLAGS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_tests_nm_bt_test_LDADD = \
-@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm-bluetooth-utils.la \
-@WITH_MODEM_MANAGER_1_TRUE@	src/libNetworkManager.la \
+@WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_tests_nm_bt_test_LDADD = \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/libnm-bluetooth-utils.la \
+@WITH_MODEM_MANAGER_1_TRUE@	src/core/libNetworkManager.la \
 @WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) \
 @WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_wifi_base_la_SOURCES =  \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.h \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi-p2p.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi-p2p.h \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi.h \
-@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-common.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-common.h \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-p2p-peer.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-p2p-peer.h \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.h $(NULL) \
-@WITH_WIFI_TRUE@	$(am__append_41)
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_cppflags_device_plugin)
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_wifi_base_la_LIBADD = \
+@WITH_WIFI_TRUE@src_core_devices_wifi_libnm_wifi_base_la_SOURCES =  \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-olpc-mesh.c \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-olpc-mesh.h \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-wifi-p2p.c \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-wifi-p2p.h \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-wifi.c \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-wifi.h \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-ap.c \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-ap.h \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-common.c \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-common.h \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-p2p-peer.c \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-p2p-peer.h \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-utils.c \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-utils.h $(NULL) \
+@WITH_WIFI_TRUE@	$(am__append_43)
+@WITH_WIFI_TRUE@src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_core_cppflags_device_plugin)
+@WITH_WIFI_TRUE@src_core_devices_wifi_libnm_wifi_base_la_LIBADD = \
 @WITH_WIFI_TRUE@	$(GLIB_LIBS)
 
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-factory.c \
+@WITH_WIFI_TRUE@src_core_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-factory.c \
 @WITH_WIFI_TRUE@	$(NULL)
 
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin)
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
+@WITH_WIFI_TRUE@src_core_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_core_cppflags_device_plugin)
+@WITH_WIFI_TRUE@src_core_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
 @WITH_WIFI_TRUE@	-module -avoid-version \
 @WITH_WIFI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
-@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm-wifi-base.la \
+@WITH_WIFI_TRUE@src_core_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm-wifi-base.la \
 @WITH_WIFI_TRUE@	$(GLIB_LIBS)
 
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_SOURCES = \
-@WITH_WIFI_TRUE@	src/devices/wifi/tests/test-devices-wifi.c \
+@WITH_WIFI_TRUE@src_core_devices_wifi_tests_test_devices_wifi_SOURCES = \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/tests/test-devices-wifi.c \
 @WITH_WIFI_TRUE@	$(NULL)
 
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_cppflags_base_test)
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_LDADD = \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm-wifi-base.la \
-@WITH_WIFI_TRUE@	src/libNetworkManagerTest.la \
-@WITH_WIFI_TRUE@	src/libNetworkManagerBase.la \
+@WITH_WIFI_TRUE@src_core_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_core_cppflags_base_test)
+@WITH_WIFI_TRUE@src_core_devices_wifi_tests_test_devices_wifi_LDADD = \
+@WITH_WIFI_TRUE@	src/core/devices/wifi/libnm-wifi-base.la \
+@WITH_WIFI_TRUE@	src/core/libNetworkManagerTest.la \
+@WITH_WIFI_TRUE@	src/core/libNetworkManagerBase.la \
 @WITH_WIFI_TRUE@	$(NULL)
 
-@WITH_WIFI_TRUE@src_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
-@WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_SOURCES = \
-@WITH_TEAMDCTL_TRUE@	src/devices/team/nm-team-factory.c \
-@WITH_TEAMDCTL_TRUE@	src/devices/team/nm-device-team.c \
-@WITH_TEAMDCTL_TRUE@	src/devices/team/nm-device-team.h \
+@WITH_WIFI_TRUE@src_core_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
+@WITH_TEAMDCTL_TRUE@src_core_devices_team_libnm_device_plugin_team_la_SOURCES = \
+@WITH_TEAMDCTL_TRUE@	src/core/devices/team/nm-team-factory.c \
+@WITH_TEAMDCTL_TRUE@	src/core/devices/team/nm-device-team.c \
+@WITH_TEAMDCTL_TRUE@	src/core/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) \
+@WITH_TEAMDCTL_TRUE@src_core_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
+@WITH_TEAMDCTL_TRUE@	$(src_core_cppflags_device_plugin) \
 @WITH_TEAMDCTL_TRUE@	$(LIBTEAMDCTL_CFLAGS) \
 @WITH_TEAMDCTL_TRUE@	$(JANSSON_CFLAGS) \
 @WITH_TEAMDCTL_TRUE@	$(NULL)
 
-@WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \
+@WITH_TEAMDCTL_TRUE@src_core_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@	$(NULL)
 
-@WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_LIBADD = \
+@WITH_TEAMDCTL_TRUE@src_core_devices_team_libnm_device_plugin_team_la_LIBADD = \
 @WITH_TEAMDCTL_TRUE@	$(LIBTEAMDCTL_LIBS) \
 @WITH_TEAMDCTL_TRUE@	$(JANSSON_LIBS) \
 @WITH_TEAMDCTL_TRUE@	$(GLIB_LIBS) \
@@ -7204,209 +7463,208 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 
 
 ###############################################################################
-# src/devices/ovs
+# src/core/devices/ovs
 ###############################################################################
 @HAVE_SYSTEMD_TRUE@@WITH_OPENVSWITCH_TRUE@systemdnmunitdir = $(systemdsystemunitdir)/NetworkManager.service.d
 @HAVE_SYSTEMD_TRUE@@WITH_OPENVSWITCH_TRUE@systemdnmunit_DATA = \
 @HAVE_SYSTEMD_TRUE@@WITH_OPENVSWITCH_TRUE@	data/NetworkManager-ovs.conf
 
-@WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-ovsdb.c \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-ovsdb.h \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-ovs-factory.c \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-interface.c \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-interface.h \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-port.c \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-port.h \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-bridge.c \
-@WITH_OPENVSWITCH_TRUE@	src/devices/ovs/nm-device-ovs-bridge.h \
+@WITH_OPENVSWITCH_TRUE@src_core_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/nm-ovsdb.c \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/nm-ovsdb.h \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/nm-ovs-factory.c \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/nm-device-ovs-interface.c \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/nm-device-ovs-interface.h \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/nm-device-ovs-port.c \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/nm-device-ovs-port.h \
+@WITH_OPENVSWITCH_TRUE@	src/core/devices/ovs/nm-device-ovs-bridge.c \
+@WITH_OPENVSWITCH_TRUE@	src/core/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) \
+@WITH_OPENVSWITCH_TRUE@src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \
+@WITH_OPENVSWITCH_TRUE@	$(src_core_cppflags_device_plugin) \
 @WITH_OPENVSWITCH_TRUE@	$(JANSSON_CFLAGS) \
 @WITH_OPENVSWITCH_TRUE@	$(NULL)
 
-@WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \
+@WITH_OPENVSWITCH_TRUE@src_core_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@	$(NULL)
 
-@WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \
+@WITH_OPENVSWITCH_TRUE@src_core_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \
 @WITH_OPENVSWITCH_TRUE@	$(JANSSON_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 = \
-	src/libNetworkManagerTest.la
+src_core_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_core_cppflags_test)
+src_core_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
+	src/core/libNetworkManagerTest.la
 
-src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \
+src_core_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
 
 ###############################################################################
-# src/platform/tests
+# src/core/platform/tests
 ###############################################################################
-src_platform_tests_ldflags = \
+src_core_platform_tests_ldflags = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_platform_tests_libadd = \
-	src/libNetworkManagerTest.la \
+src_core_platform_tests_libadd = \
+	src/core/libNetworkManagerTest.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS)
 
-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_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)
-src_platform_tests_test_address_fake_LDADD = $(src_platform_tests_libadd)
-src_platform_tests_test_address_linux_SOURCES = src/platform/tests/test-address.c
-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_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)
-src_platform_tests_test_cleanup_fake_LDADD = $(src_platform_tests_libadd)
-src_platform_tests_test_cleanup_linux_SOURCES = src/platform/tests/test-cleanup.c
-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_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_platform_tests_test_tc_fake_SOURCES = src/platform/tests/test-tc.c
-src_platform_tests_test_tc_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_platform_tests_test_tc_fake_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_tc_fake_LDADD = $(src_platform_tests_libadd)
-src_platform_tests_test_tc_linux_SOURCES = src/platform/tests/test-tc.c
-src_platform_tests_test_tc_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_platform_tests_test_tc_linux_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_tc_linux_LDADD = $(src_platform_tests_libadd)
+src_core_platform_tests_monitor_CPPFLAGS = $(src_core_cppflags_test)
+src_core_platform_tests_monitor_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_monitor_LDADD = $(src_core_platform_tests_libadd)
+src_core_platform_tests_test_address_fake_SOURCES = src/core/platform/tests/test-address.c
+src_core_platform_tests_test_address_fake_CPPFLAGS = $(src_core_tests_cppflags_fake)
+src_core_platform_tests_test_address_fake_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_address_fake_LDADD = $(src_core_platform_tests_libadd)
+src_core_platform_tests_test_address_linux_SOURCES = src/core/platform/tests/test-address.c
+src_core_platform_tests_test_address_linux_CPPFLAGS = $(src_core_tests_cppflags_linux)
+src_core_platform_tests_test_address_linux_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_address_linux_LDADD = $(src_core_platform_tests_libadd)
+src_core_platform_tests_test_cleanup_fake_SOURCES = src/core/platform/tests/test-cleanup.c
+src_core_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_core_tests_cppflags_fake)
+src_core_platform_tests_test_cleanup_fake_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_cleanup_fake_LDADD = $(src_core_platform_tests_libadd)
+src_core_platform_tests_test_cleanup_linux_SOURCES = src/core/platform/tests/test-cleanup.c
+src_core_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_core_tests_cppflags_linux)
+src_core_platform_tests_test_cleanup_linux_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_cleanup_linux_LDADD = $(src_core_platform_tests_libadd)
+src_core_platform_tests_test_link_fake_SOURCES = src/core/platform/tests/test-link.c
+src_core_platform_tests_test_link_fake_CPPFLAGS = $(src_core_tests_cppflags_fake)
+src_core_platform_tests_test_link_fake_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_link_fake_LDADD = $(src_core_platform_tests_libadd)
+src_core_platform_tests_test_link_linux_SOURCES = src/core/platform/tests/test-link.c
+src_core_platform_tests_test_link_linux_CPPFLAGS = $(src_core_tests_cppflags_linux)
+src_core_platform_tests_test_link_linux_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_link_linux_LDADD = $(src_core_platform_tests_libadd)
+src_core_platform_tests_test_nmp_object_CPPFLAGS = $(src_core_cppflags_test)
+src_core_platform_tests_test_nmp_object_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_nmp_object_LDADD = src/core/libNetworkManagerTest.la
+src_core_platform_tests_test_platform_general_CPPFLAGS = $(src_core_cppflags_test)
+src_core_platform_tests_test_platform_general_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_platform_general_LDADD = src/core/libNetworkManagerTest.la
+src_core_platform_tests_test_route_fake_SOURCES = src/core/platform/tests/test-route.c
+src_core_platform_tests_test_route_fake_CPPFLAGS = $(src_core_tests_cppflags_fake)
+src_core_platform_tests_test_route_fake_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_route_fake_LDADD = $(src_core_platform_tests_libadd)
+src_core_platform_tests_test_route_linux_SOURCES = src/core/platform/tests/test-route.c
+src_core_platform_tests_test_route_linux_CPPFLAGS = $(src_core_tests_cppflags_linux)
+src_core_platform_tests_test_route_linux_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_route_linux_LDADD = $(src_core_platform_tests_libadd)
+src_core_platform_tests_test_tc_fake_SOURCES = src/core/platform/tests/test-tc.c
+src_core_platform_tests_test_tc_fake_CPPFLAGS = $(src_core_tests_cppflags_fake)
+src_core_platform_tests_test_tc_fake_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_tc_fake_LDADD = $(src_core_platform_tests_libadd)
+src_core_platform_tests_test_tc_linux_SOURCES = src/core/platform/tests/test-tc.c
+src_core_platform_tests_test_tc_linux_CPPFLAGS = $(src_core_tests_cppflags_linux)
+src_core_platform_tests_test_tc_linux_LDFLAGS = $(src_core_platform_tests_ldflags)
+src_core_platform_tests_test_tc_linux_LDADD = $(src_core_platform_tests_libadd)
 
 ###############################################################################
-# src/devices/tests
+# src/core/devices/tests
 ###############################################################################
-src_devices_tests_ldflags = \
+src_core_devices_tests_ldflags = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_devices_tests_test_lldp_CPPFLAGS = $(src_cppflags_test)
-src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags)
-src_devices_tests_test_lldp_LDADD = \
-	src/libNetworkManagerTest.la
+src_core_devices_tests_test_lldp_CPPFLAGS = $(src_core_cppflags_test)
+src_core_devices_tests_test_lldp_LDFLAGS = $(src_core_devices_tests_ldflags)
+src_core_devices_tests_test_lldp_LDADD = \
+	src/core/libNetworkManagerTest.la
 
-src_devices_tests_test_acd_CPPFLAGS = $(src_cppflags_test)
-src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags)
-src_devices_tests_test_acd_LDADD = \
-	src/libNetworkManagerTest.la
+src_core_devices_tests_test_acd_CPPFLAGS = $(src_core_cppflags_test)
+src_core_devices_tests_test_acd_LDFLAGS = $(src_core_devices_tests_ldflags)
+src_core_devices_tests_test_acd_LDADD = \
+	src/core/libNetworkManagerTest.la
 
 
 ###############################################################################
-# src/ndisc/tests
+# src/core/ndisc/tests
 ###############################################################################
-src_ndisc_tests_ldflags = \
+src_core_ndisc_tests_ldflags = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_ndisc_tests_ldadd = \
-	src/libNetworkManagerTest.la \
+src_core_ndisc_tests_ldadd = \
+	src/core/libNetworkManagerTest.la \
 	$(GLIB_LIBS)
 
-src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_cppflags_test)
-src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags)
-src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd)
-src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_cppflags_test)
-src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags)
-src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd)
-src_supplicant_tests_test_supplicant_config_CPPFLAGS = $(src_cppflags_test)
-src_supplicant_tests_test_supplicant_config_LDADD = \
-	src/libNetworkManagerTest.la
-
-src_supplicant_tests_test_supplicant_config_LDFLAGS = \
+src_core_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_core_cppflags_test)
+src_core_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_core_ndisc_tests_ldflags)
+src_core_ndisc_tests_test_ndisc_linux_LDADD = $(src_core_ndisc_tests_ldadd)
+src_core_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_core_cppflags_test)
+src_core_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_core_ndisc_tests_ldflags)
+src_core_ndisc_tests_test_ndisc_fake_LDADD = $(src_core_ndisc_tests_ldadd)
+src_core_supplicant_tests_test_supplicant_config_CPPFLAGS = $(src_core_cppflags_test)
+src_core_supplicant_tests_test_supplicant_config_LDADD = \
+	src/core/libNetworkManagerTest.la
+
+src_core_supplicant_tests_test_supplicant_config_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_tests_config_test_config_SOURCES = \
-	src/tests/config/nm-test-device.c \
-	src/tests/config/nm-test-device.h \
-	src/tests/config/test-config.c
+src_core_tests_config_test_config_SOURCES = \
+	src/core/tests/config/nm-test-device.c \
+	src/core/tests/config/nm-test-device.h \
+	src/core/tests/config/test-config.c
 
-src_tests_config_test_config_CPPFLAGS = $(src_cppflags_test)
-src_tests_config_test_config_LDADD = \
-	src/libNetworkManagerTest.la
+src_core_tests_config_test_config_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_config_test_config_LDADD = \
+	src/core/libNetworkManagerTest.la
 
-src_tests_config_test_config_LDFLAGS = \
+src_core_tests_config_test_config_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
 
 ###############################################################################
-# src/tests
+# src/core/tests
 ###############################################################################
-src_tests_ldflags = \
+src_core_tests_ldflags = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_tests_ldadd = \
-	src/libNetworkManagerTest.la
-
-src_tests_test_ip4_config_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_ip4_config_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_ip4_config_LDADD = $(src_tests_ldadd)
-src_tests_test_ip6_config_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_ip6_config_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_ip6_config_LDADD = $(src_tests_ldadd)
-src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_dcb_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)
-src_tests_test_utils_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_utils_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_utils_LDADD = $(src_tests_ldadd)
-src_tests_test_l3cfg_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_l3cfg_LDFLAGS = $(src_devices_tests_ldflags)
-src_tests_test_l3cfg_LDADD = $(src_tests_ldadd)
-src_tests_test_systemd_CPPFLAGS = \
-	$(src_libnm_systemd_core_la_cppflags) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
+src_core_tests_ldadd = \
+	src/core/libNetworkManagerTest.la
+
+src_core_tests_test_ip4_config_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_ip4_config_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_ip4_config_LDADD = $(src_core_tests_ldadd)
+src_core_tests_test_ip6_config_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_ip6_config_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_ip6_config_LDADD = $(src_core_tests_ldadd)
+src_core_tests_test_dcb_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_dcb_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_dcb_LDADD = $(src_core_tests_ldadd)
+src_core_tests_test_core_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_core_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_core_LDADD = $(src_core_tests_ldadd)
+src_core_tests_test_core_with_expect_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_core_with_expect_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_core_with_expect_LDADD = $(src_core_tests_ldadd)
+src_core_tests_test_wired_defname_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_wired_defname_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_wired_defname_LDADD = $(src_core_tests_ldadd)
+src_core_tests_test_utils_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_utils_LDFLAGS = $(src_core_tests_ldflags)
+src_core_tests_test_utils_LDADD = $(src_core_tests_ldadd)
+src_core_tests_test_l3cfg_CPPFLAGS = $(src_core_cppflags_test)
+src_core_tests_test_l3cfg_LDFLAGS = $(src_core_devices_tests_ldflags)
+src_core_tests_test_l3cfg_LDADD = $(src_core_tests_ldadd)
+src_core_tests_test_systemd_CPPFLAGS = \
+	$(src_core_libnm_systemd_core_la_cppflags) \
 	$(NULL)
 
-src_tests_test_systemd_LDFLAGS = \
+src_core_tests_test_systemd_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-src_tests_test_systemd_LDADD = \
-	src/libnm-systemd-core.la \
+src_core_tests_test_systemd_LDADD = \
+	src/core/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
@@ -7434,7 +7692,6 @@ dispatcher_cppflags = \
 	-I$(builddir)/dispatcher \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nm-dispatcher"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(NULL)
 
 dispatcher_libnm_dispatcher_core_la_SOURCES = \
@@ -7475,8 +7732,7 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/dispatcher \
 	-I$(builddir)/dispatcher \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(INTROSPECTION_EXTRA_CFLAGS) \
@@ -7510,7 +7766,6 @@ clients_nm_online_CPPFLAGS = \
 	-I$(builddir)/libnm \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nm-online"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(NULL)
 
 clients_nm_online_LDFLAGS = \
@@ -7540,7 +7795,6 @@ clients_cppflags = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/clients/common \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
@@ -7568,8 +7822,9 @@ clients_common_libnmc_base_la_LIBADD = \
 
 clients_common_settings_doc_h = clients/common/settings-docs.h
 clients_common_libnmc_la_SOURCES = \
-	shared/nm-meta-setting.c \
-	shared/nm-meta-setting.h \
+	clients/common/nm-meta-setting-base-impl.c \
+	clients/common/nm-meta-setting-base-impl.h \
+	clients/common/nm-meta-setting-base.h \
 	\
 	clients/common/nm-meta-setting-desc.c \
 	clients/common/nm-meta-setting-desc.h \
@@ -7591,7 +7846,7 @@ clients_common_libnmc_la_LIBADD = \
 clients_common_tests_test_clients_common_CPPFLAGS = \
 	-I$(srcdir)/clients/common/tests \
 	$(clients_cppflags) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(NULL)
 
 clients_common_tests_test_clients_common_LDFLAGS = \
@@ -7602,6 +7857,7 @@ clients_common_tests_test_clients_common_LDADD = \
 	clients/common/libnmc-base.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-base/libnm-base.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
@@ -7616,8 +7872,7 @@ clients_common_tests_test_libnm_core_aux_CPPFLAGS = \
 	-I$(srcdir)/libnm-core \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/libnm \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
@@ -7667,6 +7922,7 @@ clients_common_tests_test_libnm_core_aux_LDADD = \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
 @BUILD_NMCLI_TRUE@	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NMCLI_TRUE@	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NMCLI_TRUE@	shared/nm-base/libnm-base.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 \
@@ -7695,6 +7951,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDADD = \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-base/libnm-base.la \
 	libnm/libnm.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
@@ -7861,6 +8118,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDFLAGS = \
 @BUILD_NMTUI_TRUE@	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 @BUILD_NMTUI_TRUE@	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NMTUI_TRUE@	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NMTUI_TRUE@	shared/nm-base/libnm-base.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 \
@@ -7870,8 +8128,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDFLAGS = \
 @BUILD_NMTUI_TRUE@	$(NULL)
 
 @BUILD_NMTUI_TRUE@nmtui_links = nmtui-edit nmtui-connect nmtui-hostname
-@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_nm_cloud_setup_SOURCES = \
-@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/main.c \
+@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_libnm_cloud_setup_core_a_SOURCES = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm-cloud-setup-utils.c \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm-cloud-setup-utils.h \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nm-http-client.c \
@@ -7886,6 +8143,16 @@ clients_cli_generate_docs_nm_settings_nmcli_LDFLAGS = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/nmcs-provider-azure.h \
 @BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
 
+@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS = \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(clients_cppflags) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	-DG_LOG_DOMAIN=\""nm-cloud-setup"\" \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(LIBCURL_CFLAGS) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
+
+@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_nm_cloud_setup_SOURCES = \
+@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/main.c \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
+
 @BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_nm_cloud_setup_CPPFLAGS = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	$(clients_cppflags) \
 @BUILD_NM_CLOUD_SETUP_TRUE@	-DG_LOG_DOMAIN=\""nm-cloud-setup"\" \
@@ -7898,9 +8165,37 @@ clients_cli_generate_docs_nm_settings_nmcli_LDFLAGS = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
 
 @BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_nm_cloud_setup_LDADD = \
+@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/libnm-cloud-setup-core.a \
+@BUILD_NM_CLOUD_SETUP_TRUE@	libnm/nm-libnm-aux/libnm-libnm-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-base/libnm-base.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/libcsiphash.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	libnm/libnm.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(GLIB_LIBS) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(LIBCURL_LIBS) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
+
+@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_tests_test_cloud_setup_general_CPPFLAGS = \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(clients_cppflags) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	-I$(srcdir)/clients/cloud-setup \
+@BUILD_NM_CLOUD_SETUP_TRUE@	-DG_LOG_DOMAIN=\""tests"\" \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(LIBCURL_CFLAGS) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
+
+@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_tests_test_cloud_setup_general_LDFLAGS = \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(CODE_COVERAGE_LDFLAGS) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(SANITIZER_EXEC_LDFLAGS) \
+@BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
+
+@BUILD_NM_CLOUD_SETUP_TRUE@clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \
+@BUILD_NM_CLOUD_SETUP_TRUE@	clients/cloud-setup/libnm-cloud-setup-core.a \
 @BUILD_NM_CLOUD_SETUP_TRUE@	libnm/nm-libnm-aux/libnm-libnm-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+@BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-base/libnm-base.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-glib-aux/libnm-glib-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/nm-std-aux/libnm-std-aux.la \
 @BUILD_NM_CLOUD_SETUP_TRUE@	shared/libcsiphash.la \
@@ -8081,7 +8376,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-shared/nm-version-macros.h: $(top_builddir)/config.status $(top_srcdir)/shared/nm-version-macros.h.in
+libnm-core/nm-version-macros.h: $(top_builddir)/config.status $(top_srcdir)/libnm-core/nm-version-macros.h.in
 	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 $@
@@ -8384,6 +8679,35 @@ clean-pppd_pluginLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
+clients/cloud-setup/$(am__dirstamp):
+	@$(MKDIR_P) clients/cloud-setup
+	@: > clients/cloud-setup/$(am__dirstamp)
+clients/cloud-setup/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) clients/cloud-setup/$(DEPDIR)
+	@: > clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
+clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.$(OBJEXT):  \
+	clients/cloud-setup/$(am__dirstamp) \
+	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
+clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-client.$(OBJEXT):  \
+	clients/cloud-setup/$(am__dirstamp) \
+	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.$(OBJEXT):  \
+	clients/cloud-setup/$(am__dirstamp) \
+	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.$(OBJEXT):  \
+	clients/cloud-setup/$(am__dirstamp) \
+	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.$(OBJEXT):  \
+	clients/cloud-setup/$(am__dirstamp) \
+	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.$(OBJEXT):  \
+	clients/cloud-setup/$(am__dirstamp) \
+	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
+
+clients/cloud-setup/libnm-cloud-setup-core.a: $(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS) $(clients_cloud_setup_libnm_cloud_setup_core_a_DEPENDENCIES) $(EXTRA_clients_cloud_setup_libnm_cloud_setup_core_a_DEPENDENCIES) clients/cloud-setup/$(am__dirstamp)
+	$(AM_V_at)-rm -f clients/cloud-setup/libnm-cloud-setup-core.a
+	$(AM_V_AR)$(clients_cloud_setup_libnm_cloud_setup_core_a_AR) clients/cloud-setup/libnm-cloud-setup-core.a $(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS) $(clients_cloud_setup_libnm_cloud_setup_core_a_LIBADD)
+	$(AM_V_at)$(RANLIB) clients/cloud-setup/libnm-cloud-setup-core.a
 clients/tui/newt/$(am__dirstamp):
 	@$(MKDIR_P) clients/tui/newt
 	@: > clients/tui/newt/$(am__dirstamp)
@@ -8476,14 +8800,9 @@ clients/common/libnmc_base_la-nm-polkit-listener.lo:  \
 
 clients/common/libnmc-base.la: $(clients_common_libnmc_base_la_OBJECTS) $(clients_common_libnmc_base_la_DEPENDENCIES) $(EXTRA_clients_common_libnmc_base_la_DEPENDENCIES) clients/common/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK) $(am_clients_common_libnmc_base_la_rpath) $(clients_common_libnmc_base_la_OBJECTS) $(clients_common_libnmc_base_la_LIBADD) $(LIBS)
-shared/$(am__dirstamp):
-	@$(MKDIR_P) shared
-	@: > shared/$(am__dirstamp)
-shared/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) shared/$(DEPDIR)
-	@: > shared/$(DEPDIR)/$(am__dirstamp)
-shared/clients_common_libnmc_la-nm-meta-setting.lo:  \
-	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
+clients/common/libnmc_la-nm-meta-setting-base-impl.lo:  \
+	clients/common/$(am__dirstamp) \
+	clients/common/$(DEPDIR)/$(am__dirstamp)
 clients/common/libnmc_la-nm-meta-setting-desc.lo:  \
 	clients/common/$(am__dirstamp) \
 	clients/common/$(DEPDIR)/$(am__dirstamp)
@@ -8706,6 +9025,9 @@ libnm-core/libnm_core_la-nm-setting-generic.lo:  \
 libnm-core/libnm_core_la-nm-setting-gsm.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-setting-hostname.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-setting-infiniband.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -8739,6 +9061,9 @@ libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo:  \
 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-external-ids.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)
@@ -8778,6 +9103,9 @@ libnm-core/libnm_core_la-nm-setting-tun.lo:  \
 libnm-core/libnm_core_la-nm-setting-user.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-setting-veth.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-setting-vlan.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -8811,8 +9139,6 @@ libnm-core/libnm_core_la-nm-setting-wireless.lo:  \
 libnm-core/libnm_core_la-nm-setting-wpan.lo:  \
 	libnm-core/$(am__dirstamp) \
 	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-connection.lo: libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-crypto.lo: libnm-core/$(am__dirstamp) \
@@ -8821,6 +9147,14 @@ libnm-core/libnm_core_la-nm-dbus-utils.lo: libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-errors.lo: libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-keyfile-utils.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-keyfile.lo: libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-meta-setting-base-impl.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)
@@ -8857,21 +9191,6 @@ 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-core/nm-keyfile/$(am__dirstamp):
-	@$(MKDIR_P) libnm-core/nm-keyfile
-	@: > libnm-core/nm-keyfile/$(am__dirstamp)
-libnm-core/nm-keyfile/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) libnm-core/nm-keyfile/$(DEPDIR)
-	@: > libnm-core/nm-keyfile/$(DEPDIR)/$(am__dirstamp)
-libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo:  \
-	libnm-core/nm-keyfile/$(am__dirstamp) \
-	libnm-core/nm-keyfile/$(DEPDIR)/$(am__dirstamp)
-libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo:  \
-	libnm-core/nm-keyfile/$(am__dirstamp) \
-	libnm-core/nm-keyfile/$(DEPDIR)/$(am__dirstamp)
-
-libnm-core/nm-keyfile/libnm-keyfile.la: $(libnm_core_nm_keyfile_libnm_keyfile_la_OBJECTS) $(libnm_core_nm_keyfile_libnm_keyfile_la_DEPENDENCIES) $(EXTRA_libnm_core_nm_keyfile_libnm_keyfile_la_DEPENDENCIES) libnm-core/nm-keyfile/$(am__dirstamp)
-	$(AM_V_CCLD)$(libnm_core_nm_keyfile_libnm_keyfile_la_LINK)  $(libnm_core_nm_keyfile_libnm_keyfile_la_OBJECTS) $(libnm_core_nm_keyfile_libnm_keyfile_la_LIBADD) $(LIBS)
 libnm-core/nm-libnm-core-aux/$(am__dirstamp):
 	@$(MKDIR_P) libnm-core/nm-libnm-core-aux
 	@: > libnm-core/nm-libnm-core-aux/$(am__dirstamp)
@@ -8893,9 +9212,6 @@ libnm-core/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp):
 libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo:  \
 	libnm-core/nm-libnm-core-intern/$(am__dirstamp) \
 	libnm-core/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp)
-libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo:  \
-	libnm-core/nm-libnm-core-intern/$(am__dirstamp) \
-	libnm-core/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp)
 libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo:  \
 	libnm-core/nm-libnm-core-intern/$(am__dirstamp) \
 	libnm-core/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp)
@@ -8905,119 +9221,121 @@ libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la: $(libnm_core_nm_libn
 libnm/$(am__dirstamp):
 	@$(MKDIR_P) libnm
 	@: > libnm/$(am__dirstamp)
+
+libnm/libnm.la: $(libnm_libnm_la_OBJECTS) $(libnm_libnm_la_DEPENDENCIES) $(EXTRA_libnm_libnm_la_DEPENDENCIES) libnm/$(am__dirstamp)
+	$(AM_V_CCLD)$(libnm_libnm_la_LINK) -rpath $(libdir) $(libnm_libnm_la_OBJECTS) $(libnm_libnm_la_LIBADD) $(LIBS)
 libnm/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) libnm/$(DEPDIR)
 	@: > libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-client.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-client.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-object.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-object.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-active-connection.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-active-connection.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-access-point.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-access-point.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-checkpoint.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-checkpoint.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-dbus-helpers.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-dbus-helpers.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-6lowpan.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-6lowpan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-adsl.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-adsl.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-bond.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-bond.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-bridge.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-bridge.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-bt.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-bt.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-dummy.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-dummy.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-ethernet.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-ethernet.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-generic.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-generic.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-infiniband.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-infiniband.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-ip-tunnel.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-ip-tunnel.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-macsec.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-macsec.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-macvlan.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-macvlan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-modem.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-modem.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-olpc-mesh.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-olpc-mesh.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-ovs-bridge.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-ovs-bridge.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-ovs-interface.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-ovs-interface.lo:  \
+	libnm/$(am__dirstamp) libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/libnm_static_la-nm-device-ovs-port.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-ovs-port.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-ppp.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-ppp.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-team.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-team.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-tun.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-tun.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-veth.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-vlan.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-vlan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-vrf.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-vrf.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-vxlan.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-vxlan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-wifi-p2p.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-wifi-p2p.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-wifi.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-wifi.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-wimax.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-wimax.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-wireguard.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-wireguard.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-device-wpan.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-device-wpan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-dhcp-config.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-dhcp-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-dhcp4-config.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-dhcp4-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-dhcp6-config.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-dhcp6-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-dns-manager.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-dns-manager.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-ip-config.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-ip-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-ip4-config.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-ip4-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-ip6-config.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-ip6-config.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-libnm-utils.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-libnm-utils.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-remote-connection.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-remote-connection.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-secret-agent-old.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-secret-agent-old.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-vpn-connection.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-vpn-connection.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-vpn-editor.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-vpn-editor.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-vpn-plugin-old.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-vpn-plugin-old.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-vpn-service-plugin.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-vpn-service-plugin.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-wifi-p2p-peer.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-wifi-p2p-peer.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-wimax-nsp.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-wimax-nsp.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/liblibnm_la-nm-enum-types.lo: libnm/$(am__dirstamp) \
+libnm/libnm_static_la-nm-enum-types.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: $(libnm_libnm_la_OBJECTS) $(libnm_libnm_la_DEPENDENCIES) $(EXTRA_libnm_libnm_la_DEPENDENCIES) libnm/$(am__dirstamp)
-	$(AM_V_CCLD)$(libnm_libnm_la_LINK) -rpath $(libdir) $(libnm_libnm_la_OBJECTS) $(libnm_libnm_la_LIBADD) $(LIBS)
+libnm/libnm_static.la: $(libnm_libnm_static_la_OBJECTS) $(libnm_libnm_static_la_DEPENDENCIES) $(EXTRA_libnm_libnm_static_la_DEPENDENCIES) libnm/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK)  $(libnm_libnm_static_la_OBJECTS) $(libnm_libnm_static_la_LIBADD) $(LIBS)
 libnm/nm-libnm-aux/$(am__dirstamp):
 	@$(MKDIR_P) libnm/nm-libnm-aux
 	@: > libnm/nm-libnm-aux/$(am__dirstamp)
@@ -9054,6 +9372,9 @@ shared/c-rbtree/src/$(DEPDIR)/$(am__dirstamp):
 shared/c-rbtree/src/libcrbtree_la-c-rbtree.lo:  \
 	shared/c-rbtree/src/$(am__dirstamp) \
 	shared/c-rbtree/src/$(DEPDIR)/$(am__dirstamp)
+shared/$(am__dirstamp):
+	@$(MKDIR_P) shared
+	@: > shared/$(am__dirstamp)
 
 shared/libcrbtree.la: $(shared_libcrbtree_la_OBJECTS) $(shared_libcrbtree_la_DEPENDENCIES) $(EXTRA_shared_libcrbtree_la_DEPENDENCIES) shared/$(am__dirstamp)
 	$(AM_V_CCLD)$(shared_libcrbtree_la_LINK)  $(shared_libcrbtree_la_OBJECTS) $(shared_libcrbtree_la_LIBADD) $(LIBS)
@@ -9141,6 +9462,18 @@ shared/n-dhcp4/src/util/libndhcp4_la-socket.lo:  \
 
 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-base/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-base
+	@: > shared/nm-base/$(am__dirstamp)
+shared/nm-base/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-base/$(DEPDIR)
+	@: > shared/nm-base/$(DEPDIR)/$(am__dirstamp)
+shared/nm-base/libnm_base_la-nm-ethtool-base.lo:  \
+	shared/nm-base/$(am__dirstamp) \
+	shared/nm-base/$(DEPDIR)/$(am__dirstamp)
+
+shared/nm-base/libnm-base.la: $(shared_nm_base_libnm_base_la_OBJECTS) $(shared_nm_base_libnm_base_la_DEPENDENCIES) $(EXTRA_shared_nm_base_libnm_base_la_DEPENDENCIES) shared/nm-base/$(am__dirstamp)
+	$(AM_V_CCLD)$(shared_nm_base_libnm_base_la_LINK)  $(shared_nm_base_libnm_base_la_OBJECTS) $(shared_nm_base_libnm_base_la_LIBADD) $(LIBS)
 shared/nm-glib-aux/$(am__dirstamp):
 	@$(MKDIR_P) shared/nm-glib-aux
 	@: > shared/nm-glib-aux/$(am__dirstamp)
@@ -9192,6 +9525,36 @@ shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo:  \
 
 shared/nm-glib-aux/libnm-glib-aux.la: $(shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS) $(shared_nm_glib_aux_libnm_glib_aux_la_DEPENDENCIES) $(EXTRA_shared_nm_glib_aux_libnm_glib_aux_la_DEPENDENCIES) shared/nm-glib-aux/$(am__dirstamp)
 	$(AM_V_CCLD)$(shared_nm_glib_aux_libnm_glib_aux_la_LINK)  $(shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS) $(shared_nm_glib_aux_libnm_glib_aux_la_LIBADD) $(LIBS)
+shared/nm-log-core/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-log-core
+	@: > shared/nm-log-core/$(am__dirstamp)
+shared/nm-log-core/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-log-core/$(DEPDIR)
+	@: > shared/nm-log-core/$(DEPDIR)/$(am__dirstamp)
+shared/nm-log-core/libnm_log_core_la-nm-logging.lo:  \
+	shared/nm-log-core/$(am__dirstamp) \
+	shared/nm-log-core/$(DEPDIR)/$(am__dirstamp)
+
+shared/nm-log-core/libnm-log-core.la: $(shared_nm_log_core_libnm_log_core_la_OBJECTS) $(shared_nm_log_core_libnm_log_core_la_DEPENDENCIES) $(EXTRA_shared_nm_log_core_libnm_log_core_la_DEPENDENCIES) shared/nm-log-core/$(am__dirstamp)
+	$(AM_V_CCLD)$(shared_nm_log_core_libnm_log_core_la_LINK)  $(shared_nm_log_core_libnm_log_core_la_OBJECTS) $(shared_nm_log_core_libnm_log_core_la_LIBADD) $(LIBS)
+shared/nm-platform/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-platform
+	@: > shared/nm-platform/$(am__dirstamp)
+shared/nm-platform/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-platform/$(DEPDIR)
+	@: > shared/nm-platform/$(DEPDIR)/$(am__dirstamp)
+shared/nm-platform/libnm_platform_la-nm-netlink.lo:  \
+	shared/nm-platform/$(am__dirstamp) \
+	shared/nm-platform/$(DEPDIR)/$(am__dirstamp)
+shared/nm-platform/libnm_platform_la-nm-platform-utils.lo:  \
+	shared/nm-platform/$(am__dirstamp) \
+	shared/nm-platform/$(DEPDIR)/$(am__dirstamp)
+shared/nm-platform/libnm_platform_la-nmp-netns.lo:  \
+	shared/nm-platform/$(am__dirstamp) \
+	shared/nm-platform/$(DEPDIR)/$(am__dirstamp)
+
+shared/nm-platform/libnm-platform.la: $(shared_nm_platform_libnm_platform_la_OBJECTS) $(shared_nm_platform_libnm_platform_la_DEPENDENCIES) $(EXTRA_shared_nm_platform_libnm_platform_la_DEPENDENCIES) shared/nm-platform/$(am__dirstamp)
+	$(AM_V_CCLD)$(shared_nm_platform_libnm_platform_la_LINK)  $(shared_nm_platform_libnm_platform_la_OBJECTS) $(shared_nm_platform_libnm_platform_la_LIBADD) $(LIBS)
 shared/nm-std-aux/$(am__dirstamp):
 	@$(MKDIR_P) shared/nm-std-aux
 	@: > shared/nm-std-aux/$(am__dirstamp)
@@ -9309,6 +9672,9 @@ shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo:  \
 shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo:  \
 	shared/systemd/src/basic/$(am__dirstamp) \
 	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-ratelimit.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
 shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo:  \
 	shared/systemd/src/basic/$(am__dirstamp) \
 	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
@@ -9357,729 +9723,744 @@ shared/systemd/src/shared/libnm_systemd_shared_la-web-util.lo:  \
 
 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)
-src/devices/adsl/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/adsl
-	@: > src/devices/adsl/$(am__dirstamp)
-src/devices/adsl/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/adsl/$(DEPDIR)
-	@: > src/devices/adsl/$(DEPDIR)/$(am__dirstamp)
-src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo:  \
-	src/devices/adsl/$(am__dirstamp) \
-	src/devices/adsl/$(DEPDIR)/$(am__dirstamp)
-src/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo:  \
-	src/devices/adsl/$(am__dirstamp) \
-	src/devices/adsl/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/adsl/libnm-device-plugin-adsl.la: $(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS) $(src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES) $(EXTRA_src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES) src/devices/adsl/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_devices_adsl_libnm_device_plugin_adsl_la_LINK) -rpath $(plugindir) $(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS) $(src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD) $(LIBS)
-src/devices/bluetooth/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/bluetooth
-	@: > src/devices/bluetooth/$(am__dirstamp)
-src/devices/bluetooth/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/bluetooth/$(DEPDIR)
-	@: > src/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
-src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo:  \
-	src/devices/bluetooth/$(am__dirstamp) \
-	src/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
-src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo:  \
-	src/devices/bluetooth/$(am__dirstamp) \
-	src/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/bluetooth/libnm-bluetooth-utils.la: $(src_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS) $(src_devices_bluetooth_libnm_bluetooth_utils_la_DEPENDENCIES) $(EXTRA_src_devices_bluetooth_libnm_bluetooth_utils_la_DEPENDENCIES) src/devices/bluetooth/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK) $(am_src_devices_bluetooth_libnm_bluetooth_utils_la_rpath) $(src_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS) $(src_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD) $(LIBS)
-src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo:  \
-	src/devices/bluetooth/$(am__dirstamp) \
-	src/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
-src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo:  \
-	src/devices/bluetooth/$(am__dirstamp) \
-	src/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/bluetooth/libnm-device-plugin-bluetooth.la: $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES) $(EXTRA_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES) src/devices/bluetooth/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK) $(am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_rpath) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD) $(LIBS)
-src/devices/ovs/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/ovs
-	@: > src/devices/ovs/$(am__dirstamp)
-src/devices/ovs/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/ovs/$(DEPDIR)
-	@: > src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
-src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo:  \
-	src/devices/ovs/$(am__dirstamp) \
-	src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
-src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo:  \
-	src/devices/ovs/$(am__dirstamp) \
-	src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
-src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo:  \
-	src/devices/ovs/$(am__dirstamp) \
-	src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
-src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo:  \
-	src/devices/ovs/$(am__dirstamp) \
-	src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
-src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo:  \
-	src/devices/ovs/$(am__dirstamp) \
-	src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/ovs/libnm-device-plugin-ovs.la: $(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS) $(src_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES) $(EXTRA_src_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES) src/devices/ovs/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_devices_ovs_libnm_device_plugin_ovs_la_LINK) $(am_src_devices_ovs_libnm_device_plugin_ovs_la_rpath) $(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS) $(src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD) $(LIBS)
-src/devices/team/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/team
-	@: > src/devices/team/$(am__dirstamp)
-src/devices/team/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/team/$(DEPDIR)
-	@: > src/devices/team/$(DEPDIR)/$(am__dirstamp)
-src/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo:  \
-	src/devices/team/$(am__dirstamp) \
-	src/devices/team/$(DEPDIR)/$(am__dirstamp)
-src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo:  \
-	src/devices/team/$(am__dirstamp) \
-	src/devices/team/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/team/libnm-device-plugin-team.la: $(src_devices_team_libnm_device_plugin_team_la_OBJECTS) $(src_devices_team_libnm_device_plugin_team_la_DEPENDENCIES) $(EXTRA_src_devices_team_libnm_device_plugin_team_la_DEPENDENCIES) src/devices/team/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_devices_team_libnm_device_plugin_team_la_LINK) $(am_src_devices_team_libnm_device_plugin_team_la_rpath) $(src_devices_team_libnm_device_plugin_team_la_OBJECTS) $(src_devices_team_libnm_device_plugin_team_la_LIBADD) $(LIBS)
-src/devices/wifi/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/wifi
-	@: > src/devices/wifi/$(am__dirstamp)
-src/devices/wifi/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/wifi/$(DEPDIR)
-	@: > src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo:  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/wifi/libnm-device-plugin-wifi.la: $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) $(EXTRA_src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) src/devices/wifi/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_devices_wifi_libnm_device_plugin_wifi_la_LINK) $(am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath) $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD) $(LIBS)
-src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo:  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo:  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo:  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo:  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo:  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo:  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo:  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo:  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo:  \
-	src/devices/wifi/$(am__dirstamp) \
-	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/wifi/libnm-wifi-base.la: $(src_devices_wifi_libnm_wifi_base_la_OBJECTS) $(src_devices_wifi_libnm_wifi_base_la_DEPENDENCIES) $(EXTRA_src_devices_wifi_libnm_wifi_base_la_DEPENDENCIES) src/devices/wifi/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK) $(am_src_devices_wifi_libnm_wifi_base_la_rpath) $(src_devices_wifi_libnm_wifi_base_la_OBJECTS) $(src_devices_wifi_libnm_wifi_base_la_LIBADD) $(LIBS)
-src/devices/wwan/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/wwan
-	@: > src/devices/wwan/$(am__dirstamp)
-src/devices/wwan/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/wwan/$(DEPDIR)
-	@: > src/devices/wwan/$(DEPDIR)/$(am__dirstamp)
-src/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo:  \
-	src/devices/wwan/$(am__dirstamp) \
-	src/devices/wwan/$(DEPDIR)/$(am__dirstamp)
-src/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo:  \
-	src/devices/wwan/$(am__dirstamp) \
-	src/devices/wwan/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/wwan/libnm-device-plugin-wwan.la: $(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS) $(src_devices_wwan_libnm_device_plugin_wwan_la_DEPENDENCIES) $(EXTRA_src_devices_wwan_libnm_device_plugin_wwan_la_DEPENDENCIES) src/devices/wwan/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_devices_wwan_libnm_device_plugin_wwan_la_LINK) $(am_src_devices_wwan_libnm_device_plugin_wwan_la_rpath) $(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS) $(src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD) $(LIBS)
-src/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo:  \
-	src/devices/wwan/$(am__dirstamp) \
-	src/devices/wwan/$(DEPDIR)/$(am__dirstamp)
-src/devices/wwan/libnm_wwan_la-nm-modem-manager.lo:  \
-	src/devices/wwan/$(am__dirstamp) \
-	src/devices/wwan/$(DEPDIR)/$(am__dirstamp)
-src/devices/wwan/libnm_wwan_la-nm-modem.lo:  \
-	src/devices/wwan/$(am__dirstamp) \
-	src/devices/wwan/$(DEPDIR)/$(am__dirstamp)
-src/devices/wwan/libnm_wwan_la-nm-service-providers.lo:  \
-	src/devices/wwan/$(am__dirstamp) \
-	src/devices/wwan/$(DEPDIR)/$(am__dirstamp)
-src/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo:  \
-	src/devices/wwan/$(am__dirstamp) \
-	src/devices/wwan/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/wwan/libnm-wwan.la: $(src_devices_wwan_libnm_wwan_la_OBJECTS) $(src_devices_wwan_libnm_wwan_la_DEPENDENCIES) $(EXTRA_src_devices_wwan_libnm_wwan_la_DEPENDENCIES) src/devices/wwan/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_devices_wwan_libnm_wwan_la_LINK) $(am_src_devices_wwan_libnm_wwan_la_rpath) $(src_devices_wwan_libnm_wwan_la_OBJECTS) $(src_devices_wwan_libnm_wwan_la_LIBADD) $(LIBS)
-src/initrd/$(am__dirstamp):
-	@$(MKDIR_P) src/initrd
-	@: > src/initrd/$(am__dirstamp)
-src/initrd/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/initrd/$(DEPDIR)
-	@: > src/initrd/$(DEPDIR)/$(am__dirstamp)
-src/initrd/libnmi_core_la-nmi-cmdline-reader.lo:  \
-	src/initrd/$(am__dirstamp) \
-	src/initrd/$(DEPDIR)/$(am__dirstamp)
-src/initrd/libnmi_core_la-nmi-dt-reader.lo:  \
-	src/initrd/$(am__dirstamp) \
-	src/initrd/$(DEPDIR)/$(am__dirstamp)
-src/initrd/libnmi_core_la-nmi-ibft-reader.lo:  \
-	src/initrd/$(am__dirstamp) \
-	src/initrd/$(DEPDIR)/$(am__dirstamp)
-
-src/initrd/libnmi-core.la: $(src_initrd_libnmi_core_la_OBJECTS) $(src_initrd_libnmi_core_la_DEPENDENCIES) $(EXTRA_src_initrd_libnmi_core_la_DEPENDENCIES) src/initrd/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK)  $(src_initrd_libnmi_core_la_OBJECTS) $(src_initrd_libnmi_core_la_LIBADD) $(LIBS)
-src/$(am__dirstamp):
-	@$(MKDIR_P) src
-	@: > src/$(am__dirstamp)
-src/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/$(DEPDIR)
-	@: > src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-checkpoint.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-checkpoint-manager.lo:  \
-	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/devices/$(am__dirstamp):
-	@$(MKDIR_P) src/devices
-	@: > src/devices/$(am__dirstamp)
-src/devices/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/$(DEPDIR)
-	@: > src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-acd-manager.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-lldp-listener.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-factory.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-generic.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-6lowpan.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-bond.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-bridge.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-dummy.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-ethernet.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-infiniband.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-ip-tunnel.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-macsec.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-macvlan.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-ppp.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-tun.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-veth.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-vlan.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-vrf.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-vxlan.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-wireguard.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device-wpan.lo:  \
-	src/devices/$(am__dirstamp) \
-	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/dhcp/$(am__dirstamp):
-	@$(MKDIR_P) src/dhcp
-	@: > src/dhcp/$(am__dirstamp)
-src/dhcp/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/dhcp/$(DEPDIR)
-	@: > src/dhcp/$(DEPDIR)/$(am__dirstamp)
-src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo:  \
-	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
-src/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo:  \
-	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
-src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo:  \
-	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
-src/dhcp/libNetworkManager_la-nm-dhcp-listener.lo:  \
-	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
-src/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo:  \
-	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
-src/dns/$(am__dirstamp):
-	@$(MKDIR_P) src/dns
-	@: > src/dns/$(am__dirstamp)
-src/dns/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/dns/$(DEPDIR)
-	@: > src/dns/$(DEPDIR)/$(am__dirstamp)
-src/dns/libNetworkManager_la-nm-dns-manager.lo:  \
-	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
-src/dns/libNetworkManager_la-nm-dns-plugin.lo:  \
-	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
-src/dns/libNetworkManager_la-nm-dns-dnsmasq.lo:  \
-	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
-src/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo:  \
-	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
-src/dns/libNetworkManager_la-nm-dns-unbound.lo:  \
-	src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp)
-src/dnsmasq/$(am__dirstamp):
-	@$(MKDIR_P) src/dnsmasq
-	@: > src/dnsmasq/$(am__dirstamp)
-src/dnsmasq/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/dnsmasq/$(DEPDIR)
-	@: > src/dnsmasq/$(DEPDIR)/$(am__dirstamp)
-src/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo:  \
-	src/dnsmasq/$(am__dirstamp) \
-	src/dnsmasq/$(DEPDIR)/$(am__dirstamp)
-src/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo:  \
-	src/dnsmasq/$(am__dirstamp) \
-	src/dnsmasq/$(DEPDIR)/$(am__dirstamp)
-src/ppp/$(am__dirstamp):
-	@$(MKDIR_P) src/ppp
-	@: > src/ppp/$(am__dirstamp)
-src/ppp/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/ppp/$(DEPDIR)
-	@: > src/ppp/$(DEPDIR)/$(am__dirstamp)
-src/ppp/libNetworkManager_la-nm-ppp-manager-call.lo:  \
-	src/ppp/$(am__dirstamp) src/ppp/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-hostname-manager.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/settings/$(am__dirstamp):
-	@$(MKDIR_P) src/settings
-	@: > src/settings/$(am__dirstamp)
-src/settings/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/$(DEPDIR)
-	@: > src/settings/$(DEPDIR)/$(am__dirstamp)
-src/settings/libNetworkManager_la-nm-agent-manager.lo:  \
-	src/settings/$(am__dirstamp) \
-	src/settings/$(DEPDIR)/$(am__dirstamp)
-src/settings/libNetworkManager_la-nm-secret-agent.lo:  \
-	src/settings/$(am__dirstamp) \
-	src/settings/$(DEPDIR)/$(am__dirstamp)
-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-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:  \
-	src/settings/plugins/keyfile/$(am__dirstamp) \
-	src/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo:  \
-	src/settings/plugins/keyfile/$(am__dirstamp) \
-	src/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo:  \
-	src/settings/plugins/keyfile/$(am__dirstamp) \
-	src/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo:  \
-	src/settings/plugins/keyfile/$(am__dirstamp) \
-	src/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
-src/supplicant/$(am__dirstamp):
-	@$(MKDIR_P) src/supplicant
-	@: > src/supplicant/$(am__dirstamp)
-src/supplicant/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/supplicant/$(DEPDIR)
-	@: > src/supplicant/$(DEPDIR)/$(am__dirstamp)
-src/supplicant/libNetworkManager_la-nm-supplicant-config.lo:  \
-	src/supplicant/$(am__dirstamp) \
-	src/supplicant/$(DEPDIR)/$(am__dirstamp)
-src/supplicant/libNetworkManager_la-nm-supplicant-interface.lo:  \
-	src/supplicant/$(am__dirstamp) \
-	src/supplicant/$(DEPDIR)/$(am__dirstamp)
-src/supplicant/libNetworkManager_la-nm-supplicant-manager.lo:  \
-	src/supplicant/$(am__dirstamp) \
-	src/supplicant/$(DEPDIR)/$(am__dirstamp)
-src/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo:  \
-	src/supplicant/$(am__dirstamp) \
-	src/supplicant/$(DEPDIR)/$(am__dirstamp)
-src/vpn/$(am__dirstamp):
-	@$(MKDIR_P) src/vpn
-	@: > src/vpn/$(am__dirstamp)
-src/vpn/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/vpn/$(DEPDIR)
-	@: > src/vpn/$(DEPDIR)/$(am__dirstamp)
-src/vpn/libNetworkManager_la-nm-vpn-connection.lo:  \
-	src/vpn/$(am__dirstamp) src/vpn/$(DEPDIR)/$(am__dirstamp)
-src/vpn/libNetworkManager_la-nm-vpn-manager.lo:  \
-	src/vpn/$(am__dirstamp) src/vpn/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-act-request.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-active-connection.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-audit-manager.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-dbus-manager.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-config.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-config-data.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-connectivity.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-dcb.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-dhcp-config.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-dispatcher.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-firewall-manager.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-proxy-config.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-auth-manager.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-auth-utils.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-manager.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-pacrunner-manager.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-policy.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-rfkill-manager.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-session-monitor.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-keep-alive.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManager_la-nm-sleep-monitor.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-
-src/libNetworkManager.la: $(src_libNetworkManager_la_OBJECTS) $(src_libNetworkManager_la_DEPENDENCIES) $(EXTRA_src_libNetworkManager_la_DEPENDENCIES) src/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK)  $(src_libNetworkManager_la_OBJECTS) $(src_libNetworkManager_la_LIBADD) $(LIBS)
-src/libNetworkManagerBase_la-nm-core-utils.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManagerBase_la-nm-logging.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManagerBase_la-NetworkManagerUtils.lo:  \
-	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/platform/$(am__dirstamp):
-	@$(MKDIR_P) src/platform
-	@: > src/platform/$(am__dirstamp)
-src/platform/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/platform/$(DEPDIR)
-	@: > src/platform/$(DEPDIR)/$(am__dirstamp)
-src/platform/libNetworkManagerBase_la-nm-netlink.lo:  \
-	src/platform/$(am__dirstamp) \
-	src/platform/$(DEPDIR)/$(am__dirstamp)
-src/platform/libNetworkManagerBase_la-nmp-netns.lo:  \
-	src/platform/$(am__dirstamp) \
-	src/platform/$(DEPDIR)/$(am__dirstamp)
-src/platform/libNetworkManagerBase_la-nmp-object.lo:  \
-	src/platform/$(am__dirstamp) \
-	src/platform/$(DEPDIR)/$(am__dirstamp)
-src/platform/libNetworkManagerBase_la-nm-platform-utils.lo:  \
-	src/platform/$(am__dirstamp) \
-	src/platform/$(DEPDIR)/$(am__dirstamp)
-src/platform/libNetworkManagerBase_la-nm-platform.lo:  \
-	src/platform/$(am__dirstamp) \
-	src/platform/$(DEPDIR)/$(am__dirstamp)
-src/platform/libNetworkManagerBase_la-nm-linux-platform.lo:  \
-	src/platform/$(am__dirstamp) \
-	src/platform/$(DEPDIR)/$(am__dirstamp)
-src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo:  \
-	src/platform/$(am__dirstamp) \
-	src/platform/$(DEPDIR)/$(am__dirstamp)
-src/platform/wifi/$(am__dirstamp):
-	@$(MKDIR_P) src/platform/wifi
-	@: > src/platform/wifi/$(am__dirstamp)
-src/platform/wifi/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/platform/wifi/$(DEPDIR)
-	@: > src/platform/wifi/$(DEPDIR)/$(am__dirstamp)
-src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo:  \
-	src/platform/wifi/$(am__dirstamp) \
-	src/platform/wifi/$(DEPDIR)/$(am__dirstamp)
-src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo:  \
-	src/platform/wifi/$(am__dirstamp) \
-	src/platform/wifi/$(DEPDIR)/$(am__dirstamp)
-src/platform/wpan/$(am__dirstamp):
-	@$(MKDIR_P) src/platform/wpan
-	@: > src/platform/wpan/$(am__dirstamp)
-src/platform/wpan/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/platform/wpan/$(DEPDIR)
-	@: > src/platform/wpan/$(DEPDIR)/$(am__dirstamp)
-src/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo:  \
-	src/platform/wpan/$(am__dirstamp) \
-	src/platform/wpan/$(DEPDIR)/$(am__dirstamp)
-src/ndisc/$(am__dirstamp):
-	@$(MKDIR_P) src/ndisc
-	@: > src/ndisc/$(am__dirstamp)
-src/ndisc/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/ndisc/$(DEPDIR)
-	@: > src/ndisc/$(DEPDIR)/$(am__dirstamp)
-src/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo:  \
-	src/ndisc/$(am__dirstamp) src/ndisc/$(DEPDIR)/$(am__dirstamp)
-src/ndisc/libNetworkManagerBase_la-nm-ndisc.lo:  \
-	src/ndisc/$(am__dirstamp) src/ndisc/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManagerBase_la-nm-dbus-utils.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManagerBase_la-nm-dbus-object.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManagerBase_la-nm-netns.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManagerBase_la-nm-l3-config-data.lo:  \
-	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManagerBase_la-nm-l3cfg.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManagerBase_la-nm-ip-config.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManagerBase_la-nm-ip4-config.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-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:  \
-	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
-src/libNetworkManagerBase_la-main-utils.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo:  \
-	src/platform/wifi/$(am__dirstamp) \
-	src/platform/wifi/$(DEPDIR)/$(am__dirstamp)
-
-src/libNetworkManagerBase.la: $(src_libNetworkManagerBase_la_OBJECTS) $(src_libNetworkManagerBase_la_DEPENDENCIES) $(EXTRA_src_libNetworkManagerBase_la_DEPENDENCIES) src/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK)  $(src_libNetworkManagerBase_la_OBJECTS) $(src_libNetworkManagerBase_la_LIBADD) $(LIBS)
-src/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo:  \
-	src/ndisc/$(am__dirstamp) src/ndisc/$(DEPDIR)/$(am__dirstamp)
-src/platform/libNetworkManagerTest_la-nm-fake-platform.lo:  \
-	src/platform/$(am__dirstamp) \
-	src/platform/$(DEPDIR)/$(am__dirstamp)
-src/platform/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/platform/tests
-	@: > src/platform/tests/$(am__dirstamp)
-src/platform/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/platform/tests/$(DEPDIR)
-	@: > src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-src/platform/tests/libNetworkManagerTest_la-test-common.lo:  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/libNetworkManagerTest.la: $(src_libNetworkManagerTest_la_OBJECTS) $(src_libNetworkManagerTest_la_DEPENDENCIES) $(EXTRA_src_libNetworkManagerTest_la_DEPENDENCIES) src/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK) $(am_src_libNetworkManagerTest_la_rpath) $(src_libNetworkManagerTest_la_OBJECTS) $(src_libNetworkManagerTest_la_LIBADD) $(LIBS)
-src/systemd/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd
-	@: > src/systemd/$(am__dirstamp)
-src/systemd/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/$(DEPDIR)
-	@: > src/systemd/$(DEPDIR)/$(am__dirstamp)
-src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo:  \
-	src/systemd/$(am__dirstamp) \
-	src/systemd/$(DEPDIR)/$(am__dirstamp)
-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)
-src/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/sd-adapt-core/$(DEPDIR)
-	@: > src/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp)
-src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo:  \
-	src/systemd/sd-adapt-core/$(am__dirstamp) \
-	src/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/src/libsystemd-network
-	@: > src/systemd/src/libsystemd-network/$(am__dirstamp)
-src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/src/libsystemd-network/$(DEPDIR)
-	@: > src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo:  \
-	src/systemd/src/libsystemd-network/$(am__dirstamp) \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd/sd-event/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/src/libsystemd/sd-event
-	@: > src/systemd/src/libsystemd/sd-event/$(am__dirstamp)
-src/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/src/libsystemd/sd-event/$(DEPDIR)
-	@: > src/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo:  \
-	src/systemd/src/libsystemd/sd-event/$(am__dirstamp) \
-	src/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo:  \
-	src/systemd/src/libsystemd/sd-event/$(am__dirstamp) \
-	src/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd/sd-id128/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/src/libsystemd/sd-id128
-	@: > src/systemd/src/libsystemd/sd-id128/$(am__dirstamp)
-src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/src/libsystemd/sd-id128/$(DEPDIR)
-	@: > src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo:  \
-	src/systemd/src/libsystemd/sd-id128/$(am__dirstamp) \
-	src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
-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/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)
-src/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo:  \
-	src/ppp/$(am__dirstamp) src/ppp/$(DEPDIR)/$(am__dirstamp)
-
-src/ppp/libnm-ppp-plugin.la: $(src_ppp_libnm_ppp_plugin_la_OBJECTS) $(src_ppp_libnm_ppp_plugin_la_DEPENDENCIES) $(EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES) src/ppp/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_ppp_libnm_ppp_plugin_la_LINK) $(am_src_ppp_libnm_ppp_plugin_la_rpath) $(src_ppp_libnm_ppp_plugin_la_OBJECTS) $(src_ppp_libnm_ppp_plugin_la_LIBADD) $(LIBS)
-src/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo: src/ppp/$(am__dirstamp) \
-	src/ppp/$(DEPDIR)/$(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/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-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:  \
-	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: $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES) src/settings/plugins/ifcfg-rh/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LINK) $(am_src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_rpath) $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD) $(LIBS)
-src/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo:  \
-	src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
-	src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la: $(src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_DEPENDENCIES) src/settings/plugins/ifcfg-rh/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK) $(am_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_rpath) $(src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_LIBADD) $(LIBS)
-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-nms-ifcfg-rh-utils.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-reader.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-writer.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: $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_DEPENDENCIES) src/settings/plugins/ifcfg-rh/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK) $(am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_rpath) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_LIBADD) $(LIBS)
-src/settings/plugins/ifupdown/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ifupdown
-	@: > 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-plugin.lo:  \
-	src/settings/plugins/ifupdown/$(am__dirstamp) \
-	src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la: $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS) $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES) src/settings/plugins/ifupdown/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LINK) $(am_src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_rpath) $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS) $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD) $(LIBS)
-src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo:  \
-	src/settings/plugins/ifupdown/$(am__dirstamp) \
-	src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo:  \
-	src/settings/plugins/ifupdown/$(am__dirstamp) \
-	src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ifupdown/libnms-ifupdown-core.la: $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS) $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifupdown_libnms_ifupdown_core_la_DEPENDENCIES) src/settings/plugins/ifupdown/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK) $(am_src_settings_plugins_ifupdown_libnms_ifupdown_core_la_rpath) $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS) $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD) $(LIBS)
+src/core/devices/adsl/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/adsl
+	@: > src/core/devices/adsl/$(am__dirstamp)
+src/core/devices/adsl/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/adsl/$(DEPDIR)
+	@: > src/core/devices/adsl/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo:  \
+	src/core/devices/adsl/$(am__dirstamp) \
+	src/core/devices/adsl/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo:  \
+	src/core/devices/adsl/$(am__dirstamp) \
+	src/core/devices/adsl/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/adsl/libnm-device-plugin-adsl.la: $(src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS) $(src_core_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES) $(EXTRA_src_core_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES) src/core/devices/adsl/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_devices_adsl_libnm_device_plugin_adsl_la_LINK) -rpath $(plugindir) $(src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS) $(src_core_devices_adsl_libnm_device_plugin_adsl_la_LIBADD) $(LIBS)
+src/core/devices/bluetooth/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/bluetooth
+	@: > src/core/devices/bluetooth/$(am__dirstamp)
+src/core/devices/bluetooth/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/bluetooth/$(DEPDIR)
+	@: > src/core/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo:  \
+	src/core/devices/bluetooth/$(am__dirstamp) \
+	src/core/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo:  \
+	src/core/devices/bluetooth/$(am__dirstamp) \
+	src/core/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/bluetooth/libnm-bluetooth-utils.la: $(src_core_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS) $(src_core_devices_bluetooth_libnm_bluetooth_utils_la_DEPENDENCIES) $(EXTRA_src_core_devices_bluetooth_libnm_bluetooth_utils_la_DEPENDENCIES) src/core/devices/bluetooth/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK) $(am_src_core_devices_bluetooth_libnm_bluetooth_utils_la_rpath) $(src_core_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS) $(src_core_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD) $(LIBS)
+src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo:  \
+	src/core/devices/bluetooth/$(am__dirstamp) \
+	src/core/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo:  \
+	src/core/devices/bluetooth/$(am__dirstamp) \
+	src/core/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/bluetooth/libnm-device-plugin-bluetooth.la: $(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS) $(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES) $(EXTRA_src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES) src/core/devices/bluetooth/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK) $(am_src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_rpath) $(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS) $(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD) $(LIBS)
+src/core/devices/ovs/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/ovs
+	@: > src/core/devices/ovs/$(am__dirstamp)
+src/core/devices/ovs/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/ovs/$(DEPDIR)
+	@: > src/core/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo:  \
+	src/core/devices/ovs/$(am__dirstamp) \
+	src/core/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo:  \
+	src/core/devices/ovs/$(am__dirstamp) \
+	src/core/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo:  \
+	src/core/devices/ovs/$(am__dirstamp) \
+	src/core/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo:  \
+	src/core/devices/ovs/$(am__dirstamp) \
+	src/core/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo:  \
+	src/core/devices/ovs/$(am__dirstamp) \
+	src/core/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/ovs/libnm-device-plugin-ovs.la: $(src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES) $(EXTRA_src_core_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES) src/core/devices/ovs/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_devices_ovs_libnm_device_plugin_ovs_la_LINK) $(am_src_core_devices_ovs_libnm_device_plugin_ovs_la_rpath) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_LIBADD) $(LIBS)
+src/core/devices/team/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/team
+	@: > src/core/devices/team/$(am__dirstamp)
+src/core/devices/team/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/team/$(DEPDIR)
+	@: > src/core/devices/team/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo:  \
+	src/core/devices/team/$(am__dirstamp) \
+	src/core/devices/team/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/team/libnm_device_plugin_team_la-nm-device-team.lo:  \
+	src/core/devices/team/$(am__dirstamp) \
+	src/core/devices/team/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/team/libnm-device-plugin-team.la: $(src_core_devices_team_libnm_device_plugin_team_la_OBJECTS) $(src_core_devices_team_libnm_device_plugin_team_la_DEPENDENCIES) $(EXTRA_src_core_devices_team_libnm_device_plugin_team_la_DEPENDENCIES) src/core/devices/team/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_devices_team_libnm_device_plugin_team_la_LINK) $(am_src_core_devices_team_libnm_device_plugin_team_la_rpath) $(src_core_devices_team_libnm_device_plugin_team_la_OBJECTS) $(src_core_devices_team_libnm_device_plugin_team_la_LIBADD) $(LIBS)
+src/core/devices/wifi/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/wifi
+	@: > src/core/devices/wifi/$(am__dirstamp)
+src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/wifi/$(DEPDIR)
+	@: > src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo:  \
+	src/core/devices/wifi/$(am__dirstamp) \
+	src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/wifi/libnm-device-plugin-wifi.la: $(src_core_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_core_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) $(EXTRA_src_core_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) src/core/devices/wifi/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_devices_wifi_libnm_device_plugin_wifi_la_LINK) $(am_src_core_devices_wifi_libnm_device_plugin_wifi_la_rpath) $(src_core_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_core_devices_wifi_libnm_device_plugin_wifi_la_LIBADD) $(LIBS)
+src/core/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo:  \
+	src/core/devices/wifi/$(am__dirstamp) \
+	src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo:  \
+	src/core/devices/wifi/$(am__dirstamp) \
+	src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo:  \
+	src/core/devices/wifi/$(am__dirstamp) \
+	src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo:  \
+	src/core/devices/wifi/$(am__dirstamp) \
+	src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo:  \
+	src/core/devices/wifi/$(am__dirstamp) \
+	src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo:  \
+	src/core/devices/wifi/$(am__dirstamp) \
+	src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo:  \
+	src/core/devices/wifi/$(am__dirstamp) \
+	src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo:  \
+	src/core/devices/wifi/$(am__dirstamp) \
+	src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo:  \
+	src/core/devices/wifi/$(am__dirstamp) \
+	src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/wifi/libnm-wifi-base.la: $(src_core_devices_wifi_libnm_wifi_base_la_OBJECTS) $(src_core_devices_wifi_libnm_wifi_base_la_DEPENDENCIES) $(EXTRA_src_core_devices_wifi_libnm_wifi_base_la_DEPENDENCIES) src/core/devices/wifi/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK) $(am_src_core_devices_wifi_libnm_wifi_base_la_rpath) $(src_core_devices_wifi_libnm_wifi_base_la_OBJECTS) $(src_core_devices_wifi_libnm_wifi_base_la_LIBADD) $(LIBS)
+src/core/devices/wwan/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/wwan
+	@: > src/core/devices/wwan/$(am__dirstamp)
+src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/wwan/$(DEPDIR)
+	@: > src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo:  \
+	src/core/devices/wwan/$(am__dirstamp) \
+	src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo:  \
+	src/core/devices/wwan/$(am__dirstamp) \
+	src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/wwan/libnm-device-plugin-wwan.la: $(src_core_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS) $(src_core_devices_wwan_libnm_device_plugin_wwan_la_DEPENDENCIES) $(EXTRA_src_core_devices_wwan_libnm_device_plugin_wwan_la_DEPENDENCIES) src/core/devices/wwan/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_devices_wwan_libnm_device_plugin_wwan_la_LINK) $(am_src_core_devices_wwan_libnm_device_plugin_wwan_la_rpath) $(src_core_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS) $(src_core_devices_wwan_libnm_device_plugin_wwan_la_LIBADD) $(LIBS)
+src/core/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo:  \
+	src/core/devices/wwan/$(am__dirstamp) \
+	src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wwan/libnm_wwan_la-nm-modem-manager.lo:  \
+	src/core/devices/wwan/$(am__dirstamp) \
+	src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wwan/libnm_wwan_la-nm-modem.lo:  \
+	src/core/devices/wwan/$(am__dirstamp) \
+	src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wwan/libnm_wwan_la-nm-service-providers.lo:  \
+	src/core/devices/wwan/$(am__dirstamp) \
+	src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo:  \
+	src/core/devices/wwan/$(am__dirstamp) \
+	src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/wwan/libnm-wwan.la: $(src_core_devices_wwan_libnm_wwan_la_OBJECTS) $(src_core_devices_wwan_libnm_wwan_la_DEPENDENCIES) $(EXTRA_src_core_devices_wwan_libnm_wwan_la_DEPENDENCIES) src/core/devices/wwan/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_devices_wwan_libnm_wwan_la_LINK) $(am_src_core_devices_wwan_libnm_wwan_la_rpath) $(src_core_devices_wwan_libnm_wwan_la_OBJECTS) $(src_core_devices_wwan_libnm_wwan_la_LIBADD) $(LIBS)
+src/core/initrd/$(am__dirstamp):
+	@$(MKDIR_P) src/core/initrd
+	@: > src/core/initrd/$(am__dirstamp)
+src/core/initrd/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/initrd/$(DEPDIR)
+	@: > src/core/initrd/$(DEPDIR)/$(am__dirstamp)
+src/core/initrd/libnmi_core_la-nmi-cmdline-reader.lo:  \
+	src/core/initrd/$(am__dirstamp) \
+	src/core/initrd/$(DEPDIR)/$(am__dirstamp)
+src/core/initrd/libnmi_core_la-nmi-dt-reader.lo:  \
+	src/core/initrd/$(am__dirstamp) \
+	src/core/initrd/$(DEPDIR)/$(am__dirstamp)
+src/core/initrd/libnmi_core_la-nmi-ibft-reader.lo:  \
+	src/core/initrd/$(am__dirstamp) \
+	src/core/initrd/$(DEPDIR)/$(am__dirstamp)
+
+src/core/initrd/libnmi-core.la: $(src_core_initrd_libnmi_core_la_OBJECTS) $(src_core_initrd_libnmi_core_la_DEPENDENCIES) $(EXTRA_src_core_initrd_libnmi_core_la_DEPENDENCIES) src/core/initrd/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK)  $(src_core_initrd_libnmi_core_la_OBJECTS) $(src_core_initrd_libnmi_core_la_LIBADD) $(LIBS)
+src/core/$(am__dirstamp):
+	@$(MKDIR_P) src/core
+	@: > src/core/$(am__dirstamp)
+src/core/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/$(DEPDIR)
+	@: > src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-checkpoint.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-checkpoint-manager.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices
+	@: > src/core/devices/$(am__dirstamp)
+src/core/devices/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/$(DEPDIR)
+	@: > src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-acd-manager.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-lldp-listener.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-ethernet-utils.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-factory.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-generic.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-6lowpan.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-bond.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-bridge.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-dummy.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-ethernet.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-infiniband.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-ip-tunnel.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-macsec.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-macvlan.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-ppp.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-tun.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-veth.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-vlan.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-vrf.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-vxlan.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-wireguard.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/libNetworkManager_la-nm-device-wpan.lo:  \
+	src/core/devices/$(am__dirstamp) \
+	src/core/devices/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/$(am__dirstamp):
+	@$(MKDIR_P) src/core/dhcp
+	@: > src/core/dhcp/$(am__dirstamp)
+src/core/dhcp/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/dhcp/$(DEPDIR)
+	@: > src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManager_la-nm-dhcp-listener.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dns/$(am__dirstamp):
+	@$(MKDIR_P) src/core/dns
+	@: > src/core/dns/$(am__dirstamp)
+src/core/dns/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/dns/$(DEPDIR)
+	@: > src/core/dns/$(DEPDIR)/$(am__dirstamp)
+src/core/dns/libNetworkManager_la-nm-dns-manager.lo:  \
+	src/core/dns/$(am__dirstamp) \
+	src/core/dns/$(DEPDIR)/$(am__dirstamp)
+src/core/dns/libNetworkManager_la-nm-dns-plugin.lo:  \
+	src/core/dns/$(am__dirstamp) \
+	src/core/dns/$(DEPDIR)/$(am__dirstamp)
+src/core/dns/libNetworkManager_la-nm-dns-dnsmasq.lo:  \
+	src/core/dns/$(am__dirstamp) \
+	src/core/dns/$(DEPDIR)/$(am__dirstamp)
+src/core/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo:  \
+	src/core/dns/$(am__dirstamp) \
+	src/core/dns/$(DEPDIR)/$(am__dirstamp)
+src/core/dns/libNetworkManager_la-nm-dns-unbound.lo:  \
+	src/core/dns/$(am__dirstamp) \
+	src/core/dns/$(DEPDIR)/$(am__dirstamp)
+src/core/dnsmasq/$(am__dirstamp):
+	@$(MKDIR_P) src/core/dnsmasq
+	@: > src/core/dnsmasq/$(am__dirstamp)
+src/core/dnsmasq/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/dnsmasq/$(DEPDIR)
+	@: > src/core/dnsmasq/$(DEPDIR)/$(am__dirstamp)
+src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo:  \
+	src/core/dnsmasq/$(am__dirstamp) \
+	src/core/dnsmasq/$(DEPDIR)/$(am__dirstamp)
+src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo:  \
+	src/core/dnsmasq/$(am__dirstamp) \
+	src/core/dnsmasq/$(DEPDIR)/$(am__dirstamp)
+src/core/ppp/$(am__dirstamp):
+	@$(MKDIR_P) src/core/ppp
+	@: > src/core/ppp/$(am__dirstamp)
+src/core/ppp/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/ppp/$(DEPDIR)
+	@: > src/core/ppp/$(DEPDIR)/$(am__dirstamp)
+src/core/ppp/libNetworkManager_la-nm-ppp-manager-call.lo:  \
+	src/core/ppp/$(am__dirstamp) \
+	src/core/ppp/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-hostname-manager.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings
+	@: > src/core/settings/$(am__dirstamp)
+src/core/settings/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/$(DEPDIR)
+	@: > src/core/settings/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/libNetworkManager_la-nm-agent-manager.lo:  \
+	src/core/settings/$(am__dirstamp) \
+	src/core/settings/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/libNetworkManager_la-nm-secret-agent.lo:  \
+	src/core/settings/$(am__dirstamp) \
+	src/core/settings/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/libNetworkManager_la-nm-settings-connection.lo:  \
+	src/core/settings/$(am__dirstamp) \
+	src/core/settings/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/libNetworkManager_la-nm-settings-storage.lo:  \
+	src/core/settings/$(am__dirstamp) \
+	src/core/settings/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/libNetworkManager_la-nm-settings-plugin.lo:  \
+	src/core/settings/$(am__dirstamp) \
+	src/core/settings/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/libNetworkManager_la-nm-settings.lo:  \
+	src/core/settings/$(am__dirstamp) \
+	src/core/settings/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/libNetworkManager_la-nm-settings-utils.lo:  \
+	src/core/settings/$(am__dirstamp) \
+	src/core/settings/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/keyfile/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/keyfile
+	@: > src/core/settings/plugins/keyfile/$(am__dirstamp)
+src/core/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/keyfile/$(DEPDIR)
+	@: > src/core/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo:  \
+	src/core/settings/plugins/keyfile/$(am__dirstamp) \
+	src/core/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo:  \
+	src/core/settings/plugins/keyfile/$(am__dirstamp) \
+	src/core/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo:  \
+	src/core/settings/plugins/keyfile/$(am__dirstamp) \
+	src/core/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo:  \
+	src/core/settings/plugins/keyfile/$(am__dirstamp) \
+	src/core/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo:  \
+	src/core/settings/plugins/keyfile/$(am__dirstamp) \
+	src/core/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
+src/core/supplicant/$(am__dirstamp):
+	@$(MKDIR_P) src/core/supplicant
+	@: > src/core/supplicant/$(am__dirstamp)
+src/core/supplicant/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/supplicant/$(DEPDIR)
+	@: > src/core/supplicant/$(DEPDIR)/$(am__dirstamp)
+src/core/supplicant/libNetworkManager_la-nm-supplicant-config.lo:  \
+	src/core/supplicant/$(am__dirstamp) \
+	src/core/supplicant/$(DEPDIR)/$(am__dirstamp)
+src/core/supplicant/libNetworkManager_la-nm-supplicant-interface.lo:  \
+	src/core/supplicant/$(am__dirstamp) \
+	src/core/supplicant/$(DEPDIR)/$(am__dirstamp)
+src/core/supplicant/libNetworkManager_la-nm-supplicant-manager.lo:  \
+	src/core/supplicant/$(am__dirstamp) \
+	src/core/supplicant/$(DEPDIR)/$(am__dirstamp)
+src/core/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo:  \
+	src/core/supplicant/$(am__dirstamp) \
+	src/core/supplicant/$(DEPDIR)/$(am__dirstamp)
+src/core/vpn/$(am__dirstamp):
+	@$(MKDIR_P) src/core/vpn
+	@: > src/core/vpn/$(am__dirstamp)
+src/core/vpn/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/vpn/$(DEPDIR)
+	@: > src/core/vpn/$(DEPDIR)/$(am__dirstamp)
+src/core/vpn/libNetworkManager_la-nm-vpn-connection.lo:  \
+	src/core/vpn/$(am__dirstamp) \
+	src/core/vpn/$(DEPDIR)/$(am__dirstamp)
+src/core/vpn/libNetworkManager_la-nm-vpn-manager.lo:  \
+	src/core/vpn/$(am__dirstamp) \
+	src/core/vpn/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-act-request.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-active-connection.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-audit-manager.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-dbus-manager.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-config.lo: src/core/$(am__dirstamp) \
+	src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-config-data.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-connectivity.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-dcb.lo: src/core/$(am__dirstamp) \
+	src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-dhcp-config.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-dispatcher.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-firewall-manager.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-proxy-config.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-auth-manager.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-auth-utils.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-manager.lo: src/core/$(am__dirstamp) \
+	src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-pacrunner-manager.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-policy.lo: src/core/$(am__dirstamp) \
+	src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-rfkill-manager.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-session-monitor.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-keep-alive.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManager_la-nm-sleep-monitor.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+
+src/core/libNetworkManager.la: $(src_core_libNetworkManager_la_OBJECTS) $(src_core_libNetworkManager_la_DEPENDENCIES) $(EXTRA_src_core_libNetworkManager_la_DEPENDENCIES) src/core/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK)  $(src_core_libNetworkManager_la_OBJECTS) $(src_core_libNetworkManager_la_LIBADD) $(LIBS)
+src/core/libNetworkManagerBase_la-nm-core-utils.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-NetworkManagerUtils.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/$(am__dirstamp):
+	@$(MKDIR_P) src/core/platform
+	@: > src/core/platform/$(am__dirstamp)
+src/core/platform/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/platform/$(DEPDIR)
+	@: > src/core/platform/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/libNetworkManagerBase_la-nmp-object.lo:  \
+	src/core/platform/$(am__dirstamp) \
+	src/core/platform/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/libNetworkManagerBase_la-nm-platform.lo:  \
+	src/core/platform/$(am__dirstamp) \
+	src/core/platform/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/libNetworkManagerBase_la-nm-linux-platform.lo:  \
+	src/core/platform/$(am__dirstamp) \
+	src/core/platform/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/libNetworkManagerBase_la-nmp-rules-manager.lo:  \
+	src/core/platform/$(am__dirstamp) \
+	src/core/platform/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/wifi/$(am__dirstamp):
+	@$(MKDIR_P) src/core/platform/wifi
+	@: > src/core/platform/wifi/$(am__dirstamp)
+src/core/platform/wifi/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/platform/wifi/$(DEPDIR)
+	@: > src/core/platform/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo:  \
+	src/core/platform/wifi/$(am__dirstamp) \
+	src/core/platform/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo:  \
+	src/core/platform/wifi/$(am__dirstamp) \
+	src/core/platform/wifi/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/wpan/$(am__dirstamp):
+	@$(MKDIR_P) src/core/platform/wpan
+	@: > src/core/platform/wpan/$(am__dirstamp)
+src/core/platform/wpan/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/platform/wpan/$(DEPDIR)
+	@: > src/core/platform/wpan/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo:  \
+	src/core/platform/wpan/$(am__dirstamp) \
+	src/core/platform/wpan/$(DEPDIR)/$(am__dirstamp)
+src/core/ndisc/$(am__dirstamp):
+	@$(MKDIR_P) src/core/ndisc
+	@: > src/core/ndisc/$(am__dirstamp)
+src/core/ndisc/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/ndisc/$(DEPDIR)
+	@: > src/core/ndisc/$(DEPDIR)/$(am__dirstamp)
+src/core/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo:  \
+	src/core/ndisc/$(am__dirstamp) \
+	src/core/ndisc/$(DEPDIR)/$(am__dirstamp)
+src/core/ndisc/libNetworkManagerBase_la-nm-ndisc.lo:  \
+	src/core/ndisc/$(am__dirstamp) \
+	src/core/ndisc/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-nm-dbus-utils.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-nm-dbus-object.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-nm-netns.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-nm-l3-config-data.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-nm-l3-ipv4ll.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-nm-l3cfg.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-nm-ip-config.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-nm-ip4-config.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-nm-ip6-config.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo:  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+src/core/libNetworkManagerBase_la-main-utils.lo:  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo:  \
+	src/core/platform/wifi/$(am__dirstamp) \
+	src/core/platform/wifi/$(DEPDIR)/$(am__dirstamp)
+
+src/core/libNetworkManagerBase.la: $(src_core_libNetworkManagerBase_la_OBJECTS) $(src_core_libNetworkManagerBase_la_DEPENDENCIES) $(EXTRA_src_core_libNetworkManagerBase_la_DEPENDENCIES) src/core/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK)  $(src_core_libNetworkManagerBase_la_OBJECTS) $(src_core_libNetworkManagerBase_la_LIBADD) $(LIBS)
+src/core/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo:  \
+	src/core/ndisc/$(am__dirstamp) \
+	src/core/ndisc/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/libNetworkManagerTest_la-nm-fake-platform.lo:  \
+	src/core/platform/$(am__dirstamp) \
+	src/core/platform/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/platform/tests
+	@: > src/core/platform/tests/$(am__dirstamp)
+src/core/platform/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/platform/tests/$(DEPDIR)
+	@: > src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/platform/tests/libNetworkManagerTest_la-test-common.lo:  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/libNetworkManagerTest.la: $(src_core_libNetworkManagerTest_la_OBJECTS) $(src_core_libNetworkManagerTest_la_DEPENDENCIES) $(EXTRA_src_core_libNetworkManagerTest_la_DEPENDENCIES) src/core/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK) $(am_src_core_libNetworkManagerTest_la_rpath) $(src_core_libNetworkManagerTest_la_OBJECTS) $(src_core_libNetworkManagerTest_la_LIBADD) $(LIBS)
+src/core/systemd/$(am__dirstamp):
+	@$(MKDIR_P) src/core/systemd
+	@: > src/core/systemd/$(am__dirstamp)
+src/core/systemd/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/systemd/$(DEPDIR)
+	@: > src/core/systemd/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo:  \
+	src/core/systemd/$(am__dirstamp) \
+	src/core/systemd/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/libnm_systemd_core_la-nm-sd.lo:  \
+	src/core/systemd/$(am__dirstamp) \
+	src/core/systemd/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo:  \
+	src/core/systemd/$(am__dirstamp) \
+	src/core/systemd/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/sd-adapt-core/$(am__dirstamp):
+	@$(MKDIR_P) src/core/systemd/sd-adapt-core
+	@: > src/core/systemd/sd-adapt-core/$(am__dirstamp)
+src/core/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/systemd/sd-adapt-core/$(DEPDIR)
+	@: > src/core/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo:  \
+	src/core/systemd/sd-adapt-core/$(am__dirstamp) \
+	src/core/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/$(am__dirstamp):
+	@$(MKDIR_P) src/core/systemd/src/libsystemd-network
+	@: > src/core/systemd/src/libsystemd-network/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/systemd/src/libsystemd-network/$(DEPDIR)
+	@: > src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo:  \
+	src/core/systemd/src/libsystemd-network/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd/sd-event/$(am__dirstamp):
+	@$(MKDIR_P) src/core/systemd/src/libsystemd/sd-event
+	@: > src/core/systemd/src/libsystemd/sd-event/$(am__dirstamp)
+src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)
+	@: > src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo:  \
+	src/core/systemd/src/libsystemd/sd-event/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo:  \
+	src/core/systemd/src/libsystemd/sd-event/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd/sd-id128/$(am__dirstamp):
+	@$(MKDIR_P) src/core/systemd/src/libsystemd/sd-id128
+	@: > src/core/systemd/src/libsystemd/sd-id128/$(am__dirstamp)
+src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)
+	@: > src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo:  \
+	src/core/systemd/src/libsystemd/sd-id128/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
+src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo:  \
+	src/core/systemd/src/libsystemd/sd-id128/$(am__dirstamp) \
+	src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
+
+src/core/libnm-systemd-core.la: $(src_core_libnm_systemd_core_la_OBJECTS) $(src_core_libnm_systemd_core_la_DEPENDENCIES) $(EXTRA_src_core_libnm_systemd_core_la_DEPENDENCIES) src/core/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK)  $(src_core_libnm_systemd_core_la_OBJECTS) $(src_core_libnm_systemd_core_la_LIBADD) $(LIBS)
+src/core/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo:  \
+	src/core/ppp/$(am__dirstamp) \
+	src/core/ppp/$(DEPDIR)/$(am__dirstamp)
+
+src/core/ppp/libnm-ppp-plugin.la: $(src_core_ppp_libnm_ppp_plugin_la_OBJECTS) $(src_core_ppp_libnm_ppp_plugin_la_DEPENDENCIES) $(EXTRA_src_core_ppp_libnm_ppp_plugin_la_DEPENDENCIES) src/core/ppp/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_ppp_libnm_ppp_plugin_la_LINK) $(am_src_core_ppp_libnm_ppp_plugin_la_rpath) $(src_core_ppp_libnm_ppp_plugin_la_OBJECTS) $(src_core_ppp_libnm_ppp_plugin_la_LIBADD) $(LIBS)
+src/core/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo:  \
+	src/core/ppp/$(am__dirstamp) \
+	src/core/ppp/$(DEPDIR)/$(am__dirstamp)
+
+src/core/ppp/nm-pppd-plugin.la: $(src_core_ppp_nm_pppd_plugin_la_OBJECTS) $(src_core_ppp_nm_pppd_plugin_la_DEPENDENCIES) $(EXTRA_src_core_ppp_nm_pppd_plugin_la_DEPENDENCIES) src/core/ppp/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_ppp_nm_pppd_plugin_la_LINK) $(am_src_core_ppp_nm_pppd_plugin_la_rpath) $(src_core_ppp_nm_pppd_plugin_la_OBJECTS) $(src_core_ppp_nm_pppd_plugin_la_LIBADD) $(LIBS)
+src/core/settings/plugins/ifcfg-rh/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/ifcfg-rh
+	@: > src/core/settings/plugins/ifcfg-rh/$(am__dirstamp)
+src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/ifcfg-rh/$(DEPDIR)
+	@: > src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo:  \
+	src/core/settings/plugins/ifcfg-rh/$(am__dirstamp) \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo:  \
+	src/core/settings/plugins/ifcfg-rh/$(am__dirstamp) \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+
+src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la: $(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS) $(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES) $(EXTRA_src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES) src/core/settings/plugins/ifcfg-rh/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LINK) $(am_src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_rpath) $(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS) $(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD) $(LIBS)
+src/core/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo:  \
+	src/core/settings/plugins/ifcfg-rh/$(am__dirstamp) \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+
+src/core/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la: $(src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS) $(src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_DEPENDENCIES) $(EXTRA_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_DEPENDENCIES) src/core/settings/plugins/ifcfg-rh/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK) $(am_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_rpath) $(src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS) $(src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_LIBADD) $(LIBS)
+src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo:  \
+	src/core/settings/plugins/ifcfg-rh/$(am__dirstamp) \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo:  \
+	src/core/settings/plugins/ifcfg-rh/$(am__dirstamp) \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo:  \
+	src/core/settings/plugins/ifcfg-rh/$(am__dirstamp) \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo:  \
+	src/core/settings/plugins/ifcfg-rh/$(am__dirstamp) \
+	src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+
+src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la: $(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) $(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_DEPENDENCIES) $(EXTRA_src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_DEPENDENCIES) src/core/settings/plugins/ifcfg-rh/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK) $(am_src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_rpath) $(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) $(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_LIBADD) $(LIBS)
+src/core/settings/plugins/ifupdown/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/ifupdown
+	@: > src/core/settings/plugins/ifupdown/$(am__dirstamp)
+src/core/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/ifupdown/$(DEPDIR)
+	@: > src/core/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo:  \
+	src/core/settings/plugins/ifupdown/$(am__dirstamp) \
+	src/core/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
+
+src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la: $(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS) $(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES) $(EXTRA_src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES) src/core/settings/plugins/ifupdown/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LINK) $(am_src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_rpath) $(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS) $(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD) $(LIBS)
+src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo:  \
+	src/core/settings/plugins/ifupdown/$(am__dirstamp) \
+	src/core/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo:  \
+	src/core/settings/plugins/ifupdown/$(am__dirstamp) \
+	src/core/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
+
+src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la: $(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS) $(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_DEPENDENCIES) $(EXTRA_src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_DEPENDENCIES) src/core/settings/plugins/ifupdown/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK) $(am_src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_rpath) $(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS) $(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD) $(LIBS)
 clients/cli/$(am__dirstamp):
 	@$(MKDIR_P) clients/cli
 	@: > clients/cli/$(am__dirstamp)
@@ -10115,37 +10496,26 @@ clients/cli/nmcli-polkit-agent.$(OBJEXT): clients/cli/$(am__dirstamp) \
 clients/cli/nmcli$(EXEEXT): $(clients_cli_nmcli_OBJECTS) $(clients_cli_nmcli_DEPENDENCIES) $(EXTRA_clients_cli_nmcli_DEPENDENCIES) clients/cli/$(am__dirstamp)
 	@rm -f clients/cli/nmcli$(EXEEXT)
 	$(AM_V_CCLD)$(clients_cli_nmcli_LINK) $(clients_cli_nmcli_OBJECTS) $(clients_cli_nmcli_LDADD) $(LIBS)
-clients/cloud-setup/$(am__dirstamp):
-	@$(MKDIR_P) clients/cloud-setup
-	@: > clients/cloud-setup/$(am__dirstamp)
-clients/cloud-setup/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) clients/cloud-setup/$(DEPDIR)
-	@: > clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
 clients/cloud-setup/nm_cloud_setup-main.$(OBJEXT):  \
 	clients/cloud-setup/$(am__dirstamp) \
 	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
-clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.$(OBJEXT):  \
-	clients/cloud-setup/$(am__dirstamp) \
-	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
-clients/cloud-setup/nm_cloud_setup-nm-http-client.$(OBJEXT):  \
-	clients/cloud-setup/$(am__dirstamp) \
-	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
-clients/cloud-setup/nm_cloud_setup-nmcs-provider.$(OBJEXT):  \
-	clients/cloud-setup/$(am__dirstamp) \
-	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
-clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.$(OBJEXT):  \
-	clients/cloud-setup/$(am__dirstamp) \
-	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
-clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.$(OBJEXT):  \
-	clients/cloud-setup/$(am__dirstamp) \
-	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
-clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.$(OBJEXT):  \
-	clients/cloud-setup/$(am__dirstamp) \
-	clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
 
 clients/cloud-setup/nm-cloud-setup$(EXEEXT): $(clients_cloud_setup_nm_cloud_setup_OBJECTS) $(clients_cloud_setup_nm_cloud_setup_DEPENDENCIES) $(EXTRA_clients_cloud_setup_nm_cloud_setup_DEPENDENCIES) clients/cloud-setup/$(am__dirstamp)
 	@rm -f clients/cloud-setup/nm-cloud-setup$(EXEEXT)
 	$(AM_V_CCLD)$(clients_cloud_setup_nm_cloud_setup_LINK) $(clients_cloud_setup_nm_cloud_setup_OBJECTS) $(clients_cloud_setup_nm_cloud_setup_LDADD) $(LIBS)
+clients/cloud-setup/tests/$(am__dirstamp):
+	@$(MKDIR_P) clients/cloud-setup/tests
+	@: > clients/cloud-setup/tests/$(am__dirstamp)
+clients/cloud-setup/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) clients/cloud-setup/tests/$(DEPDIR)
+	@: > clients/cloud-setup/tests/$(DEPDIR)/$(am__dirstamp)
+clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.$(OBJEXT):  \
+	clients/cloud-setup/tests/$(am__dirstamp) \
+	clients/cloud-setup/tests/$(DEPDIR)/$(am__dirstamp)
+
+clients/cloud-setup/tests/test-cloud-setup-general$(EXEEXT): $(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS) $(clients_cloud_setup_tests_test_cloud_setup_general_DEPENDENCIES) $(EXTRA_clients_cloud_setup_tests_test_cloud_setup_general_DEPENDENCIES) clients/cloud-setup/tests/$(am__dirstamp)
+	@rm -f clients/cloud-setup/tests/test-cloud-setup-general$(EXEEXT)
+	$(AM_V_CCLD)$(clients_cloud_setup_tests_test_cloud_setup_general_LINK) $(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS) $(clients_cloud_setup_tests_test_cloud_setup_general_LDADD) $(LIBS)
 clients/common/tests/$(am__dirstamp):
 	@$(MKDIR_P) clients/common/tests
 	@: > clients/common/tests/$(am__dirstamp)
@@ -10489,6 +10859,9 @@ libnm/tests/test_libnm-test-libnm.$(OBJEXT):  \
 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/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/$(DEPDIR)
+	@: > shared/$(DEPDIR)/$(am__dirstamp)
 shared/libnm_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT):  \
 	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
 libnm/tests/test_nm_client-test-nm-client.$(OBJEXT):  \
@@ -10536,398 +10909,421 @@ shared/nm-glib-aux/tests/test_shared_general-test-shared-general.$(OBJEXT):  \
 shared/nm-glib-aux/tests/test-shared-general$(EXEEXT): $(shared_nm_glib_aux_tests_test_shared_general_OBJECTS) $(shared_nm_glib_aux_tests_test_shared_general_DEPENDENCIES) $(EXTRA_shared_nm_glib_aux_tests_test_shared_general_DEPENDENCIES) shared/nm-glib-aux/tests/$(am__dirstamp)
 	@rm -f shared/nm-glib-aux/tests/test-shared-general$(EXEEXT)
 	$(AM_V_CCLD)$(shared_nm_glib_aux_tests_test_shared_general_LINK) $(shared_nm_glib_aux_tests_test_shared_general_OBJECTS) $(shared_nm_glib_aux_tests_test_shared_general_LDADD) $(LIBS)
-src/NetworkManager-main.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-
-src/NetworkManager$(EXEEXT): $(src_NetworkManager_OBJECTS) $(src_NetworkManager_DEPENDENCIES) $(EXTRA_src_NetworkManager_DEPENDENCIES) src/$(am__dirstamp)
-	@rm -f src/NetworkManager$(EXEEXT)
-	$(AM_V_CCLD)$(src_NetworkManager_LINK) $(src_NetworkManager_OBJECTS) $(src_NetworkManager_LDADD) $(LIBS)
-src/NetworkManager_all_sym-main.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-
-src/NetworkManager-all-sym$(EXEEXT): $(src_NetworkManager_all_sym_OBJECTS) $(src_NetworkManager_all_sym_DEPENDENCIES) $(EXTRA_src_NetworkManager_all_sym_DEPENDENCIES) src/$(am__dirstamp)
-	@rm -f src/NetworkManager-all-sym$(EXEEXT)
-	$(AM_V_CCLD)$(src_NetworkManager_all_sym_LINK) $(src_NetworkManager_all_sym_OBJECTS) $(src_NetworkManager_all_sym_LDADD) $(LIBS)
-src/devices/bluetooth/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/bluetooth/tests
-	@: > src/devices/bluetooth/tests/$(am__dirstamp)
-src/devices/bluetooth/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/bluetooth/tests/$(DEPDIR)
-	@: > src/devices/bluetooth/tests/$(DEPDIR)/$(am__dirstamp)
-src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.$(OBJEXT):  \
-	src/devices/bluetooth/tests/$(am__dirstamp) \
-	src/devices/bluetooth/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/bluetooth/tests/nm-bt-test$(EXEEXT): $(src_devices_bluetooth_tests_nm_bt_test_OBJECTS) $(src_devices_bluetooth_tests_nm_bt_test_DEPENDENCIES) $(EXTRA_src_devices_bluetooth_tests_nm_bt_test_DEPENDENCIES) src/devices/bluetooth/tests/$(am__dirstamp)
-	@rm -f src/devices/bluetooth/tests/nm-bt-test$(EXEEXT)
-	$(AM_V_CCLD)$(src_devices_bluetooth_tests_nm_bt_test_LINK) $(src_devices_bluetooth_tests_nm_bt_test_OBJECTS) $(src_devices_bluetooth_tests_nm_bt_test_LDADD) $(LIBS)
-src/devices/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/tests
-	@: > src/devices/tests/$(am__dirstamp)
-src/devices/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/tests/$(DEPDIR)
-	@: > src/devices/tests/$(DEPDIR)/$(am__dirstamp)
-src/devices/tests/test_acd-test-acd.$(OBJEXT):  \
-	src/devices/tests/$(am__dirstamp) \
-	src/devices/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/tests/test-acd$(EXEEXT): $(src_devices_tests_test_acd_OBJECTS) $(src_devices_tests_test_acd_DEPENDENCIES) $(EXTRA_src_devices_tests_test_acd_DEPENDENCIES) src/devices/tests/$(am__dirstamp)
-	@rm -f src/devices/tests/test-acd$(EXEEXT)
-	$(AM_V_CCLD)$(src_devices_tests_test_acd_LINK) $(src_devices_tests_test_acd_OBJECTS) $(src_devices_tests_test_acd_LDADD) $(LIBS)
-src/devices/tests/test_lldp-test-lldp.$(OBJEXT):  \
-	src/devices/tests/$(am__dirstamp) \
-	src/devices/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/tests/test-lldp$(EXEEXT): $(src_devices_tests_test_lldp_OBJECTS) $(src_devices_tests_test_lldp_DEPENDENCIES) $(EXTRA_src_devices_tests_test_lldp_DEPENDENCIES) src/devices/tests/$(am__dirstamp)
-	@rm -f src/devices/tests/test-lldp$(EXEEXT)
-	$(AM_V_CCLD)$(src_devices_tests_test_lldp_LINK) $(src_devices_tests_test_lldp_OBJECTS) $(src_devices_tests_test_lldp_LDADD) $(LIBS)
-src/devices/wifi/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/wifi/tests
-	@: > 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/test_devices_wifi-test-devices-wifi.$(OBJEXT):  \
-	src/devices/wifi/tests/$(am__dirstamp) \
-	src/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/wifi/tests/test-devices-wifi$(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/devices/wwan/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/wwan/tests
-	@: > src/devices/wwan/tests/$(am__dirstamp)
-src/devices/wwan/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/devices/wwan/tests/$(DEPDIR)
-	@: > src/devices/wwan/tests/$(DEPDIR)/$(am__dirstamp)
-src/devices/wwan/tests/test_service_providers-test-service-providers.$(OBJEXT):  \
-	src/devices/wwan/tests/$(am__dirstamp) \
-	src/devices/wwan/tests/$(DEPDIR)/$(am__dirstamp)
-src/devices/wwan/tests_test_service_providers-nm-service-providers.$(OBJEXT):  \
-	src/devices/wwan/$(am__dirstamp) \
-	src/devices/wwan/$(DEPDIR)/$(am__dirstamp)
-
-src/devices/wwan/tests/test-service-providers$(EXEEXT): $(src_devices_wwan_tests_test_service_providers_OBJECTS) $(src_devices_wwan_tests_test_service_providers_DEPENDENCIES) $(EXTRA_src_devices_wwan_tests_test_service_providers_DEPENDENCIES) src/devices/wwan/tests/$(am__dirstamp)
-	@rm -f src/devices/wwan/tests/test-service-providers$(EXEEXT)
-	$(AM_V_CCLD)$(src_devices_wwan_tests_test_service_providers_LINK) $(src_devices_wwan_tests_test_service_providers_OBJECTS) $(src_devices_wwan_tests_test_service_providers_LDADD) $(LIBS)
-src/dhcp/nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT):  \
-	src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp)
-
-src/dhcp/nm-dhcp-helper$(EXEEXT): $(src_dhcp_nm_dhcp_helper_OBJECTS) $(src_dhcp_nm_dhcp_helper_DEPENDENCIES) $(EXTRA_src_dhcp_nm_dhcp_helper_DEPENDENCIES) src/dhcp/$(am__dirstamp)
-	@rm -f src/dhcp/nm-dhcp-helper$(EXEEXT)
-	$(AM_V_CCLD)$(src_dhcp_nm_dhcp_helper_LINK) $(src_dhcp_nm_dhcp_helper_OBJECTS) $(src_dhcp_nm_dhcp_helper_LDADD) $(LIBS)
-src/dhcp/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/dhcp/tests
-	@: > src/dhcp/tests/$(am__dirstamp)
-src/dhcp/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/dhcp/tests/$(DEPDIR)
-	@: > src/dhcp/tests/$(DEPDIR)/$(am__dirstamp)
-src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT):  \
-	src/dhcp/tests/$(am__dirstamp) \
-	src/dhcp/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/dhcp/tests/test-dhcp-dhclient$(EXEEXT): $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES) $(EXTRA_src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES) src/dhcp/tests/$(am__dirstamp)
-	@rm -f src/dhcp/tests/test-dhcp-dhclient$(EXEEXT)
-	$(AM_V_CCLD)$(src_dhcp_tests_test_dhcp_dhclient_LINK) $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_LDADD) $(LIBS)
-src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.$(OBJEXT):  \
-	src/dhcp/tests/$(am__dirstamp) \
-	src/dhcp/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/dhcp/tests/test-dhcp-utils$(EXEEXT): $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_DEPENDENCIES) $(EXTRA_src_dhcp_tests_test_dhcp_utils_DEPENDENCIES) src/dhcp/tests/$(am__dirstamp)
-	@rm -f src/dhcp/tests/test-dhcp-utils$(EXEEXT)
-	$(AM_V_CCLD)$(src_dhcp_tests_test_dhcp_utils_LINK) $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_LDADD) $(LIBS)
-src/dnsmasq/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/dnsmasq/tests
-	@: > src/dnsmasq/tests/$(am__dirstamp)
-src/dnsmasq/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/dnsmasq/tests/$(DEPDIR)
-	@: > src/dnsmasq/tests/$(DEPDIR)/$(am__dirstamp)
-src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.$(OBJEXT):  \
-	src/dnsmasq/tests/$(am__dirstamp) \
-	src/dnsmasq/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT): $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES) $(EXTRA_src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES) src/dnsmasq/tests/$(am__dirstamp)
-	@rm -f src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT)
-	$(AM_V_CCLD)$(src_dnsmasq_tests_test_dnsmasq_utils_LINK) $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_LDADD) $(LIBS)
-src/initrd/nm_initrd_generator-nm-initrd-generator.$(OBJEXT):  \
-	src/initrd/$(am__dirstamp) \
-	src/initrd/$(DEPDIR)/$(am__dirstamp)
-
-src/initrd/nm-initrd-generator$(EXEEXT): $(src_initrd_nm_initrd_generator_OBJECTS) $(src_initrd_nm_initrd_generator_DEPENDENCIES) $(EXTRA_src_initrd_nm_initrd_generator_DEPENDENCIES) src/initrd/$(am__dirstamp)
-	@rm -f src/initrd/nm-initrd-generator$(EXEEXT)
-	$(AM_V_CCLD)$(src_initrd_nm_initrd_generator_LINK) $(src_initrd_nm_initrd_generator_OBJECTS) $(src_initrd_nm_initrd_generator_LDADD) $(LIBS)
-src/initrd/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/initrd/tests
-	@: > src/initrd/tests/$(am__dirstamp)
-src/initrd/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/initrd/tests/$(DEPDIR)
-	@: > src/initrd/tests/$(DEPDIR)/$(am__dirstamp)
-src/initrd/tests/test_cmdline_reader-test-cmdline-reader.$(OBJEXT):  \
-	src/initrd/tests/$(am__dirstamp) \
-	src/initrd/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/initrd/tests/test-cmdline-reader$(EXEEXT): $(src_initrd_tests_test_cmdline_reader_OBJECTS) $(src_initrd_tests_test_cmdline_reader_DEPENDENCIES) $(EXTRA_src_initrd_tests_test_cmdline_reader_DEPENDENCIES) src/initrd/tests/$(am__dirstamp)
-	@rm -f src/initrd/tests/test-cmdline-reader$(EXEEXT)
-	$(AM_V_CCLD)$(src_initrd_tests_test_cmdline_reader_LINK) $(src_initrd_tests_test_cmdline_reader_OBJECTS) $(src_initrd_tests_test_cmdline_reader_LDADD) $(LIBS)
-src/initrd/tests/test_dt_reader-test-dt-reader.$(OBJEXT):  \
-	src/initrd/tests/$(am__dirstamp) \
-	src/initrd/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/initrd/tests/test-dt-reader$(EXEEXT): $(src_initrd_tests_test_dt_reader_OBJECTS) $(src_initrd_tests_test_dt_reader_DEPENDENCIES) $(EXTRA_src_initrd_tests_test_dt_reader_DEPENDENCIES) src/initrd/tests/$(am__dirstamp)
-	@rm -f src/initrd/tests/test-dt-reader$(EXEEXT)
-	$(AM_V_CCLD)$(src_initrd_tests_test_dt_reader_LINK) $(src_initrd_tests_test_dt_reader_OBJECTS) $(src_initrd_tests_test_dt_reader_LDADD) $(LIBS)
-src/initrd/tests/test_ibft_reader-test-ibft-reader.$(OBJEXT):  \
-	src/initrd/tests/$(am__dirstamp) \
-	src/initrd/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/initrd/tests/test-ibft-reader$(EXEEXT): $(src_initrd_tests_test_ibft_reader_OBJECTS) $(src_initrd_tests_test_ibft_reader_DEPENDENCIES) $(EXTRA_src_initrd_tests_test_ibft_reader_DEPENDENCIES) src/initrd/tests/$(am__dirstamp)
-	@rm -f src/initrd/tests/test-ibft-reader$(EXEEXT)
-	$(AM_V_CCLD)$(src_initrd_tests_test_ibft_reader_LINK) $(src_initrd_tests_test_ibft_reader_OBJECTS) $(src_initrd_tests_test_ibft_reader_LDADD) $(LIBS)
-src/ndisc/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/ndisc/tests
-	@: > src/ndisc/tests/$(am__dirstamp)
-src/ndisc/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/ndisc/tests/$(DEPDIR)
-	@: > src/ndisc/tests/$(DEPDIR)/$(am__dirstamp)
-src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.$(OBJEXT):  \
-	src/ndisc/tests/$(am__dirstamp) \
-	src/ndisc/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/ndisc/tests/test-ndisc-fake$(EXEEXT): $(src_ndisc_tests_test_ndisc_fake_OBJECTS) $(src_ndisc_tests_test_ndisc_fake_DEPENDENCIES) $(EXTRA_src_ndisc_tests_test_ndisc_fake_DEPENDENCIES) src/ndisc/tests/$(am__dirstamp)
-	@rm -f src/ndisc/tests/test-ndisc-fake$(EXEEXT)
-	$(AM_V_CCLD)$(src_ndisc_tests_test_ndisc_fake_LINK) $(src_ndisc_tests_test_ndisc_fake_OBJECTS) $(src_ndisc_tests_test_ndisc_fake_LDADD) $(LIBS)
-src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.$(OBJEXT):  \
-	src/ndisc/tests/$(am__dirstamp) \
-	src/ndisc/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/ndisc/tests/test-ndisc-linux$(EXEEXT): $(src_ndisc_tests_test_ndisc_linux_OBJECTS) $(src_ndisc_tests_test_ndisc_linux_DEPENDENCIES) $(EXTRA_src_ndisc_tests_test_ndisc_linux_DEPENDENCIES) src/ndisc/tests/$(am__dirstamp)
-	@rm -f src/ndisc/tests/test-ndisc-linux$(EXEEXT)
-	$(AM_V_CCLD)$(src_ndisc_tests_test_ndisc_linux_LINK) $(src_ndisc_tests_test_ndisc_linux_OBJECTS) $(src_ndisc_tests_test_ndisc_linux_LDADD) $(LIBS)
-src/nm_iface_helper-nm-iface-helper.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-
-src/nm-iface-helper$(EXEEXT): $(src_nm_iface_helper_OBJECTS) $(src_nm_iface_helper_DEPENDENCIES) $(EXTRA_src_nm_iface_helper_DEPENDENCIES) src/$(am__dirstamp)
-	@rm -f src/nm-iface-helper$(EXEEXT)
-	$(AM_V_CCLD)$(src_nm_iface_helper_LINK) $(src_nm_iface_helper_OBJECTS) $(src_nm_iface_helper_LDADD) $(LIBS)
-src/platform/tests/monitor-monitor.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/platform/tests/monitor$(EXEEXT): $(src_platform_tests_monitor_OBJECTS) $(src_platform_tests_monitor_DEPENDENCIES) $(EXTRA_src_platform_tests_monitor_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
-	@rm -f src/platform/tests/monitor$(EXEEXT)
-	$(AM_V_CCLD)$(src_platform_tests_monitor_LINK) $(src_platform_tests_monitor_OBJECTS) $(src_platform_tests_monitor_LDADD) $(LIBS)
-src/platform/tests/test_address_fake-test-address.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/platform/tests/test-address-fake$(EXEEXT): $(src_platform_tests_test_address_fake_OBJECTS) $(src_platform_tests_test_address_fake_DEPENDENCIES) $(EXTRA_src_platform_tests_test_address_fake_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
-	@rm -f src/platform/tests/test-address-fake$(EXEEXT)
-	$(AM_V_CCLD)$(src_platform_tests_test_address_fake_LINK) $(src_platform_tests_test_address_fake_OBJECTS) $(src_platform_tests_test_address_fake_LDADD) $(LIBS)
-src/platform/tests/test_address_linux-test-address.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/platform/tests/test-address-linux$(EXEEXT): $(src_platform_tests_test_address_linux_OBJECTS) $(src_platform_tests_test_address_linux_DEPENDENCIES) $(EXTRA_src_platform_tests_test_address_linux_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
-	@rm -f src/platform/tests/test-address-linux$(EXEEXT)
-	$(AM_V_CCLD)$(src_platform_tests_test_address_linux_LINK) $(src_platform_tests_test_address_linux_OBJECTS) $(src_platform_tests_test_address_linux_LDADD) $(LIBS)
-src/platform/tests/test_cleanup_fake-test-cleanup.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/platform/tests/test-cleanup-fake$(EXEEXT): $(src_platform_tests_test_cleanup_fake_OBJECTS) $(src_platform_tests_test_cleanup_fake_DEPENDENCIES) $(EXTRA_src_platform_tests_test_cleanup_fake_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
-	@rm -f src/platform/tests/test-cleanup-fake$(EXEEXT)
-	$(AM_V_CCLD)$(src_platform_tests_test_cleanup_fake_LINK) $(src_platform_tests_test_cleanup_fake_OBJECTS) $(src_platform_tests_test_cleanup_fake_LDADD) $(LIBS)
-src/platform/tests/test_cleanup_linux-test-cleanup.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-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/test_link_fake-test-link.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/platform/tests/test-link-fake$(EXEEXT): $(src_platform_tests_test_link_fake_OBJECTS) $(src_platform_tests_test_link_fake_DEPENDENCIES) $(EXTRA_src_platform_tests_test_link_fake_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
-	@rm -f src/platform/tests/test-link-fake$(EXEEXT)
-	$(AM_V_CCLD)$(src_platform_tests_test_link_fake_LINK) $(src_platform_tests_test_link_fake_OBJECTS) $(src_platform_tests_test_link_fake_LDADD) $(LIBS)
-src/platform/tests/test_link_linux-test-link.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/platform/tests/test-link-linux$(EXEEXT): $(src_platform_tests_test_link_linux_OBJECTS) $(src_platform_tests_test_link_linux_DEPENDENCIES) $(EXTRA_src_platform_tests_test_link_linux_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
-	@rm -f src/platform/tests/test-link-linux$(EXEEXT)
-	$(AM_V_CCLD)$(src_platform_tests_test_link_linux_LINK) $(src_platform_tests_test_link_linux_OBJECTS) $(src_platform_tests_test_link_linux_LDADD) $(LIBS)
-src/platform/tests/test_nmp_object-test-nmp-object.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-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)
-
-src/platform/tests/test-route-fake$(EXEEXT): $(src_platform_tests_test_route_fake_OBJECTS) $(src_platform_tests_test_route_fake_DEPENDENCIES) $(EXTRA_src_platform_tests_test_route_fake_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
-	@rm -f src/platform/tests/test-route-fake$(EXEEXT)
-	$(AM_V_CCLD)$(src_platform_tests_test_route_fake_LINK) $(src_platform_tests_test_route_fake_OBJECTS) $(src_platform_tests_test_route_fake_LDADD) $(LIBS)
-src/platform/tests/test_route_linux-test-route.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-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/platform/tests/test_tc_fake-test-tc.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/platform/tests/test-tc-fake$(EXEEXT): $(src_platform_tests_test_tc_fake_OBJECTS) $(src_platform_tests_test_tc_fake_DEPENDENCIES) $(EXTRA_src_platform_tests_test_tc_fake_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
-	@rm -f src/platform/tests/test-tc-fake$(EXEEXT)
-	$(AM_V_CCLD)$(src_platform_tests_test_tc_fake_LINK) $(src_platform_tests_test_tc_fake_OBJECTS) $(src_platform_tests_test_tc_fake_LDADD) $(LIBS)
-src/platform/tests/test_tc_linux-test-tc.$(OBJEXT):  \
-	src/platform/tests/$(am__dirstamp) \
-	src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/platform/tests/test-tc-linux$(EXEEXT): $(src_platform_tests_test_tc_linux_OBJECTS) $(src_platform_tests_test_tc_linux_DEPENDENCIES) $(EXTRA_src_platform_tests_test_tc_linux_DEPENDENCIES) src/platform/tests/$(am__dirstamp)
-	@rm -f src/platform/tests/test-tc-linux$(EXEEXT)
-	$(AM_V_CCLD)$(src_platform_tests_test_tc_linux_LINK) $(src_platform_tests_test_tc_linux_OBJECTS) $(src_platform_tests_test_tc_linux_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)
-src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)
-	@: > src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.$(OBJEXT):  \
-	src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp) \
-	src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT): $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES) src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp)
-	@rm -f src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)
-	$(AM_V_CCLD)$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LINK) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD) $(LIBS)
-src/settings/plugins/ifupdown/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ifupdown/tests
-	@: > src/settings/plugins/ifupdown/tests/$(am__dirstamp)
-src/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/ifupdown/tests/$(DEPDIR)
-	@: > src/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp)
-src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.$(OBJEXT):  \
-	src/settings/plugins/ifupdown/tests/$(am__dirstamp) \
-	src/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT): $(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS) $(src_settings_plugins_ifupdown_tests_test_ifupdown_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifupdown_tests_test_ifupdown_DEPENDENCIES) src/settings/plugins/ifupdown/tests/$(am__dirstamp)
-	@rm -f src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)
-	$(AM_V_CCLD)$(src_settings_plugins_ifupdown_tests_test_ifupdown_LINK) $(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS) $(src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD) $(LIBS)
-src/settings/plugins/keyfile/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/settings/plugins/keyfile/tests
-	@: > 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/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-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)
-src/supplicant/tests/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/supplicant/tests/$(DEPDIR)
-	@: > src/supplicant/tests/$(DEPDIR)/$(am__dirstamp)
-src/supplicant/tests/test_supplicant_config-test-supplicant-config.$(OBJEXT):  \
-	src/supplicant/tests/$(am__dirstamp) \
-	src/supplicant/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/supplicant/tests/test-supplicant-config$(EXEEXT): $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_DEPENDENCIES) $(EXTRA_src_supplicant_tests_test_supplicant_config_DEPENDENCIES) src/supplicant/tests/$(am__dirstamp)
-	@rm -f src/supplicant/tests/test-supplicant-config$(EXEEXT)
-	$(AM_V_CCLD)$(src_supplicant_tests_test_supplicant_config_LINK) $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_LDADD) $(LIBS)
-src/tests/config/$(am__dirstamp):
-	@$(MKDIR_P) src/tests/config
-	@: > src/tests/config/$(am__dirstamp)
-src/tests/config/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/tests/config/$(DEPDIR)
-	@: > src/tests/config/$(DEPDIR)/$(am__dirstamp)
-src/tests/config/test_config-nm-test-device.$(OBJEXT):  \
-	src/tests/config/$(am__dirstamp) \
-	src/tests/config/$(DEPDIR)/$(am__dirstamp)
-src/tests/config/test_config-test-config.$(OBJEXT):  \
-	src/tests/config/$(am__dirstamp) \
-	src/tests/config/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/config/test-config$(EXEEXT): $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_DEPENDENCIES) $(EXTRA_src_tests_config_test_config_DEPENDENCIES) src/tests/config/$(am__dirstamp)
-	@rm -f src/tests/config/test-config$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_config_test_config_LINK) $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_LDADD) $(LIBS)
-src/tests/$(am__dirstamp):
-	@$(MKDIR_P) src/tests
-	@: > src/tests/$(am__dirstamp)
-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/test_ip4_config-test-ip4-config.$(OBJEXT):  \
-	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-ip4-config$(EXEEXT): $(src_tests_test_ip4_config_OBJECTS) $(src_tests_test_ip4_config_DEPENDENCIES) $(EXTRA_src_tests_test_ip4_config_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-ip4-config$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_ip4_config_LINK) $(src_tests_test_ip4_config_OBJECTS) $(src_tests_test_ip4_config_LDADD) $(LIBS)
-src/tests/test_ip6_config-test-ip6-config.$(OBJEXT):  \
-	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-ip6-config$(EXEEXT): $(src_tests_test_ip6_config_OBJECTS) $(src_tests_test_ip6_config_DEPENDENCIES) $(EXTRA_src_tests_test_ip6_config_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-ip6-config$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_ip6_config_LINK) $(src_tests_test_ip6_config_OBJECTS) $(src_tests_test_ip6_config_LDADD) $(LIBS)
-src/tests/test_l3cfg-test-l3cfg.$(OBJEXT): src/tests/$(am__dirstamp) \
-	src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-l3cfg$(EXEEXT): $(src_tests_test_l3cfg_OBJECTS) $(src_tests_test_l3cfg_DEPENDENCIES) $(EXTRA_src_tests_test_l3cfg_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-l3cfg$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_l3cfg_LINK) $(src_tests_test_l3cfg_OBJECTS) $(src_tests_test_l3cfg_LDADD) $(LIBS)
-src/tests/test_systemd-test-systemd.$(OBJEXT):  \
-	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-systemd$(EXEEXT): $(src_tests_test_systemd_OBJECTS) $(src_tests_test_systemd_DEPENDENCIES) $(EXTRA_src_tests_test_systemd_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-systemd$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_systemd_LINK) $(src_tests_test_systemd_OBJECTS) $(src_tests_test_systemd_LDADD) $(LIBS)
-src/tests/test_utils-test-utils.$(OBJEXT): src/tests/$(am__dirstamp) \
-	src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-utils$(EXEEXT): $(src_tests_test_utils_OBJECTS) $(src_tests_test_utils_DEPENDENCIES) $(EXTRA_src_tests_test_utils_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-utils$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_utils_LINK) $(src_tests_test_utils_OBJECTS) $(src_tests_test_utils_LDADD) $(LIBS)
-src/tests/test_wired_defname-test-wired-defname.$(OBJEXT):  \
-	src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp)
-
-src/tests/test-wired-defname$(EXEEXT): $(src_tests_test_wired_defname_OBJECTS) $(src_tests_test_wired_defname_DEPENDENCIES) $(EXTRA_src_tests_test_wired_defname_DEPENDENCIES) src/tests/$(am__dirstamp)
-	@rm -f src/tests/test-wired-defname$(EXEEXT)
-	$(AM_V_CCLD)$(src_tests_test_wired_defname_LINK) $(src_tests_test_wired_defname_OBJECTS) $(src_tests_test_wired_defname_LDADD) $(LIBS)
+shared/nm-platform/tests/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-platform/tests
+	@: > shared/nm-platform/tests/$(am__dirstamp)
+shared/nm-platform/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-platform/tests/$(DEPDIR)
+	@: > shared/nm-platform/tests/$(DEPDIR)/$(am__dirstamp)
+shared/nm-platform/tests/test_nm_platform-test-nm-platform.$(OBJEXT):  \
+	shared/nm-platform/tests/$(am__dirstamp) \
+	shared/nm-platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+shared/nm-platform/tests/test-nm-platform$(EXEEXT): $(shared_nm_platform_tests_test_nm_platform_OBJECTS) $(shared_nm_platform_tests_test_nm_platform_DEPENDENCIES) $(EXTRA_shared_nm_platform_tests_test_nm_platform_DEPENDENCIES) shared/nm-platform/tests/$(am__dirstamp)
+	@rm -f shared/nm-platform/tests/test-nm-platform$(EXEEXT)
+	$(AM_V_CCLD)$(shared_nm_platform_tests_test_nm_platform_LINK) $(shared_nm_platform_tests_test_nm_platform_OBJECTS) $(shared_nm_platform_tests_test_nm_platform_LDADD) $(LIBS)
+src/core/NetworkManager-main.$(OBJEXT): src/core/$(am__dirstamp) \
+	src/core/$(DEPDIR)/$(am__dirstamp)
+
+src/core/NetworkManager$(EXEEXT): $(src_core_NetworkManager_OBJECTS) $(src_core_NetworkManager_DEPENDENCIES) $(EXTRA_src_core_NetworkManager_DEPENDENCIES) src/core/$(am__dirstamp)
+	@rm -f src/core/NetworkManager$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_NetworkManager_LINK) $(src_core_NetworkManager_OBJECTS) $(src_core_NetworkManager_LDADD) $(LIBS)
+src/core/NetworkManager_all_sym-main.$(OBJEXT):  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+
+src/core/NetworkManager-all-sym$(EXEEXT): $(src_core_NetworkManager_all_sym_OBJECTS) $(src_core_NetworkManager_all_sym_DEPENDENCIES) $(EXTRA_src_core_NetworkManager_all_sym_DEPENDENCIES) src/core/$(am__dirstamp)
+	@rm -f src/core/NetworkManager-all-sym$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_NetworkManager_all_sym_LINK) $(src_core_NetworkManager_all_sym_OBJECTS) $(src_core_NetworkManager_all_sym_LDADD) $(LIBS)
+src/core/devices/bluetooth/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/bluetooth/tests
+	@: > src/core/devices/bluetooth/tests/$(am__dirstamp)
+src/core/devices/bluetooth/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/bluetooth/tests/$(DEPDIR)
+	@: > src/core/devices/bluetooth/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-test.$(OBJEXT):  \
+	src/core/devices/bluetooth/tests/$(am__dirstamp) \
+	src/core/devices/bluetooth/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/bluetooth/tests/nm-bt-test$(EXEEXT): $(src_core_devices_bluetooth_tests_nm_bt_test_OBJECTS) $(src_core_devices_bluetooth_tests_nm_bt_test_DEPENDENCIES) $(EXTRA_src_core_devices_bluetooth_tests_nm_bt_test_DEPENDENCIES) src/core/devices/bluetooth/tests/$(am__dirstamp)
+	@rm -f src/core/devices/bluetooth/tests/nm-bt-test$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_devices_bluetooth_tests_nm_bt_test_LINK) $(src_core_devices_bluetooth_tests_nm_bt_test_OBJECTS) $(src_core_devices_bluetooth_tests_nm_bt_test_LDADD) $(LIBS)
+src/core/devices/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/tests
+	@: > src/core/devices/tests/$(am__dirstamp)
+src/core/devices/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/tests/$(DEPDIR)
+	@: > src/core/devices/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/tests/test_acd-test-acd.$(OBJEXT):  \
+	src/core/devices/tests/$(am__dirstamp) \
+	src/core/devices/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/tests/test-acd$(EXEEXT): $(src_core_devices_tests_test_acd_OBJECTS) $(src_core_devices_tests_test_acd_DEPENDENCIES) $(EXTRA_src_core_devices_tests_test_acd_DEPENDENCIES) src/core/devices/tests/$(am__dirstamp)
+	@rm -f src/core/devices/tests/test-acd$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_devices_tests_test_acd_LINK) $(src_core_devices_tests_test_acd_OBJECTS) $(src_core_devices_tests_test_acd_LDADD) $(LIBS)
+src/core/devices/tests/test_lldp-test-lldp.$(OBJEXT):  \
+	src/core/devices/tests/$(am__dirstamp) \
+	src/core/devices/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/tests/test-lldp$(EXEEXT): $(src_core_devices_tests_test_lldp_OBJECTS) $(src_core_devices_tests_test_lldp_DEPENDENCIES) $(EXTRA_src_core_devices_tests_test_lldp_DEPENDENCIES) src/core/devices/tests/$(am__dirstamp)
+	@rm -f src/core/devices/tests/test-lldp$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_devices_tests_test_lldp_LINK) $(src_core_devices_tests_test_lldp_OBJECTS) $(src_core_devices_tests_test_lldp_LDADD) $(LIBS)
+src/core/devices/wifi/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/wifi/tests
+	@: > src/core/devices/wifi/tests/$(am__dirstamp)
+src/core/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/wifi/tests/$(DEPDIR)
+	@: > src/core/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wifi/tests/test_devices_wifi-test-devices-wifi.$(OBJEXT):  \
+	src/core/devices/wifi/tests/$(am__dirstamp) \
+	src/core/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/wifi/tests/test-devices-wifi$(EXEEXT): $(src_core_devices_wifi_tests_test_devices_wifi_OBJECTS) $(src_core_devices_wifi_tests_test_devices_wifi_DEPENDENCIES) $(EXTRA_src_core_devices_wifi_tests_test_devices_wifi_DEPENDENCIES) src/core/devices/wifi/tests/$(am__dirstamp)
+	@rm -f src/core/devices/wifi/tests/test-devices-wifi$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_devices_wifi_tests_test_devices_wifi_LINK) $(src_core_devices_wifi_tests_test_devices_wifi_OBJECTS) $(src_core_devices_wifi_tests_test_devices_wifi_LDADD) $(LIBS)
+src/core/devices/wwan/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/wwan/tests
+	@: > src/core/devices/wwan/tests/$(am__dirstamp)
+src/core/devices/wwan/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/devices/wwan/tests/$(DEPDIR)
+	@: > src/core/devices/wwan/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wwan/tests/test_service_providers-test-service-providers.$(OBJEXT):  \
+	src/core/devices/wwan/tests/$(am__dirstamp) \
+	src/core/devices/wwan/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/devices/wwan/tests_test_service_providers-nm-service-providers.$(OBJEXT):  \
+	src/core/devices/wwan/$(am__dirstamp) \
+	src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp)
+
+src/core/devices/wwan/tests/test-service-providers$(EXEEXT): $(src_core_devices_wwan_tests_test_service_providers_OBJECTS) $(src_core_devices_wwan_tests_test_service_providers_DEPENDENCIES) $(EXTRA_src_core_devices_wwan_tests_test_service_providers_DEPENDENCIES) src/core/devices/wwan/tests/$(am__dirstamp)
+	@rm -f src/core/devices/wwan/tests/test-service-providers$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_devices_wwan_tests_test_service_providers_LINK) $(src_core_devices_wwan_tests_test_service_providers_OBJECTS) $(src_core_devices_wwan_tests_test_service_providers_LDADD) $(LIBS)
+src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT):  \
+	src/core/dhcp/$(am__dirstamp) \
+	src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+
+src/core/dhcp/nm-dhcp-helper$(EXEEXT): $(src_core_dhcp_nm_dhcp_helper_OBJECTS) $(src_core_dhcp_nm_dhcp_helper_DEPENDENCIES) $(EXTRA_src_core_dhcp_nm_dhcp_helper_DEPENDENCIES) src/core/dhcp/$(am__dirstamp)
+	@rm -f src/core/dhcp/nm-dhcp-helper$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_dhcp_nm_dhcp_helper_LINK) $(src_core_dhcp_nm_dhcp_helper_OBJECTS) $(src_core_dhcp_nm_dhcp_helper_LDADD) $(LIBS)
+src/core/dhcp/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/dhcp/tests
+	@: > src/core/dhcp/tests/$(am__dirstamp)
+src/core/dhcp/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/dhcp/tests/$(DEPDIR)
+	@: > src/core/dhcp/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT):  \
+	src/core/dhcp/tests/$(am__dirstamp) \
+	src/core/dhcp/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/dhcp/tests/test-dhcp-dhclient$(EXEEXT): $(src_core_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_core_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES) $(EXTRA_src_core_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES) src/core/dhcp/tests/$(am__dirstamp)
+	@rm -f src/core/dhcp/tests/test-dhcp-dhclient$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_dhcp_tests_test_dhcp_dhclient_LINK) $(src_core_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_core_dhcp_tests_test_dhcp_dhclient_LDADD) $(LIBS)
+src/core/dhcp/tests/test_dhcp_utils-test-dhcp-utils.$(OBJEXT):  \
+	src/core/dhcp/tests/$(am__dirstamp) \
+	src/core/dhcp/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/dhcp/tests/test-dhcp-utils$(EXEEXT): $(src_core_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_core_dhcp_tests_test_dhcp_utils_DEPENDENCIES) $(EXTRA_src_core_dhcp_tests_test_dhcp_utils_DEPENDENCIES) src/core/dhcp/tests/$(am__dirstamp)
+	@rm -f src/core/dhcp/tests/test-dhcp-utils$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_dhcp_tests_test_dhcp_utils_LINK) $(src_core_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_core_dhcp_tests_test_dhcp_utils_LDADD) $(LIBS)
+src/core/dnsmasq/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/dnsmasq/tests
+	@: > src/core/dnsmasq/tests/$(am__dirstamp)
+src/core/dnsmasq/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/dnsmasq/tests/$(DEPDIR)
+	@: > src/core/dnsmasq/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.$(OBJEXT):  \
+	src/core/dnsmasq/tests/$(am__dirstamp) \
+	src/core/dnsmasq/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT): $(src_core_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_core_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES) $(EXTRA_src_core_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES) src/core/dnsmasq/tests/$(am__dirstamp)
+	@rm -f src/core/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_dnsmasq_tests_test_dnsmasq_utils_LINK) $(src_core_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_core_dnsmasq_tests_test_dnsmasq_utils_LDADD) $(LIBS)
+src/core/initrd/nm_initrd_generator-nm-initrd-generator.$(OBJEXT):  \
+	src/core/initrd/$(am__dirstamp) \
+	src/core/initrd/$(DEPDIR)/$(am__dirstamp)
+
+src/core/initrd/nm-initrd-generator$(EXEEXT): $(src_core_initrd_nm_initrd_generator_OBJECTS) $(src_core_initrd_nm_initrd_generator_DEPENDENCIES) $(EXTRA_src_core_initrd_nm_initrd_generator_DEPENDENCIES) src/core/initrd/$(am__dirstamp)
+	@rm -f src/core/initrd/nm-initrd-generator$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_initrd_nm_initrd_generator_LINK) $(src_core_initrd_nm_initrd_generator_OBJECTS) $(src_core_initrd_nm_initrd_generator_LDADD) $(LIBS)
+src/core/initrd/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/initrd/tests
+	@: > src/core/initrd/tests/$(am__dirstamp)
+src/core/initrd/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/initrd/tests/$(DEPDIR)
+	@: > src/core/initrd/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.$(OBJEXT):  \
+	src/core/initrd/tests/$(am__dirstamp) \
+	src/core/initrd/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/initrd/tests/test-cmdline-reader$(EXEEXT): $(src_core_initrd_tests_test_cmdline_reader_OBJECTS) $(src_core_initrd_tests_test_cmdline_reader_DEPENDENCIES) $(EXTRA_src_core_initrd_tests_test_cmdline_reader_DEPENDENCIES) src/core/initrd/tests/$(am__dirstamp)
+	@rm -f src/core/initrd/tests/test-cmdline-reader$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_initrd_tests_test_cmdline_reader_LINK) $(src_core_initrd_tests_test_cmdline_reader_OBJECTS) $(src_core_initrd_tests_test_cmdline_reader_LDADD) $(LIBS)
+src/core/initrd/tests/test_dt_reader-test-dt-reader.$(OBJEXT):  \
+	src/core/initrd/tests/$(am__dirstamp) \
+	src/core/initrd/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/initrd/tests/test-dt-reader$(EXEEXT): $(src_core_initrd_tests_test_dt_reader_OBJECTS) $(src_core_initrd_tests_test_dt_reader_DEPENDENCIES) $(EXTRA_src_core_initrd_tests_test_dt_reader_DEPENDENCIES) src/core/initrd/tests/$(am__dirstamp)
+	@rm -f src/core/initrd/tests/test-dt-reader$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_initrd_tests_test_dt_reader_LINK) $(src_core_initrd_tests_test_dt_reader_OBJECTS) $(src_core_initrd_tests_test_dt_reader_LDADD) $(LIBS)
+src/core/initrd/tests/test_ibft_reader-test-ibft-reader.$(OBJEXT):  \
+	src/core/initrd/tests/$(am__dirstamp) \
+	src/core/initrd/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/initrd/tests/test-ibft-reader$(EXEEXT): $(src_core_initrd_tests_test_ibft_reader_OBJECTS) $(src_core_initrd_tests_test_ibft_reader_DEPENDENCIES) $(EXTRA_src_core_initrd_tests_test_ibft_reader_DEPENDENCIES) src/core/initrd/tests/$(am__dirstamp)
+	@rm -f src/core/initrd/tests/test-ibft-reader$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_initrd_tests_test_ibft_reader_LINK) $(src_core_initrd_tests_test_ibft_reader_OBJECTS) $(src_core_initrd_tests_test_ibft_reader_LDADD) $(LIBS)
+src/core/ndisc/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/ndisc/tests
+	@: > src/core/ndisc/tests/$(am__dirstamp)
+src/core/ndisc/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/ndisc/tests/$(DEPDIR)
+	@: > src/core/ndisc/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.$(OBJEXT):  \
+	src/core/ndisc/tests/$(am__dirstamp) \
+	src/core/ndisc/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/ndisc/tests/test-ndisc-fake$(EXEEXT): $(src_core_ndisc_tests_test_ndisc_fake_OBJECTS) $(src_core_ndisc_tests_test_ndisc_fake_DEPENDENCIES) $(EXTRA_src_core_ndisc_tests_test_ndisc_fake_DEPENDENCIES) src/core/ndisc/tests/$(am__dirstamp)
+	@rm -f src/core/ndisc/tests/test-ndisc-fake$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_ndisc_tests_test_ndisc_fake_LINK) $(src_core_ndisc_tests_test_ndisc_fake_OBJECTS) $(src_core_ndisc_tests_test_ndisc_fake_LDADD) $(LIBS)
+src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.$(OBJEXT):  \
+	src/core/ndisc/tests/$(am__dirstamp) \
+	src/core/ndisc/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/ndisc/tests/test-ndisc-linux$(EXEEXT): $(src_core_ndisc_tests_test_ndisc_linux_OBJECTS) $(src_core_ndisc_tests_test_ndisc_linux_DEPENDENCIES) $(EXTRA_src_core_ndisc_tests_test_ndisc_linux_DEPENDENCIES) src/core/ndisc/tests/$(am__dirstamp)
+	@rm -f src/core/ndisc/tests/test-ndisc-linux$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_ndisc_tests_test_ndisc_linux_LINK) $(src_core_ndisc_tests_test_ndisc_linux_OBJECTS) $(src_core_ndisc_tests_test_ndisc_linux_LDADD) $(LIBS)
+src/core/nm_iface_helper-nm-iface-helper.$(OBJEXT):  \
+	src/core/$(am__dirstamp) src/core/$(DEPDIR)/$(am__dirstamp)
+
+src/core/nm-iface-helper$(EXEEXT): $(src_core_nm_iface_helper_OBJECTS) $(src_core_nm_iface_helper_DEPENDENCIES) $(EXTRA_src_core_nm_iface_helper_DEPENDENCIES) src/core/$(am__dirstamp)
+	@rm -f src/core/nm-iface-helper$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_nm_iface_helper_LINK) $(src_core_nm_iface_helper_OBJECTS) $(src_core_nm_iface_helper_LDADD) $(LIBS)
+src/core/platform/tests/monitor-monitor.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/monitor$(EXEEXT): $(src_core_platform_tests_monitor_OBJECTS) $(src_core_platform_tests_monitor_DEPENDENCIES) $(EXTRA_src_core_platform_tests_monitor_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/monitor$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_monitor_LINK) $(src_core_platform_tests_monitor_OBJECTS) $(src_core_platform_tests_monitor_LDADD) $(LIBS)
+src/core/platform/tests/test_address_fake-test-address.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-address-fake$(EXEEXT): $(src_core_platform_tests_test_address_fake_OBJECTS) $(src_core_platform_tests_test_address_fake_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_address_fake_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-address-fake$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_address_fake_LINK) $(src_core_platform_tests_test_address_fake_OBJECTS) $(src_core_platform_tests_test_address_fake_LDADD) $(LIBS)
+src/core/platform/tests/test_address_linux-test-address.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-address-linux$(EXEEXT): $(src_core_platform_tests_test_address_linux_OBJECTS) $(src_core_platform_tests_test_address_linux_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_address_linux_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-address-linux$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_address_linux_LINK) $(src_core_platform_tests_test_address_linux_OBJECTS) $(src_core_platform_tests_test_address_linux_LDADD) $(LIBS)
+src/core/platform/tests/test_cleanup_fake-test-cleanup.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-cleanup-fake$(EXEEXT): $(src_core_platform_tests_test_cleanup_fake_OBJECTS) $(src_core_platform_tests_test_cleanup_fake_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_cleanup_fake_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-cleanup-fake$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_cleanup_fake_LINK) $(src_core_platform_tests_test_cleanup_fake_OBJECTS) $(src_core_platform_tests_test_cleanup_fake_LDADD) $(LIBS)
+src/core/platform/tests/test_cleanup_linux-test-cleanup.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-cleanup-linux$(EXEEXT): $(src_core_platform_tests_test_cleanup_linux_OBJECTS) $(src_core_platform_tests_test_cleanup_linux_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_cleanup_linux_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-cleanup-linux$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_cleanup_linux_LINK) $(src_core_platform_tests_test_cleanup_linux_OBJECTS) $(src_core_platform_tests_test_cleanup_linux_LDADD) $(LIBS)
+src/core/platform/tests/test_link_fake-test-link.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-link-fake$(EXEEXT): $(src_core_platform_tests_test_link_fake_OBJECTS) $(src_core_platform_tests_test_link_fake_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_link_fake_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-link-fake$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_link_fake_LINK) $(src_core_platform_tests_test_link_fake_OBJECTS) $(src_core_platform_tests_test_link_fake_LDADD) $(LIBS)
+src/core/platform/tests/test_link_linux-test-link.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-link-linux$(EXEEXT): $(src_core_platform_tests_test_link_linux_OBJECTS) $(src_core_platform_tests_test_link_linux_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_link_linux_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-link-linux$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_link_linux_LINK) $(src_core_platform_tests_test_link_linux_OBJECTS) $(src_core_platform_tests_test_link_linux_LDADD) $(LIBS)
+src/core/platform/tests/test_nmp_object-test-nmp-object.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-nmp-object$(EXEEXT): $(src_core_platform_tests_test_nmp_object_OBJECTS) $(src_core_platform_tests_test_nmp_object_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_nmp_object_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-nmp-object$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_nmp_object_LINK) $(src_core_platform_tests_test_nmp_object_OBJECTS) $(src_core_platform_tests_test_nmp_object_LDADD) $(LIBS)
+src/core/platform/tests/test_platform_general-test-platform-general.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-platform-general$(EXEEXT): $(src_core_platform_tests_test_platform_general_OBJECTS) $(src_core_platform_tests_test_platform_general_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_platform_general_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-platform-general$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_platform_general_LINK) $(src_core_platform_tests_test_platform_general_OBJECTS) $(src_core_platform_tests_test_platform_general_LDADD) $(LIBS)
+src/core/platform/tests/test_route_fake-test-route.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-route-fake$(EXEEXT): $(src_core_platform_tests_test_route_fake_OBJECTS) $(src_core_platform_tests_test_route_fake_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_route_fake_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-route-fake$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_route_fake_LINK) $(src_core_platform_tests_test_route_fake_OBJECTS) $(src_core_platform_tests_test_route_fake_LDADD) $(LIBS)
+src/core/platform/tests/test_route_linux-test-route.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-route-linux$(EXEEXT): $(src_core_platform_tests_test_route_linux_OBJECTS) $(src_core_platform_tests_test_route_linux_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_route_linux_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-route-linux$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_route_linux_LINK) $(src_core_platform_tests_test_route_linux_OBJECTS) $(src_core_platform_tests_test_route_linux_LDADD) $(LIBS)
+src/core/platform/tests/test_tc_fake-test-tc.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-tc-fake$(EXEEXT): $(src_core_platform_tests_test_tc_fake_OBJECTS) $(src_core_platform_tests_test_tc_fake_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_tc_fake_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-tc-fake$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_tc_fake_LINK) $(src_core_platform_tests_test_tc_fake_OBJECTS) $(src_core_platform_tests_test_tc_fake_LDADD) $(LIBS)
+src/core/platform/tests/test_tc_linux-test-tc.$(OBJEXT):  \
+	src/core/platform/tests/$(am__dirstamp) \
+	src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/platform/tests/test-tc-linux$(EXEEXT): $(src_core_platform_tests_test_tc_linux_OBJECTS) $(src_core_platform_tests_test_tc_linux_DEPENDENCIES) $(EXTRA_src_core_platform_tests_test_tc_linux_DEPENDENCIES) src/core/platform/tests/$(am__dirstamp)
+	@rm -f src/core/platform/tests/test-tc-linux$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_platform_tests_test_tc_linux_LINK) $(src_core_platform_tests_test_tc_linux_OBJECTS) $(src_core_platform_tests_test_tc_linux_LDADD) $(LIBS)
+src/core/settings/plugins/ifcfg-rh/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/ifcfg-rh/tests
+	@: > src/core/settings/plugins/ifcfg-rh/tests/$(am__dirstamp)
+src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)
+	@: > src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.$(OBJEXT):  \
+	src/core/settings/plugins/ifcfg-rh/tests/$(am__dirstamp) \
+	src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT): $(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS) $(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES) $(EXTRA_src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES) src/core/settings/plugins/ifcfg-rh/tests/$(am__dirstamp)
+	@rm -f src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LINK) $(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS) $(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD) $(LIBS)
+src/core/settings/plugins/ifupdown/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/ifupdown/tests
+	@: > src/core/settings/plugins/ifupdown/tests/$(am__dirstamp)
+src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/ifupdown/tests/$(DEPDIR)
+	@: > src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.$(OBJEXT):  \
+	src/core/settings/plugins/ifupdown/tests/$(am__dirstamp) \
+	src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT): $(src_core_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS) $(src_core_settings_plugins_ifupdown_tests_test_ifupdown_DEPENDENCIES) $(EXTRA_src_core_settings_plugins_ifupdown_tests_test_ifupdown_DEPENDENCIES) src/core/settings/plugins/ifupdown/tests/$(am__dirstamp)
+	@rm -f src/core/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_settings_plugins_ifupdown_tests_test_ifupdown_LINK) $(src_core_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS) $(src_core_settings_plugins_ifupdown_tests_test_ifupdown_LDADD) $(LIBS)
+src/core/settings/plugins/keyfile/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/keyfile/tests
+	@: > src/core/settings/plugins/keyfile/tests/$(am__dirstamp)
+src/core/settings/plugins/keyfile/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/settings/plugins/keyfile/tests/$(DEPDIR)
+	@: > src/core/settings/plugins/keyfile/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.$(OBJEXT):  \
+	src/core/settings/plugins/keyfile/tests/$(am__dirstamp) \
+	src/core/settings/plugins/keyfile/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/settings/plugins/keyfile/tests/test-keyfile-settings$(EXEEXT): $(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS) $(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_DEPENDENCIES) $(EXTRA_src_core_settings_plugins_keyfile_tests_test_keyfile_settings_DEPENDENCIES) src/core/settings/plugins/keyfile/tests/$(am__dirstamp)
+	@rm -f src/core/settings/plugins/keyfile/tests/test-keyfile-settings$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LINK) $(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS) $(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD) $(LIBS)
+src/core/supplicant/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/supplicant/tests
+	@: > src/core/supplicant/tests/$(am__dirstamp)
+src/core/supplicant/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/supplicant/tests/$(DEPDIR)
+	@: > src/core/supplicant/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.$(OBJEXT):  \
+	src/core/supplicant/tests/$(am__dirstamp) \
+	src/core/supplicant/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/supplicant/tests/test-supplicant-config$(EXEEXT): $(src_core_supplicant_tests_test_supplicant_config_OBJECTS) $(src_core_supplicant_tests_test_supplicant_config_DEPENDENCIES) $(EXTRA_src_core_supplicant_tests_test_supplicant_config_DEPENDENCIES) src/core/supplicant/tests/$(am__dirstamp)
+	@rm -f src/core/supplicant/tests/test-supplicant-config$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_supplicant_tests_test_supplicant_config_LINK) $(src_core_supplicant_tests_test_supplicant_config_OBJECTS) $(src_core_supplicant_tests_test_supplicant_config_LDADD) $(LIBS)
+src/core/tests/config/$(am__dirstamp):
+	@$(MKDIR_P) src/core/tests/config
+	@: > src/core/tests/config/$(am__dirstamp)
+src/core/tests/config/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/tests/config/$(DEPDIR)
+	@: > src/core/tests/config/$(DEPDIR)/$(am__dirstamp)
+src/core/tests/config/test_config-nm-test-device.$(OBJEXT):  \
+	src/core/tests/config/$(am__dirstamp) \
+	src/core/tests/config/$(DEPDIR)/$(am__dirstamp)
+src/core/tests/config/test_config-test-config.$(OBJEXT):  \
+	src/core/tests/config/$(am__dirstamp) \
+	src/core/tests/config/$(DEPDIR)/$(am__dirstamp)
+
+src/core/tests/config/test-config$(EXEEXT): $(src_core_tests_config_test_config_OBJECTS) $(src_core_tests_config_test_config_DEPENDENCIES) $(EXTRA_src_core_tests_config_test_config_DEPENDENCIES) src/core/tests/config/$(am__dirstamp)
+	@rm -f src/core/tests/config/test-config$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_tests_config_test_config_LINK) $(src_core_tests_config_test_config_OBJECTS) $(src_core_tests_config_test_config_LDADD) $(LIBS)
+src/core/tests/$(am__dirstamp):
+	@$(MKDIR_P) src/core/tests
+	@: > src/core/tests/$(am__dirstamp)
+src/core/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/core/tests/$(DEPDIR)
+	@: > src/core/tests/$(DEPDIR)/$(am__dirstamp)
+src/core/tests/test_core-test-core.$(OBJEXT):  \
+	src/core/tests/$(am__dirstamp) \
+	src/core/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/tests/test-core$(EXEEXT): $(src_core_tests_test_core_OBJECTS) $(src_core_tests_test_core_DEPENDENCIES) $(EXTRA_src_core_tests_test_core_DEPENDENCIES) src/core/tests/$(am__dirstamp)
+	@rm -f src/core/tests/test-core$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_tests_test_core_LINK) $(src_core_tests_test_core_OBJECTS) $(src_core_tests_test_core_LDADD) $(LIBS)
+src/core/tests/test_core_with_expect-test-core-with-expect.$(OBJEXT):  \
+	src/core/tests/$(am__dirstamp) \
+	src/core/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/tests/test-core-with-expect$(EXEEXT): $(src_core_tests_test_core_with_expect_OBJECTS) $(src_core_tests_test_core_with_expect_DEPENDENCIES) $(EXTRA_src_core_tests_test_core_with_expect_DEPENDENCIES) src/core/tests/$(am__dirstamp)
+	@rm -f src/core/tests/test-core-with-expect$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_tests_test_core_with_expect_LINK) $(src_core_tests_test_core_with_expect_OBJECTS) $(src_core_tests_test_core_with_expect_LDADD) $(LIBS)
+src/core/tests/test_dcb-test-dcb.$(OBJEXT):  \
+	src/core/tests/$(am__dirstamp) \
+	src/core/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/tests/test-dcb$(EXEEXT): $(src_core_tests_test_dcb_OBJECTS) $(src_core_tests_test_dcb_DEPENDENCIES) $(EXTRA_src_core_tests_test_dcb_DEPENDENCIES) src/core/tests/$(am__dirstamp)
+	@rm -f src/core/tests/test-dcb$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_tests_test_dcb_LINK) $(src_core_tests_test_dcb_OBJECTS) $(src_core_tests_test_dcb_LDADD) $(LIBS)
+src/core/tests/test_ip4_config-test-ip4-config.$(OBJEXT):  \
+	src/core/tests/$(am__dirstamp) \
+	src/core/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/tests/test-ip4-config$(EXEEXT): $(src_core_tests_test_ip4_config_OBJECTS) $(src_core_tests_test_ip4_config_DEPENDENCIES) $(EXTRA_src_core_tests_test_ip4_config_DEPENDENCIES) src/core/tests/$(am__dirstamp)
+	@rm -f src/core/tests/test-ip4-config$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_tests_test_ip4_config_LINK) $(src_core_tests_test_ip4_config_OBJECTS) $(src_core_tests_test_ip4_config_LDADD) $(LIBS)
+src/core/tests/test_ip6_config-test-ip6-config.$(OBJEXT):  \
+	src/core/tests/$(am__dirstamp) \
+	src/core/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/tests/test-ip6-config$(EXEEXT): $(src_core_tests_test_ip6_config_OBJECTS) $(src_core_tests_test_ip6_config_DEPENDENCIES) $(EXTRA_src_core_tests_test_ip6_config_DEPENDENCIES) src/core/tests/$(am__dirstamp)
+	@rm -f src/core/tests/test-ip6-config$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_tests_test_ip6_config_LINK) $(src_core_tests_test_ip6_config_OBJECTS) $(src_core_tests_test_ip6_config_LDADD) $(LIBS)
+src/core/tests/test_l3cfg-test-l3cfg.$(OBJEXT):  \
+	src/core/tests/$(am__dirstamp) \
+	src/core/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/tests/test-l3cfg$(EXEEXT): $(src_core_tests_test_l3cfg_OBJECTS) $(src_core_tests_test_l3cfg_DEPENDENCIES) $(EXTRA_src_core_tests_test_l3cfg_DEPENDENCIES) src/core/tests/$(am__dirstamp)
+	@rm -f src/core/tests/test-l3cfg$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_tests_test_l3cfg_LINK) $(src_core_tests_test_l3cfg_OBJECTS) $(src_core_tests_test_l3cfg_LDADD) $(LIBS)
+src/core/tests/test_systemd-test-systemd.$(OBJEXT):  \
+	src/core/tests/$(am__dirstamp) \
+	src/core/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/tests/test-systemd$(EXEEXT): $(src_core_tests_test_systemd_OBJECTS) $(src_core_tests_test_systemd_DEPENDENCIES) $(EXTRA_src_core_tests_test_systemd_DEPENDENCIES) src/core/tests/$(am__dirstamp)
+	@rm -f src/core/tests/test-systemd$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_tests_test_systemd_LINK) $(src_core_tests_test_systemd_OBJECTS) $(src_core_tests_test_systemd_LDADD) $(LIBS)
+src/core/tests/test_utils-test-utils.$(OBJEXT):  \
+	src/core/tests/$(am__dirstamp) \
+	src/core/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/tests/test-utils$(EXEEXT): $(src_core_tests_test_utils_OBJECTS) $(src_core_tests_test_utils_DEPENDENCIES) $(EXTRA_src_core_tests_test_utils_DEPENDENCIES) src/core/tests/$(am__dirstamp)
+	@rm -f src/core/tests/test-utils$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_tests_test_utils_LINK) $(src_core_tests_test_utils_OBJECTS) $(src_core_tests_test_utils_LDADD) $(LIBS)
+src/core/tests/test_wired_defname-test-wired-defname.$(OBJEXT):  \
+	src/core/tests/$(am__dirstamp) \
+	src/core/tests/$(DEPDIR)/$(am__dirstamp)
+
+src/core/tests/test-wired-defname$(EXEEXT): $(src_core_tests_test_wired_defname_OBJECTS) $(src_core_tests_test_wired_defname_DEPENDENCIES) $(EXTRA_src_core_tests_test_wired_defname_DEPENDENCIES) src/core/tests/$(am__dirstamp)
+	@rm -f src/core/tests/test-wired-defname$(EXEEXT)
+	$(AM_V_CCLD)$(src_core_tests_test_wired_defname_LINK) $(src_core_tests_test_wired_defname_OBJECTS) $(src_core_tests_test_wired_defname_LDADD) $(LIBS)
 install-dist_libexecSCRIPTS: $(dist_libexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	@list='$(dist_libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \
@@ -10969,6 +11365,7 @@ mostlyclean-compile:
 	-rm -f clients/*.$(OBJEXT)
 	-rm -f clients/cli/*.$(OBJEXT)
 	-rm -f clients/cloud-setup/*.$(OBJEXT)
+	-rm -f clients/cloud-setup/tests/*.$(OBJEXT)
 	-rm -f clients/common/*.$(OBJEXT)
 	-rm -f clients/common/*.lo
 	-rm -f clients/common/tests/*.$(OBJEXT)
@@ -10983,8 +11380,6 @@ mostlyclean-compile:
 	-rm -f introspection/*.lo
 	-rm -f libnm-core/*.$(OBJEXT)
 	-rm -f libnm-core/*.lo
-	-rm -f libnm-core/nm-keyfile/*.$(OBJEXT)
-	-rm -f libnm-core/nm-keyfile/*.lo
 	-rm -f libnm-core/nm-libnm-core-aux/*.$(OBJEXT)
 	-rm -f libnm-core/nm-libnm-core-aux/*.lo
 	-rm -f libnm-core/nm-libnm-core-intern/*.$(OBJEXT)
@@ -10996,7 +11391,6 @@ mostlyclean-compile:
 	-rm -f libnm/nm-libnm-aux/*.lo
 	-rm -f libnm/tests/*.$(OBJEXT)
 	-rm -f shared/*.$(OBJEXT)
-	-rm -f shared/*.lo
 	-rm -f shared/c-rbtree/src/*.$(OBJEXT)
 	-rm -f shared/c-rbtree/src/*.lo
 	-rm -f shared/c-siphash/src/*.$(OBJEXT)
@@ -11009,9 +11403,16 @@ mostlyclean-compile:
 	-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-base/*.$(OBJEXT)
+	-rm -f shared/nm-base/*.lo
 	-rm -f shared/nm-glib-aux/*.$(OBJEXT)
 	-rm -f shared/nm-glib-aux/*.lo
 	-rm -f shared/nm-glib-aux/tests/*.$(OBJEXT)
+	-rm -f shared/nm-log-core/*.$(OBJEXT)
+	-rm -f shared/nm-log-core/*.lo
+	-rm -f shared/nm-platform/*.$(OBJEXT)
+	-rm -f shared/nm-platform/*.lo
+	-rm -f shared/nm-platform/tests/*.$(OBJEXT)
 	-rm -f shared/nm-std-aux/*.$(OBJEXT)
 	-rm -f shared/nm-std-aux/*.lo
 	-rm -f shared/nm-udev-aux/*.$(OBJEXT)
@@ -11024,78 +11425,78 @@ mostlyclean-compile:
 	-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)
-	-rm -f src/devices/*.lo
-	-rm -f src/devices/adsl/*.$(OBJEXT)
-	-rm -f src/devices/adsl/*.lo
-	-rm -f src/devices/bluetooth/*.$(OBJEXT)
-	-rm -f src/devices/bluetooth/*.lo
-	-rm -f src/devices/bluetooth/tests/*.$(OBJEXT)
-	-rm -f src/devices/ovs/*.$(OBJEXT)
-	-rm -f src/devices/ovs/*.lo
-	-rm -f src/devices/team/*.$(OBJEXT)
-	-rm -f src/devices/team/*.lo
-	-rm -f src/devices/tests/*.$(OBJEXT)
-	-rm -f src/devices/wifi/*.$(OBJEXT)
-	-rm -f src/devices/wifi/*.lo
-	-rm -f src/devices/wifi/tests/*.$(OBJEXT)
-	-rm -f src/devices/wwan/*.$(OBJEXT)
-	-rm -f src/devices/wwan/*.lo
-	-rm -f src/devices/wwan/tests/*.$(OBJEXT)
-	-rm -f src/dhcp/*.$(OBJEXT)
-	-rm -f src/dhcp/*.lo
-	-rm -f src/dhcp/tests/*.$(OBJEXT)
-	-rm -f src/dns/*.$(OBJEXT)
-	-rm -f src/dns/*.lo
-	-rm -f src/dnsmasq/*.$(OBJEXT)
-	-rm -f src/dnsmasq/*.lo
-	-rm -f src/dnsmasq/tests/*.$(OBJEXT)
-	-rm -f src/initrd/*.$(OBJEXT)
-	-rm -f src/initrd/*.lo
-	-rm -f src/initrd/tests/*.$(OBJEXT)
-	-rm -f src/ndisc/*.$(OBJEXT)
-	-rm -f src/ndisc/*.lo
-	-rm -f src/ndisc/tests/*.$(OBJEXT)
-	-rm -f src/platform/*.$(OBJEXT)
-	-rm -f src/platform/*.lo
-	-rm -f src/platform/tests/*.$(OBJEXT)
-	-rm -f src/platform/tests/*.lo
-	-rm -f src/platform/wifi/*.$(OBJEXT)
-	-rm -f src/platform/wifi/*.lo
-	-rm -f src/platform/wpan/*.$(OBJEXT)
-	-rm -f src/platform/wpan/*.lo
-	-rm -f src/ppp/*.$(OBJEXT)
-	-rm -f src/ppp/*.lo
-	-rm -f src/settings/*.$(OBJEXT)
-	-rm -f src/settings/*.lo
-	-rm -f src/settings/plugins/ifcfg-rh/*.$(OBJEXT)
-	-rm -f src/settings/plugins/ifcfg-rh/*.lo
-	-rm -f src/settings/plugins/ifcfg-rh/tests/*.$(OBJEXT)
-	-rm -f src/settings/plugins/ifupdown/*.$(OBJEXT)
-	-rm -f src/settings/plugins/ifupdown/*.lo
-	-rm -f src/settings/plugins/ifupdown/tests/*.$(OBJEXT)
-	-rm -f src/settings/plugins/keyfile/*.$(OBJEXT)
-	-rm -f src/settings/plugins/keyfile/*.lo
-	-rm -f src/settings/plugins/keyfile/tests/*.$(OBJEXT)
-	-rm -f src/supplicant/*.$(OBJEXT)
-	-rm -f src/supplicant/*.lo
-	-rm -f src/supplicant/tests/*.$(OBJEXT)
-	-rm -f src/systemd/*.$(OBJEXT)
-	-rm -f src/systemd/*.lo
-	-rm -f src/systemd/sd-adapt-core/*.$(OBJEXT)
-	-rm -f src/systemd/sd-adapt-core/*.lo
-	-rm -f src/systemd/src/libsystemd-network/*.$(OBJEXT)
-	-rm -f src/systemd/src/libsystemd-network/*.lo
-	-rm -f src/systemd/src/libsystemd/sd-event/*.$(OBJEXT)
-	-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/tests/*.$(OBJEXT)
-	-rm -f src/tests/config/*.$(OBJEXT)
-	-rm -f src/vpn/*.$(OBJEXT)
-	-rm -f src/vpn/*.lo
+	-rm -f src/core/*.$(OBJEXT)
+	-rm -f src/core/*.lo
+	-rm -f src/core/devices/*.$(OBJEXT)
+	-rm -f src/core/devices/*.lo
+	-rm -f src/core/devices/adsl/*.$(OBJEXT)
+	-rm -f src/core/devices/adsl/*.lo
+	-rm -f src/core/devices/bluetooth/*.$(OBJEXT)
+	-rm -f src/core/devices/bluetooth/*.lo
+	-rm -f src/core/devices/bluetooth/tests/*.$(OBJEXT)
+	-rm -f src/core/devices/ovs/*.$(OBJEXT)
+	-rm -f src/core/devices/ovs/*.lo
+	-rm -f src/core/devices/team/*.$(OBJEXT)
+	-rm -f src/core/devices/team/*.lo
+	-rm -f src/core/devices/tests/*.$(OBJEXT)
+	-rm -f src/core/devices/wifi/*.$(OBJEXT)
+	-rm -f src/core/devices/wifi/*.lo
+	-rm -f src/core/devices/wifi/tests/*.$(OBJEXT)
+	-rm -f src/core/devices/wwan/*.$(OBJEXT)
+	-rm -f src/core/devices/wwan/*.lo
+	-rm -f src/core/devices/wwan/tests/*.$(OBJEXT)
+	-rm -f src/core/dhcp/*.$(OBJEXT)
+	-rm -f src/core/dhcp/*.lo
+	-rm -f src/core/dhcp/tests/*.$(OBJEXT)
+	-rm -f src/core/dns/*.$(OBJEXT)
+	-rm -f src/core/dns/*.lo
+	-rm -f src/core/dnsmasq/*.$(OBJEXT)
+	-rm -f src/core/dnsmasq/*.lo
+	-rm -f src/core/dnsmasq/tests/*.$(OBJEXT)
+	-rm -f src/core/initrd/*.$(OBJEXT)
+	-rm -f src/core/initrd/*.lo
+	-rm -f src/core/initrd/tests/*.$(OBJEXT)
+	-rm -f src/core/ndisc/*.$(OBJEXT)
+	-rm -f src/core/ndisc/*.lo
+	-rm -f src/core/ndisc/tests/*.$(OBJEXT)
+	-rm -f src/core/platform/*.$(OBJEXT)
+	-rm -f src/core/platform/*.lo
+	-rm -f src/core/platform/tests/*.$(OBJEXT)
+	-rm -f src/core/platform/tests/*.lo
+	-rm -f src/core/platform/wifi/*.$(OBJEXT)
+	-rm -f src/core/platform/wifi/*.lo
+	-rm -f src/core/platform/wpan/*.$(OBJEXT)
+	-rm -f src/core/platform/wpan/*.lo
+	-rm -f src/core/ppp/*.$(OBJEXT)
+	-rm -f src/core/ppp/*.lo
+	-rm -f src/core/settings/*.$(OBJEXT)
+	-rm -f src/core/settings/*.lo
+	-rm -f src/core/settings/plugins/ifcfg-rh/*.$(OBJEXT)
+	-rm -f src/core/settings/plugins/ifcfg-rh/*.lo
+	-rm -f src/core/settings/plugins/ifcfg-rh/tests/*.$(OBJEXT)
+	-rm -f src/core/settings/plugins/ifupdown/*.$(OBJEXT)
+	-rm -f src/core/settings/plugins/ifupdown/*.lo
+	-rm -f src/core/settings/plugins/ifupdown/tests/*.$(OBJEXT)
+	-rm -f src/core/settings/plugins/keyfile/*.$(OBJEXT)
+	-rm -f src/core/settings/plugins/keyfile/*.lo
+	-rm -f src/core/settings/plugins/keyfile/tests/*.$(OBJEXT)
+	-rm -f src/core/supplicant/*.$(OBJEXT)
+	-rm -f src/core/supplicant/*.lo
+	-rm -f src/core/supplicant/tests/*.$(OBJEXT)
+	-rm -f src/core/systemd/*.$(OBJEXT)
+	-rm -f src/core/systemd/*.lo
+	-rm -f src/core/systemd/sd-adapt-core/*.$(OBJEXT)
+	-rm -f src/core/systemd/sd-adapt-core/*.lo
+	-rm -f src/core/systemd/src/libsystemd-network/*.$(OBJEXT)
+	-rm -f src/core/systemd/src/libsystemd-network/*.lo
+	-rm -f src/core/systemd/src/libsystemd/sd-event/*.$(OBJEXT)
+	-rm -f src/core/systemd/src/libsystemd/sd-event/*.lo
+	-rm -f src/core/systemd/src/libsystemd/sd-id128/*.$(OBJEXT)
+	-rm -f src/core/systemd/src/libsystemd/sd-id128/*.lo
+	-rm -f src/core/tests/*.$(OBJEXT)
+	-rm -f src/core/tests/config/*.$(OBJEXT)
+	-rm -f src/core/vpn/*.$(OBJEXT)
+	-rm -f src/core/vpn/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -11111,18 +11512,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@clients/cli/$(DEPDIR)/nmcli-polkit-agent.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/cli/$(DEPDIR)/nmcli-settings.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/cli/$(DEPDIR)/nmcli-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-cloud-setup-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-http-client.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-azure.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-ec2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-gcp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-main.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-cloud-setup-utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-azure.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-gcp.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/cloud-setup/tests/$(DEPDIR)/test_cloud_setup_general-test-cloud-setup-general.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_base_la-nm-client-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-base-impl.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)/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
@@ -11255,6 +11658,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-meta-setting-base-impl.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Plo@am__quote@ # am--include-marker
@@ -11270,6 +11676,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ethtool.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-generic.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-gsm.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-hostname.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-config.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-tunnel.Plo@am__quote@ # am--include-marker
@@ -11281,6 +11688,7 @@ distclean-compile:
 @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-external-ids.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
@@ -11294,6 +11702,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tun.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-veth.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Plo@am__quote@ # am--include-marker
@@ -11313,11 +11722,8 @@ distclean-compile:
 @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/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/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@libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/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@libnm-core/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@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
@@ -11327,65 +11733,64 @@ distclean-compile:
 @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-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-vrf.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
-@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-enum-types.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-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-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_static_la-nm-access-point.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-active-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-checkpoint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-client.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-dbus-helpers.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-6lowpan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-adsl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-bond.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-bridge.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-bt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-dummy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-ethernet.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-generic.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-infiniband.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-ip-tunnel.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-macsec.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-macvlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-modem.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-olpc-mesh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-bridge.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-interface.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-port.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-ppp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-team.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-tun.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-veth.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-vlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-vrf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-vxlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-wimax.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-wireguard.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device-wpan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-device.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-dhcp-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-dhcp4-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-dhcp6-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-dns-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-enum-types.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-ip-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-ip4-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-ip6-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-libnm-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-object.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-remote-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-secret-agent-old.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-vpn-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-vpn-editor.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-vpn-plugin-old.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-vpn-service-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-wifi-p2p-peer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_static_la-nm-wimax-nsp.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Plo@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_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
@@ -11405,6 +11810,7 @@ distclean-compile:
 @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-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.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
@@ -11421,6 +11827,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/tests/$(DEPDIR)/test_json_aux-test-json-aux.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-log-core/$(DEPDIR)/libnm_log_core_la-nm-logging.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-netlink.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-platform-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-platform/$(DEPDIR)/libnm_platform_la-nmp-netns.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-platform/tests/$(DEPDIR)/test_nm_platform-test-nm-platform.Po@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-std-aux/$(DEPDIR)/libnm_std_aux_la-nm-std-utils.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
@@ -11451,6 +11862,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ratelimit.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo@am__quote@ # am--include-marker
@@ -11464,235 +11876,232 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/NetworkManager-main.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/NetworkManager_all_sym-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
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-nm-logging.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-act-request.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-config-data.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-policy.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/test_acd-test-acd.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Plo@am__quote@ # am--include-marker
-@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/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po@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
-@AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-netlink.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo@am__quote@ # am--include-marker
-@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)/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
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po@am__quote@ # am--include-marker
-@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/tests/$(DEPDIR)/test_tc_fake-test-tc.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.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
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Plo@am__quote@ # am--include-marker
-@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/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-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-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-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)/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
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo@am__quote@ # am--include-marker
-@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/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_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_l3cfg-test-l3cfg.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
-@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_utils-test-utils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/tests/config/$(DEPDIR)/test_config-nm-test-device.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/tests/config/$(DEPDIR)/test_config-test-config.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/NetworkManager-main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/NetworkManager_all_sym-main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-ipv4ll.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-act-request.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-config-data.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-policy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/tests/$(DEPDIR)/test_acd-test-acd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/monitor-monitor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/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/core/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/core/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/core/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/core/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/core/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/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/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/core/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/core/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/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/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/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/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/core/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/core/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/core/tests/$(DEPDIR)/test_core-test-core.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/$(DEPDIR)/test_dcb-test-dcb.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/$(DEPDIR)/test_systemd-test-systemd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/$(DEPDIR)/test_utils-test-utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/config/$(DEPDIR)/test_config-nm-test-device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/config/$(DEPDIR)/test_config-test-config.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -11724,6 +12133,90 @@ am--depfiles: $(am__depfiles_remade)
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.o: clients/cloud-setup/nm-cloud-setup-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-cloud-setup-utils.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.o `test -f 'clients/cloud-setup/nm-cloud-setup-utils.c' || echo '$(srcdir)/'`clients/cloud-setup/nm-cloud-setup-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-cloud-setup-utils.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-cloud-setup-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nm-cloud-setup-utils.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.o `test -f 'clients/cloud-setup/nm-cloud-setup-utils.c' || echo '$(srcdir)/'`clients/cloud-setup/nm-cloud-setup-utils.c
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.obj: clients/cloud-setup/nm-cloud-setup-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-cloud-setup-utils.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.obj `if test -f 'clients/cloud-setup/nm-cloud-setup-utils.c'; then $(CYGPATH_W) 'clients/cloud-setup/nm-cloud-setup-utils.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nm-cloud-setup-utils.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-cloud-setup-utils.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-cloud-setup-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nm-cloud-setup-utils.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nm-cloud-setup-utils.obj `if test -f 'clients/cloud-setup/nm-cloud-setup-utils.c'; then $(CYGPATH_W) 'clients/cloud-setup/nm-cloud-setup-utils.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nm-cloud-setup-utils.c'; fi`
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-client.o: clients/cloud-setup/nm-http-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-client.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-http-client.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-client.o `test -f 'clients/cloud-setup/nm-http-client.c' || echo '$(srcdir)/'`clients/cloud-setup/nm-http-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-http-client.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-http-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nm-http-client.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-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) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-client.o `test -f 'clients/cloud-setup/nm-http-client.c' || echo '$(srcdir)/'`clients/cloud-setup/nm-http-client.c
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-client.obj: clients/cloud-setup/nm-http-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-client.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-http-client.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-client.obj `if test -f 'clients/cloud-setup/nm-http-client.c'; then $(CYGPATH_W) 'clients/cloud-setup/nm-http-client.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nm-http-client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-http-client.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-http-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nm-http-client.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-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) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nm-http-client.obj `if test -f 'clients/cloud-setup/nm-http-client.c'; then $(CYGPATH_W) 'clients/cloud-setup/nm-http-client.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nm-http-client.c'; fi`
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.o: clients/cloud-setup/nmcs-provider.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.o `test -f 'clients/cloud-setup/nmcs-provider.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.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_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.o `test -f 'clients/cloud-setup/nmcs-provider.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider.c
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.obj: clients/cloud-setup/nmcs-provider.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.obj `if test -f 'clients/cloud-setup/nmcs-provider.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.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_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider.obj `if test -f 'clients/cloud-setup/nmcs-provider.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider.c'; fi`
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.o: clients/cloud-setup/nmcs-provider-ec2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-ec2.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.o `test -f 'clients/cloud-setup/nmcs-provider-ec2.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-ec2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-ec2.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-ec2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-ec2.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.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_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.o `test -f 'clients/cloud-setup/nmcs-provider-ec2.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-ec2.c
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.obj: clients/cloud-setup/nmcs-provider-ec2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-ec2.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.obj `if test -f 'clients/cloud-setup/nmcs-provider-ec2.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-ec2.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-ec2.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-ec2.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-ec2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-ec2.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.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_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-ec2.obj `if test -f 'clients/cloud-setup/nmcs-provider-ec2.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-ec2.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-ec2.c'; fi`
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.o: clients/cloud-setup/nmcs-provider-gcp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-gcp.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.o `test -f 'clients/cloud-setup/nmcs-provider-gcp.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-gcp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-gcp.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-gcp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-gcp.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.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_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.o `test -f 'clients/cloud-setup/nmcs-provider-gcp.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-gcp.c
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.obj: clients/cloud-setup/nmcs-provider-gcp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-gcp.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.obj `if test -f 'clients/cloud-setup/nmcs-provider-gcp.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-gcp.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-gcp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-gcp.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-gcp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-gcp.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.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_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-gcp.obj `if test -f 'clients/cloud-setup/nmcs-provider-gcp.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-gcp.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-gcp.c'; fi`
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.o: clients/cloud-setup/nmcs-provider-azure.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-azure.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.o `test -f 'clients/cloud-setup/nmcs-provider-azure.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-azure.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-azure.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-azure.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-azure.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.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_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.o `test -f 'clients/cloud-setup/nmcs-provider-azure.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-azure.c
+
+clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.obj: clients/cloud-setup/nmcs-provider-azure.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-azure.Tpo -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.obj `if test -f 'clients/cloud-setup/nmcs-provider-azure.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-azure.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-azure.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-azure.Tpo clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-azure.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-azure.c' object='clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.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_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/libnm_cloud_setup_core_a-nmcs-provider-azure.obj `if test -f 'clients/cloud-setup/nmcs-provider-azure.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-azure.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-azure.c'; fi`
+
 clients/tui/newt/libnmt_newt_a-nmt-newt-button.o: clients/tui/newt/nmt-newt-button.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_tui_newt_libnmt_newt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/tui/newt/libnmt_newt_a-nmt-newt-button.o -MD -MP -MF clients/tui/newt/$(DEPDIR)/libnmt_newt_a-nmt-newt-button.Tpo -c -o clients/tui/newt/libnmt_newt_a-nmt-newt-button.o `test -f 'clients/tui/newt/nmt-newt-button.c' || echo '$(srcdir)/'`clients/tui/newt/nmt-newt-button.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/tui/newt/$(DEPDIR)/libnmt_newt_a-nmt-newt-button.Tpo clients/tui/newt/$(DEPDIR)/libnmt_newt_a-nmt-newt-button.Po
@@ -12032,12 +12525,12 @@ clients/common/libnmc_base_la-nm-polkit-listener.lo: clients/common/nm-polkit-li
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/libnmc_base_la-nm-polkit-listener.lo `test -f 'clients/common/nm-polkit-listener.c' || echo '$(srcdir)/'`clients/common/nm-polkit-listener.c
 
-shared/clients_common_libnmc_la-nm-meta-setting.lo: shared/nm-meta-setting.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/clients_common_libnmc_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Tpo -c -o shared/clients_common_libnmc_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Tpo shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/clients_common_libnmc_la-nm-meta-setting.lo' libtool=yes @AMDEPBACKSLASH@
+clients/common/libnmc_la-nm-meta-setting-base-impl.lo: clients/common/nm-meta-setting-base-impl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/libnmc_la-nm-meta-setting-base-impl.lo -MD -MP -MF clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-base-impl.Tpo -c -o clients/common/libnmc_la-nm-meta-setting-base-impl.lo `test -f 'clients/common/nm-meta-setting-base-impl.c' || echo '$(srcdir)/'`clients/common/nm-meta-setting-base-impl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-base-impl.Tpo clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-base-impl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/common/nm-meta-setting-base-impl.c' object='clients/common/libnmc_la-nm-meta-setting-base-impl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/clients_common_libnmc_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/common/libnmc_la-nm-meta-setting-base-impl.lo `test -f 'clients/common/nm-meta-setting-base-impl.c' || echo '$(srcdir)/'`clients/common/nm-meta-setting-base-impl.c
 
 clients/common/libnmc_la-nm-meta-setting-desc.lo: clients/common/nm-meta-setting-desc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/libnmc_la-nm-meta-setting-desc.lo -MD -MP -MF clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Tpo -c -o clients/common/libnmc_la-nm-meta-setting-desc.lo `test -f 'clients/common/nm-meta-setting-desc.c' || echo '$(srcdir)/'`clients/common/nm-meta-setting-desc.c
@@ -12494,6 +12987,13 @@ libnm-core/libnm_core_la-nm-setting-gsm.lo: libnm-core/nm-setting-gsm.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-gsm.lo `test -f 'libnm-core/nm-setting-gsm.c' || echo '$(srcdir)/'`libnm-core/nm-setting-gsm.c
 
+libnm-core/libnm_core_la-nm-setting-hostname.lo: libnm-core/nm-setting-hostname.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-hostname.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-hostname.Tpo -c -o libnm-core/libnm_core_la-nm-setting-hostname.lo `test -f 'libnm-core/nm-setting-hostname.c' || echo '$(srcdir)/'`libnm-core/nm-setting-hostname.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-hostname.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-hostname.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-hostname.c' object='libnm-core/libnm_core_la-nm-setting-hostname.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__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-hostname.lo `test -f 'libnm-core/nm-setting-hostname.c' || echo '$(srcdir)/'`libnm-core/nm-setting-hostname.c
+
 libnm-core/libnm_core_la-nm-setting-infiniband.lo: libnm-core/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_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-infiniband.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Tpo -c -o libnm-core/libnm_core_la-nm-setting-infiniband.lo `test -f 'libnm-core/nm-setting-infiniband.c' || echo '$(srcdir)/'`libnm-core/nm-setting-infiniband.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Plo
@@ -12571,6 +13071,13 @@ libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo: libnm-core/nm-setting-ovs-dpdk.
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__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-external-ids.lo: libnm-core/nm-setting-ovs-external-ids.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-external-ids.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-external-ids.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-external-ids.lo `test -f 'libnm-core/nm-setting-ovs-external-ids.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-external-ids.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-external-ids.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-external-ids.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-external-ids.c' object='libnm-core/libnm_core_la-nm-setting-ovs-external-ids.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__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-external-ids.lo `test -f 'libnm-core/nm-setting-ovs-external-ids.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-external-ids.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
@@ -12662,6 +13169,13 @@ libnm-core/libnm_core_la-nm-setting-user.lo: libnm-core/nm-setting-user.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-user.lo `test -f 'libnm-core/nm-setting-user.c' || echo '$(srcdir)/'`libnm-core/nm-setting-user.c
 
+libnm-core/libnm_core_la-nm-setting-veth.lo: libnm-core/nm-setting-veth.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-veth.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-veth.Tpo -c -o libnm-core/libnm_core_la-nm-setting-veth.lo `test -f 'libnm-core/nm-setting-veth.c' || echo '$(srcdir)/'`libnm-core/nm-setting-veth.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-veth.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-veth.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-veth.c' object='libnm-core/libnm_core_la-nm-setting-veth.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__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-veth.lo `test -f 'libnm-core/nm-setting-veth.c' || echo '$(srcdir)/'`libnm-core/nm-setting-veth.c
+
 libnm-core/libnm_core_la-nm-setting-vlan.lo: libnm-core/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_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-vlan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-vlan.lo `test -f 'libnm-core/nm-setting-vlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vlan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo
@@ -12739,13 +13253,6 @@ libnm-core/libnm_core_la-nm-setting-wpan.lo: libnm-core/nm-setting-wpan.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wpan.lo `test -f 'libnm-core/nm-setting-wpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wpan.c
 
-shared/libnm_core_libnm_core_la-nm-meta-setting.lo: shared/nm-meta-setting.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/libnm_core_libnm_core_la-nm-meta-setting.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
-
 libnm-core/libnm_core_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
@@ -12774,6 +13281,27 @@ libnm-core/libnm_core_la-nm-errors.lo: libnm-core/nm-errors.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
 
+libnm-core/libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile-utils.c' object='libnm-core/libnm_core_la-nm-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
+
+libnm-core/libnm_core_la-nm-keyfile.lo: libnm-core/nm-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile.c' object='libnm-core/libnm_core_la-nm-keyfile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
+
+libnm-core/libnm_core_la-nm-meta-setting-base-impl.lo: libnm-core/nm-meta-setting-base-impl.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-meta-setting-base-impl.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-meta-setting-base-impl.Tpo -c -o libnm-core/libnm_core_la-nm-meta-setting-base-impl.lo `test -f 'libnm-core/nm-meta-setting-base-impl.c' || echo '$(srcdir)/'`libnm-core/nm-meta-setting-base-impl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-meta-setting-base-impl.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-meta-setting-base-impl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-meta-setting-base-impl.c' object='libnm-core/libnm_core_la-nm-meta-setting-base-impl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__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-meta-setting-base-impl.lo `test -f 'libnm-core/nm-meta-setting-base-impl.c' || echo '$(srcdir)/'`libnm-core/nm-meta-setting-base-impl.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
@@ -12844,20 +13372,6 @@ 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-core/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile/nm-keyfile-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_nm_keyfile_libnm_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Tpo -c -o libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile/nm-keyfile-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Tpo libnm-core/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile/nm-keyfile-utils.c' object='libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_nm_keyfile_libnm_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile/nm-keyfile-utils.c
-
-libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo: libnm-core/nm-keyfile/nm-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_nm_keyfile_libnm_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo -MD -MP -MF libnm-core/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Tpo -c -o libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile/nm-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Tpo libnm-core/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile/nm-keyfile.c' object='libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_nm_keyfile_libnm_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/nm-keyfile/libnm_keyfile_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile/nm-keyfile.c
-
 libnm-core/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo: libnm-core/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) $(libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo -MD -MP -MF libnm-core/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Tpo -c -o libnm-core/nm-libnm-core-aux/libnm_libnm_core_aux_la-nm-libnm-core-aux.lo `test -f 'libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c' || echo '$(srcdir)/'`libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Tpo libnm-core/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo
@@ -12872,13 +13386,6 @@ libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo: l
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-auth-subject.lo `test -f 'libnm-core/nm-libnm-core-intern/nm-auth-subject.c' || echo '$(srcdir)/'`libnm-core/nm-libnm-core-intern/nm-auth-subject.c
 
-libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo: libnm-core/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) $(libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo -MD -MP -MF libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Tpo -c -o libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo `test -f 'libnm-core/nm-libnm-core-intern/nm-ethtool-utils.c' || echo '$(srcdir)/'`libnm-core/nm-libnm-core-intern/nm-ethtool-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Tpo libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-libnm-core-intern/nm-ethtool-utils.c' object='libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo `test -f 'libnm-core/nm-libnm-core-intern/nm-ethtool-utils.c' || echo '$(srcdir)/'`libnm-core/nm-libnm-core-intern/nm-ethtool-utils.c
-
 libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo: libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo -MD -MP -MF libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Tpo -c -o libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo `test -f 'libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c' || echo '$(srcdir)/'`libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Tpo libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo
@@ -12886,369 +13393,376 @@ libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.l
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo `test -f 'libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c' || echo '$(srcdir)/'`libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-client.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-client.Tpo -c -o libnm/libnm_static_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_static_la-nm-client.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-client.c' object='libnm/libnm_static_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_libnm_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-client.lo `test -f 'libnm/nm-client.c' || echo '$(srcdir)/'`libnm/nm-client.c
+
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-object.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-object.Tpo -c -o libnm/libnm_static_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_static_la-nm-object.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-object.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-object.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-object.lo `test -f 'libnm/nm-object.c' || echo '$(srcdir)/'`libnm/nm-object.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device.Tpo -c -o libnm/libnm_static_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_static_la-nm-device.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device.lo `test -f 'libnm/nm-device.c' || echo '$(srcdir)/'`libnm/nm-device.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-active-connection.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-active-connection.Tpo -c -o libnm/libnm_static_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_static_la-nm-active-connection.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-active-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-active-connection.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-active-connection.lo `test -f 'libnm/nm-active-connection.c' || echo '$(srcdir)/'`libnm/nm-active-connection.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-access-point.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-access-point.Tpo -c -o libnm/libnm_static_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_static_la-nm-access-point.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-access-point.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-access-point.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-access-point.lo `test -f 'libnm/nm-access-point.c' || echo '$(srcdir)/'`libnm/nm-access-point.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-checkpoint.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-checkpoint.Tpo -c -o libnm/libnm_static_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_static_la-nm-checkpoint.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-checkpoint.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-checkpoint.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-dbus-helpers.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-dbus-helpers.Tpo -c -o libnm/libnm_static_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_static_la-nm-dbus-helpers.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-dbus-helpers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dbus-helpers.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-dbus-helpers.lo `test -f 'libnm/nm-dbus-helpers.c' || echo '$(srcdir)/'`libnm/nm-dbus-helpers.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-6lowpan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-6lowpan.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-6lowpan.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-6lowpan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-6lowpan.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-6lowpan.lo `test -f 'libnm/nm-device-6lowpan.c' || echo '$(srcdir)/'`libnm/nm-device-6lowpan.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-adsl.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-adsl.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-adsl.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-adsl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-adsl.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-adsl.lo `test -f 'libnm/nm-device-adsl.c' || echo '$(srcdir)/'`libnm/nm-device-adsl.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-bond.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-bond.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-bond.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-bond.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-bond.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-bond.lo `test -f 'libnm/nm-device-bond.c' || echo '$(srcdir)/'`libnm/nm-device-bond.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-bridge.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-bridge.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-bridge.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-bridge.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-bridge.lo `test -f 'libnm/nm-device-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-bridge.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-bt.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-bt.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-bt.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-bt.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-bt.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-bt.lo `test -f 'libnm/nm-device-bt.c' || echo '$(srcdir)/'`libnm/nm-device-bt.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-dummy.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-dummy.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-dummy.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-dummy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-dummy.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-dummy.lo `test -f 'libnm/nm-device-dummy.c' || echo '$(srcdir)/'`libnm/nm-device-dummy.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-ethernet.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-ethernet.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-ethernet.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-ethernet.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ethernet.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-ethernet.lo `test -f 'libnm/nm-device-ethernet.c' || echo '$(srcdir)/'`libnm/nm-device-ethernet.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-generic.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-generic.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-generic.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-generic.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-generic.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-generic.lo `test -f 'libnm/nm-device-generic.c' || echo '$(srcdir)/'`libnm/nm-device-generic.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-infiniband.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-infiniband.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-infiniband.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-infiniband.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-infiniband.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-infiniband.lo `test -f 'libnm/nm-device-infiniband.c' || echo '$(srcdir)/'`libnm/nm-device-infiniband.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-ip-tunnel.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-ip-tunnel.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-ip-tunnel.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-ip-tunnel.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ip-tunnel.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-ip-tunnel.lo `test -f 'libnm/nm-device-ip-tunnel.c' || echo '$(srcdir)/'`libnm/nm-device-ip-tunnel.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-macsec.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-macsec.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-macsec.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-macsec.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-macsec.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-macsec.lo `test -f 'libnm/nm-device-macsec.c' || echo '$(srcdir)/'`libnm/nm-device-macsec.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-macvlan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-macvlan.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-macvlan.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-macvlan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-macvlan.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-macvlan.lo `test -f 'libnm/nm-device-macvlan.c' || echo '$(srcdir)/'`libnm/nm-device-macvlan.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-modem.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-modem.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-modem.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-modem.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-modem.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-modem.lo `test -f 'libnm/nm-device-modem.c' || echo '$(srcdir)/'`libnm/nm-device-modem.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-olpc-mesh.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-olpc-mesh.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-olpc-mesh.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-olpc-mesh.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-olpc-mesh.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-olpc-mesh.lo `test -f 'libnm/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`libnm/nm-device-olpc-mesh.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-ovs-bridge.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-bridge.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-ovs-bridge.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-bridge.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-ovs-bridge.lo `test -f 'libnm/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-bridge.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-ovs-interface.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-interface.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-ovs-interface.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-interface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-interface.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-ovs-interface.lo `test -f 'libnm/nm-device-ovs-interface.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-interface.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-ovs-port.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-port.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-ovs-port.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-port.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-port.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-ovs-port.lo `test -f 'libnm/nm-device-ovs-port.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-port.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-ppp.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-ppp.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-ppp.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-ppp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ppp.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-ppp.lo `test -f 'libnm/nm-device-ppp.c' || echo '$(srcdir)/'`libnm/nm-device-ppp.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-team.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-team.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-team.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-team.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-team.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-team.lo `test -f 'libnm/nm-device-team.c' || echo '$(srcdir)/'`libnm/nm-device-team.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-tun.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-tun.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-tun.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-tun.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-tun.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-tun.lo `test -f 'libnm/nm-device-tun.c' || echo '$(srcdir)/'`libnm/nm-device-tun.c
 
-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@
+libnm/libnm_static_la-nm-device-veth.lo: libnm/nm-device-veth.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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-veth.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-veth.Tpo -c -o libnm/libnm_static_la-nm-device-veth.lo `test -f 'libnm/nm-device-veth.c' || echo '$(srcdir)/'`libnm/nm-device-veth.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_static_la-nm-device-veth.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-veth.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-veth.c' object='libnm/libnm_static_la-nm-device-veth.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-veth.lo `test -f 'libnm/nm-device-veth.c' || echo '$(srcdir)/'`libnm/nm-device-veth.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-vlan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-vlan.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-vlan.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-vlan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-vlan.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-vlan.lo `test -f 'libnm/nm-device-vlan.c' || echo '$(srcdir)/'`libnm/nm-device-vlan.c
 
-libnm/liblibnm_la-nm-device-vrf.lo: libnm/nm-device-vrf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-vrf.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-vrf.Tpo -c -o libnm/liblibnm_la-nm-device-vrf.lo `test -f 'libnm/nm-device-vrf.c' || echo '$(srcdir)/'`libnm/nm-device-vrf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-vrf.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-vrf.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-vrf.c' object='libnm/liblibnm_la-nm-device-vrf.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/libnm_static_la-nm-device-vrf.lo: libnm/nm-device-vrf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-vrf.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-vrf.Tpo -c -o libnm/libnm_static_la-nm-device-vrf.lo `test -f 'libnm/nm-device-vrf.c' || echo '$(srcdir)/'`libnm/nm-device-vrf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_static_la-nm-device-vrf.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-vrf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-vrf.c' object='libnm/libnm_static_la-nm-device-vrf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-device-vrf.lo `test -f 'libnm/nm-device-vrf.c' || echo '$(srcdir)/'`libnm/nm-device-vrf.c
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-vrf.lo `test -f 'libnm/nm-device-vrf.c' || echo '$(srcdir)/'`libnm/nm-device-vrf.c
 
-libnm/liblibnm_la-nm-device-vxlan.lo: libnm/nm-device-vxlan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-device-vxlan.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Tpo -c -o libnm/liblibnm_la-nm-device-vxlan.lo `test -f 'libnm/nm-device-vxlan.c' || echo '$(srcdir)/'`libnm/nm-device-vxlan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo
-@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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-vxlan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-vxlan.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-vxlan.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-vxlan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-vxlan.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-vxlan.lo `test -f 'libnm/nm-device-vxlan.c' || echo '$(srcdir)/'`libnm/nm-device-vxlan.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-wifi-p2p.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi-p2p.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-wifi-p2p.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi-p2p.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wifi-p2p.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-wifi-p2p.lo `test -f 'libnm/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`libnm/nm-device-wifi-p2p.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-wifi.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-wifi.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wifi.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-wifi.lo `test -f 'libnm/nm-device-wifi.c' || echo '$(srcdir)/'`libnm/nm-device-wifi.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-wimax.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-wimax.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-wimax.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-wimax.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wimax.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-wimax.lo `test -f 'libnm/nm-device-wimax.c' || echo '$(srcdir)/'`libnm/nm-device-wimax.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-wireguard.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-wireguard.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-wireguard.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-wireguard.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wireguard.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-wireguard.lo `test -f 'libnm/nm-device-wireguard.c' || echo '$(srcdir)/'`libnm/nm-device-wireguard.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-device-wpan.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-device-wpan.Tpo -c -o libnm/libnm_static_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_static_la-nm-device-wpan.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-device-wpan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wpan.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-device-wpan.lo `test -f 'libnm/nm-device-wpan.c' || echo '$(srcdir)/'`libnm/nm-device-wpan.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-dhcp-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-dhcp-config.Tpo -c -o libnm/libnm_static_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_static_la-nm-dhcp-config.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-dhcp-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dhcp-config.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-dhcp-config.lo `test -f 'libnm/nm-dhcp-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp-config.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-dhcp4-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-dhcp4-config.Tpo -c -o libnm/libnm_static_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_static_la-nm-dhcp4-config.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-dhcp4-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dhcp4-config.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-dhcp4-config.lo `test -f 'libnm/nm-dhcp4-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp4-config.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-dhcp6-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-dhcp6-config.Tpo -c -o libnm/libnm_static_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_static_la-nm-dhcp6-config.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-dhcp6-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dhcp6-config.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-dhcp6-config.lo `test -f 'libnm/nm-dhcp6-config.c' || echo '$(srcdir)/'`libnm/nm-dhcp6-config.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-dns-manager.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-dns-manager.Tpo -c -o libnm/libnm_static_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_static_la-nm-dns-manager.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-dns-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-dns-manager.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-dns-manager.lo `test -f 'libnm/nm-dns-manager.c' || echo '$(srcdir)/'`libnm/nm-dns-manager.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-ip-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-ip-config.Tpo -c -o libnm/libnm_static_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_static_la-nm-ip-config.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-ip-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-ip-config.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-ip-config.lo `test -f 'libnm/nm-ip-config.c' || echo '$(srcdir)/'`libnm/nm-ip-config.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-ip4-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-ip4-config.Tpo -c -o libnm/libnm_static_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_static_la-nm-ip4-config.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-ip4-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-ip4-config.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-ip4-config.lo `test -f 'libnm/nm-ip4-config.c' || echo '$(srcdir)/'`libnm/nm-ip4-config.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-ip6-config.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-ip6-config.Tpo -c -o libnm/libnm_static_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_static_la-nm-ip6-config.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-ip6-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-ip6-config.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-ip6-config.lo `test -f 'libnm/nm-ip6-config.c' || echo '$(srcdir)/'`libnm/nm-ip6-config.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-libnm-utils.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-libnm-utils.Tpo -c -o libnm/libnm_static_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_static_la-nm-libnm-utils.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-libnm-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-libnm-utils.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-libnm-utils.lo `test -f 'libnm/nm-libnm-utils.c' || echo '$(srcdir)/'`libnm/nm-libnm-utils.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-remote-connection.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-remote-connection.Tpo -c -o libnm/libnm_static_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_static_la-nm-remote-connection.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-remote-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-remote-connection.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-remote-connection.lo `test -f 'libnm/nm-remote-connection.c' || echo '$(srcdir)/'`libnm/nm-remote-connection.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-secret-agent-old.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-secret-agent-old.Tpo -c -o libnm/libnm_static_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_static_la-nm-secret-agent-old.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-secret-agent-old.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-secret-agent-old.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-secret-agent-old.lo `test -f 'libnm/nm-secret-agent-old.c' || echo '$(srcdir)/'`libnm/nm-secret-agent-old.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-vpn-connection.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-vpn-connection.Tpo -c -o libnm/libnm_static_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_static_la-nm-vpn-connection.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-vpn-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-connection.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-vpn-connection.lo `test -f 'libnm/nm-vpn-connection.c' || echo '$(srcdir)/'`libnm/nm-vpn-connection.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-vpn-editor.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-vpn-editor.Tpo -c -o libnm/libnm_static_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_static_la-nm-vpn-editor.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-vpn-editor.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-editor.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-vpn-editor.lo `test -f 'libnm/nm-vpn-editor.c' || echo '$(srcdir)/'`libnm/nm-vpn-editor.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-vpn-plugin-old.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-vpn-plugin-old.Tpo -c -o libnm/libnm_static_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_static_la-nm-vpn-plugin-old.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-vpn-plugin-old.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-plugin-old.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-vpn-plugin-old.lo `test -f 'libnm/nm-vpn-plugin-old.c' || echo '$(srcdir)/'`libnm/nm-vpn-plugin-old.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-vpn-service-plugin.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-vpn-service-plugin.Tpo -c -o libnm/libnm_static_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_static_la-nm-vpn-service-plugin.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-vpn-service-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-service-plugin.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-vpn-service-plugin.lo `test -f 'libnm/nm-vpn-service-plugin.c' || echo '$(srcdir)/'`libnm/nm-vpn-service-plugin.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-wifi-p2p-peer.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-wifi-p2p-peer.Tpo -c -o libnm/libnm_static_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_static_la-nm-wifi-p2p-peer.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-wifi-p2p-peer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-wifi-p2p-peer.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-wifi-p2p-peer.lo `test -f 'libnm/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`libnm/nm-wifi-p2p-peer.c
 
-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@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-wimax-nsp.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-wimax-nsp.Tpo -c -o libnm/libnm_static_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_static_la-nm-wimax-nsp.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-wimax-nsp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-wimax-nsp.c' object='libnm/libnm_static_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_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
+@am__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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-wimax-nsp.lo `test -f 'libnm/nm-wimax-nsp.c' || echo '$(srcdir)/'`libnm/nm-wimax-nsp.c
 
-libnm/liblibnm_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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/liblibnm_la-nm-enum-types.lo -MD -MP -MF libnm/$(DEPDIR)/liblibnm_la-nm-enum-types.Tpo -c -o libnm/liblibnm_la-nm-enum-types.lo `test -f 'libnm/nm-enum-types.c' || echo '$(srcdir)/'`libnm/nm-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/liblibnm_la-nm-enum-types.Tpo libnm/$(DEPDIR)/liblibnm_la-nm-enum-types.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-enum-types.c' object='libnm/liblibnm_la-nm-enum-types.lo' libtool=yes @AMDEPBACKSLASH@
+libnm/libnm_static_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_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_static_la-nm-enum-types.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_static_la-nm-enum-types.Tpo -c -o libnm/libnm_static_la-nm-enum-types.lo `test -f 'libnm/nm-enum-types.c' || echo '$(srcdir)/'`libnm/nm-enum-types.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_static_la-nm-enum-types.Tpo libnm/$(DEPDIR)/libnm_static_la-nm-enum-types.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-enum-types.c' object='libnm/libnm_static_la-nm-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_liblibnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/liblibnm_la-nm-enum-types.lo `test -f 'libnm/nm-enum-types.c' || echo '$(srcdir)/'`libnm/nm-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_libnm_static_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_static_la-nm-enum-types.lo `test -f 'libnm/nm-enum-types.c' || echo '$(srcdir)/'`libnm/nm-enum-types.c
 
 libnm/nm-libnm-aux/libnm_libnm_aux_la-nm-libnm-aux.lo: libnm/nm-libnm-aux/nm-libnm-aux.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/nm-libnm-aux/libnm_libnm_aux_la-nm-libnm-aux.lo -MD -MP -MF libnm/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Tpo -c -o libnm/nm-libnm-aux/libnm_libnm_aux_la-nm-libnm-aux.lo `test -f 'libnm/nm-libnm-aux/nm-libnm-aux.c' || echo '$(srcdir)/'`libnm/nm-libnm-aux/nm-libnm-aux.c
@@ -13376,6 +13890,13 @@ shared/n-dhcp4/src/util/libndhcp4_la-socket.lo: shared/n-dhcp4/src/util/socket.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) $(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-base/libnm_base_la-nm-ethtool-base.lo: shared/nm-base/nm-ethtool-base.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_base_libnm_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-base/libnm_base_la-nm-ethtool-base.lo -MD -MP -MF shared/nm-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.Tpo -c -o shared/nm-base/libnm_base_la-nm-ethtool-base.lo `test -f 'shared/nm-base/nm-ethtool-base.c' || echo '$(srcdir)/'`shared/nm-base/nm-ethtool-base.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.Tpo shared/nm-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-base/nm-ethtool-base.c' object='shared/nm-base/libnm_base_la-nm-ethtool-base.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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_base_libnm_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-base/libnm_base_la-nm-ethtool-base.lo `test -f 'shared/nm-base/nm-ethtool-base.c' || echo '$(srcdir)/'`shared/nm-base/nm-ethtool-base.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
@@ -13474,6 +13995,34 @@ 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-log-core/libnm_log_core_la-nm-logging.lo: shared/nm-log-core/nm-logging.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_log_core_libnm_log_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-log-core/libnm_log_core_la-nm-logging.lo -MD -MP -MF shared/nm-log-core/$(DEPDIR)/libnm_log_core_la-nm-logging.Tpo -c -o shared/nm-log-core/libnm_log_core_la-nm-logging.lo `test -f 'shared/nm-log-core/nm-logging.c' || echo '$(srcdir)/'`shared/nm-log-core/nm-logging.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-log-core/$(DEPDIR)/libnm_log_core_la-nm-logging.Tpo shared/nm-log-core/$(DEPDIR)/libnm_log_core_la-nm-logging.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-log-core/nm-logging.c' object='shared/nm-log-core/libnm_log_core_la-nm-logging.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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_log_core_libnm_log_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-log-core/libnm_log_core_la-nm-logging.lo `test -f 'shared/nm-log-core/nm-logging.c' || echo '$(srcdir)/'`shared/nm-log-core/nm-logging.c
+
+shared/nm-platform/libnm_platform_la-nm-netlink.lo: shared/nm-platform/nm-netlink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_platform_libnm_platform_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-platform/libnm_platform_la-nm-netlink.lo -MD -MP -MF shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-netlink.Tpo -c -o shared/nm-platform/libnm_platform_la-nm-netlink.lo `test -f 'shared/nm-platform/nm-netlink.c' || echo '$(srcdir)/'`shared/nm-platform/nm-netlink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-netlink.Tpo shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-netlink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-platform/nm-netlink.c' object='shared/nm-platform/libnm_platform_la-nm-netlink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_platform_libnm_platform_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-platform/libnm_platform_la-nm-netlink.lo `test -f 'shared/nm-platform/nm-netlink.c' || echo '$(srcdir)/'`shared/nm-platform/nm-netlink.c
+
+shared/nm-platform/libnm_platform_la-nm-platform-utils.lo: shared/nm-platform/nm-platform-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_platform_libnm_platform_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-platform/libnm_platform_la-nm-platform-utils.lo -MD -MP -MF shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-platform-utils.Tpo -c -o shared/nm-platform/libnm_platform_la-nm-platform-utils.lo `test -f 'shared/nm-platform/nm-platform-utils.c' || echo '$(srcdir)/'`shared/nm-platform/nm-platform-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-platform-utils.Tpo shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-platform-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-platform/nm-platform-utils.c' object='shared/nm-platform/libnm_platform_la-nm-platform-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_platform_libnm_platform_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-platform/libnm_platform_la-nm-platform-utils.lo `test -f 'shared/nm-platform/nm-platform-utils.c' || echo '$(srcdir)/'`shared/nm-platform/nm-platform-utils.c
+
+shared/nm-platform/libnm_platform_la-nmp-netns.lo: shared/nm-platform/nmp-netns.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_platform_libnm_platform_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-platform/libnm_platform_la-nmp-netns.lo -MD -MP -MF shared/nm-platform/$(DEPDIR)/libnm_platform_la-nmp-netns.Tpo -c -o shared/nm-platform/libnm_platform_la-nmp-netns.lo `test -f 'shared/nm-platform/nmp-netns.c' || echo '$(srcdir)/'`shared/nm-platform/nmp-netns.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-platform/$(DEPDIR)/libnm_platform_la-nmp-netns.Tpo shared/nm-platform/$(DEPDIR)/libnm_platform_la-nmp-netns.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-platform/nmp-netns.c' object='shared/nm-platform/libnm_platform_la-nmp-netns.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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_platform_libnm_platform_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-platform/libnm_platform_la-nmp-netns.lo `test -f 'shared/nm-platform/nmp-netns.c' || echo '$(srcdir)/'`shared/nm-platform/nmp-netns.c
+
 shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo: shared/nm-std-aux/c-list-util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo -MD -MP -MF shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Tpo -c -o shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo `test -f 'shared/nm-std-aux/c-list-util.c' || echo '$(srcdir)/'`shared/nm-std-aux/c-list-util.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Tpo shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo
@@ -13670,6 +14219,13 @@ shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo: shared/systemd/
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo `test -f 'shared/systemd/src/basic/random-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/random-util.c
 
+shared/systemd/src/basic/libnm_systemd_shared_la-ratelimit.lo: shared/systemd/src/basic/ratelimit.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-ratelimit.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ratelimit.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-ratelimit.lo `test -f 'shared/systemd/src/basic/ratelimit.c' || echo '$(srcdir)/'`shared/systemd/src/basic/ratelimit.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ratelimit.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ratelimit.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/ratelimit.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-ratelimit.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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-ratelimit.lo `test -f 'shared/systemd/src/basic/ratelimit.c' || echo '$(srcdir)/'`shared/systemd/src/basic/ratelimit.c
+
 shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo: shared/systemd/src/basic/signal-util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-signal-util.lo `test -f 'shared/systemd/src/basic/signal-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/signal-util.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Plo
@@ -13761,1279 +14317,1258 @@ shared/systemd/src/shared/libnm_systemd_shared_la-web-util.lo: shared/systemd/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) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/shared/libnm_systemd_shared_la-web-util.lo `test -f 'shared/systemd/src/shared/web-util.c' || echo '$(srcdir)/'`shared/systemd/src/shared/web-util.c
 
-src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo: src/devices/adsl/nm-atm-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo -MD -MP -MF src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Tpo -c -o src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo `test -f 'src/devices/adsl/nm-atm-manager.c' || echo '$(srcdir)/'`src/devices/adsl/nm-atm-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Tpo src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/adsl/nm-atm-manager.c' object='src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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
-
-src/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo: src/devices/adsl/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) $(src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo -MD -MP -MF src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Tpo -c -o src/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo `test -f 'src/devices/adsl/nm-device-adsl.c' || echo '$(srcdir)/'`src/devices/adsl/nm-device-adsl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Tpo src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/adsl/nm-device-adsl.c' object='src/devices/adsl/libnm_device_plugin_adsl_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) $(src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo `test -f 'src/devices/adsl/nm-device-adsl.c' || echo '$(srcdir)/'`src/devices/adsl/nm-device-adsl.c
-
-src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo: src/devices/bluetooth/nm-bt-error.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_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo -MD -MP -MF src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Tpo -c -o src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo `test -f 'src/devices/bluetooth/nm-bt-error.c' || echo '$(srcdir)/'`src/devices/bluetooth/nm-bt-error.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Tpo src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/bluetooth/nm-bt-error.c' object='src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo `test -f 'src/devices/bluetooth/nm-bt-error.c' || echo '$(srcdir)/'`src/devices/bluetooth/nm-bt-error.c
-
-src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo: src/devices/bluetooth/nm-bluez5-dun.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_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo -MD -MP -MF src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Tpo -c -o src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo `test -f 'src/devices/bluetooth/nm-bluez5-dun.c' || echo '$(srcdir)/'`src/devices/bluetooth/nm-bluez5-dun.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Tpo src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/bluetooth/nm-bluez5-dun.c' object='src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo: src/core/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_core_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo -MD -MP -MF src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Tpo -c -o src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo `test -f 'src/core/devices/adsl/nm-atm-manager.c' || echo '$(srcdir)/'`src/core/devices/adsl/nm-atm-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Tpo src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/adsl/nm-atm-manager.c' object='src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo `test -f 'src/devices/bluetooth/nm-bluez5-dun.c' || echo '$(srcdir)/'`src/devices/bluetooth/nm-bluez5-dun.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_core_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo `test -f 'src/core/devices/adsl/nm-atm-manager.c' || echo '$(srcdir)/'`src/core/devices/adsl/nm-atm-manager.c
 
-src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo: src/devices/bluetooth/nm-bluez-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_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo -MD -MP -MF src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Tpo -c -o src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo `test -f 'src/devices/bluetooth/nm-bluez-manager.c' || echo '$(srcdir)/'`src/devices/bluetooth/nm-bluez-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Tpo src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/bluetooth/nm-bluez-manager.c' object='src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo: src/core/devices/adsl/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) $(src_core_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo -MD -MP -MF src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Tpo -c -o src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo `test -f 'src/core/devices/adsl/nm-device-adsl.c' || echo '$(srcdir)/'`src/core/devices/adsl/nm-device-adsl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Tpo src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/adsl/nm-device-adsl.c' object='src/core/devices/adsl/libnm_device_plugin_adsl_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) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo `test -f 'src/devices/bluetooth/nm-bluez-manager.c' || echo '$(srcdir)/'`src/devices/bluetooth/nm-bluez-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/adsl/libnm_device_plugin_adsl_la-nm-device-adsl.lo `test -f 'src/core/devices/adsl/nm-device-adsl.c' || echo '$(srcdir)/'`src/core/devices/adsl/nm-device-adsl.c
 
-src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo: src/devices/bluetooth/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) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo -MD -MP -MF src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Tpo -c -o src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo `test -f 'src/devices/bluetooth/nm-device-bt.c' || echo '$(srcdir)/'`src/devices/bluetooth/nm-device-bt.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Tpo src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/bluetooth/nm-device-bt.c' object='src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo: src/core/devices/bluetooth/nm-bt-error.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo -MD -MP -MF src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Tpo -c -o src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo `test -f 'src/core/devices/bluetooth/nm-bt-error.c' || echo '$(srcdir)/'`src/core/devices/bluetooth/nm-bt-error.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Tpo src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/bluetooth/nm-bt-error.c' object='src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo `test -f 'src/devices/bluetooth/nm-device-bt.c' || echo '$(srcdir)/'`src/devices/bluetooth/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) $(src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bt-error.lo `test -f 'src/core/devices/bluetooth/nm-bt-error.c' || echo '$(srcdir)/'`src/core/devices/bluetooth/nm-bt-error.c
 
-src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo: src/devices/ovs/nm-ovsdb.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo -MD -MP -MF src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Tpo -c -o src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo `test -f 'src/devices/ovs/nm-ovsdb.c' || echo '$(srcdir)/'`src/devices/ovs/nm-ovsdb.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Tpo src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/ovs/nm-ovsdb.c' object='src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo: src/core/devices/bluetooth/nm-bluez5-dun.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo -MD -MP -MF src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Tpo -c -o src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo `test -f 'src/core/devices/bluetooth/nm-bluez5-dun.c' || echo '$(srcdir)/'`src/core/devices/bluetooth/nm-bluez5-dun.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Tpo src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/bluetooth/nm-bluez5-dun.c' object='src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo `test -f 'src/devices/ovs/nm-ovsdb.c' || echo '$(srcdir)/'`src/devices/ovs/nm-ovsdb.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/bluetooth/libnm_bluetooth_utils_la-nm-bluez5-dun.lo `test -f 'src/core/devices/bluetooth/nm-bluez5-dun.c' || echo '$(srcdir)/'`src/core/devices/bluetooth/nm-bluez5-dun.c
 
-src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo: src/devices/ovs/nm-ovs-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo -MD -MP -MF src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Tpo -c -o src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo `test -f 'src/devices/ovs/nm-ovs-factory.c' || echo '$(srcdir)/'`src/devices/ovs/nm-ovs-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Tpo src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/ovs/nm-ovs-factory.c' object='src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo: src/core/devices/bluetooth/nm-bluez-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_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo -MD -MP -MF src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Tpo -c -o src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo `test -f 'src/core/devices/bluetooth/nm-bluez-manager.c' || echo '$(srcdir)/'`src/core/devices/bluetooth/nm-bluez-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Tpo src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/bluetooth/nm-bluez-manager.c' object='src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo `test -f 'src/devices/ovs/nm-ovs-factory.c' || echo '$(srcdir)/'`src/devices/ovs/nm-ovs-factory.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo `test -f 'src/core/devices/bluetooth/nm-bluez-manager.c' || echo '$(srcdir)/'`src/core/devices/bluetooth/nm-bluez-manager.c
 
-src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo: src/devices/ovs/nm-device-ovs-interface.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo -MD -MP -MF src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Tpo -c -o src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo `test -f 'src/devices/ovs/nm-device-ovs-interface.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-interface.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Tpo src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/ovs/nm-device-ovs-interface.c' object='src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo: src/core/devices/bluetooth/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) $(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo -MD -MP -MF src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Tpo -c -o src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo `test -f 'src/core/devices/bluetooth/nm-device-bt.c' || echo '$(srcdir)/'`src/core/devices/bluetooth/nm-device-bt.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Tpo src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/bluetooth/nm-device-bt.c' object='src/core/devices/bluetooth/libnm_device_plugin_bluetooth_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) $(src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo `test -f 'src/devices/ovs/nm-device-ovs-interface.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-interface.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo `test -f 'src/core/devices/bluetooth/nm-device-bt.c' || echo '$(srcdir)/'`src/core/devices/bluetooth/nm-device-bt.c
 
-src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo: src/devices/ovs/nm-device-ovs-port.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo -MD -MP -MF src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Tpo -c -o src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo `test -f 'src/devices/ovs/nm-device-ovs-port.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-port.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Tpo src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/ovs/nm-device-ovs-port.c' object='src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo: src/core/devices/ovs/nm-ovsdb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo -MD -MP -MF src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Tpo -c -o src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo `test -f 'src/core/devices/ovs/nm-ovsdb.c' || echo '$(srcdir)/'`src/core/devices/ovs/nm-ovsdb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Tpo src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/ovs/nm-ovsdb.c' object='src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo `test -f 'src/devices/ovs/nm-device-ovs-port.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-port.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovsdb.lo `test -f 'src/core/devices/ovs/nm-ovsdb.c' || echo '$(srcdir)/'`src/core/devices/ovs/nm-ovsdb.c
 
-src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo: src/devices/ovs/nm-device-ovs-bridge.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo -MD -MP -MF src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Tpo -c -o src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo `test -f 'src/devices/ovs/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-bridge.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Tpo src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/ovs/nm-device-ovs-bridge.c' object='src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo: src/core/devices/ovs/nm-ovs-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo -MD -MP -MF src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Tpo -c -o src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo `test -f 'src/core/devices/ovs/nm-ovs-factory.c' || echo '$(srcdir)/'`src/core/devices/ovs/nm-ovs-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Tpo src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/ovs/nm-ovs-factory.c' object='src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo `test -f 'src/devices/ovs/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`src/devices/ovs/nm-device-ovs-bridge.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-ovs-factory.lo `test -f 'src/core/devices/ovs/nm-ovs-factory.c' || echo '$(srcdir)/'`src/core/devices/ovs/nm-ovs-factory.c
 
-src/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo: src/devices/team/nm-team-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo -MD -MP -MF src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Tpo -c -o src/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo `test -f 'src/devices/team/nm-team-factory.c' || echo '$(srcdir)/'`src/devices/team/nm-team-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Tpo src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/team/nm-team-factory.c' object='src/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo: src/core/devices/ovs/nm-device-ovs-interface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo -MD -MP -MF src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Tpo -c -o src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo `test -f 'src/core/devices/ovs/nm-device-ovs-interface.c' || echo '$(srcdir)/'`src/core/devices/ovs/nm-device-ovs-interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Tpo src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/ovs/nm-device-ovs-interface.c' object='src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo `test -f 'src/devices/team/nm-team-factory.c' || echo '$(srcdir)/'`src/devices/team/nm-team-factory.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-interface.lo `test -f 'src/core/devices/ovs/nm-device-ovs-interface.c' || echo '$(srcdir)/'`src/core/devices/ovs/nm-device-ovs-interface.c
 
-src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo: src/devices/team/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) $(src_devices_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo -MD -MP -MF src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Tpo -c -o src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo `test -f 'src/devices/team/nm-device-team.c' || echo '$(srcdir)/'`src/devices/team/nm-device-team.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Tpo src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/team/nm-device-team.c' object='src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo: src/core/devices/ovs/nm-device-ovs-port.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo -MD -MP -MF src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Tpo -c -o src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo `test -f 'src/core/devices/ovs/nm-device-ovs-port.c' || echo '$(srcdir)/'`src/core/devices/ovs/nm-device-ovs-port.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Tpo src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/ovs/nm-device-ovs-port.c' object='src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo `test -f 'src/devices/team/nm-device-team.c' || echo '$(srcdir)/'`src/devices/team/nm-device-team.c
+@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_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-port.lo `test -f 'src/core/devices/ovs/nm-device-ovs-port.c' || echo '$(srcdir)/'`src/core/devices/ovs/nm-device-ovs-port.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo: src/devices/wifi/nm-wifi-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-factory.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo: src/core/devices/ovs/nm-device-ovs-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo -MD -MP -MF src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Tpo -c -o src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo `test -f 'src/core/devices/ovs/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`src/core/devices/ovs/nm-device-ovs-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Tpo src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/ovs/nm-device-ovs-bridge.c' object='src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-factory.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/ovs/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo `test -f 'src/core/devices/ovs/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`src/core/devices/ovs/nm-device-ovs-bridge.c
 
-src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo: src/devices/wifi/nm-device-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-olpc-mesh.c' object='src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo: src/core/devices/team/nm-team-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo -MD -MP -MF src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Tpo -c -o src/core/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo `test -f 'src/core/devices/team/nm-team-factory.c' || echo '$(srcdir)/'`src/core/devices/team/nm-team-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Tpo src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/team/nm-team-factory.c' object='src/core/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
+@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_core_devices_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/team/libnm_device_plugin_team_la-nm-team-factory.lo `test -f 'src/core/devices/team/nm-team-factory.c' || echo '$(srcdir)/'`src/core/devices/team/nm-team-factory.c
 
-src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo: src/devices/wifi/nm-device-wifi-p2p.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo `test -f 'src/devices/wifi/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi-p2p.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-wifi-p2p.c' object='src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/team/libnm_device_plugin_team_la-nm-device-team.lo: src/core/devices/team/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) $(src_core_devices_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/team/libnm_device_plugin_team_la-nm-device-team.lo -MD -MP -MF src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Tpo -c -o src/core/devices/team/libnm_device_plugin_team_la-nm-device-team.lo `test -f 'src/core/devices/team/nm-device-team.c' || echo '$(srcdir)/'`src/core/devices/team/nm-device-team.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Tpo src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/team/nm-device-team.c' object='src/core/devices/team/libnm_device_plugin_team_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) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo `test -f 'src/devices/wifi/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi-p2p.c
+@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_core_devices_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/team/libnm_device_plugin_team_la-nm-device-team.lo `test -f 'src/core/devices/team/nm-device-team.c' || echo '$(srcdir)/'`src/core/devices/team/nm-device-team.c
 
-src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo: src/devices/wifi/nm-device-wifi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo `test -f 'src/devices/wifi/nm-device-wifi.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-wifi.c' object='src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo: src/core/devices/wifi/nm-wifi-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo -MD -MP -MF src/core/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo -c -o src/core/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/core/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-wifi-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo src/core/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/nm-wifi-factory.c' object='src/core/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo `test -f 'src/devices/wifi/nm-device-wifi.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi.c
+@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_core_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/core/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-wifi-factory.c
 
-src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo: src/devices/wifi/nm-wifi-ap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-ap.c' object='src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo: src/core/devices/wifi/nm-device-olpc-mesh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo -MD -MP -MF src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Tpo -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo `test -f 'src/core/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-device-olpc-mesh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Tpo src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/nm-device-olpc-mesh.c' object='src/core/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
+@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_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-device-olpc-mesh.lo `test -f 'src/core/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-device-olpc-mesh.c
 
-src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo: src/devices/wifi/nm-wifi-common.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-common.c' object='src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo: src/core/devices/wifi/nm-device-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo -MD -MP -MF src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Tpo -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo `test -f 'src/core/devices/wifi/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-device-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Tpo src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/nm-device-wifi-p2p.c' object='src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c
+@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_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi-p2p.lo `test -f 'src/core/devices/wifi/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-device-wifi-p2p.c
 
-src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo: src/devices/wifi/nm-wifi-p2p-peer.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo `test -f 'src/devices/wifi/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-p2p-peer.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-p2p-peer.c' object='src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo: src/core/devices/wifi/nm-device-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo -MD -MP -MF src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Tpo -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo `test -f 'src/core/devices/wifi/nm-device-wifi.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-device-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Tpo src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/nm-device-wifi.c' object='src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo `test -f 'src/devices/wifi/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-p2p-peer.c
+@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_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-device-wifi.lo `test -f 'src/core/devices/wifi/nm-device-wifi.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-device-wifi.c
 
-src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo: src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo: src/core/devices/wifi/nm-wifi-ap.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo -MD -MP -MF src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Tpo -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo `test -f 'src/core/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-wifi-ap.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Tpo src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/nm-wifi-ap.c' object='src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
+@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_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-ap.lo `test -f 'src/core/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-wifi-ap.c
 
-src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo: src/devices/wifi/nm-device-iwd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-iwd.c' object='src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo: src/core/devices/wifi/nm-wifi-common.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo -MD -MP -MF src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Tpo -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo `test -f 'src/core/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-wifi-common.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Tpo src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/nm-wifi-common.c' object='src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c
+@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_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-common.lo `test -f 'src/core/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-wifi-common.c
 
-src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo: src/devices/wifi/nm-iwd-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Tpo -c -o src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Tpo src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-iwd-manager.c' object='src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo: src/core/devices/wifi/nm-wifi-p2p-peer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo -MD -MP -MF src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Tpo -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo `test -f 'src/core/devices/wifi/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-wifi-p2p-peer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Tpo src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/nm-wifi-p2p-peer.c' object='src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c
+@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_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-p2p-peer.lo `test -f 'src/core/devices/wifi/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-wifi-p2p-peer.c
 
-src/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo: src/devices/wwan/nm-wwan-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo -c -o src/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo `test -f 'src/devices/wwan/nm-wwan-factory.c' || echo '$(srcdir)/'`src/devices/wwan/nm-wwan-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/nm-wwan-factory.c' object='src/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo: src/core/devices/wifi/nm-wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo -MD -MP -MF src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Tpo -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo `test -f 'src/core/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Tpo src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/nm-wifi-utils.c' object='src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo `test -f 'src/devices/wwan/nm-wwan-factory.c' || echo '$(srcdir)/'`src/devices/wwan/nm-wwan-factory.c
+@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_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-wifi-utils.lo `test -f 'src/core/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-wifi-utils.c
 
-src/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo: src/devices/wwan/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) $(src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Tpo -c -o src/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo `test -f 'src/devices/wwan/nm-device-modem.c' || echo '$(srcdir)/'`src/devices/wwan/nm-device-modem.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Tpo src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/nm-device-modem.c' object='src/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo: src/core/devices/wifi/nm-device-iwd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo -MD -MP -MF src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Tpo -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo `test -f 'src/core/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-device-iwd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Tpo src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/nm-device-iwd.c' object='src/core/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo `test -f 'src/devices/wwan/nm-device-modem.c' || echo '$(srcdir)/'`src/devices/wwan/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) $(src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-device-iwd.lo `test -f 'src/core/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-device-iwd.c
 
-src/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo: src/devices/wwan/nm-modem-broadband.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Tpo -c -o src/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo `test -f 'src/devices/wwan/nm-modem-broadband.c' || echo '$(srcdir)/'`src/devices/wwan/nm-modem-broadband.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Tpo src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/nm-modem-broadband.c' object='src/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo: src/core/devices/wifi/nm-iwd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo -MD -MP -MF src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Tpo -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo `test -f 'src/core/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-iwd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Tpo src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/nm-iwd-manager.c' object='src/core/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo `test -f 'src/devices/wwan/nm-modem-broadband.c' || echo '$(srcdir)/'`src/devices/wwan/nm-modem-broadband.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_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/libnm_wifi_base_la-nm-iwd-manager.lo `test -f 'src/core/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/core/devices/wifi/nm-iwd-manager.c
 
-src/devices/wwan/libnm_wwan_la-nm-modem-manager.lo: src/devices/wwan/nm-modem-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_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/libnm_wwan_la-nm-modem-manager.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Tpo -c -o src/devices/wwan/libnm_wwan_la-nm-modem-manager.lo `test -f 'src/devices/wwan/nm-modem-manager.c' || echo '$(srcdir)/'`src/devices/wwan/nm-modem-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Tpo src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/nm-modem-manager.c' object='src/devices/wwan/libnm_wwan_la-nm-modem-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo: src/core/devices/wwan/nm-wwan-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo -MD -MP -MF src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo -c -o src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo `test -f 'src/core/devices/wwan/nm-wwan-factory.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-wwan-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/nm-wwan-factory.c' object='src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/libnm_wwan_la-nm-modem-manager.lo `test -f 'src/devices/wwan/nm-modem-manager.c' || echo '$(srcdir)/'`src/devices/wwan/nm-modem-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-wwan-factory.lo `test -f 'src/core/devices/wwan/nm-wwan-factory.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-wwan-factory.c
 
-src/devices/wwan/libnm_wwan_la-nm-modem.lo: src/devices/wwan/nm-modem.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/libnm_wwan_la-nm-modem.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Tpo -c -o src/devices/wwan/libnm_wwan_la-nm-modem.lo `test -f 'src/devices/wwan/nm-modem.c' || echo '$(srcdir)/'`src/devices/wwan/nm-modem.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Tpo src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/nm-modem.c' object='src/devices/wwan/libnm_wwan_la-nm-modem.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo: src/core/devices/wwan/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) $(src_core_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo -MD -MP -MF src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Tpo -c -o src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo `test -f 'src/core/devices/wwan/nm-device-modem.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-device-modem.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Tpo src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/nm-device-modem.c' object='src/core/devices/wwan/libnm_device_plugin_wwan_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) $(src_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/libnm_wwan_la-nm-modem.lo `test -f 'src/devices/wwan/nm-modem.c' || echo '$(srcdir)/'`src/devices/wwan/nm-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) $(src_core_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/libnm_device_plugin_wwan_la-nm-device-modem.lo `test -f 'src/core/devices/wwan/nm-device-modem.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-device-modem.c
 
-src/devices/wwan/libnm_wwan_la-nm-service-providers.lo: src/devices/wwan/nm-service-providers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/libnm_wwan_la-nm-service-providers.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Tpo -c -o src/devices/wwan/libnm_wwan_la-nm-service-providers.lo `test -f 'src/devices/wwan/nm-service-providers.c' || echo '$(srcdir)/'`src/devices/wwan/nm-service-providers.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Tpo src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/nm-service-providers.c' object='src/devices/wwan/libnm_wwan_la-nm-service-providers.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo: src/core/devices/wwan/nm-modem-broadband.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo -MD -MP -MF src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Tpo -c -o src/core/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo `test -f 'src/core/devices/wwan/nm-modem-broadband.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-modem-broadband.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Tpo src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/nm-modem-broadband.c' object='src/core/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/libnm_wwan_la-nm-service-providers.lo `test -f 'src/devices/wwan/nm-service-providers.c' || echo '$(srcdir)/'`src/devices/wwan/nm-service-providers.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_core_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo `test -f 'src/core/devices/wwan/nm-modem-broadband.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-modem-broadband.c
 
-src/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo: src/devices/wwan/nm-modem-ofono.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Tpo -c -o src/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo `test -f 'src/devices/wwan/nm-modem-ofono.c' || echo '$(srcdir)/'`src/devices/wwan/nm-modem-ofono.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Tpo src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/nm-modem-ofono.c' object='src/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wwan/libnm_wwan_la-nm-modem-manager.lo: src/core/devices/wwan/nm-modem-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_core_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/libnm_wwan_la-nm-modem-manager.lo -MD -MP -MF src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Tpo -c -o src/core/devices/wwan/libnm_wwan_la-nm-modem-manager.lo `test -f 'src/core/devices/wwan/nm-modem-manager.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-modem-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Tpo src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/nm-modem-manager.c' object='src/core/devices/wwan/libnm_wwan_la-nm-modem-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo `test -f 'src/devices/wwan/nm-modem-ofono.c' || echo '$(srcdir)/'`src/devices/wwan/nm-modem-ofono.c
+@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_core_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/libnm_wwan_la-nm-modem-manager.lo `test -f 'src/core/devices/wwan/nm-modem-manager.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-modem-manager.c
 
-src/initrd/libnmi_core_la-nmi-cmdline-reader.lo: src/initrd/nmi-cmdline-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_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/libnmi_core_la-nmi-cmdline-reader.lo -MD -MP -MF src/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Tpo -c -o src/initrd/libnmi_core_la-nmi-cmdline-reader.lo `test -f 'src/initrd/nmi-cmdline-reader.c' || echo '$(srcdir)/'`src/initrd/nmi-cmdline-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Tpo src/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/nmi-cmdline-reader.c' object='src/initrd/libnmi_core_la-nmi-cmdline-reader.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wwan/libnm_wwan_la-nm-modem.lo: src/core/devices/wwan/nm-modem.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/libnm_wwan_la-nm-modem.lo -MD -MP -MF src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Tpo -c -o src/core/devices/wwan/libnm_wwan_la-nm-modem.lo `test -f 'src/core/devices/wwan/nm-modem.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-modem.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Tpo src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/nm-modem.c' object='src/core/devices/wwan/libnm_wwan_la-nm-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) $(src_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/libnmi_core_la-nmi-cmdline-reader.lo `test -f 'src/initrd/nmi-cmdline-reader.c' || echo '$(srcdir)/'`src/initrd/nmi-cmdline-reader.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_core_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/libnm_wwan_la-nm-modem.lo `test -f 'src/core/devices/wwan/nm-modem.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-modem.c
 
-src/initrd/libnmi_core_la-nmi-dt-reader.lo: src/initrd/nmi-dt-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_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/libnmi_core_la-nmi-dt-reader.lo -MD -MP -MF src/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Tpo -c -o src/initrd/libnmi_core_la-nmi-dt-reader.lo `test -f 'src/initrd/nmi-dt-reader.c' || echo '$(srcdir)/'`src/initrd/nmi-dt-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Tpo src/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/nmi-dt-reader.c' object='src/initrd/libnmi_core_la-nmi-dt-reader.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wwan/libnm_wwan_la-nm-service-providers.lo: src/core/devices/wwan/nm-service-providers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/libnm_wwan_la-nm-service-providers.lo -MD -MP -MF src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Tpo -c -o src/core/devices/wwan/libnm_wwan_la-nm-service-providers.lo `test -f 'src/core/devices/wwan/nm-service-providers.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-service-providers.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Tpo src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/nm-service-providers.c' object='src/core/devices/wwan/libnm_wwan_la-nm-service-providers.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/libnmi_core_la-nmi-dt-reader.lo `test -f 'src/initrd/nmi-dt-reader.c' || echo '$(srcdir)/'`src/initrd/nmi-dt-reader.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_core_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/libnm_wwan_la-nm-service-providers.lo `test -f 'src/core/devices/wwan/nm-service-providers.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-service-providers.c
 
-src/initrd/libnmi_core_la-nmi-ibft-reader.lo: src/initrd/nmi-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_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/libnmi_core_la-nmi-ibft-reader.lo -MD -MP -MF src/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Tpo -c -o src/initrd/libnmi_core_la-nmi-ibft-reader.lo `test -f 'src/initrd/nmi-ibft-reader.c' || echo '$(srcdir)/'`src/initrd/nmi-ibft-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Tpo src/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/nmi-ibft-reader.c' object='src/initrd/libnmi_core_la-nmi-ibft-reader.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo: src/core/devices/wwan/nm-modem-ofono.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo -MD -MP -MF src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Tpo -c -o src/core/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo `test -f 'src/core/devices/wwan/nm-modem-ofono.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-modem-ofono.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Tpo src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/nm-modem-ofono.c' object='src/core/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/libnmi_core_la-nmi-ibft-reader.lo `test -f 'src/initrd/nmi-ibft-reader.c' || echo '$(srcdir)/'`src/initrd/nmi-ibft-reader.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_core_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo `test -f 'src/core/devices/wwan/nm-modem-ofono.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-modem-ofono.c
 
-src/libNetworkManager_la-nm-checkpoint.lo: src/nm-checkpoint.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-checkpoint.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Tpo -c -o src/libNetworkManager_la-nm-checkpoint.lo `test -f 'src/nm-checkpoint.c' || echo '$(srcdir)/'`src/nm-checkpoint.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-checkpoint.c' object='src/libNetworkManager_la-nm-checkpoint.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/initrd/libnmi_core_la-nmi-cmdline-reader.lo: src/core/initrd/nmi-cmdline-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_core_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/libnmi_core_la-nmi-cmdline-reader.lo -MD -MP -MF src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Tpo -c -o src/core/initrd/libnmi_core_la-nmi-cmdline-reader.lo `test -f 'src/core/initrd/nmi-cmdline-reader.c' || echo '$(srcdir)/'`src/core/initrd/nmi-cmdline-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Tpo src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/nmi-cmdline-reader.c' object='src/core/initrd/libnmi_core_la-nmi-cmdline-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-checkpoint.lo `test -f 'src/nm-checkpoint.c' || echo '$(srcdir)/'`src/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) $(src_core_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/libnmi_core_la-nmi-cmdline-reader.lo `test -f 'src/core/initrd/nmi-cmdline-reader.c' || echo '$(srcdir)/'`src/core/initrd/nmi-cmdline-reader.c
 
-src/libNetworkManager_la-nm-checkpoint-manager.lo: src/nm-checkpoint-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-checkpoint-manager.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Tpo -c -o src/libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-checkpoint-manager.c' object='src/libNetworkManager_la-nm-checkpoint-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/initrd/libnmi_core_la-nmi-dt-reader.lo: src/core/initrd/nmi-dt-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_core_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/libnmi_core_la-nmi-dt-reader.lo -MD -MP -MF src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Tpo -c -o src/core/initrd/libnmi_core_la-nmi-dt-reader.lo `test -f 'src/core/initrd/nmi-dt-reader.c' || echo '$(srcdir)/'`src/core/initrd/nmi-dt-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Tpo src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/nmi-dt-reader.c' object='src/core/initrd/libnmi_core_la-nmi-dt-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/libnmi_core_la-nmi-dt-reader.lo `test -f 'src/core/initrd/nmi-dt-reader.c' || echo '$(srcdir)/'`src/core/initrd/nmi-dt-reader.c
 
-src/devices/libNetworkManager_la-nm-acd-manager.lo: src/devices/nm-acd-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-acd-manager.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Tpo -c -o src/devices/libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-acd-manager.c' object='src/devices/libNetworkManager_la-nm-acd-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/initrd/libnmi_core_la-nmi-ibft-reader.lo: src/core/initrd/nmi-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_core_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/libnmi_core_la-nmi-ibft-reader.lo -MD -MP -MF src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Tpo -c -o src/core/initrd/libnmi_core_la-nmi-ibft-reader.lo `test -f 'src/core/initrd/nmi-ibft-reader.c' || echo '$(srcdir)/'`src/core/initrd/nmi-ibft-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Tpo src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/nmi-ibft-reader.c' object='src/core/initrd/libnmi_core_la-nmi-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_libnmi_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/libnmi_core_la-nmi-ibft-reader.lo `test -f 'src/core/initrd/nmi-ibft-reader.c' || echo '$(srcdir)/'`src/core/initrd/nmi-ibft-reader.c
 
-src/devices/libNetworkManager_la-nm-lldp-listener.lo: src/devices/nm-lldp-listener.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-lldp-listener.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Tpo -c -o src/devices/libNetworkManager_la-nm-lldp-listener.lo `test -f 'src/devices/nm-lldp-listener.c' || echo '$(srcdir)/'`src/devices/nm-lldp-listener.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-lldp-listener.c' object='src/devices/libNetworkManager_la-nm-lldp-listener.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-checkpoint.lo: src/core/nm-checkpoint.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-checkpoint.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Tpo -c -o src/core/libNetworkManager_la-nm-checkpoint.lo `test -f 'src/core/nm-checkpoint.c' || echo '$(srcdir)/'`src/core/nm-checkpoint.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-checkpoint.c' object='src/core/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-lldp-listener.lo `test -f 'src/devices/nm-lldp-listener.c' || echo '$(srcdir)/'`src/devices/nm-lldp-listener.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-checkpoint.lo `test -f 'src/core/nm-checkpoint.c' || echo '$(srcdir)/'`src/core/nm-checkpoint.c
 
-src/devices/libNetworkManager_la-nm-device.lo: src/devices/nm-device.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Tpo -c -o src/devices/libNetworkManager_la-nm-device.lo `test -f 'src/devices/nm-device.c' || echo '$(srcdir)/'`src/devices/nm-device.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device.c' object='src/devices/libNetworkManager_la-nm-device.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-checkpoint-manager.lo: src/core/nm-checkpoint-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-checkpoint-manager.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Tpo -c -o src/core/libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/core/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/core/nm-checkpoint-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-checkpoint-manager.c' object='src/core/libNetworkManager_la-nm-checkpoint-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device.lo `test -f 'src/devices/nm-device.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/core/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/core/nm-checkpoint-manager.c
 
-src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo: src/devices/nm-device-ethernet-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Tpo -c -o src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo `test -f 'src/devices/nm-device-ethernet-utils.c' || echo '$(srcdir)/'`src/devices/nm-device-ethernet-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-ethernet-utils.c' object='src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-acd-manager.lo: src/core/devices/nm-acd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-acd-manager.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Tpo -c -o src/core/devices/libNetworkManager_la-nm-acd-manager.lo `test -f 'src/core/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/core/devices/nm-acd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-acd-manager.c' object='src/core/devices/libNetworkManager_la-nm-acd-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo `test -f 'src/devices/nm-device-ethernet-utils.c' || echo '$(srcdir)/'`src/devices/nm-device-ethernet-utils.c
+@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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-acd-manager.lo `test -f 'src/core/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/core/devices/nm-acd-manager.c
 
-src/devices/libNetworkManager_la-nm-device-factory.lo: src/devices/nm-device-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-factory.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Tpo -c -o src/devices/libNetworkManager_la-nm-device-factory.lo `test -f 'src/devices/nm-device-factory.c' || echo '$(srcdir)/'`src/devices/nm-device-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-factory.c' object='src/devices/libNetworkManager_la-nm-device-factory.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-lldp-listener.lo: src/core/devices/nm-lldp-listener.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-lldp-listener.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Tpo -c -o src/core/devices/libNetworkManager_la-nm-lldp-listener.lo `test -f 'src/core/devices/nm-lldp-listener.c' || echo '$(srcdir)/'`src/core/devices/nm-lldp-listener.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-lldp-listener.c' object='src/core/devices/libNetworkManager_la-nm-lldp-listener.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-factory.lo `test -f 'src/devices/nm-device-factory.c' || echo '$(srcdir)/'`src/devices/nm-device-factory.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-lldp-listener.lo `test -f 'src/core/devices/nm-lldp-listener.c' || echo '$(srcdir)/'`src/core/devices/nm-lldp-listener.c
 
-src/devices/libNetworkManager_la-nm-device-generic.lo: src/devices/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-generic.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Tpo -c -o src/devices/libNetworkManager_la-nm-device-generic.lo `test -f 'src/devices/nm-device-generic.c' || echo '$(srcdir)/'`src/devices/nm-device-generic.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-generic.c' object='src/devices/libNetworkManager_la-nm-device-generic.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device.lo: src/core/devices/nm-device.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device.lo `test -f 'src/core/devices/nm-device.c' || echo '$(srcdir)/'`src/core/devices/nm-device.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-generic.lo `test -f 'src/devices/nm-device-generic.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device.lo `test -f 'src/core/devices/nm-device.c' || echo '$(srcdir)/'`src/core/devices/nm-device.c
 
-src/devices/libNetworkManager_la-nm-device-6lowpan.lo: src/devices/nm-device-6lowpan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-6lowpan.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Tpo -c -o src/devices/libNetworkManager_la-nm-device-6lowpan.lo `test -f 'src/devices/nm-device-6lowpan.c' || echo '$(srcdir)/'`src/devices/nm-device-6lowpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-6lowpan.c' object='src/devices/libNetworkManager_la-nm-device-6lowpan.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-ethernet-utils.lo: src/core/devices/nm-device-ethernet-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-ethernet-utils.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-ethernet-utils.lo `test -f 'src/core/devices/nm-device-ethernet-utils.c' || echo '$(srcdir)/'`src/core/devices/nm-device-ethernet-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-ethernet-utils.c' object='src/core/devices/libNetworkManager_la-nm-device-ethernet-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/devices/libNetworkManager_la-nm-device-6lowpan.lo `test -f 'src/devices/nm-device-6lowpan.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-ethernet-utils.lo `test -f 'src/core/devices/nm-device-ethernet-utils.c' || echo '$(srcdir)/'`src/core/devices/nm-device-ethernet-utils.c
 
-src/devices/libNetworkManager_la-nm-device-bond.lo: src/devices/nm-device-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-bond.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Tpo -c -o src/devices/libNetworkManager_la-nm-device-bond.lo `test -f 'src/devices/nm-device-bond.c' || echo '$(srcdir)/'`src/devices/nm-device-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-bond.c' object='src/devices/libNetworkManager_la-nm-device-bond.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-factory.lo: src/core/devices/nm-device-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-factory.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-factory.lo `test -f 'src/core/devices/nm-device-factory.c' || echo '$(srcdir)/'`src/core/devices/nm-device-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-factory.c' object='src/core/devices/libNetworkManager_la-nm-device-factory.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-bond.lo `test -f 'src/devices/nm-device-bond.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-factory.lo `test -f 'src/core/devices/nm-device-factory.c' || echo '$(srcdir)/'`src/core/devices/nm-device-factory.c
 
-src/devices/libNetworkManager_la-nm-device-bridge.lo: src/devices/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-bridge.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Tpo -c -o src/devices/libNetworkManager_la-nm-device-bridge.lo `test -f 'src/devices/nm-device-bridge.c' || echo '$(srcdir)/'`src/devices/nm-device-bridge.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-bridge.c' object='src/devices/libNetworkManager_la-nm-device-bridge.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-generic.lo: src/core/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-generic.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-generic.lo `test -f 'src/core/devices/nm-device-generic.c' || echo '$(srcdir)/'`src/core/devices/nm-device-generic.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-generic.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-bridge.lo `test -f 'src/devices/nm-device-bridge.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-generic.lo `test -f 'src/core/devices/nm-device-generic.c' || echo '$(srcdir)/'`src/core/devices/nm-device-generic.c
 
-src/devices/libNetworkManager_la-nm-device-dummy.lo: src/devices/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-dummy.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Tpo -c -o src/devices/libNetworkManager_la-nm-device-dummy.lo `test -f 'src/devices/nm-device-dummy.c' || echo '$(srcdir)/'`src/devices/nm-device-dummy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-dummy.c' object='src/devices/libNetworkManager_la-nm-device-dummy.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-6lowpan.lo: src/core/devices/nm-device-6lowpan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-6lowpan.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-6lowpan.lo `test -f 'src/core/devices/nm-device-6lowpan.c' || echo '$(srcdir)/'`src/core/devices/nm-device-6lowpan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-6lowpan.c' object='src/core/devices/libNetworkManager_la-nm-device-6lowpan.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-dummy.lo `test -f 'src/devices/nm-device-dummy.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-6lowpan.lo `test -f 'src/core/devices/nm-device-6lowpan.c' || echo '$(srcdir)/'`src/core/devices/nm-device-6lowpan.c
 
-src/devices/libNetworkManager_la-nm-device-ethernet.lo: src/devices/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-ethernet.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Tpo -c -o src/devices/libNetworkManager_la-nm-device-ethernet.lo `test -f 'src/devices/nm-device-ethernet.c' || echo '$(srcdir)/'`src/devices/nm-device-ethernet.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-ethernet.c' object='src/devices/libNetworkManager_la-nm-device-ethernet.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-bond.lo: src/core/devices/nm-device-bond.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-bond.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-bond.lo `test -f 'src/core/devices/nm-device-bond.c' || echo '$(srcdir)/'`src/core/devices/nm-device-bond.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-bond.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-ethernet.lo `test -f 'src/devices/nm-device-ethernet.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-bond.lo `test -f 'src/core/devices/nm-device-bond.c' || echo '$(srcdir)/'`src/core/devices/nm-device-bond.c
 
-src/devices/libNetworkManager_la-nm-device-infiniband.lo: src/devices/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-infiniband.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Tpo -c -o src/devices/libNetworkManager_la-nm-device-infiniband.lo `test -f 'src/devices/nm-device-infiniband.c' || echo '$(srcdir)/'`src/devices/nm-device-infiniband.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-infiniband.c' object='src/devices/libNetworkManager_la-nm-device-infiniband.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-bridge.lo: src/core/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-bridge.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-bridge.lo `test -f 'src/core/devices/nm-device-bridge.c' || echo '$(srcdir)/'`src/core/devices/nm-device-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-bridge.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-infiniband.lo `test -f 'src/devices/nm-device-infiniband.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-bridge.lo `test -f 'src/core/devices/nm-device-bridge.c' || echo '$(srcdir)/'`src/core/devices/nm-device-bridge.c
 
-src/devices/libNetworkManager_la-nm-device-ip-tunnel.lo: src/devices/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-ip-tunnel.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Tpo -c -o src/devices/libNetworkManager_la-nm-device-ip-tunnel.lo `test -f 'src/devices/nm-device-ip-tunnel.c' || echo '$(srcdir)/'`src/devices/nm-device-ip-tunnel.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-ip-tunnel.c' object='src/devices/libNetworkManager_la-nm-device-ip-tunnel.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-dummy.lo: src/core/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-dummy.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-dummy.lo `test -f 'src/core/devices/nm-device-dummy.c' || echo '$(srcdir)/'`src/core/devices/nm-device-dummy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-dummy.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-ip-tunnel.lo `test -f 'src/devices/nm-device-ip-tunnel.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-dummy.lo `test -f 'src/core/devices/nm-device-dummy.c' || echo '$(srcdir)/'`src/core/devices/nm-device-dummy.c
 
-src/devices/libNetworkManager_la-nm-device-macsec.lo: src/devices/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-macsec.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Tpo -c -o src/devices/libNetworkManager_la-nm-device-macsec.lo `test -f 'src/devices/nm-device-macsec.c' || echo '$(srcdir)/'`src/devices/nm-device-macsec.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-macsec.c' object='src/devices/libNetworkManager_la-nm-device-macsec.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-ethernet.lo: src/core/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-ethernet.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-ethernet.lo `test -f 'src/core/devices/nm-device-ethernet.c' || echo '$(srcdir)/'`src/core/devices/nm-device-ethernet.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-ethernet.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-macsec.lo `test -f 'src/devices/nm-device-macsec.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-ethernet.lo `test -f 'src/core/devices/nm-device-ethernet.c' || echo '$(srcdir)/'`src/core/devices/nm-device-ethernet.c
 
-src/devices/libNetworkManager_la-nm-device-macvlan.lo: src/devices/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-macvlan.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Tpo -c -o src/devices/libNetworkManager_la-nm-device-macvlan.lo `test -f 'src/devices/nm-device-macvlan.c' || echo '$(srcdir)/'`src/devices/nm-device-macvlan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-macvlan.c' object='src/devices/libNetworkManager_la-nm-device-macvlan.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-infiniband.lo: src/core/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-infiniband.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-infiniband.lo `test -f 'src/core/devices/nm-device-infiniband.c' || echo '$(srcdir)/'`src/core/devices/nm-device-infiniband.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-infiniband.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-macvlan.lo `test -f 'src/devices/nm-device-macvlan.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-infiniband.lo `test -f 'src/core/devices/nm-device-infiniband.c' || echo '$(srcdir)/'`src/core/devices/nm-device-infiniband.c
 
-src/devices/libNetworkManager_la-nm-device-ppp.lo: src/devices/nm-device-ppp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-ppp.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Tpo -c -o src/devices/libNetworkManager_la-nm-device-ppp.lo `test -f 'src/devices/nm-device-ppp.c' || echo '$(srcdir)/'`src/devices/nm-device-ppp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-ppp.c' object='src/devices/libNetworkManager_la-nm-device-ppp.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-ip-tunnel.lo: src/core/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-ip-tunnel.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-ip-tunnel.lo `test -f 'src/core/devices/nm-device-ip-tunnel.c' || echo '$(srcdir)/'`src/core/devices/nm-device-ip-tunnel.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-ip-tunnel.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-ppp.lo `test -f 'src/devices/nm-device-ppp.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-ip-tunnel.lo `test -f 'src/core/devices/nm-device-ip-tunnel.c' || echo '$(srcdir)/'`src/core/devices/nm-device-ip-tunnel.c
 
-src/devices/libNetworkManager_la-nm-device-tun.lo: src/devices/nm-device-tun.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-tun.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Tpo -c -o src/devices/libNetworkManager_la-nm-device-tun.lo `test -f 'src/devices/nm-device-tun.c' || echo '$(srcdir)/'`src/devices/nm-device-tun.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-tun.c' object='src/devices/libNetworkManager_la-nm-device-tun.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-macsec.lo: src/core/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-macsec.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-macsec.lo `test -f 'src/core/devices/nm-device-macsec.c' || echo '$(srcdir)/'`src/core/devices/nm-device-macsec.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-macsec.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-tun.lo `test -f 'src/devices/nm-device-tun.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-macsec.lo `test -f 'src/core/devices/nm-device-macsec.c' || echo '$(srcdir)/'`src/core/devices/nm-device-macsec.c
 
-src/devices/libNetworkManager_la-nm-device-veth.lo: src/devices/nm-device-veth.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-veth.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Tpo -c -o src/devices/libNetworkManager_la-nm-device-veth.lo `test -f 'src/devices/nm-device-veth.c' || echo '$(srcdir)/'`src/devices/nm-device-veth.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-veth.c' object='src/devices/libNetworkManager_la-nm-device-veth.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-macvlan.lo: src/core/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-macvlan.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-macvlan.lo `test -f 'src/core/devices/nm-device-macvlan.c' || echo '$(srcdir)/'`src/core/devices/nm-device-macvlan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-macvlan.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-veth.lo `test -f 'src/devices/nm-device-veth.c' || echo '$(srcdir)/'`src/devices/nm-device-veth.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-macvlan.lo `test -f 'src/core/devices/nm-device-macvlan.c' || echo '$(srcdir)/'`src/core/devices/nm-device-macvlan.c
 
-src/devices/libNetworkManager_la-nm-device-vlan.lo: src/devices/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-vlan.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Tpo -c -o src/devices/libNetworkManager_la-nm-device-vlan.lo `test -f 'src/devices/nm-device-vlan.c' || echo '$(srcdir)/'`src/devices/nm-device-vlan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-vlan.c' object='src/devices/libNetworkManager_la-nm-device-vlan.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-ppp.lo: src/core/devices/nm-device-ppp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-ppp.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-ppp.lo `test -f 'src/core/devices/nm-device-ppp.c' || echo '$(srcdir)/'`src/core/devices/nm-device-ppp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-ppp.c' object='src/core/devices/libNetworkManager_la-nm-device-ppp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-vlan.lo `test -f 'src/devices/nm-device-vlan.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-ppp.lo `test -f 'src/core/devices/nm-device-ppp.c' || echo '$(srcdir)/'`src/core/devices/nm-device-ppp.c
 
-src/devices/libNetworkManager_la-nm-device-vrf.lo: src/devices/nm-device-vrf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-vrf.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Tpo -c -o src/devices/libNetworkManager_la-nm-device-vrf.lo `test -f 'src/devices/nm-device-vrf.c' || echo '$(srcdir)/'`src/devices/nm-device-vrf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-vrf.c' object='src/devices/libNetworkManager_la-nm-device-vrf.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-tun.lo: src/core/devices/nm-device-tun.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-tun.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-tun.lo `test -f 'src/core/devices/nm-device-tun.c' || echo '$(srcdir)/'`src/core/devices/nm-device-tun.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-tun.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-vrf.lo `test -f 'src/devices/nm-device-vrf.c' || echo '$(srcdir)/'`src/devices/nm-device-vrf.c
+@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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-tun.lo `test -f 'src/core/devices/nm-device-tun.c' || echo '$(srcdir)/'`src/core/devices/nm-device-tun.c
 
-src/devices/libNetworkManager_la-nm-device-vxlan.lo: src/devices/nm-device-vxlan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-vxlan.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Tpo -c -o src/devices/libNetworkManager_la-nm-device-vxlan.lo `test -f 'src/devices/nm-device-vxlan.c' || echo '$(srcdir)/'`src/devices/nm-device-vxlan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-vxlan.c' object='src/devices/libNetworkManager_la-nm-device-vxlan.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-veth.lo: src/core/devices/nm-device-veth.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-veth.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-veth.lo `test -f 'src/core/devices/nm-device-veth.c' || echo '$(srcdir)/'`src/core/devices/nm-device-veth.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-veth.c' object='src/core/devices/libNetworkManager_la-nm-device-veth.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-vxlan.lo `test -f 'src/devices/nm-device-vxlan.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-veth.lo `test -f 'src/core/devices/nm-device-veth.c' || echo '$(srcdir)/'`src/core/devices/nm-device-veth.c
 
-src/devices/libNetworkManager_la-nm-device-wireguard.lo: src/devices/nm-device-wireguard.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-wireguard.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Tpo -c -o src/devices/libNetworkManager_la-nm-device-wireguard.lo `test -f 'src/devices/nm-device-wireguard.c' || echo '$(srcdir)/'`src/devices/nm-device-wireguard.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-wireguard.c' object='src/devices/libNetworkManager_la-nm-device-wireguard.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-vlan.lo: src/core/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-vlan.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-vlan.lo `test -f 'src/core/devices/nm-device-vlan.c' || echo '$(srcdir)/'`src/core/devices/nm-device-vlan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-vlan.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-wireguard.lo `test -f 'src/devices/nm-device-wireguard.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-vlan.lo `test -f 'src/core/devices/nm-device-vlan.c' || echo '$(srcdir)/'`src/core/devices/nm-device-vlan.c
 
-src/devices/libNetworkManager_la-nm-device-wpan.lo: src/devices/nm-device-wpan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-wpan.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Tpo -c -o src/devices/libNetworkManager_la-nm-device-wpan.lo `test -f 'src/devices/nm-device-wpan.c' || echo '$(srcdir)/'`src/devices/nm-device-wpan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device-wpan.c' object='src/devices/libNetworkManager_la-nm-device-wpan.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-vrf.lo: src/core/devices/nm-device-vrf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-vrf.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-vrf.lo `test -f 'src/core/devices/nm-device-vrf.c' || echo '$(srcdir)/'`src/core/devices/nm-device-vrf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-vrf.c' object='src/core/devices/libNetworkManager_la-nm-device-vrf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device-wpan.lo `test -f 'src/devices/nm-device-wpan.c' || echo '$(srcdir)/'`src/devices/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-vrf.lo `test -f 'src/core/devices/nm-device-vrf.c' || echo '$(srcdir)/'`src/core/devices/nm-device-vrf.c
 
-src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo: src/dhcp/nm-dhcp-dhcpcanon.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Tpo -c -o src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo `test -f 'src/dhcp/nm-dhcp-dhcpcanon.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhcpcanon.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Tpo src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-dhcpcanon.c' object='src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-vxlan.lo: src/core/devices/nm-device-vxlan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-vxlan.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-vxlan.lo `test -f 'src/core/devices/nm-device-vxlan.c' || echo '$(srcdir)/'`src/core/devices/nm-device-vxlan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-vxlan.c' object='src/core/devices/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo `test -f 'src/dhcp/nm-dhcp-dhcpcanon.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhcpcanon.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-vxlan.lo `test -f 'src/core/devices/nm-device-vxlan.c' || echo '$(srcdir)/'`src/core/devices/nm-device-vxlan.c
 
-src/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo: src/dhcp/nm-dhcp-dhclient.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Tpo -c -o src/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo `test -f 'src/dhcp/nm-dhcp-dhclient.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhclient.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Tpo src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-dhclient.c' object='src/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-wireguard.lo: src/core/devices/nm-device-wireguard.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-wireguard.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-wireguard.lo `test -f 'src/core/devices/nm-device-wireguard.c' || echo '$(srcdir)/'`src/core/devices/nm-device-wireguard.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-wireguard.c' object='src/core/devices/libNetworkManager_la-nm-device-wireguard.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo `test -f 'src/dhcp/nm-dhcp-dhclient.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhclient.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-wireguard.lo `test -f 'src/core/devices/nm-device-wireguard.c' || echo '$(srcdir)/'`src/core/devices/nm-device-wireguard.c
 
-src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo: src/dhcp/nm-dhcp-dhcpcd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Tpo -c -o src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo `test -f 'src/dhcp/nm-dhcp-dhcpcd.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhcpcd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Tpo src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-dhcpcd.c' object='src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/devices/libNetworkManager_la-nm-device-wpan.lo: src/core/devices/nm-device-wpan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/libNetworkManager_la-nm-device-wpan.lo -MD -MP -MF src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Tpo -c -o src/core/devices/libNetworkManager_la-nm-device-wpan.lo `test -f 'src/core/devices/nm-device-wpan.c' || echo '$(srcdir)/'`src/core/devices/nm-device-wpan.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Tpo src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/nm-device-wpan.c' object='src/core/devices/libNetworkManager_la-nm-device-wpan.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo `test -f 'src/dhcp/nm-dhcp-dhcpcd.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhcpcd.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/libNetworkManager_la-nm-device-wpan.lo `test -f 'src/core/devices/nm-device-wpan.c' || echo '$(srcdir)/'`src/core/devices/nm-device-wpan.c
 
-src/dhcp/libNetworkManager_la-nm-dhcp-listener.lo: src/dhcp/nm-dhcp-listener.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/libNetworkManager_la-nm-dhcp-listener.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Tpo -c -o src/dhcp/libNetworkManager_la-nm-dhcp-listener.lo `test -f 'src/dhcp/nm-dhcp-listener.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-listener.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Tpo src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-listener.c' object='src/dhcp/libNetworkManager_la-nm-dhcp-listener.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo: src/core/dhcp/nm-dhcp-dhcpcanon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Tpo -c -o src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo `test -f 'src/core/dhcp/nm-dhcp-dhcpcanon.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-dhcpcanon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-dhcpcanon.c' object='src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/libNetworkManager_la-nm-dhcp-listener.lo `test -f 'src/dhcp/nm-dhcp-listener.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-listener.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcanon.lo `test -f 'src/core/dhcp/nm-dhcp-dhcpcanon.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-dhcpcanon.c
 
-src/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo: src/dhcp/nm-dhcp-dhclient-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/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Tpo -c -o src/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo `test -f 'src/dhcp/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhclient-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Tpo src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-dhclient-utils.c' object='src/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo: src/core/dhcp/nm-dhcp-dhclient.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Tpo -c -o src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo `test -f 'src/core/dhcp/nm-dhcp-dhclient.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-dhclient.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-dhclient.c' object='src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo `test -f 'src/dhcp/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhclient-utils.c
+@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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient.lo `test -f 'src/core/dhcp/nm-dhcp-dhclient.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-dhclient.c
 
-src/dns/libNetworkManager_la-nm-dns-manager.lo: src/dns/nm-dns-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/libNetworkManager_la-nm-dns-manager.lo -MD -MP -MF src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Tpo -c -o src/dns/libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Tpo src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dns/nm-dns-manager.c' object='src/dns/libNetworkManager_la-nm-dns-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo: src/core/dhcp/nm-dhcp-dhcpcd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Tpo -c -o src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo `test -f 'src/core/dhcp/nm-dhcp-dhcpcd.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-dhcpcd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-dhcpcd.c' object='src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManager_la-nm-dhcp-dhcpcd.lo `test -f 'src/core/dhcp/nm-dhcp-dhcpcd.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-dhcpcd.c
 
-src/dns/libNetworkManager_la-nm-dns-plugin.lo: src/dns/nm-dns-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/libNetworkManager_la-nm-dns-plugin.lo -MD -MP -MF src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Tpo -c -o src/dns/libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Tpo src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dns/nm-dns-plugin.c' object='src/dns/libNetworkManager_la-nm-dns-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dhcp/libNetworkManager_la-nm-dhcp-listener.lo: src/core/dhcp/nm-dhcp-listener.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManager_la-nm-dhcp-listener.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Tpo -c -o src/core/dhcp/libNetworkManager_la-nm-dhcp-listener.lo `test -f 'src/core/dhcp/nm-dhcp-listener.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-listener.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-listener.c' object='src/core/dhcp/libNetworkManager_la-nm-dhcp-listener.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManager_la-nm-dhcp-listener.lo `test -f 'src/core/dhcp/nm-dhcp-listener.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-listener.c
 
-src/dns/libNetworkManager_la-nm-dns-dnsmasq.lo: src/dns/nm-dns-dnsmasq.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/libNetworkManager_la-nm-dns-dnsmasq.lo -MD -MP -MF src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Tpo -c -o src/dns/libNetworkManager_la-nm-dns-dnsmasq.lo `test -f 'src/dns/nm-dns-dnsmasq.c' || echo '$(srcdir)/'`src/dns/nm-dns-dnsmasq.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Tpo src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dns/nm-dns-dnsmasq.c' object='src/dns/libNetworkManager_la-nm-dns-dnsmasq.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo: src/core/dhcp/nm-dhcp-dhclient-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Tpo -c -o src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo `test -f 'src/core/dhcp/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-dhclient-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-dhclient-utils.c' object='src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient-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/dns/libNetworkManager_la-nm-dns-dnsmasq.lo `test -f 'src/dns/nm-dns-dnsmasq.c' || echo '$(srcdir)/'`src/dns/nm-dns-dnsmasq.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManager_la-nm-dhcp-dhclient-utils.lo `test -f 'src/core/dhcp/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-dhclient-utils.c
 
-src/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo: src/dns/nm-dns-systemd-resolved.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo -MD -MP -MF src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Tpo -c -o src/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo `test -f 'src/dns/nm-dns-systemd-resolved.c' || echo '$(srcdir)/'`src/dns/nm-dns-systemd-resolved.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Tpo src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dns/nm-dns-systemd-resolved.c' object='src/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dns/libNetworkManager_la-nm-dns-manager.lo: src/core/dns/nm-dns-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dns/libNetworkManager_la-nm-dns-manager.lo -MD -MP -MF src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Tpo -c -o src/core/dns/libNetworkManager_la-nm-dns-manager.lo `test -f 'src/core/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/core/dns/nm-dns-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Tpo src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dns/nm-dns-manager.c' object='src/core/dns/libNetworkManager_la-nm-dns-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo `test -f 'src/dns/nm-dns-systemd-resolved.c' || echo '$(srcdir)/'`src/dns/nm-dns-systemd-resolved.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dns/libNetworkManager_la-nm-dns-manager.lo `test -f 'src/core/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/core/dns/nm-dns-manager.c
 
-src/dns/libNetworkManager_la-nm-dns-unbound.lo: src/dns/nm-dns-unbound.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/libNetworkManager_la-nm-dns-unbound.lo -MD -MP -MF src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Tpo -c -o src/dns/libNetworkManager_la-nm-dns-unbound.lo `test -f 'src/dns/nm-dns-unbound.c' || echo '$(srcdir)/'`src/dns/nm-dns-unbound.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Tpo src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dns/nm-dns-unbound.c' object='src/dns/libNetworkManager_la-nm-dns-unbound.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dns/libNetworkManager_la-nm-dns-plugin.lo: src/core/dns/nm-dns-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dns/libNetworkManager_la-nm-dns-plugin.lo -MD -MP -MF src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Tpo -c -o src/core/dns/libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/core/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/core/dns/nm-dns-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Tpo src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dns/nm-dns-plugin.c' object='src/core/dns/libNetworkManager_la-nm-dns-plugin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/libNetworkManager_la-nm-dns-unbound.lo `test -f 'src/dns/nm-dns-unbound.c' || echo '$(srcdir)/'`src/dns/nm-dns-unbound.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dns/libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/core/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/core/dns/nm-dns-plugin.c
 
-src/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo: src/dnsmasq/nm-dnsmasq-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo -MD -MP -MF src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Tpo -c -o src/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo `test -f 'src/dnsmasq/nm-dnsmasq-manager.c' || echo '$(srcdir)/'`src/dnsmasq/nm-dnsmasq-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Tpo src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dnsmasq/nm-dnsmasq-manager.c' object='src/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dns/libNetworkManager_la-nm-dns-dnsmasq.lo: src/core/dns/nm-dns-dnsmasq.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dns/libNetworkManager_la-nm-dns-dnsmasq.lo -MD -MP -MF src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Tpo -c -o src/core/dns/libNetworkManager_la-nm-dns-dnsmasq.lo `test -f 'src/core/dns/nm-dns-dnsmasq.c' || echo '$(srcdir)/'`src/core/dns/nm-dns-dnsmasq.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Tpo src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dns/nm-dns-dnsmasq.c' object='src/core/dns/libNetworkManager_la-nm-dns-dnsmasq.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo `test -f 'src/dnsmasq/nm-dnsmasq-manager.c' || echo '$(srcdir)/'`src/dnsmasq/nm-dnsmasq-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dns/libNetworkManager_la-nm-dns-dnsmasq.lo `test -f 'src/core/dns/nm-dns-dnsmasq.c' || echo '$(srcdir)/'`src/core/dns/nm-dns-dnsmasq.c
 
-src/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo: src/dnsmasq/nm-dnsmasq-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/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo -MD -MP -MF src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Tpo -c -o src/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo `test -f 'src/dnsmasq/nm-dnsmasq-utils.c' || echo '$(srcdir)/'`src/dnsmasq/nm-dnsmasq-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Tpo src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dnsmasq/nm-dnsmasq-utils.c' object='src/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo: src/core/dns/nm-dns-systemd-resolved.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo -MD -MP -MF src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Tpo -c -o src/core/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo `test -f 'src/core/dns/nm-dns-systemd-resolved.c' || echo '$(srcdir)/'`src/core/dns/nm-dns-systemd-resolved.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Tpo src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dns/nm-dns-systemd-resolved.c' object='src/core/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo `test -f 'src/dnsmasq/nm-dnsmasq-utils.c' || echo '$(srcdir)/'`src/dnsmasq/nm-dnsmasq-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dns/libNetworkManager_la-nm-dns-systemd-resolved.lo `test -f 'src/core/dns/nm-dns-systemd-resolved.c' || echo '$(srcdir)/'`src/core/dns/nm-dns-systemd-resolved.c
 
-src/ppp/libNetworkManager_la-nm-ppp-manager-call.lo: src/ppp/nm-ppp-manager-call.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/ppp/libNetworkManager_la-nm-ppp-manager-call.lo -MD -MP -MF src/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Tpo -c -o src/ppp/libNetworkManager_la-nm-ppp-manager-call.lo `test -f 'src/ppp/nm-ppp-manager-call.c' || echo '$(srcdir)/'`src/ppp/nm-ppp-manager-call.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Tpo src/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ppp/nm-ppp-manager-call.c' object='src/ppp/libNetworkManager_la-nm-ppp-manager-call.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dns/libNetworkManager_la-nm-dns-unbound.lo: src/core/dns/nm-dns-unbound.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dns/libNetworkManager_la-nm-dns-unbound.lo -MD -MP -MF src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Tpo -c -o src/core/dns/libNetworkManager_la-nm-dns-unbound.lo `test -f 'src/core/dns/nm-dns-unbound.c' || echo '$(srcdir)/'`src/core/dns/nm-dns-unbound.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Tpo src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dns/nm-dns-unbound.c' object='src/core/dns/libNetworkManager_la-nm-dns-unbound.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ppp/libNetworkManager_la-nm-ppp-manager-call.lo `test -f 'src/ppp/nm-ppp-manager-call.c' || echo '$(srcdir)/'`src/ppp/nm-ppp-manager-call.c
+@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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dns/libNetworkManager_la-nm-dns-unbound.lo `test -f 'src/core/dns/nm-dns-unbound.c' || echo '$(srcdir)/'`src/core/dns/nm-dns-unbound.c
 
-src/libNetworkManager_la-nm-hostname-manager.lo: src/nm-hostname-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-hostname-manager.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Tpo -c -o src/libNetworkManager_la-nm-hostname-manager.lo `test -f 'src/nm-hostname-manager.c' || echo '$(srcdir)/'`src/nm-hostname-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-hostname-manager.c' object='src/libNetworkManager_la-nm-hostname-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo: src/core/dnsmasq/nm-dnsmasq-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo -MD -MP -MF src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Tpo -c -o src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo `test -f 'src/core/dnsmasq/nm-dnsmasq-manager.c' || echo '$(srcdir)/'`src/core/dnsmasq/nm-dnsmasq-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Tpo src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dnsmasq/nm-dnsmasq-manager.c' object='src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-hostname-manager.lo `test -f 'src/nm-hostname-manager.c' || echo '$(srcdir)/'`src/nm-hostname-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-manager.lo `test -f 'src/core/dnsmasq/nm-dnsmasq-manager.c' || echo '$(srcdir)/'`src/core/dnsmasq/nm-dnsmasq-manager.c
 
-src/settings/libNetworkManager_la-nm-agent-manager.lo: src/settings/nm-agent-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/libNetworkManager_la-nm-agent-manager.lo -MD -MP -MF src/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Tpo -c -o src/settings/libNetworkManager_la-nm-agent-manager.lo `test -f 'src/settings/nm-agent-manager.c' || echo '$(srcdir)/'`src/settings/nm-agent-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Tpo src/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/nm-agent-manager.c' object='src/settings/libNetworkManager_la-nm-agent-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo: src/core/dnsmasq/nm-dnsmasq-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo -MD -MP -MF src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Tpo -c -o src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo `test -f 'src/core/dnsmasq/nm-dnsmasq-utils.c' || echo '$(srcdir)/'`src/core/dnsmasq/nm-dnsmasq-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Tpo src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dnsmasq/nm-dnsmasq-utils.c' object='src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-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-agent-manager.lo `test -f 'src/settings/nm-agent-manager.c' || echo '$(srcdir)/'`src/settings/nm-agent-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dnsmasq/libNetworkManager_la-nm-dnsmasq-utils.lo `test -f 'src/core/dnsmasq/nm-dnsmasq-utils.c' || echo '$(srcdir)/'`src/core/dnsmasq/nm-dnsmasq-utils.c
 
-src/settings/libNetworkManager_la-nm-secret-agent.lo: src/settings/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/libNetworkManager_la-nm-secret-agent.lo -MD -MP -MF src/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Tpo -c -o src/settings/libNetworkManager_la-nm-secret-agent.lo `test -f 'src/settings/nm-secret-agent.c' || echo '$(srcdir)/'`src/settings/nm-secret-agent.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Tpo src/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/nm-secret-agent.c' object='src/settings/libNetworkManager_la-nm-secret-agent.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/ppp/libNetworkManager_la-nm-ppp-manager-call.lo: src/core/ppp/nm-ppp-manager-call.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/ppp/libNetworkManager_la-nm-ppp-manager-call.lo -MD -MP -MF src/core/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Tpo -c -o src/core/ppp/libNetworkManager_la-nm-ppp-manager-call.lo `test -f 'src/core/ppp/nm-ppp-manager-call.c' || echo '$(srcdir)/'`src/core/ppp/nm-ppp-manager-call.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Tpo src/core/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/ppp/nm-ppp-manager-call.c' object='src/core/ppp/libNetworkManager_la-nm-ppp-manager-call.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-secret-agent.lo `test -f 'src/settings/nm-secret-agent.c' || echo '$(srcdir)/'`src/settings/nm-secret-agent.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/ppp/libNetworkManager_la-nm-ppp-manager-call.lo `test -f 'src/core/ppp/nm-ppp-manager-call.c' || echo '$(srcdir)/'`src/core/ppp/nm-ppp-manager-call.c
 
-src/settings/libNetworkManager_la-nm-settings-connection.lo: src/settings/nm-settings-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/libNetworkManager_la-nm-settings-connection.lo -MD -MP -MF src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Tpo -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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Tpo src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/nm-settings-connection.c' object='src/settings/libNetworkManager_la-nm-settings-connection.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-hostname-manager.lo: src/core/nm-hostname-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-hostname-manager.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Tpo -c -o src/core/libNetworkManager_la-nm-hostname-manager.lo `test -f 'src/core/nm-hostname-manager.c' || echo '$(srcdir)/'`src/core/nm-hostname-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-hostname-manager.c' object='src/core/libNetworkManager_la-nm-hostname-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/libNetworkManager_la-nm-settings-connection.lo `test -f 'src/settings/nm-settings-connection.c' || echo '$(srcdir)/'`src/settings/nm-settings-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-hostname-manager.lo `test -f 'src/core/nm-hostname-manager.c' || echo '$(srcdir)/'`src/core/nm-hostname-manager.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@
+src/core/settings/libNetworkManager_la-nm-agent-manager.lo: src/core/settings/nm-agent-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/libNetworkManager_la-nm-agent-manager.lo -MD -MP -MF src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Tpo -c -o src/core/settings/libNetworkManager_la-nm-agent-manager.lo `test -f 'src/core/settings/nm-agent-manager.c' || echo '$(srcdir)/'`src/core/settings/nm-agent-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Tpo src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/nm-agent-manager.c' object='src/core/settings/libNetworkManager_la-nm-agent-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/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_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/libNetworkManager_la-nm-agent-manager.lo `test -f 'src/core/settings/nm-agent-manager.c' || echo '$(srcdir)/'`src/core/settings/nm-agent-manager.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/nm-settings-plugin.c' object='src/settings/libNetworkManager_la-nm-settings-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/libNetworkManager_la-nm-secret-agent.lo: src/core/settings/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/libNetworkManager_la-nm-secret-agent.lo -MD -MP -MF src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Tpo -c -o src/core/settings/libNetworkManager_la-nm-secret-agent.lo `test -f 'src/core/settings/nm-secret-agent.c' || echo '$(srcdir)/'`src/core/settings/nm-secret-agent.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Tpo src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/nm-secret-agent.c' object='src/core/settings/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/libNetworkManager_la-nm-secret-agent.lo `test -f 'src/core/settings/nm-secret-agent.c' || echo '$(srcdir)/'`src/core/settings/nm-secret-agent.c
 
-src/settings/libNetworkManager_la-nm-settings.lo: src/settings/nm-settings.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.lo -MD -MP -MF src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Tpo -c -o src/settings/libNetworkManager_la-nm-settings.lo `test -f 'src/settings/nm-settings.c' || echo '$(srcdir)/'`src/settings/nm-settings.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Tpo src/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/nm-settings.c' object='src/settings/libNetworkManager_la-nm-settings.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/libNetworkManager_la-nm-settings-connection.lo: src/core/settings/nm-settings-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/libNetworkManager_la-nm-settings-connection.lo -MD -MP -MF src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Tpo -c -o src/core/settings/libNetworkManager_la-nm-settings-connection.lo `test -f 'src/core/settings/nm-settings-connection.c' || echo '$(srcdir)/'`src/core/settings/nm-settings-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Tpo src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/nm-settings-connection.c' object='src/core/settings/libNetworkManager_la-nm-settings-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_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
+@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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/libNetworkManager_la-nm-settings-connection.lo `test -f 'src/core/settings/nm-settings-connection.c' || echo '$(srcdir)/'`src/core/settings/nm-settings-connection.c
 
-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@
+src/core/settings/libNetworkManager_la-nm-settings-storage.lo: src/core/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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/libNetworkManager_la-nm-settings-storage.lo -MD -MP -MF src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Tpo -c -o src/core/settings/libNetworkManager_la-nm-settings-storage.lo `test -f 'src/core/settings/nm-settings-storage.c' || echo '$(srcdir)/'`src/core/settings/nm-settings-storage.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Tpo src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/nm-settings-storage.c' object='src/core/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-utils.lo `test -f 'src/settings/nm-settings-utils.c' || echo '$(srcdir)/'`src/settings/nm-settings-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/libNetworkManager_la-nm-settings-storage.lo `test -f 'src/core/settings/nm-settings-storage.c' || echo '$(srcdir)/'`src/core/settings/nm-settings-storage.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@
+src/core/settings/libNetworkManager_la-nm-settings-plugin.lo: src/core/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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/libNetworkManager_la-nm-settings-plugin.lo -MD -MP -MF src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Tpo -c -o src/core/settings/libNetworkManager_la-nm-settings-plugin.lo `test -f 'src/core/settings/nm-settings-plugin.c' || echo '$(srcdir)/'`src/core/settings/nm-settings-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Tpo src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/nm-settings-plugin.c' object='src/core/settings/libNetworkManager_la-nm-settings-plugin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/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_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/libNetworkManager_la-nm-settings-plugin.lo `test -f 'src/core/settings/nm-settings-plugin.c' || echo '$(srcdir)/'`src/core/settings/nm-settings-plugin.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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Tpo src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/keyfile/nms-keyfile-plugin.c' object='src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/libNetworkManager_la-nm-settings.lo: src/core/settings/nm-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/libNetworkManager_la-nm-settings.lo -MD -MP -MF src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Tpo -c -o src/core/settings/libNetworkManager_la-nm-settings.lo `test -f 'src/core/settings/nm-settings.c' || echo '$(srcdir)/'`src/core/settings/nm-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Tpo src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/nm-settings.c' object='src/core/settings/libNetworkManager_la-nm-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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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
+@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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/libNetworkManager_la-nm-settings.lo `test -f 'src/core/settings/nm-settings.c' || echo '$(srcdir)/'`src/core/settings/nm-settings.c
 
-src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo: src/settings/plugins/keyfile/nms-keyfile-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo -MD -MP -MF src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Tpo -c -o src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-reader.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Tpo src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/keyfile/nms-keyfile-reader.c' object='src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/libNetworkManager_la-nm-settings-utils.lo: src/core/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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/libNetworkManager_la-nm-settings-utils.lo -MD -MP -MF src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Tpo -c -o src/core/settings/libNetworkManager_la-nm-settings-utils.lo `test -f 'src/core/settings/nm-settings-utils.c' || echo '$(srcdir)/'`src/core/settings/nm-settings-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Tpo src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/nm-settings-utils.c' object='src/core/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/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-reader.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-reader.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/libNetworkManager_la-nm-settings-utils.lo `test -f 'src/core/settings/nm-settings-utils.c' || echo '$(srcdir)/'`src/core/settings/nm-settings-utils.c
 
-src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo: src/settings/plugins/keyfile/nms-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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo -MD -MP -MF src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Tpo -c -o src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-utils.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Tpo src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/keyfile/nms-keyfile-utils.c' object='src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo: src/core/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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo -MD -MP -MF src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Tpo -c -o src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo `test -f 'src/core/settings/plugins/keyfile/nms-keyfile-storage.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/nms-keyfile-storage.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Tpo src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/keyfile/nms-keyfile-storage.c' object='src/core/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-utils.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-utils.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-storage.lo `test -f 'src/core/settings/plugins/keyfile/nms-keyfile-storage.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/nms-keyfile-storage.c
 
-src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo: src/settings/plugins/keyfile/nms-keyfile-writer.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo -MD -MP -MF src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Tpo -c -o src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-writer.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-writer.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Tpo src/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/keyfile/nms-keyfile-writer.c' object='src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo: src/core/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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo -MD -MP -MF src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Tpo -c -o src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo `test -f 'src/core/settings/plugins/keyfile/nms-keyfile-plugin.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Tpo src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/keyfile/nms-keyfile-plugin.c' object='src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo `test -f 'src/settings/plugins/keyfile/nms-keyfile-writer.c' || echo '$(srcdir)/'`src/settings/plugins/keyfile/nms-keyfile-writer.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-plugin.lo `test -f 'src/core/settings/plugins/keyfile/nms-keyfile-plugin.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
 
-src/supplicant/libNetworkManager_la-nm-supplicant-config.lo: src/supplicant/nm-supplicant-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/supplicant/libNetworkManager_la-nm-supplicant-config.lo -MD -MP -MF src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Tpo -c -o src/supplicant/libNetworkManager_la-nm-supplicant-config.lo `test -f 'src/supplicant/nm-supplicant-config.c' || echo '$(srcdir)/'`src/supplicant/nm-supplicant-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Tpo src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/supplicant/nm-supplicant-config.c' object='src/supplicant/libNetworkManager_la-nm-supplicant-config.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo: src/core/settings/plugins/keyfile/nms-keyfile-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo -MD -MP -MF src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Tpo -c -o src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo `test -f 'src/core/settings/plugins/keyfile/nms-keyfile-reader.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/nms-keyfile-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Tpo src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/keyfile/nms-keyfile-reader.c' object='src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/supplicant/libNetworkManager_la-nm-supplicant-config.lo `test -f 'src/supplicant/nm-supplicant-config.c' || echo '$(srcdir)/'`src/supplicant/nm-supplicant-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-reader.lo `test -f 'src/core/settings/plugins/keyfile/nms-keyfile-reader.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/nms-keyfile-reader.c
 
-src/supplicant/libNetworkManager_la-nm-supplicant-interface.lo: src/supplicant/nm-supplicant-interface.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/supplicant/libNetworkManager_la-nm-supplicant-interface.lo -MD -MP -MF src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Tpo -c -o src/supplicant/libNetworkManager_la-nm-supplicant-interface.lo `test -f 'src/supplicant/nm-supplicant-interface.c' || echo '$(srcdir)/'`src/supplicant/nm-supplicant-interface.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Tpo src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/supplicant/nm-supplicant-interface.c' object='src/supplicant/libNetworkManager_la-nm-supplicant-interface.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo: src/core/settings/plugins/keyfile/nms-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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo -MD -MP -MF src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Tpo -c -o src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo `test -f 'src/core/settings/plugins/keyfile/nms-keyfile-utils.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/nms-keyfile-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Tpo src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/keyfile/nms-keyfile-utils.c' object='src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/supplicant/libNetworkManager_la-nm-supplicant-interface.lo `test -f 'src/supplicant/nm-supplicant-interface.c' || echo '$(srcdir)/'`src/supplicant/nm-supplicant-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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-utils.lo `test -f 'src/core/settings/plugins/keyfile/nms-keyfile-utils.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/nms-keyfile-utils.c
 
-src/supplicant/libNetworkManager_la-nm-supplicant-manager.lo: src/supplicant/nm-supplicant-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/supplicant/libNetworkManager_la-nm-supplicant-manager.lo -MD -MP -MF src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Tpo -c -o src/supplicant/libNetworkManager_la-nm-supplicant-manager.lo `test -f 'src/supplicant/nm-supplicant-manager.c' || echo '$(srcdir)/'`src/supplicant/nm-supplicant-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Tpo src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/supplicant/nm-supplicant-manager.c' object='src/supplicant/libNetworkManager_la-nm-supplicant-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo: src/core/settings/plugins/keyfile/nms-keyfile-writer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo -MD -MP -MF src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Tpo -c -o src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo `test -f 'src/core/settings/plugins/keyfile/nms-keyfile-writer.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/nms-keyfile-writer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Tpo src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/keyfile/nms-keyfile-writer.c' object='src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/supplicant/libNetworkManager_la-nm-supplicant-manager.lo `test -f 'src/supplicant/nm-supplicant-manager.c' || echo '$(srcdir)/'`src/supplicant/nm-supplicant-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/keyfile/libNetworkManager_la-nms-keyfile-writer.lo `test -f 'src/core/settings/plugins/keyfile/nms-keyfile-writer.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/nms-keyfile-writer.c
 
-src/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo: src/supplicant/nm-supplicant-settings-verify.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/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo -MD -MP -MF src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Tpo -c -o src/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo `test -f 'src/supplicant/nm-supplicant-settings-verify.c' || echo '$(srcdir)/'`src/supplicant/nm-supplicant-settings-verify.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Tpo src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/supplicant/nm-supplicant-settings-verify.c' object='src/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/supplicant/libNetworkManager_la-nm-supplicant-config.lo: src/core/supplicant/nm-supplicant-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/supplicant/libNetworkManager_la-nm-supplicant-config.lo -MD -MP -MF src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Tpo -c -o src/core/supplicant/libNetworkManager_la-nm-supplicant-config.lo `test -f 'src/core/supplicant/nm-supplicant-config.c' || echo '$(srcdir)/'`src/core/supplicant/nm-supplicant-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Tpo src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/supplicant/nm-supplicant-config.c' object='src/core/supplicant/libNetworkManager_la-nm-supplicant-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo `test -f 'src/supplicant/nm-supplicant-settings-verify.c' || echo '$(srcdir)/'`src/supplicant/nm-supplicant-settings-verify.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/supplicant/libNetworkManager_la-nm-supplicant-config.lo `test -f 'src/core/supplicant/nm-supplicant-config.c' || echo '$(srcdir)/'`src/core/supplicant/nm-supplicant-config.c
 
-src/vpn/libNetworkManager_la-nm-vpn-connection.lo: src/vpn/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/vpn/libNetworkManager_la-nm-vpn-connection.lo -MD -MP -MF src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Tpo -c -o src/vpn/libNetworkManager_la-nm-vpn-connection.lo `test -f 'src/vpn/nm-vpn-connection.c' || echo '$(srcdir)/'`src/vpn/nm-vpn-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Tpo src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/vpn/nm-vpn-connection.c' object='src/vpn/libNetworkManager_la-nm-vpn-connection.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/supplicant/libNetworkManager_la-nm-supplicant-interface.lo: src/core/supplicant/nm-supplicant-interface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/supplicant/libNetworkManager_la-nm-supplicant-interface.lo -MD -MP -MF src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Tpo -c -o src/core/supplicant/libNetworkManager_la-nm-supplicant-interface.lo `test -f 'src/core/supplicant/nm-supplicant-interface.c' || echo '$(srcdir)/'`src/core/supplicant/nm-supplicant-interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Tpo src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/supplicant/nm-supplicant-interface.c' object='src/core/supplicant/libNetworkManager_la-nm-supplicant-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/vpn/libNetworkManager_la-nm-vpn-connection.lo `test -f 'src/vpn/nm-vpn-connection.c' || echo '$(srcdir)/'`src/vpn/nm-vpn-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/supplicant/libNetworkManager_la-nm-supplicant-interface.lo `test -f 'src/core/supplicant/nm-supplicant-interface.c' || echo '$(srcdir)/'`src/core/supplicant/nm-supplicant-interface.c
 
-src/vpn/libNetworkManager_la-nm-vpn-manager.lo: src/vpn/nm-vpn-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/vpn/libNetworkManager_la-nm-vpn-manager.lo -MD -MP -MF src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Tpo -c -o src/vpn/libNetworkManager_la-nm-vpn-manager.lo `test -f 'src/vpn/nm-vpn-manager.c' || echo '$(srcdir)/'`src/vpn/nm-vpn-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Tpo src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/vpn/nm-vpn-manager.c' object='src/vpn/libNetworkManager_la-nm-vpn-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/supplicant/libNetworkManager_la-nm-supplicant-manager.lo: src/core/supplicant/nm-supplicant-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/supplicant/libNetworkManager_la-nm-supplicant-manager.lo -MD -MP -MF src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Tpo -c -o src/core/supplicant/libNetworkManager_la-nm-supplicant-manager.lo `test -f 'src/core/supplicant/nm-supplicant-manager.c' || echo '$(srcdir)/'`src/core/supplicant/nm-supplicant-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Tpo src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/supplicant/nm-supplicant-manager.c' object='src/core/supplicant/libNetworkManager_la-nm-supplicant-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/vpn/libNetworkManager_la-nm-vpn-manager.lo `test -f 'src/vpn/nm-vpn-manager.c' || echo '$(srcdir)/'`src/vpn/nm-vpn-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/supplicant/libNetworkManager_la-nm-supplicant-manager.lo `test -f 'src/core/supplicant/nm-supplicant-manager.c' || echo '$(srcdir)/'`src/core/supplicant/nm-supplicant-manager.c
 
-src/libNetworkManager_la-nm-act-request.lo: src/nm-act-request.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-act-request.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-act-request.Tpo -c -o src/libNetworkManager_la-nm-act-request.lo `test -f 'src/nm-act-request.c' || echo '$(srcdir)/'`src/nm-act-request.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-act-request.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-act-request.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-act-request.c' object='src/libNetworkManager_la-nm-act-request.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo: src/core/supplicant/nm-supplicant-settings-verify.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo -MD -MP -MF src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Tpo -c -o src/core/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo `test -f 'src/core/supplicant/nm-supplicant-settings-verify.c' || echo '$(srcdir)/'`src/core/supplicant/nm-supplicant-settings-verify.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Tpo src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/supplicant/nm-supplicant-settings-verify.c' object='src/core/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-act-request.lo `test -f 'src/nm-act-request.c' || echo '$(srcdir)/'`src/nm-act-request.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/supplicant/libNetworkManager_la-nm-supplicant-settings-verify.lo `test -f 'src/core/supplicant/nm-supplicant-settings-verify.c' || echo '$(srcdir)/'`src/core/supplicant/nm-supplicant-settings-verify.c
 
-src/libNetworkManager_la-nm-active-connection.lo: src/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-active-connection.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Tpo -c -o src/libNetworkManager_la-nm-active-connection.lo `test -f 'src/nm-active-connection.c' || echo '$(srcdir)/'`src/nm-active-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-active-connection.c' object='src/libNetworkManager_la-nm-active-connection.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/vpn/libNetworkManager_la-nm-vpn-connection.lo: src/core/vpn/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/vpn/libNetworkManager_la-nm-vpn-connection.lo -MD -MP -MF src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Tpo -c -o src/core/vpn/libNetworkManager_la-nm-vpn-connection.lo `test -f 'src/core/vpn/nm-vpn-connection.c' || echo '$(srcdir)/'`src/core/vpn/nm-vpn-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Tpo src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/vpn/nm-vpn-connection.c' object='src/core/vpn/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-active-connection.lo `test -f 'src/nm-active-connection.c' || echo '$(srcdir)/'`src/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/vpn/libNetworkManager_la-nm-vpn-connection.lo `test -f 'src/core/vpn/nm-vpn-connection.c' || echo '$(srcdir)/'`src/core/vpn/nm-vpn-connection.c
 
-src/libNetworkManager_la-nm-audit-manager.lo: src/nm-audit-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-audit-manager.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Tpo -c -o src/libNetworkManager_la-nm-audit-manager.lo `test -f 'src/nm-audit-manager.c' || echo '$(srcdir)/'`src/nm-audit-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-audit-manager.c' object='src/libNetworkManager_la-nm-audit-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/vpn/libNetworkManager_la-nm-vpn-manager.lo: src/core/vpn/nm-vpn-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/vpn/libNetworkManager_la-nm-vpn-manager.lo -MD -MP -MF src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Tpo -c -o src/core/vpn/libNetworkManager_la-nm-vpn-manager.lo `test -f 'src/core/vpn/nm-vpn-manager.c' || echo '$(srcdir)/'`src/core/vpn/nm-vpn-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Tpo src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/vpn/nm-vpn-manager.c' object='src/core/vpn/libNetworkManager_la-nm-vpn-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-audit-manager.lo `test -f 'src/nm-audit-manager.c' || echo '$(srcdir)/'`src/nm-audit-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/vpn/libNetworkManager_la-nm-vpn-manager.lo `test -f 'src/core/vpn/nm-vpn-manager.c' || echo '$(srcdir)/'`src/core/vpn/nm-vpn-manager.c
 
-src/libNetworkManager_la-nm-dbus-manager.lo: src/nm-dbus-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-dbus-manager.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Tpo -c -o src/libNetworkManager_la-nm-dbus-manager.lo `test -f 'src/nm-dbus-manager.c' || echo '$(srcdir)/'`src/nm-dbus-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dbus-manager.c' object='src/libNetworkManager_la-nm-dbus-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-act-request.lo: src/core/nm-act-request.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-act-request.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-act-request.Tpo -c -o src/core/libNetworkManager_la-nm-act-request.lo `test -f 'src/core/nm-act-request.c' || echo '$(srcdir)/'`src/core/nm-act-request.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-act-request.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-act-request.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-act-request.c' object='src/core/libNetworkManager_la-nm-act-request.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-dbus-manager.lo `test -f 'src/nm-dbus-manager.c' || echo '$(srcdir)/'`src/nm-dbus-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-act-request.lo `test -f 'src/core/nm-act-request.c' || echo '$(srcdir)/'`src/core/nm-act-request.c
 
-src/libNetworkManager_la-nm-config.lo: src/nm-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-config.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-config.Tpo -c -o src/libNetworkManager_la-nm-config.lo `test -f 'src/nm-config.c' || echo '$(srcdir)/'`src/nm-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-config.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-config.c' object='src/libNetworkManager_la-nm-config.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-active-connection.lo: src/core/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-active-connection.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Tpo -c -o src/core/libNetworkManager_la-nm-active-connection.lo `test -f 'src/core/nm-active-connection.c' || echo '$(srcdir)/'`src/core/nm-active-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-active-connection.c' object='src/core/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-config.lo `test -f 'src/nm-config.c' || echo '$(srcdir)/'`src/nm-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-active-connection.lo `test -f 'src/core/nm-active-connection.c' || echo '$(srcdir)/'`src/core/nm-active-connection.c
 
-src/libNetworkManager_la-nm-config-data.lo: src/nm-config-data.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-config-data.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-config-data.Tpo -c -o src/libNetworkManager_la-nm-config-data.lo `test -f 'src/nm-config-data.c' || echo '$(srcdir)/'`src/nm-config-data.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-config-data.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-config-data.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-config-data.c' object='src/libNetworkManager_la-nm-config-data.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-audit-manager.lo: src/core/nm-audit-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-audit-manager.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Tpo -c -o src/core/libNetworkManager_la-nm-audit-manager.lo `test -f 'src/core/nm-audit-manager.c' || echo '$(srcdir)/'`src/core/nm-audit-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-audit-manager.c' object='src/core/libNetworkManager_la-nm-audit-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-config-data.lo `test -f 'src/nm-config-data.c' || echo '$(srcdir)/'`src/nm-config-data.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-audit-manager.lo `test -f 'src/core/nm-audit-manager.c' || echo '$(srcdir)/'`src/core/nm-audit-manager.c
 
-src/libNetworkManager_la-nm-connectivity.lo: src/nm-connectivity.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-connectivity.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Tpo -c -o src/libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-connectivity.c' object='src/libNetworkManager_la-nm-connectivity.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-dbus-manager.lo: src/core/nm-dbus-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-dbus-manager.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Tpo -c -o src/core/libNetworkManager_la-nm-dbus-manager.lo `test -f 'src/core/nm-dbus-manager.c' || echo '$(srcdir)/'`src/core/nm-dbus-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-dbus-manager.c' object='src/core/libNetworkManager_la-nm-dbus-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-dbus-manager.lo `test -f 'src/core/nm-dbus-manager.c' || echo '$(srcdir)/'`src/core/nm-dbus-manager.c
 
-src/libNetworkManager_la-nm-dcb.lo: src/nm-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-dcb.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Tpo -c -o src/libNetworkManager_la-nm-dcb.lo `test -f 'src/nm-dcb.c' || echo '$(srcdir)/'`src/nm-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dcb.c' object='src/libNetworkManager_la-nm-dcb.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-config.lo: src/core/nm-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-config.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-config.Tpo -c -o src/core/libNetworkManager_la-nm-config.lo `test -f 'src/core/nm-config.c' || echo '$(srcdir)/'`src/core/nm-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-config.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-config.c' object='src/core/libNetworkManager_la-nm-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-dcb.lo `test -f 'src/nm-dcb.c' || echo '$(srcdir)/'`src/nm-dcb.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-config.lo `test -f 'src/core/nm-config.c' || echo '$(srcdir)/'`src/core/nm-config.c
 
-src/libNetworkManager_la-nm-dhcp-config.lo: src/nm-dhcp-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-dhcp-config.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Tpo -c -o src/libNetworkManager_la-nm-dhcp-config.lo `test -f 'src/nm-dhcp-config.c' || echo '$(srcdir)/'`src/nm-dhcp-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dhcp-config.c' object='src/libNetworkManager_la-nm-dhcp-config.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-config-data.lo: src/core/nm-config-data.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-config-data.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-config-data.Tpo -c -o src/core/libNetworkManager_la-nm-config-data.lo `test -f 'src/core/nm-config-data.c' || echo '$(srcdir)/'`src/core/nm-config-data.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-config-data.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-config-data.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-config-data.c' object='src/core/libNetworkManager_la-nm-config-data.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-dhcp-config.lo `test -f 'src/nm-dhcp-config.c' || echo '$(srcdir)/'`src/nm-dhcp-config.c
+@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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-config-data.lo `test -f 'src/core/nm-config-data.c' || echo '$(srcdir)/'`src/core/nm-config-data.c
 
-src/libNetworkManager_la-nm-dispatcher.lo: src/nm-dispatcher.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-dispatcher.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Tpo -c -o src/libNetworkManager_la-nm-dispatcher.lo `test -f 'src/nm-dispatcher.c' || echo '$(srcdir)/'`src/nm-dispatcher.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dispatcher.c' object='src/libNetworkManager_la-nm-dispatcher.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-connectivity.lo: src/core/nm-connectivity.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-connectivity.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Tpo -c -o src/core/libNetworkManager_la-nm-connectivity.lo `test -f 'src/core/nm-connectivity.c' || echo '$(srcdir)/'`src/core/nm-connectivity.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-connectivity.c' object='src/core/libNetworkManager_la-nm-connectivity.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-dispatcher.lo `test -f 'src/nm-dispatcher.c' || echo '$(srcdir)/'`src/nm-dispatcher.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-connectivity.lo `test -f 'src/core/nm-connectivity.c' || echo '$(srcdir)/'`src/core/nm-connectivity.c
 
-src/libNetworkManager_la-nm-firewall-manager.lo: src/nm-firewall-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-firewall-manager.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Tpo -c -o src/libNetworkManager_la-nm-firewall-manager.lo `test -f 'src/nm-firewall-manager.c' || echo '$(srcdir)/'`src/nm-firewall-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-firewall-manager.c' object='src/libNetworkManager_la-nm-firewall-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-dcb.lo: src/core/nm-dcb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-dcb.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-dcb.Tpo -c -o src/core/libNetworkManager_la-nm-dcb.lo `test -f 'src/core/nm-dcb.c' || echo '$(srcdir)/'`src/core/nm-dcb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-dcb.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-dcb.c' object='src/core/libNetworkManager_la-nm-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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-firewall-manager.lo `test -f 'src/nm-firewall-manager.c' || echo '$(srcdir)/'`src/nm-firewall-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-dcb.lo `test -f 'src/core/nm-dcb.c' || echo '$(srcdir)/'`src/core/nm-dcb.c
 
-src/libNetworkManager_la-nm-proxy-config.lo: src/nm-proxy-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-proxy-config.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Tpo -c -o src/libNetworkManager_la-nm-proxy-config.lo `test -f 'src/nm-proxy-config.c' || echo '$(srcdir)/'`src/nm-proxy-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-proxy-config.c' object='src/libNetworkManager_la-nm-proxy-config.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-dhcp-config.lo: src/core/nm-dhcp-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-dhcp-config.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Tpo -c -o src/core/libNetworkManager_la-nm-dhcp-config.lo `test -f 'src/core/nm-dhcp-config.c' || echo '$(srcdir)/'`src/core/nm-dhcp-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-dhcp-config.c' object='src/core/libNetworkManager_la-nm-dhcp-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-proxy-config.lo `test -f 'src/nm-proxy-config.c' || echo '$(srcdir)/'`src/nm-proxy-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-dhcp-config.lo `test -f 'src/core/nm-dhcp-config.c' || echo '$(srcdir)/'`src/core/nm-dhcp-config.c
 
-src/libNetworkManager_la-nm-auth-manager.lo: src/nm-auth-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-auth-manager.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Tpo -c -o src/libNetworkManager_la-nm-auth-manager.lo `test -f 'src/nm-auth-manager.c' || echo '$(srcdir)/'`src/nm-auth-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-auth-manager.c' object='src/libNetworkManager_la-nm-auth-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-dispatcher.lo: src/core/nm-dispatcher.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-dispatcher.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Tpo -c -o src/core/libNetworkManager_la-nm-dispatcher.lo `test -f 'src/core/nm-dispatcher.c' || echo '$(srcdir)/'`src/core/nm-dispatcher.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-dispatcher.c' object='src/core/libNetworkManager_la-nm-dispatcher.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-auth-manager.lo `test -f 'src/nm-auth-manager.c' || echo '$(srcdir)/'`src/nm-auth-manager.c
+@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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-dispatcher.lo `test -f 'src/core/nm-dispatcher.c' || echo '$(srcdir)/'`src/core/nm-dispatcher.c
 
-src/libNetworkManager_la-nm-auth-utils.lo: src/nm-auth-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-auth-utils.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Tpo -c -o src/libNetworkManager_la-nm-auth-utils.lo `test -f 'src/nm-auth-utils.c' || echo '$(srcdir)/'`src/nm-auth-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-auth-utils.c' object='src/libNetworkManager_la-nm-auth-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-firewall-manager.lo: src/core/nm-firewall-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-firewall-manager.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Tpo -c -o src/core/libNetworkManager_la-nm-firewall-manager.lo `test -f 'src/core/nm-firewall-manager.c' || echo '$(srcdir)/'`src/core/nm-firewall-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-firewall-manager.c' object='src/core/libNetworkManager_la-nm-firewall-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-auth-utils.lo `test -f 'src/nm-auth-utils.c' || echo '$(srcdir)/'`src/nm-auth-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-firewall-manager.lo `test -f 'src/core/nm-firewall-manager.c' || echo '$(srcdir)/'`src/core/nm-firewall-manager.c
 
-src/libNetworkManager_la-nm-manager.lo: src/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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-manager.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-manager.Tpo -c -o src/libNetworkManager_la-nm-manager.lo `test -f 'src/nm-manager.c' || echo '$(srcdir)/'`src/nm-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-manager.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-manager.c' object='src/libNetworkManager_la-nm-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-proxy-config.lo: src/core/nm-proxy-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-proxy-config.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Tpo -c -o src/core/libNetworkManager_la-nm-proxy-config.lo `test -f 'src/core/nm-proxy-config.c' || echo '$(srcdir)/'`src/core/nm-proxy-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-proxy-config.c' object='src/core/libNetworkManager_la-nm-proxy-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-manager.lo `test -f 'src/nm-manager.c' || echo '$(srcdir)/'`src/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-proxy-config.lo `test -f 'src/core/nm-proxy-config.c' || echo '$(srcdir)/'`src/core/nm-proxy-config.c
 
-src/libNetworkManager_la-nm-pacrunner-manager.lo: src/nm-pacrunner-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-pacrunner-manager.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Tpo -c -o src/libNetworkManager_la-nm-pacrunner-manager.lo `test -f 'src/nm-pacrunner-manager.c' || echo '$(srcdir)/'`src/nm-pacrunner-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-pacrunner-manager.c' object='src/libNetworkManager_la-nm-pacrunner-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-auth-manager.lo: src/core/nm-auth-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-auth-manager.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Tpo -c -o src/core/libNetworkManager_la-nm-auth-manager.lo `test -f 'src/core/nm-auth-manager.c' || echo '$(srcdir)/'`src/core/nm-auth-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-auth-manager.c' object='src/core/libNetworkManager_la-nm-auth-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-pacrunner-manager.lo `test -f 'src/nm-pacrunner-manager.c' || echo '$(srcdir)/'`src/nm-pacrunner-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-auth-manager.lo `test -f 'src/core/nm-auth-manager.c' || echo '$(srcdir)/'`src/core/nm-auth-manager.c
 
-src/libNetworkManager_la-nm-policy.lo: src/nm-policy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-policy.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-policy.Tpo -c -o src/libNetworkManager_la-nm-policy.lo `test -f 'src/nm-policy.c' || echo '$(srcdir)/'`src/nm-policy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-policy.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-policy.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-policy.c' object='src/libNetworkManager_la-nm-policy.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-auth-utils.lo: src/core/nm-auth-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-auth-utils.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Tpo -c -o src/core/libNetworkManager_la-nm-auth-utils.lo `test -f 'src/core/nm-auth-utils.c' || echo '$(srcdir)/'`src/core/nm-auth-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-auth-utils.c' object='src/core/libNetworkManager_la-nm-auth-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/libNetworkManager_la-nm-policy.lo `test -f 'src/nm-policy.c' || echo '$(srcdir)/'`src/nm-policy.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-auth-utils.lo `test -f 'src/core/nm-auth-utils.c' || echo '$(srcdir)/'`src/core/nm-auth-utils.c
 
-src/libNetworkManager_la-nm-rfkill-manager.lo: src/nm-rfkill-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-rfkill-manager.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Tpo -c -o src/libNetworkManager_la-nm-rfkill-manager.lo `test -f 'src/nm-rfkill-manager.c' || echo '$(srcdir)/'`src/nm-rfkill-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-rfkill-manager.c' object='src/libNetworkManager_la-nm-rfkill-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-manager.lo: src/core/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) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-manager.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-manager.Tpo -c -o src/core/libNetworkManager_la-nm-manager.lo `test -f 'src/core/nm-manager.c' || echo '$(srcdir)/'`src/core/nm-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-manager.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-manager.c' object='src/core/libNetworkManager_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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-rfkill-manager.lo `test -f 'src/nm-rfkill-manager.c' || echo '$(srcdir)/'`src/nm-rfkill-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-manager.lo `test -f 'src/core/nm-manager.c' || echo '$(srcdir)/'`src/core/nm-manager.c
 
-src/libNetworkManager_la-nm-session-monitor.lo: src/nm-session-monitor.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-session-monitor.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Tpo -c -o src/libNetworkManager_la-nm-session-monitor.lo `test -f 'src/nm-session-monitor.c' || echo '$(srcdir)/'`src/nm-session-monitor.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-session-monitor.c' object='src/libNetworkManager_la-nm-session-monitor.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-pacrunner-manager.lo: src/core/nm-pacrunner-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-pacrunner-manager.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Tpo -c -o src/core/libNetworkManager_la-nm-pacrunner-manager.lo `test -f 'src/core/nm-pacrunner-manager.c' || echo '$(srcdir)/'`src/core/nm-pacrunner-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-pacrunner-manager.c' object='src/core/libNetworkManager_la-nm-pacrunner-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-session-monitor.lo `test -f 'src/nm-session-monitor.c' || echo '$(srcdir)/'`src/nm-session-monitor.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-pacrunner-manager.lo `test -f 'src/core/nm-pacrunner-manager.c' || echo '$(srcdir)/'`src/core/nm-pacrunner-manager.c
 
-src/libNetworkManager_la-nm-keep-alive.lo: src/nm-keep-alive.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-keep-alive.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Tpo -c -o src/libNetworkManager_la-nm-keep-alive.lo `test -f 'src/nm-keep-alive.c' || echo '$(srcdir)/'`src/nm-keep-alive.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-keep-alive.c' object='src/libNetworkManager_la-nm-keep-alive.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-policy.lo: src/core/nm-policy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-policy.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-policy.Tpo -c -o src/core/libNetworkManager_la-nm-policy.lo `test -f 'src/core/nm-policy.c' || echo '$(srcdir)/'`src/core/nm-policy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-policy.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-policy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-policy.c' object='src/core/libNetworkManager_la-nm-policy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-keep-alive.lo `test -f 'src/nm-keep-alive.c' || echo '$(srcdir)/'`src/nm-keep-alive.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-policy.lo `test -f 'src/core/nm-policy.c' || echo '$(srcdir)/'`src/core/nm-policy.c
 
-src/libNetworkManager_la-nm-sleep-monitor.lo: src/nm-sleep-monitor.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-sleep-monitor.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Tpo -c -o src/libNetworkManager_la-nm-sleep-monitor.lo `test -f 'src/nm-sleep-monitor.c' || echo '$(srcdir)/'`src/nm-sleep-monitor.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-sleep-monitor.c' object='src/libNetworkManager_la-nm-sleep-monitor.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-rfkill-manager.lo: src/core/nm-rfkill-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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-rfkill-manager.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Tpo -c -o src/core/libNetworkManager_la-nm-rfkill-manager.lo `test -f 'src/core/nm-rfkill-manager.c' || echo '$(srcdir)/'`src/core/nm-rfkill-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-rfkill-manager.c' object='src/core/libNetworkManager_la-nm-rfkill-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-sleep-monitor.lo `test -f 'src/nm-sleep-monitor.c' || echo '$(srcdir)/'`src/nm-sleep-monitor.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-rfkill-manager.lo `test -f 'src/core/nm-rfkill-manager.c' || echo '$(srcdir)/'`src/core/nm-rfkill-manager.c
 
-src/libNetworkManagerBase_la-nm-core-utils.lo: src/nm-core-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManagerBase_la-nm-core-utils.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Tpo -c -o src/libNetworkManagerBase_la-nm-core-utils.lo `test -f 'src/nm-core-utils.c' || echo '$(srcdir)/'`src/nm-core-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-core-utils.c' object='src/libNetworkManagerBase_la-nm-core-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-session-monitor.lo: src/core/nm-session-monitor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-session-monitor.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Tpo -c -o src/core/libNetworkManager_la-nm-session-monitor.lo `test -f 'src/core/nm-session-monitor.c' || echo '$(srcdir)/'`src/core/nm-session-monitor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-session-monitor.c' object='src/core/libNetworkManager_la-nm-session-monitor.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/libNetworkManagerBase_la-nm-core-utils.lo `test -f 'src/nm-core-utils.c' || echo '$(srcdir)/'`src/nm-core-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-session-monitor.lo `test -f 'src/core/nm-session-monitor.c' || echo '$(srcdir)/'`src/core/nm-session-monitor.c
 
-src/libNetworkManagerBase_la-nm-logging.lo: src/nm-logging.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/libNetworkManagerBase_la-nm-logging.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-nm-logging.Tpo -c -o src/libNetworkManagerBase_la-nm-logging.lo `test -f 'src/nm-logging.c' || echo '$(srcdir)/'`src/nm-logging.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-nm-logging.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-nm-logging.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-logging.c' object='src/libNetworkManagerBase_la-nm-logging.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-keep-alive.lo: src/core/nm-keep-alive.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-keep-alive.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Tpo -c -o src/core/libNetworkManager_la-nm-keep-alive.lo `test -f 'src/core/nm-keep-alive.c' || echo '$(srcdir)/'`src/core/nm-keep-alive.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-keep-alive.c' object='src/core/libNetworkManager_la-nm-keep-alive.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/libNetworkManagerBase_la-nm-logging.lo `test -f 'src/nm-logging.c' || echo '$(srcdir)/'`src/nm-logging.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-keep-alive.lo `test -f 'src/core/nm-keep-alive.c' || echo '$(srcdir)/'`src/core/nm-keep-alive.c
 
-src/libNetworkManagerBase_la-NetworkManagerUtils.lo: src/NetworkManagerUtils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManagerBase_la-NetworkManagerUtils.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Tpo -c -o src/libNetworkManagerBase_la-NetworkManagerUtils.lo `test -f 'src/NetworkManagerUtils.c' || echo '$(srcdir)/'`src/NetworkManagerUtils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/NetworkManagerUtils.c' object='src/libNetworkManagerBase_la-NetworkManagerUtils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManager_la-nm-sleep-monitor.lo: src/core/nm-sleep-monitor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManager_la-nm-sleep-monitor.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Tpo -c -o src/core/libNetworkManager_la-nm-sleep-monitor.lo `test -f 'src/core/nm-sleep-monitor.c' || echo '$(srcdir)/'`src/core/nm-sleep-monitor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Tpo src/core/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-sleep-monitor.c' object='src/core/libNetworkManager_la-nm-sleep-monitor.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/libNetworkManagerBase_la-NetworkManagerUtils.lo `test -f 'src/NetworkManagerUtils.c' || echo '$(srcdir)/'`src/NetworkManagerUtils.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_core_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManager_la-nm-sleep-monitor.lo `test -f 'src/core/nm-sleep-monitor.c' || echo '$(srcdir)/'`src/core/nm-sleep-monitor.c
 
-src/platform/libNetworkManagerBase_la-nm-netlink.lo: src/platform/nm-netlink.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/libNetworkManagerBase_la-nm-netlink.lo -MD -MP -MF src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-netlink.Tpo -c -o src/platform/libNetworkManagerBase_la-nm-netlink.lo `test -f 'src/platform/nm-netlink.c' || echo '$(srcdir)/'`src/platform/nm-netlink.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-netlink.Tpo src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-netlink.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/nm-netlink.c' object='src/platform/libNetworkManagerBase_la-nm-netlink.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-nm-core-utils.lo: src/core/nm-core-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-nm-core-utils.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Tpo -c -o src/core/libNetworkManagerBase_la-nm-core-utils.lo `test -f 'src/core/nm-core-utils.c' || echo '$(srcdir)/'`src/core/nm-core-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-core-utils.c' object='src/core/libNetworkManagerBase_la-nm-core-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/libNetworkManagerBase_la-nm-netlink.lo `test -f 'src/platform/nm-netlink.c' || echo '$(srcdir)/'`src/platform/nm-netlink.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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-nm-core-utils.lo `test -f 'src/core/nm-core-utils.c' || echo '$(srcdir)/'`src/core/nm-core-utils.c
 
-src/platform/libNetworkManagerBase_la-nmp-netns.lo: src/platform/nmp-netns.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/libNetworkManagerBase_la-nmp-netns.lo -MD -MP -MF src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Tpo -c -o src/platform/libNetworkManagerBase_la-nmp-netns.lo `test -f 'src/platform/nmp-netns.c' || echo '$(srcdir)/'`src/platform/nmp-netns.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Tpo src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/nmp-netns.c' object='src/platform/libNetworkManagerBase_la-nmp-netns.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-NetworkManagerUtils.lo: src/core/NetworkManagerUtils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-NetworkManagerUtils.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Tpo -c -o src/core/libNetworkManagerBase_la-NetworkManagerUtils.lo `test -f 'src/core/NetworkManagerUtils.c' || echo '$(srcdir)/'`src/core/NetworkManagerUtils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/NetworkManagerUtils.c' object='src/core/libNetworkManagerBase_la-NetworkManagerUtils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/libNetworkManagerBase_la-nmp-netns.lo `test -f 'src/platform/nmp-netns.c' || echo '$(srcdir)/'`src/platform/nmp-netns.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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-NetworkManagerUtils.lo `test -f 'src/core/NetworkManagerUtils.c' || echo '$(srcdir)/'`src/core/NetworkManagerUtils.c
 
-src/platform/libNetworkManagerBase_la-nmp-object.lo: src/platform/nmp-object.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/libNetworkManagerBase_la-nmp-object.lo -MD -MP -MF src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Tpo -c -o src/platform/libNetworkManagerBase_la-nmp-object.lo `test -f 'src/platform/nmp-object.c' || echo '$(srcdir)/'`src/platform/nmp-object.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Tpo src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/nmp-object.c' object='src/platform/libNetworkManagerBase_la-nmp-object.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/platform/libNetworkManagerBase_la-nmp-object.lo: src/core/platform/nmp-object.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/libNetworkManagerBase_la-nmp-object.lo -MD -MP -MF src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Tpo -c -o src/core/platform/libNetworkManagerBase_la-nmp-object.lo `test -f 'src/core/platform/nmp-object.c' || echo '$(srcdir)/'`src/core/platform/nmp-object.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Tpo src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/nmp-object.c' object='src/core/platform/libNetworkManagerBase_la-nmp-object.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/libNetworkManagerBase_la-nmp-object.lo `test -f 'src/platform/nmp-object.c' || echo '$(srcdir)/'`src/platform/nmp-object.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/libNetworkManagerBase_la-nmp-object.lo `test -f 'src/core/platform/nmp-object.c' || echo '$(srcdir)/'`src/core/platform/nmp-object.c
 
-src/platform/libNetworkManagerBase_la-nm-platform-utils.lo: src/platform/nm-platform-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/libNetworkManagerBase_la-nm-platform-utils.lo -MD -MP -MF src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform-utils.Tpo -c -o src/platform/libNetworkManagerBase_la-nm-platform-utils.lo `test -f 'src/platform/nm-platform-utils.c' || echo '$(srcdir)/'`src/platform/nm-platform-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform-utils.Tpo src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/nm-platform-utils.c' object='src/platform/libNetworkManagerBase_la-nm-platform-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/platform/libNetworkManagerBase_la-nm-platform.lo: src/core/platform/nm-platform.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/libNetworkManagerBase_la-nm-platform.lo -MD -MP -MF src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Tpo -c -o src/core/platform/libNetworkManagerBase_la-nm-platform.lo `test -f 'src/core/platform/nm-platform.c' || echo '$(srcdir)/'`src/core/platform/nm-platform.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Tpo src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/nm-platform.c' object='src/core/platform/libNetworkManagerBase_la-nm-platform.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/libNetworkManagerBase_la-nm-platform-utils.lo `test -f 'src/platform/nm-platform-utils.c' || echo '$(srcdir)/'`src/platform/nm-platform-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/libNetworkManagerBase_la-nm-platform.lo `test -f 'src/core/platform/nm-platform.c' || echo '$(srcdir)/'`src/core/platform/nm-platform.c
 
-src/platform/libNetworkManagerBase_la-nm-platform.lo: src/platform/nm-platform.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/libNetworkManagerBase_la-nm-platform.lo -MD -MP -MF src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Tpo -c -o src/platform/libNetworkManagerBase_la-nm-platform.lo `test -f 'src/platform/nm-platform.c' || echo '$(srcdir)/'`src/platform/nm-platform.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Tpo src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/nm-platform.c' object='src/platform/libNetworkManagerBase_la-nm-platform.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/platform/libNetworkManagerBase_la-nm-linux-platform.lo: src/core/platform/nm-linux-platform.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/libNetworkManagerBase_la-nm-linux-platform.lo -MD -MP -MF src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Tpo -c -o src/core/platform/libNetworkManagerBase_la-nm-linux-platform.lo `test -f 'src/core/platform/nm-linux-platform.c' || echo '$(srcdir)/'`src/core/platform/nm-linux-platform.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Tpo src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/nm-linux-platform.c' object='src/core/platform/libNetworkManagerBase_la-nm-linux-platform.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/libNetworkManagerBase_la-nm-platform.lo `test -f 'src/platform/nm-platform.c' || echo '$(srcdir)/'`src/platform/nm-platform.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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/libNetworkManagerBase_la-nm-linux-platform.lo `test -f 'src/core/platform/nm-linux-platform.c' || echo '$(srcdir)/'`src/core/platform/nm-linux-platform.c
 
-src/platform/libNetworkManagerBase_la-nm-linux-platform.lo: src/platform/nm-linux-platform.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/libNetworkManagerBase_la-nm-linux-platform.lo -MD -MP -MF src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Tpo -c -o src/platform/libNetworkManagerBase_la-nm-linux-platform.lo `test -f 'src/platform/nm-linux-platform.c' || echo '$(srcdir)/'`src/platform/nm-linux-platform.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Tpo src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/nm-linux-platform.c' object='src/platform/libNetworkManagerBase_la-nm-linux-platform.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/platform/libNetworkManagerBase_la-nmp-rules-manager.lo: src/core/platform/nmp-rules-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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/libNetworkManagerBase_la-nmp-rules-manager.lo -MD -MP -MF src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Tpo -c -o src/core/platform/libNetworkManagerBase_la-nmp-rules-manager.lo `test -f 'src/core/platform/nmp-rules-manager.c' || echo '$(srcdir)/'`src/core/platform/nmp-rules-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Tpo src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/nmp-rules-manager.c' object='src/core/platform/libNetworkManagerBase_la-nmp-rules-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/libNetworkManagerBase_la-nm-linux-platform.lo `test -f 'src/platform/nm-linux-platform.c' || echo '$(srcdir)/'`src/platform/nm-linux-platform.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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/libNetworkManagerBase_la-nmp-rules-manager.lo `test -f 'src/core/platform/nmp-rules-manager.c' || echo '$(srcdir)/'`src/core/platform/nmp-rules-manager.c
 
-src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo: src/platform/nmp-rules-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo -MD -MP -MF src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Tpo -c -o src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo `test -f 'src/platform/nmp-rules-manager.c' || echo '$(srcdir)/'`src/platform/nmp-rules-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Tpo src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/nmp-rules-manager.c' object='src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo: src/core/platform/wifi/nm-wifi-utils-nl80211.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo -MD -MP -MF src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Tpo -c -o src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo `test -f 'src/core/platform/wifi/nm-wifi-utils-nl80211.c' || echo '$(srcdir)/'`src/core/platform/wifi/nm-wifi-utils-nl80211.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Tpo src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/wifi/nm-wifi-utils-nl80211.c' object='src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo `test -f 'src/platform/nmp-rules-manager.c' || echo '$(srcdir)/'`src/platform/nmp-rules-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo `test -f 'src/core/platform/wifi/nm-wifi-utils-nl80211.c' || echo '$(srcdir)/'`src/core/platform/wifi/nm-wifi-utils-nl80211.c
 
-src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo: src/platform/wifi/nm-wifi-utils-nl80211.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo -MD -MP -MF src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Tpo -c -o src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo `test -f 'src/platform/wifi/nm-wifi-utils-nl80211.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils-nl80211.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Tpo src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wifi/nm-wifi-utils-nl80211.c' object='src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo: src/core/platform/wifi/nm-wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo -MD -MP -MF src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Tpo -c -o src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo `test -f 'src/core/platform/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/core/platform/wifi/nm-wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Tpo src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/wifi/nm-wifi-utils.c' object='src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo `test -f 'src/platform/wifi/nm-wifi-utils-nl80211.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils-nl80211.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo `test -f 'src/core/platform/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/core/platform/wifi/nm-wifi-utils.c
 
-src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo: src/platform/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo -MD -MP -MF src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Tpo -c -o src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo `test -f 'src/platform/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Tpo src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wifi/nm-wifi-utils.c' object='src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo: src/core/platform/wpan/nm-wpan-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo -MD -MP -MF src/core/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Tpo -c -o src/core/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo `test -f 'src/core/platform/wpan/nm-wpan-utils.c' || echo '$(srcdir)/'`src/core/platform/wpan/nm-wpan-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Tpo src/core/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/wpan/nm-wpan-utils.c' object='src/core/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo `test -f 'src/platform/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo `test -f 'src/core/platform/wpan/nm-wpan-utils.c' || echo '$(srcdir)/'`src/core/platform/wpan/nm-wpan-utils.c
 
-src/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo: src/platform/wpan/nm-wpan-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo -MD -MP -MF src/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Tpo -c -o src/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo `test -f 'src/platform/wpan/nm-wpan-utils.c' || echo '$(srcdir)/'`src/platform/wpan/nm-wpan-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Tpo src/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wpan/nm-wpan-utils.c' object='src/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo: src/core/ndisc/nm-lndp-ndisc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo -MD -MP -MF src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Tpo -c -o src/core/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo `test -f 'src/core/ndisc/nm-lndp-ndisc.c' || echo '$(srcdir)/'`src/core/ndisc/nm-lndp-ndisc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Tpo src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/ndisc/nm-lndp-ndisc.c' object='src/core/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo `test -f 'src/platform/wpan/nm-wpan-utils.c' || echo '$(srcdir)/'`src/platform/wpan/nm-wpan-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo `test -f 'src/core/ndisc/nm-lndp-ndisc.c' || echo '$(srcdir)/'`src/core/ndisc/nm-lndp-ndisc.c
 
-src/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo: src/ndisc/nm-lndp-ndisc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo -MD -MP -MF src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Tpo -c -o src/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo `test -f 'src/ndisc/nm-lndp-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-lndp-ndisc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Tpo src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ndisc/nm-lndp-ndisc.c' object='src/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/ndisc/libNetworkManagerBase_la-nm-ndisc.lo: src/core/ndisc/nm-ndisc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/ndisc/libNetworkManagerBase_la-nm-ndisc.lo -MD -MP -MF src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Tpo -c -o src/core/ndisc/libNetworkManagerBase_la-nm-ndisc.lo `test -f 'src/core/ndisc/nm-ndisc.c' || echo '$(srcdir)/'`src/core/ndisc/nm-ndisc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Tpo src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/ndisc/nm-ndisc.c' object='src/core/ndisc/libNetworkManagerBase_la-nm-ndisc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ndisc/libNetworkManagerBase_la-nm-lndp-ndisc.lo `test -f 'src/ndisc/nm-lndp-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-lndp-ndisc.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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/ndisc/libNetworkManagerBase_la-nm-ndisc.lo `test -f 'src/core/ndisc/nm-ndisc.c' || echo '$(srcdir)/'`src/core/ndisc/nm-ndisc.c
 
-src/ndisc/libNetworkManagerBase_la-nm-ndisc.lo: src/ndisc/nm-ndisc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ndisc/libNetworkManagerBase_la-nm-ndisc.lo -MD -MP -MF src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Tpo -c -o src/ndisc/libNetworkManagerBase_la-nm-ndisc.lo `test -f 'src/ndisc/nm-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-ndisc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Tpo src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ndisc/nm-ndisc.c' object='src/ndisc/libNetworkManagerBase_la-nm-ndisc.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-nm-dbus-utils.lo: src/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) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-nm-dbus-utils.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Tpo -c -o src/core/libNetworkManagerBase_la-nm-dbus-utils.lo `test -f 'src/core/nm-dbus-utils.c' || echo '$(srcdir)/'`src/core/nm-dbus-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-dbus-utils.c' object='src/core/libNetworkManagerBase_la-nm-dbus-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ndisc/libNetworkManagerBase_la-nm-ndisc.lo `test -f 'src/ndisc/nm-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-ndisc.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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-nm-dbus-utils.lo `test -f 'src/core/nm-dbus-utils.c' || echo '$(srcdir)/'`src/core/nm-dbus-utils.c
 
-src/libNetworkManagerBase_la-nm-dbus-utils.lo: src/nm-dbus-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManagerBase_la-nm-dbus-utils.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Tpo -c -o src/libNetworkManagerBase_la-nm-dbus-utils.lo `test -f 'src/nm-dbus-utils.c' || echo '$(srcdir)/'`src/nm-dbus-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dbus-utils.c' object='src/libNetworkManagerBase_la-nm-dbus-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-nm-dbus-object.lo: src/core/nm-dbus-object.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-nm-dbus-object.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Tpo -c -o src/core/libNetworkManagerBase_la-nm-dbus-object.lo `test -f 'src/core/nm-dbus-object.c' || echo '$(srcdir)/'`src/core/nm-dbus-object.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-dbus-object.c' object='src/core/libNetworkManagerBase_la-nm-dbus-object.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManagerBase_la-nm-dbus-utils.lo `test -f 'src/nm-dbus-utils.c' || echo '$(srcdir)/'`src/nm-dbus-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-nm-dbus-object.lo `test -f 'src/core/nm-dbus-object.c' || echo '$(srcdir)/'`src/core/nm-dbus-object.c
 
-src/libNetworkManagerBase_la-nm-dbus-object.lo: src/nm-dbus-object.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManagerBase_la-nm-dbus-object.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Tpo -c -o src/libNetworkManagerBase_la-nm-dbus-object.lo `test -f 'src/nm-dbus-object.c' || echo '$(srcdir)/'`src/nm-dbus-object.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-dbus-object.c' object='src/libNetworkManagerBase_la-nm-dbus-object.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-nm-netns.lo: src/core/nm-netns.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-nm-netns.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Tpo -c -o src/core/libNetworkManagerBase_la-nm-netns.lo `test -f 'src/core/nm-netns.c' || echo '$(srcdir)/'`src/core/nm-netns.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-netns.c' object='src/core/libNetworkManagerBase_la-nm-netns.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/libNetworkManagerBase_la-nm-dbus-object.lo `test -f 'src/nm-dbus-object.c' || echo '$(srcdir)/'`src/nm-dbus-object.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-nm-netns.lo `test -f 'src/core/nm-netns.c' || echo '$(srcdir)/'`src/core/nm-netns.c
 
-src/libNetworkManagerBase_la-nm-netns.lo: src/nm-netns.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManagerBase_la-nm-netns.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Tpo -c -o src/libNetworkManagerBase_la-nm-netns.lo `test -f 'src/nm-netns.c' || echo '$(srcdir)/'`src/nm-netns.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-netns.c' object='src/libNetworkManagerBase_la-nm-netns.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-nm-l3-config-data.lo: src/core/nm-l3-config-data.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-nm-l3-config-data.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Tpo -c -o src/core/libNetworkManagerBase_la-nm-l3-config-data.lo `test -f 'src/core/nm-l3-config-data.c' || echo '$(srcdir)/'`src/core/nm-l3-config-data.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-l3-config-data.c' object='src/core/libNetworkManagerBase_la-nm-l3-config-data.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/libNetworkManagerBase_la-nm-netns.lo `test -f 'src/nm-netns.c' || echo '$(srcdir)/'`src/nm-netns.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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-nm-l3-config-data.lo `test -f 'src/core/nm-l3-config-data.c' || echo '$(srcdir)/'`src/core/nm-l3-config-data.c
 
-src/libNetworkManagerBase_la-nm-l3-config-data.lo: src/nm-l3-config-data.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/libNetworkManagerBase_la-nm-l3-config-data.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Tpo -c -o src/libNetworkManagerBase_la-nm-l3-config-data.lo `test -f 'src/nm-l3-config-data.c' || echo '$(srcdir)/'`src/nm-l3-config-data.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-l3-config-data.c' object='src/libNetworkManagerBase_la-nm-l3-config-data.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-nm-l3-ipv4ll.lo: src/core/nm-l3-ipv4ll.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-nm-l3-ipv4ll.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-ipv4ll.Tpo -c -o src/core/libNetworkManagerBase_la-nm-l3-ipv4ll.lo `test -f 'src/core/nm-l3-ipv4ll.c' || echo '$(srcdir)/'`src/core/nm-l3-ipv4ll.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-ipv4ll.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-ipv4ll.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-l3-ipv4ll.c' object='src/core/libNetworkManagerBase_la-nm-l3-ipv4ll.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/libNetworkManagerBase_la-nm-l3-config-data.lo `test -f 'src/nm-l3-config-data.c' || echo '$(srcdir)/'`src/nm-l3-config-data.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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-nm-l3-ipv4ll.lo `test -f 'src/core/nm-l3-ipv4ll.c' || echo '$(srcdir)/'`src/core/nm-l3-ipv4ll.c
 
-src/libNetworkManagerBase_la-nm-l3cfg.lo: src/nm-l3cfg.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/libNetworkManagerBase_la-nm-l3cfg.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Tpo -c -o src/libNetworkManagerBase_la-nm-l3cfg.lo `test -f 'src/nm-l3cfg.c' || echo '$(srcdir)/'`src/nm-l3cfg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-l3cfg.c' object='src/libNetworkManagerBase_la-nm-l3cfg.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-nm-l3cfg.lo: src/core/nm-l3cfg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-nm-l3cfg.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Tpo -c -o src/core/libNetworkManagerBase_la-nm-l3cfg.lo `test -f 'src/core/nm-l3cfg.c' || echo '$(srcdir)/'`src/core/nm-l3cfg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-l3cfg.c' object='src/core/libNetworkManagerBase_la-nm-l3cfg.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/libNetworkManagerBase_la-nm-l3cfg.lo `test -f 'src/nm-l3cfg.c' || echo '$(srcdir)/'`src/nm-l3cfg.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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-nm-l3cfg.lo `test -f 'src/core/nm-l3cfg.c' || echo '$(srcdir)/'`src/core/nm-l3cfg.c
 
-src/libNetworkManagerBase_la-nm-ip-config.lo: src/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) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManagerBase_la-nm-ip-config.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Tpo -c -o src/libNetworkManagerBase_la-nm-ip-config.lo `test -f 'src/nm-ip-config.c' || echo '$(srcdir)/'`src/nm-ip-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-ip-config.c' object='src/libNetworkManagerBase_la-nm-ip-config.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-nm-ip-config.lo: src/core/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) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-nm-ip-config.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Tpo -c -o src/core/libNetworkManagerBase_la-nm-ip-config.lo `test -f 'src/core/nm-ip-config.c' || echo '$(srcdir)/'`src/core/nm-ip-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-ip-config.c' object='src/core/libNetworkManagerBase_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) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManagerBase_la-nm-ip-config.lo `test -f 'src/nm-ip-config.c' || echo '$(srcdir)/'`src/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) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-nm-ip-config.lo `test -f 'src/core/nm-ip-config.c' || echo '$(srcdir)/'`src/core/nm-ip-config.c
 
-src/libNetworkManagerBase_la-nm-ip4-config.lo: src/nm-ip4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManagerBase_la-nm-ip4-config.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Tpo -c -o src/libNetworkManagerBase_la-nm-ip4-config.lo `test -f 'src/nm-ip4-config.c' || echo '$(srcdir)/'`src/nm-ip4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-ip4-config.c' object='src/libNetworkManagerBase_la-nm-ip4-config.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-nm-ip4-config.lo: src/core/nm-ip4-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-nm-ip4-config.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Tpo -c -o src/core/libNetworkManagerBase_la-nm-ip4-config.lo `test -f 'src/core/nm-ip4-config.c' || echo '$(srcdir)/'`src/core/nm-ip4-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-ip4-config.c' object='src/core/libNetworkManagerBase_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) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManagerBase_la-nm-ip4-config.lo `test -f 'src/nm-ip4-config.c' || echo '$(srcdir)/'`src/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) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-nm-ip4-config.lo `test -f 'src/core/nm-ip4-config.c' || echo '$(srcdir)/'`src/core/nm-ip4-config.c
 
-src/libNetworkManagerBase_la-nm-ip6-config.lo: src/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) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManagerBase_la-nm-ip6-config.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Tpo -c -o src/libNetworkManagerBase_la-nm-ip6-config.lo `test -f 'src/nm-ip6-config.c' || echo '$(srcdir)/'`src/nm-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-ip6-config.c' object='src/libNetworkManagerBase_la-nm-ip6-config.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-nm-ip6-config.lo: src/core/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) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-nm-ip6-config.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Tpo -c -o src/core/libNetworkManagerBase_la-nm-ip6-config.lo `test -f 'src/core/nm-ip6-config.c' || echo '$(srcdir)/'`src/core/nm-ip6-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-ip6-config.c' object='src/core/libNetworkManagerBase_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) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManagerBase_la-nm-ip6-config.lo `test -f 'src/nm-ip6-config.c' || echo '$(srcdir)/'`src/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) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-nm-ip6-config.lo `test -f 'src/core/nm-ip6-config.c' || echo '$(srcdir)/'`src/core/nm-ip6-config.c
 
-src/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo: src/dhcp/nm-dhcp-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Tpo -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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Tpo src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-client.c' object='src/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo: src/core/dhcp/nm-dhcp-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Tpo -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo `test -f 'src/core/dhcp/nm-dhcp-client.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-client.c' object='src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-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) $(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
+@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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-client.lo `test -f 'src/core/dhcp/nm-dhcp-client.c' || echo '$(srcdir)/'`src/core/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@
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo: src/core/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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Tpo -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo `test -f 'src/core/dhcp/nm-dhcp-nettools.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-nettools.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-nettools.c' object='src/core/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
+@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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-nettools.lo `test -f 'src/core/dhcp/nm-dhcp-nettools.c' || echo '$(srcdir)/'`src/core/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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-utils.c' object='src/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo: src/core/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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Tpo -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo `test -f 'src/core/dhcp/nm-dhcp-utils.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-utils.c' object='src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/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_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo `test -f 'src/core/dhcp/nm-dhcp-utils.c' || echo '$(srcdir)/'`src/core/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@
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo: src/core/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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Tpo -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo `test -f 'src/core/dhcp/nm-dhcp-options.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-options.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-options.c' object='src/core/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
+@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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-options.lo `test -f 'src/core/dhcp/nm-dhcp-options.c' || echo '$(srcdir)/'`src/core/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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-systemd.c' object='src/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo: src/core/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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Tpo -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo `test -f 'src/core/dhcp/nm-dhcp-systemd.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-systemd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-systemd.c' object='src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-systemd.lo `test -f 'src/dhcp/nm-dhcp-systemd.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-systemd.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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo `test -f 'src/core/dhcp/nm-dhcp-systemd.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-systemd.c
 
-src/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo: src/dhcp/nm-dhcp-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo -MD -MP -MF src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Tpo -c -o src/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo `test -f 'src/dhcp/nm-dhcp-manager.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Tpo src/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-manager.c' object='src/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo: src/core/dhcp/nm-dhcp-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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo -MD -MP -MF src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Tpo -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo `test -f 'src/core/dhcp/nm-dhcp-manager.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Tpo src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-manager.c' object='src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo `test -f 'src/dhcp/nm-dhcp-manager.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo `test -f 'src/core/dhcp/nm-dhcp-manager.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-manager.c
 
-src/libNetworkManagerBase_la-main-utils.lo: src/main-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/libNetworkManagerBase_la-main-utils.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Tpo -c -o src/libNetworkManagerBase_la-main-utils.lo `test -f 'src/main-utils.c' || echo '$(srcdir)/'`src/main-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Tpo src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/main-utils.c' object='src/libNetworkManagerBase_la-main-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/libNetworkManagerBase_la-main-utils.lo: src/core/main-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_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/libNetworkManagerBase_la-main-utils.lo -MD -MP -MF src/core/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Tpo -c -o src/core/libNetworkManagerBase_la-main-utils.lo `test -f 'src/core/main-utils.c' || echo '$(srcdir)/'`src/core/main-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Tpo src/core/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/main-utils.c' object='src/core/libNetworkManagerBase_la-main-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManagerBase_la-main-utils.lo `test -f 'src/main-utils.c' || echo '$(srcdir)/'`src/main-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/libNetworkManagerBase_la-main-utils.lo `test -f 'src/core/main-utils.c' || echo '$(srcdir)/'`src/core/main-utils.c
 
-src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo: src/platform/wifi/nm-wifi-utils-wext.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo -MD -MP -MF src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Tpo -c -o src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo `test -f 'src/platform/wifi/nm-wifi-utils-wext.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils-wext.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Tpo src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/wifi/nm-wifi-utils-wext.c' object='src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo: src/core/platform/wifi/nm-wifi-utils-wext.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo -MD -MP -MF src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Tpo -c -o src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo `test -f 'src/core/platform/wifi/nm-wifi-utils-wext.c' || echo '$(srcdir)/'`src/core/platform/wifi/nm-wifi-utils-wext.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Tpo src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/wifi/nm-wifi-utils-wext.c' object='src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo `test -f 'src/platform/wifi/nm-wifi-utils-wext.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils-wext.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo `test -f 'src/core/platform/wifi/nm-wifi-utils-wext.c' || echo '$(srcdir)/'`src/core/platform/wifi/nm-wifi-utils-wext.c
 
-src/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo: src/ndisc/nm-fake-ndisc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo -MD -MP -MF src/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Tpo -c -o src/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo `test -f 'src/ndisc/nm-fake-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-fake-ndisc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Tpo src/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ndisc/nm-fake-ndisc.c' object='src/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo: src/core/ndisc/nm-fake-ndisc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo -MD -MP -MF src/core/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Tpo -c -o src/core/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo `test -f 'src/core/ndisc/nm-fake-ndisc.c' || echo '$(srcdir)/'`src/core/ndisc/nm-fake-ndisc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Tpo src/core/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/ndisc/nm-fake-ndisc.c' object='src/core/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo `test -f 'src/ndisc/nm-fake-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-fake-ndisc.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_core_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/ndisc/libNetworkManagerTest_la-nm-fake-ndisc.lo `test -f 'src/core/ndisc/nm-fake-ndisc.c' || echo '$(srcdir)/'`src/core/ndisc/nm-fake-ndisc.c
 
-src/platform/libNetworkManagerTest_la-nm-fake-platform.lo: src/platform/nm-fake-platform.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/libNetworkManagerTest_la-nm-fake-platform.lo -MD -MP -MF src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Tpo -c -o src/platform/libNetworkManagerTest_la-nm-fake-platform.lo `test -f 'src/platform/nm-fake-platform.c' || echo '$(srcdir)/'`src/platform/nm-fake-platform.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Tpo src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/nm-fake-platform.c' object='src/platform/libNetworkManagerTest_la-nm-fake-platform.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/platform/libNetworkManagerTest_la-nm-fake-platform.lo: src/core/platform/nm-fake-platform.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/libNetworkManagerTest_la-nm-fake-platform.lo -MD -MP -MF src/core/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Tpo -c -o src/core/platform/libNetworkManagerTest_la-nm-fake-platform.lo `test -f 'src/core/platform/nm-fake-platform.c' || echo '$(srcdir)/'`src/core/platform/nm-fake-platform.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Tpo src/core/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/nm-fake-platform.c' object='src/core/platform/libNetworkManagerTest_la-nm-fake-platform.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/libNetworkManagerTest_la-nm-fake-platform.lo `test -f 'src/platform/nm-fake-platform.c' || echo '$(srcdir)/'`src/platform/nm-fake-platform.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_core_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/libNetworkManagerTest_la-nm-fake-platform.lo `test -f 'src/core/platform/nm-fake-platform.c' || echo '$(srcdir)/'`src/core/platform/nm-fake-platform.c
 
-src/platform/tests/libNetworkManagerTest_la-test-common.lo: src/platform/tests/test-common.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/libNetworkManagerTest_la-test-common.lo -MD -MP -MF src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Tpo -c -o src/platform/tests/libNetworkManagerTest_la-test-common.lo `test -f 'src/platform/tests/test-common.c' || echo '$(srcdir)/'`src/platform/tests/test-common.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Tpo src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-common.c' object='src/platform/tests/libNetworkManagerTest_la-test-common.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/platform/tests/libNetworkManagerTest_la-test-common.lo: src/core/platform/tests/test-common.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/libNetworkManagerTest_la-test-common.lo -MD -MP -MF src/core/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Tpo -c -o src/core/platform/tests/libNetworkManagerTest_la-test-common.lo `test -f 'src/core/platform/tests/test-common.c' || echo '$(srcdir)/'`src/core/platform/tests/test-common.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Tpo src/core/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-common.c' object='src/core/platform/tests/libNetworkManagerTest_la-test-common.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/libNetworkManagerTest_la-test-common.lo `test -f 'src/platform/tests/test-common.c' || echo '$(srcdir)/'`src/platform/tests/test-common.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/libNetworkManagerTest_la-test-common.lo `test -f 'src/core/platform/tests/test-common.c' || echo '$(srcdir)/'`src/core/platform/tests/test-common.c
 
-src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo: src/systemd/nm-sd-utils-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/libnm_systemd_core_la-nm-sd-utils-core.lo -MD -MP -MF src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Tpo -c -o src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo `test -f 'src/systemd/nm-sd-utils-core.c' || echo '$(srcdir)/'`src/systemd/nm-sd-utils-core.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Tpo src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/nm-sd-utils-core.c' object='src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo: src/core/systemd/nm-sd-utils-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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo -MD -MP -MF src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Tpo -c -o src/core/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo `test -f 'src/core/systemd/nm-sd-utils-core.c' || echo '$(srcdir)/'`src/core/systemd/nm-sd-utils-core.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Tpo src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/nm-sd-utils-core.c' object='src/core/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-core.lo `test -f 'src/systemd/nm-sd-utils-core.c' || echo '$(srcdir)/'`src/systemd/nm-sd-utils-core.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo `test -f 'src/core/systemd/nm-sd-utils-core.c' || echo '$(srcdir)/'`src/core/systemd/nm-sd-utils-core.c
 
-src/systemd/libnm_systemd_core_la-nm-sd.lo: src/systemd/nm-sd.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.lo -MD -MP -MF src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Tpo -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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Tpo src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/nm-sd.c' object='src/systemd/libnm_systemd_core_la-nm-sd.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/libnm_systemd_core_la-nm-sd.lo: src/core/systemd/nm-sd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/libnm_systemd_core_la-nm-sd.lo -MD -MP -MF src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Tpo -c -o src/core/systemd/libnm_systemd_core_la-nm-sd.lo `test -f 'src/core/systemd/nm-sd.c' || echo '$(srcdir)/'`src/core/systemd/nm-sd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Tpo src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/nm-sd.c' object='src/core/systemd/libnm_systemd_core_la-nm-sd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
+@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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/libnm_systemd_core_la-nm-sd.lo `test -f 'src/core/systemd/nm-sd.c' || echo '$(srcdir)/'`src/core/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@
+src/core/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo: src/core/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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo -MD -MP -MF src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Tpo -c -o src/core/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo `test -f 'src/core/systemd/nm-sd-utils-dhcp.c' || echo '$(srcdir)/'`src/core/systemd/nm-sd-utils-dhcp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Tpo src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/nm-sd-utils-dhcp.c' object='src/core/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
+@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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/libnm_systemd_core_la-nm-sd-utils-dhcp.lo `test -f 'src/core/systemd/nm-sd-utils-dhcp.c' || echo '$(srcdir)/'`src/core/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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/sd-adapt-core/nm-sd-adapt-core.c' object='src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo: src/core/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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo -MD -MP -MF src/core/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Tpo -c -o src/core/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo `test -f 'src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c' || echo '$(srcdir)/'`src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Tpo src/core/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c' object='src/core/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/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_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo `test -f 'src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c' || echo '$(srcdir)/'`src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo: src/systemd/src/libsystemd-network/arp-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo `test -f 'src/systemd/src/libsystemd-network/arp-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/arp-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/arp-util.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo: src/core/systemd/src/libsystemd-network/arp-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo `test -f 'src/core/systemd/src/libsystemd-network/arp-util.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/arp-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/arp-util.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo `test -f 'src/systemd/src/libsystemd-network/arp-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/arp-util.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo `test -f 'src/core/systemd/src/libsystemd-network/arp-util.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/arp-util.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo: src/systemd/src/libsystemd-network/dhcp-identifier.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/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-identifier.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-identifier.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-identifier.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo: src/core/systemd/src/libsystemd-network/dhcp-identifier.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp-identifier.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp-identifier.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/dhcp-identifier.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-dhcp-identifier.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-identifier.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-identifier.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp-identifier.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp-identifier.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo: src/systemd/src/libsystemd-network/dhcp-network.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/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-network.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-network.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo: src/core/systemd/src/libsystemd-network/dhcp-network.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp-network.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp-network.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/dhcp-network.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-dhcp-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-network.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp-network.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp-network.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo: src/systemd/src/libsystemd-network/dhcp-option.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/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-option.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-option.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo: src/core/systemd/src/libsystemd-network/dhcp-option.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp-option.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp-option.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/dhcp-option.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-dhcp-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-option.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp-option.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp-option.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo: src/systemd/src/libsystemd-network/dhcp-packet.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/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-packet.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-packet.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-packet.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo: src/core/systemd/src/libsystemd-network/dhcp-packet.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp-packet.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp-packet.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/dhcp-packet.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-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) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-packet.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-packet.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp-packet.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp-packet.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo: src/systemd/src/libsystemd-network/dhcp6-network.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/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-network.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp6-network.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo: src/core/systemd/src/libsystemd-network/dhcp6-network.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp6-network.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp6-network.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/dhcp6-network.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-dhcp6-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-network.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp6-network.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp6-network.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo: src/systemd/src/libsystemd-network/dhcp6-option.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/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-option.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp6-option.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo: src/core/systemd/src/libsystemd-network/dhcp6-option.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp6-option.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp6-option.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/dhcp6-option.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-dhcp6-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-option.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo `test -f 'src/core/systemd/src/libsystemd-network/dhcp6-option.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/dhcp6-option.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo: src/systemd/src/libsystemd-network/lldp-neighbor.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/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo `test -f 'src/systemd/src/libsystemd-network/lldp-neighbor.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-neighbor.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/lldp-neighbor.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo: src/core/systemd/src/libsystemd-network/lldp-neighbor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo `test -f 'src/core/systemd/src/libsystemd-network/lldp-neighbor.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/lldp-neighbor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/lldp-neighbor.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-lldp-neighbor.lo `test -f 'src/systemd/src/libsystemd-network/lldp-neighbor.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-neighbor.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo `test -f 'src/core/systemd/src/libsystemd-network/lldp-neighbor.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/lldp-neighbor.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo: src/systemd/src/libsystemd-network/lldp-network.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/libsystemd-network/libnm_systemd_core_la-lldp-network.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo `test -f 'src/systemd/src/libsystemd-network/lldp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-network.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/lldp-network.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo: src/core/systemd/src/libsystemd-network/lldp-network.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo `test -f 'src/core/systemd/src/libsystemd-network/lldp-network.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/lldp-network.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/lldp-network.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-lldp-network.lo `test -f 'src/systemd/src/libsystemd-network/lldp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-network.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo `test -f 'src/core/systemd/src/libsystemd-network/lldp-network.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/lldp-network.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo: src/systemd/src/libsystemd-network/network-internal.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/libsystemd-network/libnm_systemd_core_la-network-internal.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo `test -f 'src/systemd/src/libsystemd-network/network-internal.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/network-internal.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/network-internal.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo: src/core/systemd/src/libsystemd-network/network-internal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo `test -f 'src/core/systemd/src/libsystemd-network/network-internal.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/network-internal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/network-internal.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-network-internal.lo `test -f 'src/systemd/src/libsystemd-network/network-internal.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/network-internal.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo `test -f 'src/core/systemd/src/libsystemd-network/network-internal.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/network-internal.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo: src/systemd/src/libsystemd-network/sd-dhcp-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp-client.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo: src/core/systemd/src/libsystemd-network/sd-dhcp-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-dhcp-client.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-dhcp-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/sd-dhcp-client.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-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) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-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) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-dhcp-client.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-dhcp-client.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo: src/systemd/src/libsystemd-network/sd-dhcp-lease.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/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-lease.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp-lease.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo: src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-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) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-lease.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo: src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp6-client.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo: src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-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) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-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) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo: src/systemd/src/libsystemd-network/sd-dhcp6-lease.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/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp6-lease.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo: src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-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) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-lease.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo: src/systemd/src/libsystemd-network/sd-ipv4acd.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/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4acd.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4acd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-ipv4acd.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo: src/core/systemd/src/libsystemd-network/sd-ipv4acd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-ipv4acd.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-ipv4acd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/sd-ipv4acd.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-sd-ipv4acd.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4acd.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4acd.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-ipv4acd.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-ipv4acd.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo: src/systemd/src/libsystemd-network/sd-ipv4ll.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/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4ll.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4ll.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-ipv4ll.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo: src/core/systemd/src/libsystemd-network/sd-ipv4ll.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-ipv4ll.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-ipv4ll.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/sd-ipv4ll.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-sd-ipv4ll.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4ll.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4ll.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-ipv4ll.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-ipv4ll.c
 
-src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo: src/systemd/src/libsystemd-network/sd-lldp.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/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo `test -f 'src/systemd/src/libsystemd-network/sd-lldp.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-lldp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-lldp.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo: src/core/systemd/src/libsystemd-network/sd-lldp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo -MD -MP -MF src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Tpo -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-lldp.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-lldp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Tpo src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd-network/sd-lldp.c' object='src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-network/libnm_systemd_core_la-sd-lldp.lo `test -f 'src/systemd/src/libsystemd-network/sd-lldp.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-lldp.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo `test -f 'src/core/systemd/src/libsystemd-network/sd-lldp.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd-network/sd-lldp.c
 
-src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo: src/systemd/src/libsystemd/sd-event/event-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo -MD -MP -MF src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Tpo -c -o src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo `test -f 'src/systemd/src/libsystemd/sd-event/event-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-event/event-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Tpo src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-event/event-util.c' object='src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo: src/core/systemd/src/libsystemd/sd-event/event-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo -MD -MP -MF src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Tpo -c -o src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo `test -f 'src/core/systemd/src/libsystemd/sd-event/event-util.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd/sd-event/event-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Tpo src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd/sd-event/event-util.c' object='src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo `test -f 'src/systemd/src/libsystemd/sd-event/event-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-event/event-util.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo `test -f 'src/core/systemd/src/libsystemd/sd-event/event-util.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd/sd-event/event-util.c
 
-src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo: src/systemd/src/libsystemd/sd-event/sd-event.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/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo -MD -MP -MF src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Tpo -c -o src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo `test -f 'src/systemd/src/libsystemd/sd-event/sd-event.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-event/sd-event.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Tpo src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-event/sd-event.c' object='src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo: src/core/systemd/src/libsystemd/sd-event/sd-event.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo -MD -MP -MF src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Tpo -c -o src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo `test -f 'src/core/systemd/src/libsystemd/sd-event/sd-event.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd/sd-event/sd-event.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Tpo src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd/sd-event/sd-event.c' object='src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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-event/libnm_systemd_core_la-sd-event.lo `test -f 'src/systemd/src/libsystemd/sd-event/sd-event.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-event/sd-event.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo `test -f 'src/core/systemd/src/libsystemd/sd-event/sd-event.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd/sd-event/sd-event.c
 
-src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo: src/systemd/src/libsystemd/sd-id128/id128-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo -MD -MP -MF src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Tpo -c -o src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo `test -f 'src/systemd/src/libsystemd/sd-id128/id128-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/id128-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Tpo src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-id128/id128-util.c' object='src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo: src/core/systemd/src/libsystemd/sd-id128/id128-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo -MD -MP -MF src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Tpo -c -o src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo `test -f 'src/core/systemd/src/libsystemd/sd-id128/id128-util.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd/sd-id128/id128-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Tpo src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd/sd-id128/id128-util.c' object='src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo `test -f 'src/systemd/src/libsystemd/sd-id128/id128-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/id128-util.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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo `test -f 'src/core/systemd/src/libsystemd/sd-id128/id128-util.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd/sd-id128/id128-util.c
 
-src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo: src/systemd/src/libsystemd/sd-id128/sd-id128.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/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo -MD -MP -MF src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Tpo -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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Tpo src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-id128/sd-id128.c' object='src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo: src/core/systemd/src/libsystemd/sd-id128/sd-id128.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo -MD -MP -MF src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Tpo -c -o src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo `test -f 'src/core/systemd/src/libsystemd/sd-id128/sd-id128.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd/sd-id128/sd-id128.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Tpo src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/systemd/src/libsystemd/sd-id128/sd-id128.c' object='src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
+@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_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo `test -f 'src/core/systemd/src/libsystemd/sd-id128/sd-id128.c' || echo '$(srcdir)/'`src/core/systemd/src/libsystemd/sd-id128/sd-id128.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ppp/nm-ppp-manager.c' object='src/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo: src/core/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_core_ppp_libnm_ppp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo -MD -MP -MF src/core/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Tpo -c -o src/core/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo `test -f 'src/core/ppp/nm-ppp-manager.c' || echo '$(srcdir)/'`src/core/ppp/nm-ppp-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Tpo src/core/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/ppp/nm-ppp-manager.c' object='src/core/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ppp_libnm_ppp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_ppp_libnm_ppp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo `test -f 'src/core/ppp/nm-ppp-manager.c' || echo '$(srcdir)/'`src/core/ppp/nm-ppp-manager.c
 
-src/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo: src/ppp/nm-pppd-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_ppp_nm_pppd_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo -MD -MP -MF src/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Tpo -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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Tpo src/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ppp/nm-pppd-plugin.c' object='src/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo: src/core/ppp/nm-pppd-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_core_ppp_nm_pppd_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo -MD -MP -MF src/core/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Tpo -c -o src/core/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo `test -f 'src/core/ppp/nm-pppd-plugin.c' || echo '$(srcdir)/'`src/core/ppp/nm-pppd-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Tpo src/core/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/ppp/nm-pppd-plugin.c' object='src/core/ppp/nm_pppd_plugin_la-nm-pppd-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_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
+@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_core_ppp_nm_pppd_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/ppp/nm_pppd_plugin_la-nm-pppd-plugin.lo `test -f 'src/core/ppp/nm-pppd-plugin.c' || echo '$(srcdir)/'`src/core/ppp/nm-pppd-plugin.c
 
-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@
+src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo: src/core/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_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo -MD -MP -MF src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Tpo -c -o src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Tpo src/core/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/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c' object='src/core/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_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
+@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_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c' || echo '$(srcdir)/'`src/core/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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c' object='src/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo: src/core/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_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo -MD -MP -MF src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Tpo -c -o src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Tpo src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c' object='src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-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_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-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
+@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_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifcfg-rh/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
 
-src/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.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_libnmdbus_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Tpo -c -o src/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo `test -f 'src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c' object='src/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo: src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo -MD -MP -MF src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Tpo -c -o src/core/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Tpo src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c' object='src/core/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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_libnmdbus_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo `test -f 'src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.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_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifcfg-rh/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c
 
-src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo: src/settings/plugins/ifcfg-rh/shvar.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-shvar.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Tpo -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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/shvar.c' object='src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo: src/core/settings/plugins/ifcfg-rh/shvar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo -MD -MP -MF src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Tpo -c -o src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo `test -f 'src/core/settings/plugins/ifcfg-rh/shvar.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/shvar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Tpo src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifcfg-rh/shvar.c' object='src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
+@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_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-shvar.lo `test -f 'src/core/settings/plugins/ifcfg-rh/shvar.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/shvar.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c' object='src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo: src/core/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_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo -MD -MP -MF src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Tpo -c -o src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Tpo src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c' object='src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_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-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_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
 
-src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo: src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-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_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-reader.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Tpo -c -o src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c' object='src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo: src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-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_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo -MD -MP -MF src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Tpo -c -o src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Tpo src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c' object='src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-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_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-reader.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.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_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
 
-src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo: src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.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-writer.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Tpo -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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c' object='src/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo: src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo -MD -MP -MF src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Tpo -c -o src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Tpo src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c' object='src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(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
+@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_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifcfg-rh/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo `test -f 'src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifupdown/nms-ifupdown-plugin.c' object='src/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo: src/core/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_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo -MD -MP -MF src/core/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Tpo -c -o src/core/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo `test -f 'src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Tpo src/core/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c' object='src/core/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-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_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifupdown/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.lo `test -f 'src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c
 
-src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo: src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo -MD -MP -MF src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Tpo -c -o src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Tpo src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c' object='src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo: src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo -MD -MP -MF src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Tpo -c -o src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo `test -f 'src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Tpo src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c' object='src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.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_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo `test -f 'src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
 
-src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo: src/settings/plugins/ifupdown/nms-ifupdown-parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo -MD -MP -MF src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Tpo -c -o src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Tpo src/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifupdown/nms-ifupdown-parser.c' object='src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo' libtool=yes @AMDEPBACKSLASH@
+src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo: src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo -MD -MP -MF src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Tpo -c -o src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo `test -f 'src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Tpo src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c' object='src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-parser.c
+@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_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo `test -f 'src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
 
 clients/cli/generate_docs_nm_settings_nmcli-generate-docs-nm-settings-nmcli.o: clients/cli/generate-docs-nm-settings-nmcli.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cli_generate_docs_nm_settings_nmcli_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cli/generate_docs_nm_settings_nmcli-generate-docs-nm-settings-nmcli.o -MD -MP -MF clients/cli/$(DEPDIR)/generate_docs_nm_settings_nmcli-generate-docs-nm-settings-nmcli.Tpo -c -o clients/cli/generate_docs_nm_settings_nmcli-generate-docs-nm-settings-nmcli.o `test -f 'clients/cli/generate-docs-nm-settings-nmcli.c' || echo '$(srcdir)/'`clients/cli/generate-docs-nm-settings-nmcli.c
@@ -15189,89 +15724,19 @@ clients/cloud-setup/nm_cloud_setup-main.obj: clients/cloud-setup/main.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-main.obj `if test -f 'clients/cloud-setup/main.c'; then $(CYGPATH_W) 'clients/cloud-setup/main.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/main.c'; fi`
 
-clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.o: clients/cloud-setup/nm-cloud-setup-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-cloud-setup-utils.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.o `test -f 'clients/cloud-setup/nm-cloud-setup-utils.c' || echo '$(srcdir)/'`clients/cloud-setup/nm-cloud-setup-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-cloud-setup-utils.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-cloud-setup-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nm-cloud-setup-utils.c' object='clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.o `test -f 'clients/cloud-setup/nm-cloud-setup-utils.c' || echo '$(srcdir)/'`clients/cloud-setup/nm-cloud-setup-utils.c
-
-clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.obj: clients/cloud-setup/nm-cloud-setup-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-cloud-setup-utils.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.obj `if test -f 'clients/cloud-setup/nm-cloud-setup-utils.c'; then $(CYGPATH_W) 'clients/cloud-setup/nm-cloud-setup-utils.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nm-cloud-setup-utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-cloud-setup-utils.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-cloud-setup-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nm-cloud-setup-utils.c' object='clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nm-cloud-setup-utils.obj `if test -f 'clients/cloud-setup/nm-cloud-setup-utils.c'; then $(CYGPATH_W) 'clients/cloud-setup/nm-cloud-setup-utils.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nm-cloud-setup-utils.c'; fi`
-
-clients/cloud-setup/nm_cloud_setup-nm-http-client.o: clients/cloud-setup/nm-http-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nm-http-client.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nm-http-client.o `test -f 'clients/cloud-setup/nm-http-client.c' || echo '$(srcdir)/'`clients/cloud-setup/nm-http-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nm-http-client.c' object='clients/cloud-setup/nm_cloud_setup-nm-http-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) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nm-http-client.o `test -f 'clients/cloud-setup/nm-http-client.c' || echo '$(srcdir)/'`clients/cloud-setup/nm-http-client.c
-
-clients/cloud-setup/nm_cloud_setup-nm-http-client.obj: clients/cloud-setup/nm-http-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nm-http-client.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nm-http-client.obj `if test -f 'clients/cloud-setup/nm-http-client.c'; then $(CYGPATH_W) 'clients/cloud-setup/nm-http-client.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nm-http-client.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nm-http-client.c' object='clients/cloud-setup/nm_cloud_setup-nm-http-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) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nm-http-client.obj `if test -f 'clients/cloud-setup/nm-http-client.c'; then $(CYGPATH_W) 'clients/cloud-setup/nm-http-client.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nm-http-client.c'; fi`
-
-clients/cloud-setup/nm_cloud_setup-nmcs-provider.o: clients/cloud-setup/nmcs-provider.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nmcs-provider.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider.o `test -f 'clients/cloud-setup/nmcs-provider.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider.c' object='clients/cloud-setup/nm_cloud_setup-nmcs-provider.o' libtool=no @AMDEPBACKSLASH@
+clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.o: clients/cloud-setup/tests/test-cloud-setup-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_tests_test_cloud_setup_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.o -MD -MP -MF clients/cloud-setup/tests/$(DEPDIR)/test_cloud_setup_general-test-cloud-setup-general.Tpo -c -o clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.o `test -f 'clients/cloud-setup/tests/test-cloud-setup-general.c' || echo '$(srcdir)/'`clients/cloud-setup/tests/test-cloud-setup-general.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/tests/$(DEPDIR)/test_cloud_setup_general-test-cloud-setup-general.Tpo clients/cloud-setup/tests/$(DEPDIR)/test_cloud_setup_general-test-cloud-setup-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/tests/test-cloud-setup-general.c' object='clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider.o `test -f 'clients/cloud-setup/nmcs-provider.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_tests_test_cloud_setup_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.o `test -f 'clients/cloud-setup/tests/test-cloud-setup-general.c' || echo '$(srcdir)/'`clients/cloud-setup/tests/test-cloud-setup-general.c
 
-clients/cloud-setup/nm_cloud_setup-nmcs-provider.obj: clients/cloud-setup/nmcs-provider.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nmcs-provider.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider.obj `if test -f 'clients/cloud-setup/nmcs-provider.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider.c' object='clients/cloud-setup/nm_cloud_setup-nmcs-provider.obj' libtool=no @AMDEPBACKSLASH@
+clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.obj: clients/cloud-setup/tests/test-cloud-setup-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_tests_test_cloud_setup_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.obj -MD -MP -MF clients/cloud-setup/tests/$(DEPDIR)/test_cloud_setup_general-test-cloud-setup-general.Tpo -c -o clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.obj `if test -f 'clients/cloud-setup/tests/test-cloud-setup-general.c'; then $(CYGPATH_W) 'clients/cloud-setup/tests/test-cloud-setup-general.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/tests/test-cloud-setup-general.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/tests/$(DEPDIR)/test_cloud_setup_general-test-cloud-setup-general.Tpo clients/cloud-setup/tests/$(DEPDIR)/test_cloud_setup_general-test-cloud-setup-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/tests/test-cloud-setup-general.c' object='clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider.obj `if test -f 'clients/cloud-setup/nmcs-provider.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider.c'; fi`
-
-clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.o: clients/cloud-setup/nmcs-provider-ec2.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.o `test -f 'clients/cloud-setup/nmcs-provider-ec2.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-ec2.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-ec2.c' object='clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.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_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.o `test -f 'clients/cloud-setup/nmcs-provider-ec2.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-ec2.c
-
-clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.obj: clients/cloud-setup/nmcs-provider-ec2.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.obj `if test -f 'clients/cloud-setup/nmcs-provider-ec2.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-ec2.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-ec2.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-ec2.c' object='clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.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_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-ec2.obj `if test -f 'clients/cloud-setup/nmcs-provider-ec2.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-ec2.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-ec2.c'; fi`
-
-clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.o: clients/cloud-setup/nmcs-provider-gcp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-gcp.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.o `test -f 'clients/cloud-setup/nmcs-provider-gcp.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-gcp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-gcp.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-gcp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-gcp.c' object='clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.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_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.o `test -f 'clients/cloud-setup/nmcs-provider-gcp.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-gcp.c
-
-clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.obj: clients/cloud-setup/nmcs-provider-gcp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-gcp.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.obj `if test -f 'clients/cloud-setup/nmcs-provider-gcp.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-gcp.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-gcp.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-gcp.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-gcp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-gcp.c' object='clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.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_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-gcp.obj `if test -f 'clients/cloud-setup/nmcs-provider-gcp.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-gcp.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-gcp.c'; fi`
-
-clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.o: clients/cloud-setup/nmcs-provider-azure.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.o -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-azure.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.o `test -f 'clients/cloud-setup/nmcs-provider-azure.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-azure.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-azure.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-azure.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-azure.c' object='clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.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_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.o `test -f 'clients/cloud-setup/nmcs-provider-azure.c' || echo '$(srcdir)/'`clients/cloud-setup/nmcs-provider-azure.c
-
-clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.obj: clients/cloud-setup/nmcs-provider-azure.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.obj -MD -MP -MF clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-azure.Tpo -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.obj `if test -f 'clients/cloud-setup/nmcs-provider-azure.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-azure.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-azure.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-azure.Tpo clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-azure.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='clients/cloud-setup/nmcs-provider-azure.c' object='clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.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_cloud_setup_nm_cloud_setup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/nm_cloud_setup-nmcs-provider-azure.obj `if test -f 'clients/cloud-setup/nmcs-provider-azure.c'; then $(CYGPATH_W) 'clients/cloud-setup/nmcs-provider-azure.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/nmcs-provider-azure.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_cloud_setup_tests_test_cloud_setup_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/cloud-setup/tests/test_cloud_setup_general-test-cloud-setup-general.obj `if test -f 'clients/cloud-setup/tests/test-cloud-setup-general.c'; then $(CYGPATH_W) 'clients/cloud-setup/tests/test-cloud-setup-general.c'; else $(CYGPATH_W) '$(srcdir)/clients/cloud-setup/tests/test-cloud-setup-general.c'; fi`
 
 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
@@ -16281,663 +16746,677 @@ shared/nm-glib-aux/tests/test_shared_general-test-shared-general.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) $(shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/tests/test_shared_general-test-shared-general.obj `if test -f 'shared/nm-glib-aux/tests/test-shared-general.c'; then $(CYGPATH_W) 'shared/nm-glib-aux/tests/test-shared-general.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-glib-aux/tests/test-shared-general.c'; fi`
 
-src/NetworkManager-main.o: src/main.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/NetworkManager-main.o -MD -MP -MF src/$(DEPDIR)/NetworkManager-main.Tpo -c -o src/NetworkManager-main.o `test -f 'src/main.c' || echo '$(srcdir)/'`src/main.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/NetworkManager-main.Tpo src/$(DEPDIR)/NetworkManager-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/main.c' object='src/NetworkManager-main.o' libtool=no @AMDEPBACKSLASH@
+shared/nm-platform/tests/test_nm_platform-test-nm-platform.o: shared/nm-platform/tests/test-nm-platform.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_platform_tests_test_nm_platform_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-platform/tests/test_nm_platform-test-nm-platform.o -MD -MP -MF shared/nm-platform/tests/$(DEPDIR)/test_nm_platform-test-nm-platform.Tpo -c -o shared/nm-platform/tests/test_nm_platform-test-nm-platform.o `test -f 'shared/nm-platform/tests/test-nm-platform.c' || echo '$(srcdir)/'`shared/nm-platform/tests/test-nm-platform.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-platform/tests/$(DEPDIR)/test_nm_platform-test-nm-platform.Tpo shared/nm-platform/tests/$(DEPDIR)/test_nm_platform-test-nm-platform.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-platform/tests/test-nm-platform.c' object='shared/nm-platform/tests/test_nm_platform-test-nm-platform.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_platform_tests_test_nm_platform_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-platform/tests/test_nm_platform-test-nm-platform.o `test -f 'shared/nm-platform/tests/test-nm-platform.c' || echo '$(srcdir)/'`shared/nm-platform/tests/test-nm-platform.c
+
+shared/nm-platform/tests/test_nm_platform-test-nm-platform.obj: shared/nm-platform/tests/test-nm-platform.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_platform_tests_test_nm_platform_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-platform/tests/test_nm_platform-test-nm-platform.obj -MD -MP -MF shared/nm-platform/tests/$(DEPDIR)/test_nm_platform-test-nm-platform.Tpo -c -o shared/nm-platform/tests/test_nm_platform-test-nm-platform.obj `if test -f 'shared/nm-platform/tests/test-nm-platform.c'; then $(CYGPATH_W) 'shared/nm-platform/tests/test-nm-platform.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-platform/tests/test-nm-platform.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-platform/tests/$(DEPDIR)/test_nm_platform-test-nm-platform.Tpo shared/nm-platform/tests/$(DEPDIR)/test_nm_platform-test-nm-platform.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-platform/tests/test-nm-platform.c' object='shared/nm-platform/tests/test_nm_platform-test-nm-platform.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_platform_tests_test_nm_platform_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-platform/tests/test_nm_platform-test-nm-platform.obj `if test -f 'shared/nm-platform/tests/test-nm-platform.c'; then $(CYGPATH_W) 'shared/nm-platform/tests/test-nm-platform.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-platform/tests/test-nm-platform.c'; fi`
+
+src/core/NetworkManager-main.o: src/core/main.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/NetworkManager-main.o -MD -MP -MF src/core/$(DEPDIR)/NetworkManager-main.Tpo -c -o src/core/NetworkManager-main.o `test -f 'src/core/main.c' || echo '$(srcdir)/'`src/core/main.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/NetworkManager-main.Tpo src/core/$(DEPDIR)/NetworkManager-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/main.c' object='src/core/NetworkManager-main.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_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/NetworkManager-main.o `test -f 'src/main.c' || echo '$(srcdir)/'`src/main.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/NetworkManager-main.o `test -f 'src/core/main.c' || echo '$(srcdir)/'`src/core/main.c
 
-src/NetworkManager-main.obj: src/main.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/NetworkManager-main.obj -MD -MP -MF src/$(DEPDIR)/NetworkManager-main.Tpo -c -o src/NetworkManager-main.obj `if test -f 'src/main.c'; then $(CYGPATH_W) 'src/main.c'; else $(CYGPATH_W) '$(srcdir)/src/main.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/NetworkManager-main.Tpo src/$(DEPDIR)/NetworkManager-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/main.c' object='src/NetworkManager-main.obj' libtool=no @AMDEPBACKSLASH@
+src/core/NetworkManager-main.obj: src/core/main.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/NetworkManager-main.obj -MD -MP -MF src/core/$(DEPDIR)/NetworkManager-main.Tpo -c -o src/core/NetworkManager-main.obj `if test -f 'src/core/main.c'; then $(CYGPATH_W) 'src/core/main.c'; else $(CYGPATH_W) '$(srcdir)/src/core/main.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/NetworkManager-main.Tpo src/core/$(DEPDIR)/NetworkManager-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/main.c' object='src/core/NetworkManager-main.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_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/NetworkManager-main.obj `if test -f 'src/main.c'; then $(CYGPATH_W) 'src/main.c'; else $(CYGPATH_W) '$(srcdir)/src/main.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/NetworkManager-main.obj `if test -f 'src/core/main.c'; then $(CYGPATH_W) 'src/core/main.c'; else $(CYGPATH_W) '$(srcdir)/src/core/main.c'; fi`
 
-src/NetworkManager_all_sym-main.o: src/main.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_NetworkManager_all_sym_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/NetworkManager_all_sym-main.o -MD -MP -MF src/$(DEPDIR)/NetworkManager_all_sym-main.Tpo -c -o src/NetworkManager_all_sym-main.o `test -f 'src/main.c' || echo '$(srcdir)/'`src/main.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/NetworkManager_all_sym-main.Tpo src/$(DEPDIR)/NetworkManager_all_sym-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/main.c' object='src/NetworkManager_all_sym-main.o' libtool=no @AMDEPBACKSLASH@
+src/core/NetworkManager_all_sym-main.o: src/core/main.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_NetworkManager_all_sym_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/NetworkManager_all_sym-main.o -MD -MP -MF src/core/$(DEPDIR)/NetworkManager_all_sym-main.Tpo -c -o src/core/NetworkManager_all_sym-main.o `test -f 'src/core/main.c' || echo '$(srcdir)/'`src/core/main.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/NetworkManager_all_sym-main.Tpo src/core/$(DEPDIR)/NetworkManager_all_sym-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/main.c' object='src/core/NetworkManager_all_sym-main.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_NetworkManager_all_sym_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/NetworkManager_all_sym-main.o `test -f 'src/main.c' || echo '$(srcdir)/'`src/main.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_NetworkManager_all_sym_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/NetworkManager_all_sym-main.o `test -f 'src/core/main.c' || echo '$(srcdir)/'`src/core/main.c
 
-src/NetworkManager_all_sym-main.obj: src/main.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_NetworkManager_all_sym_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/NetworkManager_all_sym-main.obj -MD -MP -MF src/$(DEPDIR)/NetworkManager_all_sym-main.Tpo -c -o src/NetworkManager_all_sym-main.obj `if test -f 'src/main.c'; then $(CYGPATH_W) 'src/main.c'; else $(CYGPATH_W) '$(srcdir)/src/main.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/NetworkManager_all_sym-main.Tpo src/$(DEPDIR)/NetworkManager_all_sym-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/main.c' object='src/NetworkManager_all_sym-main.obj' libtool=no @AMDEPBACKSLASH@
+src/core/NetworkManager_all_sym-main.obj: src/core/main.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_NetworkManager_all_sym_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/NetworkManager_all_sym-main.obj -MD -MP -MF src/core/$(DEPDIR)/NetworkManager_all_sym-main.Tpo -c -o src/core/NetworkManager_all_sym-main.obj `if test -f 'src/core/main.c'; then $(CYGPATH_W) 'src/core/main.c'; else $(CYGPATH_W) '$(srcdir)/src/core/main.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/NetworkManager_all_sym-main.Tpo src/core/$(DEPDIR)/NetworkManager_all_sym-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/main.c' object='src/core/NetworkManager_all_sym-main.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_NetworkManager_all_sym_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/NetworkManager_all_sym-main.obj `if test -f 'src/main.c'; then $(CYGPATH_W) 'src/main.c'; else $(CYGPATH_W) '$(srcdir)/src/main.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_NetworkManager_all_sym_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/NetworkManager_all_sym-main.obj `if test -f 'src/core/main.c'; then $(CYGPATH_W) 'src/core/main.c'; else $(CYGPATH_W) '$(srcdir)/src/core/main.c'; fi`
 
-src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.o: src/devices/bluetooth/tests/nm-bt-test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_bluetooth_tests_nm_bt_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.o -MD -MP -MF src/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Tpo -c -o src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.o `test -f 'src/devices/bluetooth/tests/nm-bt-test.c' || echo '$(srcdir)/'`src/devices/bluetooth/tests/nm-bt-test.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Tpo src/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/bluetooth/tests/nm-bt-test.c' object='src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.o' libtool=no @AMDEPBACKSLASH@
+src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-test.o: src/core/devices/bluetooth/tests/nm-bt-test.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_bluetooth_tests_nm_bt_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-test.o -MD -MP -MF src/core/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Tpo -c -o src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-test.o `test -f 'src/core/devices/bluetooth/tests/nm-bt-test.c' || echo '$(srcdir)/'`src/core/devices/bluetooth/tests/nm-bt-test.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Tpo src/core/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/bluetooth/tests/nm-bt-test.c' object='src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-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) $(src_devices_bluetooth_tests_nm_bt_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.o `test -f 'src/devices/bluetooth/tests/nm-bt-test.c' || echo '$(srcdir)/'`src/devices/bluetooth/tests/nm-bt-test.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_bluetooth_tests_nm_bt_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-test.o `test -f 'src/core/devices/bluetooth/tests/nm-bt-test.c' || echo '$(srcdir)/'`src/core/devices/bluetooth/tests/nm-bt-test.c
 
-src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.obj: src/devices/bluetooth/tests/nm-bt-test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_bluetooth_tests_nm_bt_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.obj -MD -MP -MF src/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Tpo -c -o src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.obj `if test -f 'src/devices/bluetooth/tests/nm-bt-test.c'; then $(CYGPATH_W) 'src/devices/bluetooth/tests/nm-bt-test.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/bluetooth/tests/nm-bt-test.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Tpo src/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/bluetooth/tests/nm-bt-test.c' object='src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.obj' libtool=no @AMDEPBACKSLASH@
+src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-test.obj: src/core/devices/bluetooth/tests/nm-bt-test.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_bluetooth_tests_nm_bt_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-test.obj -MD -MP -MF src/core/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Tpo -c -o src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-test.obj `if test -f 'src/core/devices/bluetooth/tests/nm-bt-test.c'; then $(CYGPATH_W) 'src/core/devices/bluetooth/tests/nm-bt-test.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/bluetooth/tests/nm-bt-test.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Tpo src/core/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/bluetooth/tests/nm-bt-test.c' object='src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-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) $(src_devices_bluetooth_tests_nm_bt_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/bluetooth/tests/nm_bt_test-nm-bt-test.obj `if test -f 'src/devices/bluetooth/tests/nm-bt-test.c'; then $(CYGPATH_W) 'src/devices/bluetooth/tests/nm-bt-test.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/bluetooth/tests/nm-bt-test.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_bluetooth_tests_nm_bt_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/bluetooth/tests/nm_bt_test-nm-bt-test.obj `if test -f 'src/core/devices/bluetooth/tests/nm-bt-test.c'; then $(CYGPATH_W) 'src/core/devices/bluetooth/tests/nm-bt-test.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/bluetooth/tests/nm-bt-test.c'; fi`
 
-src/devices/tests/test_acd-test-acd.o: src/devices/tests/test-acd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/test_acd-test-acd.o -MD -MP -MF src/devices/tests/$(DEPDIR)/test_acd-test-acd.Tpo -c -o src/devices/tests/test_acd-test-acd.o `test -f 'src/devices/tests/test-acd.c' || echo '$(srcdir)/'`src/devices/tests/test-acd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/test_acd-test-acd.Tpo src/devices/tests/$(DEPDIR)/test_acd-test-acd.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/tests/test-acd.c' object='src/devices/tests/test_acd-test-acd.o' libtool=no @AMDEPBACKSLASH@
+src/core/devices/tests/test_acd-test-acd.o: src/core/devices/tests/test-acd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/tests/test_acd-test-acd.o -MD -MP -MF src/core/devices/tests/$(DEPDIR)/test_acd-test-acd.Tpo -c -o src/core/devices/tests/test_acd-test-acd.o `test -f 'src/core/devices/tests/test-acd.c' || echo '$(srcdir)/'`src/core/devices/tests/test-acd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/tests/$(DEPDIR)/test_acd-test-acd.Tpo src/core/devices/tests/$(DEPDIR)/test_acd-test-acd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/tests/test-acd.c' object='src/core/devices/tests/test_acd-test-acd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/test_acd-test-acd.o `test -f 'src/devices/tests/test-acd.c' || echo '$(srcdir)/'`src/devices/tests/test-acd.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/tests/test_acd-test-acd.o `test -f 'src/core/devices/tests/test-acd.c' || echo '$(srcdir)/'`src/core/devices/tests/test-acd.c
 
-src/devices/tests/test_acd-test-acd.obj: src/devices/tests/test-acd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/test_acd-test-acd.obj -MD -MP -MF src/devices/tests/$(DEPDIR)/test_acd-test-acd.Tpo -c -o src/devices/tests/test_acd-test-acd.obj `if test -f 'src/devices/tests/test-acd.c'; then $(CYGPATH_W) 'src/devices/tests/test-acd.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-acd.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/test_acd-test-acd.Tpo src/devices/tests/$(DEPDIR)/test_acd-test-acd.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/tests/test-acd.c' object='src/devices/tests/test_acd-test-acd.obj' libtool=no @AMDEPBACKSLASH@
+src/core/devices/tests/test_acd-test-acd.obj: src/core/devices/tests/test-acd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/tests/test_acd-test-acd.obj -MD -MP -MF src/core/devices/tests/$(DEPDIR)/test_acd-test-acd.Tpo -c -o src/core/devices/tests/test_acd-test-acd.obj `if test -f 'src/core/devices/tests/test-acd.c'; then $(CYGPATH_W) 'src/core/devices/tests/test-acd.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/tests/test-acd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/tests/$(DEPDIR)/test_acd-test-acd.Tpo src/core/devices/tests/$(DEPDIR)/test_acd-test-acd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/tests/test-acd.c' object='src/core/devices/tests/test_acd-test-acd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/test_acd-test-acd.obj `if test -f 'src/devices/tests/test-acd.c'; then $(CYGPATH_W) 'src/devices/tests/test-acd.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-acd.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/tests/test_acd-test-acd.obj `if test -f 'src/core/devices/tests/test-acd.c'; then $(CYGPATH_W) 'src/core/devices/tests/test-acd.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/tests/test-acd.c'; fi`
 
-src/devices/tests/test_lldp-test-lldp.o: src/devices/tests/test-lldp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/test_lldp-test-lldp.o -MD -MP -MF src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Tpo -c -o src/devices/tests/test_lldp-test-lldp.o `test -f 'src/devices/tests/test-lldp.c' || echo '$(srcdir)/'`src/devices/tests/test-lldp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Tpo src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/tests/test-lldp.c' object='src/devices/tests/test_lldp-test-lldp.o' libtool=no @AMDEPBACKSLASH@
+src/core/devices/tests/test_lldp-test-lldp.o: src/core/devices/tests/test-lldp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/tests/test_lldp-test-lldp.o -MD -MP -MF src/core/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Tpo -c -o src/core/devices/tests/test_lldp-test-lldp.o `test -f 'src/core/devices/tests/test-lldp.c' || echo '$(srcdir)/'`src/core/devices/tests/test-lldp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Tpo src/core/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/tests/test-lldp.c' object='src/core/devices/tests/test_lldp-test-lldp.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/test_lldp-test-lldp.o `test -f 'src/devices/tests/test-lldp.c' || echo '$(srcdir)/'`src/devices/tests/test-lldp.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/tests/test_lldp-test-lldp.o `test -f 'src/core/devices/tests/test-lldp.c' || echo '$(srcdir)/'`src/core/devices/tests/test-lldp.c
 
-src/devices/tests/test_lldp-test-lldp.obj: src/devices/tests/test-lldp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/test_lldp-test-lldp.obj -MD -MP -MF src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Tpo -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`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Tpo src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/tests/test-lldp.c' object='src/devices/tests/test_lldp-test-lldp.obj' libtool=no @AMDEPBACKSLASH@
+src/core/devices/tests/test_lldp-test-lldp.obj: src/core/devices/tests/test-lldp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/tests/test_lldp-test-lldp.obj -MD -MP -MF src/core/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Tpo -c -o src/core/devices/tests/test_lldp-test-lldp.obj `if test -f 'src/core/devices/tests/test-lldp.c'; then $(CYGPATH_W) 'src/core/devices/tests/test-lldp.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/tests/test-lldp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Tpo src/core/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/tests/test-lldp.c' object='src/core/devices/tests/test_lldp-test-lldp.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/tests/test_lldp-test-lldp.obj `if test -f 'src/core/devices/tests/test-lldp.c'; then $(CYGPATH_W) 'src/core/devices/tests/test-lldp.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/tests/test-lldp.c'; fi`
 
-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@
+src/core/devices/wifi/tests/test_devices_wifi-test-devices-wifi.o: src/core/devices/wifi/tests/test-devices-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/tests/test_devices_wifi-test-devices-wifi.o -MD -MP -MF src/core/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Tpo -c -o src/core/devices/wifi/tests/test_devices_wifi-test-devices-wifi.o `test -f 'src/core/devices/wifi/tests/test-devices-wifi.c' || echo '$(srcdir)/'`src/core/devices/wifi/tests/test-devices-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Tpo src/core/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/tests/test-devices-wifi.c' object='src/core/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_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
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/tests/test_devices_wifi-test-devices-wifi.o `test -f 'src/core/devices/wifi/tests/test-devices-wifi.c' || echo '$(srcdir)/'`src/core/devices/wifi/tests/test-devices-wifi.c
 
-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@
+src/core/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj: src/core/devices/wifi/tests/test-devices-wifi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj -MD -MP -MF src/core/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Tpo -c -o src/core/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj `if test -f 'src/core/devices/wifi/tests/test-devices-wifi.c'; then $(CYGPATH_W) 'src/core/devices/wifi/tests/test-devices-wifi.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/wifi/tests/test-devices-wifi.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Tpo src/core/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wifi/tests/test-devices-wifi.c' object='src/core/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_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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wifi_tests_test_devices_wifi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wifi/tests/test_devices_wifi-test-devices-wifi.obj `if test -f 'src/core/devices/wifi/tests/test-devices-wifi.c'; then $(CYGPATH_W) 'src/core/devices/wifi/tests/test-devices-wifi.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/wifi/tests/test-devices-wifi.c'; fi`
 
-src/devices/wwan/tests/test_service_providers-test-service-providers.o: src/devices/wwan/tests/test-service-providers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/tests/test_service_providers-test-service-providers.o -MD -MP -MF src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Tpo -c -o src/devices/wwan/tests/test_service_providers-test-service-providers.o `test -f 'src/devices/wwan/tests/test-service-providers.c' || echo '$(srcdir)/'`src/devices/wwan/tests/test-service-providers.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Tpo src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/tests/test-service-providers.c' object='src/devices/wwan/tests/test_service_providers-test-service-providers.o' libtool=no @AMDEPBACKSLASH@
+src/core/devices/wwan/tests/test_service_providers-test-service-providers.o: src/core/devices/wwan/tests/test-service-providers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/tests/test_service_providers-test-service-providers.o -MD -MP -MF src/core/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Tpo -c -o src/core/devices/wwan/tests/test_service_providers-test-service-providers.o `test -f 'src/core/devices/wwan/tests/test-service-providers.c' || echo '$(srcdir)/'`src/core/devices/wwan/tests/test-service-providers.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Tpo src/core/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/tests/test-service-providers.c' object='src/core/devices/wwan/tests/test_service_providers-test-service-providers.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_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/tests/test_service_providers-test-service-providers.o `test -f 'src/devices/wwan/tests/test-service-providers.c' || echo '$(srcdir)/'`src/devices/wwan/tests/test-service-providers.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/tests/test_service_providers-test-service-providers.o `test -f 'src/core/devices/wwan/tests/test-service-providers.c' || echo '$(srcdir)/'`src/core/devices/wwan/tests/test-service-providers.c
 
-src/devices/wwan/tests/test_service_providers-test-service-providers.obj: src/devices/wwan/tests/test-service-providers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/tests/test_service_providers-test-service-providers.obj -MD -MP -MF src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Tpo -c -o src/devices/wwan/tests/test_service_providers-test-service-providers.obj `if test -f 'src/devices/wwan/tests/test-service-providers.c'; then $(CYGPATH_W) 'src/devices/wwan/tests/test-service-providers.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wwan/tests/test-service-providers.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Tpo src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/tests/test-service-providers.c' object='src/devices/wwan/tests/test_service_providers-test-service-providers.obj' libtool=no @AMDEPBACKSLASH@
+src/core/devices/wwan/tests/test_service_providers-test-service-providers.obj: src/core/devices/wwan/tests/test-service-providers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/tests/test_service_providers-test-service-providers.obj -MD -MP -MF src/core/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Tpo -c -o src/core/devices/wwan/tests/test_service_providers-test-service-providers.obj `if test -f 'src/core/devices/wwan/tests/test-service-providers.c'; then $(CYGPATH_W) 'src/core/devices/wwan/tests/test-service-providers.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/wwan/tests/test-service-providers.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Tpo src/core/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/tests/test-service-providers.c' object='src/core/devices/wwan/tests/test_service_providers-test-service-providers.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_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/tests/test_service_providers-test-service-providers.obj `if test -f 'src/devices/wwan/tests/test-service-providers.c'; then $(CYGPATH_W) 'src/devices/wwan/tests/test-service-providers.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wwan/tests/test-service-providers.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/tests/test_service_providers-test-service-providers.obj `if test -f 'src/core/devices/wwan/tests/test-service-providers.c'; then $(CYGPATH_W) 'src/core/devices/wwan/tests/test-service-providers.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/wwan/tests/test-service-providers.c'; fi`
 
-src/devices/wwan/tests_test_service_providers-nm-service-providers.o: src/devices/wwan/nm-service-providers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/tests_test_service_providers-nm-service-providers.o -MD -MP -MF src/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Tpo -c -o src/devices/wwan/tests_test_service_providers-nm-service-providers.o `test -f 'src/devices/wwan/nm-service-providers.c' || echo '$(srcdir)/'`src/devices/wwan/nm-service-providers.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Tpo src/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/nm-service-providers.c' object='src/devices/wwan/tests_test_service_providers-nm-service-providers.o' libtool=no @AMDEPBACKSLASH@
+src/core/devices/wwan/tests_test_service_providers-nm-service-providers.o: src/core/devices/wwan/nm-service-providers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/tests_test_service_providers-nm-service-providers.o -MD -MP -MF src/core/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Tpo -c -o src/core/devices/wwan/tests_test_service_providers-nm-service-providers.o `test -f 'src/core/devices/wwan/nm-service-providers.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-service-providers.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Tpo src/core/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/nm-service-providers.c' object='src/core/devices/wwan/tests_test_service_providers-nm-service-providers.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_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/tests_test_service_providers-nm-service-providers.o `test -f 'src/devices/wwan/nm-service-providers.c' || echo '$(srcdir)/'`src/devices/wwan/nm-service-providers.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/tests_test_service_providers-nm-service-providers.o `test -f 'src/core/devices/wwan/nm-service-providers.c' || echo '$(srcdir)/'`src/core/devices/wwan/nm-service-providers.c
 
-src/devices/wwan/tests_test_service_providers-nm-service-providers.obj: src/devices/wwan/nm-service-providers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/tests_test_service_providers-nm-service-providers.obj -MD -MP -MF src/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Tpo -c -o src/devices/wwan/tests_test_service_providers-nm-service-providers.obj `if test -f 'src/devices/wwan/nm-service-providers.c'; then $(CYGPATH_W) 'src/devices/wwan/nm-service-providers.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wwan/nm-service-providers.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Tpo src/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wwan/nm-service-providers.c' object='src/devices/wwan/tests_test_service_providers-nm-service-providers.obj' libtool=no @AMDEPBACKSLASH@
+src/core/devices/wwan/tests_test_service_providers-nm-service-providers.obj: src/core/devices/wwan/nm-service-providers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/devices/wwan/tests_test_service_providers-nm-service-providers.obj -MD -MP -MF src/core/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Tpo -c -o src/core/devices/wwan/tests_test_service_providers-nm-service-providers.obj `if test -f 'src/core/devices/wwan/nm-service-providers.c'; then $(CYGPATH_W) 'src/core/devices/wwan/nm-service-providers.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/wwan/nm-service-providers.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Tpo src/core/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/devices/wwan/nm-service-providers.c' object='src/core/devices/wwan/tests_test_service_providers-nm-service-providers.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_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/tests_test_service_providers-nm-service-providers.obj `if test -f 'src/devices/wwan/nm-service-providers.c'; then $(CYGPATH_W) 'src/devices/wwan/nm-service-providers.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/wwan/nm-service-providers.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_devices_wwan_tests_test_service_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/devices/wwan/tests_test_service_providers-nm-service-providers.obj `if test -f 'src/core/devices/wwan/nm-service-providers.c'; then $(CYGPATH_W) 'src/core/devices/wwan/nm-service-providers.c'; else $(CYGPATH_W) '$(srcdir)/src/core/devices/wwan/nm-service-providers.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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Tpo src/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-helper.c' object='src/dhcp/nm_dhcp_helper-nm-dhcp-helper.o' libtool=no @AMDEPBACKSLASH@
+src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.o: src/core/dhcp/nm-dhcp-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_nm_dhcp_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.o -MD -MP -MF src/core/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Tpo -c -o src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.o `test -f 'src/core/dhcp/nm-dhcp-helper.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Tpo src/core/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-helper.c' object='src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.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_dhcp_nm_dhcp_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_nm_dhcp_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.o `test -f 'src/core/dhcp/nm-dhcp-helper.c' || echo '$(srcdir)/'`src/core/dhcp/nm-dhcp-helper.c
 
-src/dhcp/nm_dhcp_helper-nm-dhcp-helper.obj: 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.obj -MD -MP -MF src/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Tpo -c -o src/dhcp/nm_dhcp_helper-nm-dhcp-helper.obj `if test -f 'src/dhcp/nm-dhcp-helper.c'; then $(CYGPATH_W) 'src/dhcp/nm-dhcp-helper.c'; else $(CYGPATH_W) '$(srcdir)/src/dhcp/nm-dhcp-helper.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Tpo src/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/nm-dhcp-helper.c' object='src/dhcp/nm_dhcp_helper-nm-dhcp-helper.obj' libtool=no @AMDEPBACKSLASH@
+src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.obj: src/core/dhcp/nm-dhcp-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_nm_dhcp_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.obj -MD -MP -MF src/core/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Tpo -c -o src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.obj `if test -f 'src/core/dhcp/nm-dhcp-helper.c'; then $(CYGPATH_W) 'src/core/dhcp/nm-dhcp-helper.c'; else $(CYGPATH_W) '$(srcdir)/src/core/dhcp/nm-dhcp-helper.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Tpo src/core/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/nm-dhcp-helper.c' object='src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.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_dhcp_nm_dhcp_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/nm_dhcp_helper-nm-dhcp-helper.obj `if test -f 'src/dhcp/nm-dhcp-helper.c'; then $(CYGPATH_W) 'src/dhcp/nm-dhcp-helper.c'; else $(CYGPATH_W) '$(srcdir)/src/dhcp/nm-dhcp-helper.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_nm_dhcp_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/nm_dhcp_helper-nm-dhcp-helper.obj `if test -f 'src/core/dhcp/nm-dhcp-helper.c'; then $(CYGPATH_W) 'src/core/dhcp/nm-dhcp-helper.c'; else $(CYGPATH_W) '$(srcdir)/src/core/dhcp/nm-dhcp-helper.c'; fi`
 
-src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.o: src/dhcp/tests/test-dhcp-dhclient.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.o -MD -MP -MF src/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Tpo -c -o src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.o `test -f 'src/dhcp/tests/test-dhcp-dhclient.c' || echo '$(srcdir)/'`src/dhcp/tests/test-dhcp-dhclient.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Tpo src/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/tests/test-dhcp-dhclient.c' object='src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.o' libtool=no @AMDEPBACKSLASH@
+src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.o: src/core/dhcp/tests/test-dhcp-dhclient.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_tests_test_dhcp_dhclient_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.o -MD -MP -MF src/core/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Tpo -c -o src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.o `test -f 'src/core/dhcp/tests/test-dhcp-dhclient.c' || echo '$(srcdir)/'`src/core/dhcp/tests/test-dhcp-dhclient.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Tpo src/core/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/tests/test-dhcp-dhclient.c' object='src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.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_dhcp_tests_test_dhcp_dhclient_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.o `test -f 'src/dhcp/tests/test-dhcp-dhclient.c' || echo '$(srcdir)/'`src/dhcp/tests/test-dhcp-dhclient.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_tests_test_dhcp_dhclient_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.o `test -f 'src/core/dhcp/tests/test-dhcp-dhclient.c' || echo '$(srcdir)/'`src/core/dhcp/tests/test-dhcp-dhclient.c
 
-src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.obj: src/dhcp/tests/test-dhcp-dhclient.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.obj -MD -MP -MF src/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Tpo -c -o src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.obj `if test -f 'src/dhcp/tests/test-dhcp-dhclient.c'; then $(CYGPATH_W) 'src/dhcp/tests/test-dhcp-dhclient.c'; else $(CYGPATH_W) '$(srcdir)/src/dhcp/tests/test-dhcp-dhclient.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Tpo src/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/tests/test-dhcp-dhclient.c' object='src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.obj' libtool=no @AMDEPBACKSLASH@
+src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.obj: src/core/dhcp/tests/test-dhcp-dhclient.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_tests_test_dhcp_dhclient_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.obj -MD -MP -MF src/core/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Tpo -c -o src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.obj `if test -f 'src/core/dhcp/tests/test-dhcp-dhclient.c'; then $(CYGPATH_W) 'src/core/dhcp/tests/test-dhcp-dhclient.c'; else $(CYGPATH_W) '$(srcdir)/src/core/dhcp/tests/test-dhcp-dhclient.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Tpo src/core/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/tests/test-dhcp-dhclient.c' object='src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.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_dhcp_tests_test_dhcp_dhclient_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.obj `if test -f 'src/dhcp/tests/test-dhcp-dhclient.c'; then $(CYGPATH_W) 'src/dhcp/tests/test-dhcp-dhclient.c'; else $(CYGPATH_W) '$(srcdir)/src/dhcp/tests/test-dhcp-dhclient.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_tests_test_dhcp_dhclient_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/tests/test_dhcp_dhclient-test-dhcp-dhclient.obj `if test -f 'src/core/dhcp/tests/test-dhcp-dhclient.c'; then $(CYGPATH_W) 'src/core/dhcp/tests/test-dhcp-dhclient.c'; else $(CYGPATH_W) '$(srcdir)/src/core/dhcp/tests/test-dhcp-dhclient.c'; fi`
 
-src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.o: src/dhcp/tests/test-dhcp-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_dhcp_tests_test_dhcp_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.o -MD -MP -MF src/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Tpo -c -o src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.o `test -f 'src/dhcp/tests/test-dhcp-utils.c' || echo '$(srcdir)/'`src/dhcp/tests/test-dhcp-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Tpo src/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/tests/test-dhcp-utils.c' object='src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.o' libtool=no @AMDEPBACKSLASH@
+src/core/dhcp/tests/test_dhcp_utils-test-dhcp-utils.o: src/core/dhcp/tests/test-dhcp-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_tests_test_dhcp_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/tests/test_dhcp_utils-test-dhcp-utils.o -MD -MP -MF src/core/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Tpo -c -o src/core/dhcp/tests/test_dhcp_utils-test-dhcp-utils.o `test -f 'src/core/dhcp/tests/test-dhcp-utils.c' || echo '$(srcdir)/'`src/core/dhcp/tests/test-dhcp-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Tpo src/core/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/tests/test-dhcp-utils.c' object='src/core/dhcp/tests/test_dhcp_utils-test-dhcp-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_dhcp_tests_test_dhcp_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.o `test -f 'src/dhcp/tests/test-dhcp-utils.c' || echo '$(srcdir)/'`src/dhcp/tests/test-dhcp-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_tests_test_dhcp_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/tests/test_dhcp_utils-test-dhcp-utils.o `test -f 'src/core/dhcp/tests/test-dhcp-utils.c' || echo '$(srcdir)/'`src/core/dhcp/tests/test-dhcp-utils.c
 
-src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.obj: src/dhcp/tests/test-dhcp-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_dhcp_tests_test_dhcp_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.obj -MD -MP -MF src/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Tpo -c -o src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.obj `if test -f 'src/dhcp/tests/test-dhcp-utils.c'; then $(CYGPATH_W) 'src/dhcp/tests/test-dhcp-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/dhcp/tests/test-dhcp-utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Tpo src/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dhcp/tests/test-dhcp-utils.c' object='src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.obj' libtool=no @AMDEPBACKSLASH@
+src/core/dhcp/tests/test_dhcp_utils-test-dhcp-utils.obj: src/core/dhcp/tests/test-dhcp-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_tests_test_dhcp_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dhcp/tests/test_dhcp_utils-test-dhcp-utils.obj -MD -MP -MF src/core/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Tpo -c -o src/core/dhcp/tests/test_dhcp_utils-test-dhcp-utils.obj `if test -f 'src/core/dhcp/tests/test-dhcp-utils.c'; then $(CYGPATH_W) 'src/core/dhcp/tests/test-dhcp-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/core/dhcp/tests/test-dhcp-utils.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Tpo src/core/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dhcp/tests/test-dhcp-utils.c' object='src/core/dhcp/tests/test_dhcp_utils-test-dhcp-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_dhcp_tests_test_dhcp_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/tests/test_dhcp_utils-test-dhcp-utils.obj `if test -f 'src/dhcp/tests/test-dhcp-utils.c'; then $(CYGPATH_W) 'src/dhcp/tests/test-dhcp-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/dhcp/tests/test-dhcp-utils.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dhcp_tests_test_dhcp_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dhcp/tests/test_dhcp_utils-test-dhcp-utils.obj `if test -f 'src/core/dhcp/tests/test-dhcp-utils.c'; then $(CYGPATH_W) 'src/core/dhcp/tests/test-dhcp-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/core/dhcp/tests/test-dhcp-utils.c'; fi`
 
-src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.o: src/dnsmasq/tests/test-dnsmasq-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.o -MD -MP -MF src/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Tpo -c -o src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.o `test -f 'src/dnsmasq/tests/test-dnsmasq-utils.c' || echo '$(srcdir)/'`src/dnsmasq/tests/test-dnsmasq-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Tpo src/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dnsmasq/tests/test-dnsmasq-utils.c' object='src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.o' libtool=no @AMDEPBACKSLASH@
+src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.o: src/core/dnsmasq/tests/test-dnsmasq-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.o -MD -MP -MF src/core/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Tpo -c -o src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.o `test -f 'src/core/dnsmasq/tests/test-dnsmasq-utils.c' || echo '$(srcdir)/'`src/core/dnsmasq/tests/test-dnsmasq-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Tpo src/core/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dnsmasq/tests/test-dnsmasq-utils.c' object='src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-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_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.o `test -f 'src/dnsmasq/tests/test-dnsmasq-utils.c' || echo '$(srcdir)/'`src/dnsmasq/tests/test-dnsmasq-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.o `test -f 'src/core/dnsmasq/tests/test-dnsmasq-utils.c' || echo '$(srcdir)/'`src/core/dnsmasq/tests/test-dnsmasq-utils.c
 
-src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.obj: src/dnsmasq/tests/test-dnsmasq-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.obj -MD -MP -MF src/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Tpo -c -o src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.obj `if test -f 'src/dnsmasq/tests/test-dnsmasq-utils.c'; then $(CYGPATH_W) 'src/dnsmasq/tests/test-dnsmasq-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/dnsmasq/tests/test-dnsmasq-utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Tpo src/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dnsmasq/tests/test-dnsmasq-utils.c' object='src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.obj' libtool=no @AMDEPBACKSLASH@
+src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.obj: src/core/dnsmasq/tests/test-dnsmasq-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.obj -MD -MP -MF src/core/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Tpo -c -o src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.obj `if test -f 'src/core/dnsmasq/tests/test-dnsmasq-utils.c'; then $(CYGPATH_W) 'src/core/dnsmasq/tests/test-dnsmasq-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/core/dnsmasq/tests/test-dnsmasq-utils.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Tpo src/core/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/dnsmasq/tests/test-dnsmasq-utils.c' object='src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-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_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.obj `if test -f 'src/dnsmasq/tests/test-dnsmasq-utils.c'; then $(CYGPATH_W) 'src/dnsmasq/tests/test-dnsmasq-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/dnsmasq/tests/test-dnsmasq-utils.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/dnsmasq/tests/test_dnsmasq_utils-test-dnsmasq-utils.obj `if test -f 'src/core/dnsmasq/tests/test-dnsmasq-utils.c'; then $(CYGPATH_W) 'src/core/dnsmasq/tests/test-dnsmasq-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/core/dnsmasq/tests/test-dnsmasq-utils.c'; fi`
 
-src/initrd/nm_initrd_generator-nm-initrd-generator.o: src/initrd/nm-initrd-generator.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_initrd_nm_initrd_generator_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/nm_initrd_generator-nm-initrd-generator.o -MD -MP -MF src/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Tpo -c -o src/initrd/nm_initrd_generator-nm-initrd-generator.o `test -f 'src/initrd/nm-initrd-generator.c' || echo '$(srcdir)/'`src/initrd/nm-initrd-generator.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Tpo src/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/nm-initrd-generator.c' object='src/initrd/nm_initrd_generator-nm-initrd-generator.o' libtool=no @AMDEPBACKSLASH@
+src/core/initrd/nm_initrd_generator-nm-initrd-generator.o: src/core/initrd/nm-initrd-generator.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_nm_initrd_generator_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/nm_initrd_generator-nm-initrd-generator.o -MD -MP -MF src/core/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Tpo -c -o src/core/initrd/nm_initrd_generator-nm-initrd-generator.o `test -f 'src/core/initrd/nm-initrd-generator.c' || echo '$(srcdir)/'`src/core/initrd/nm-initrd-generator.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Tpo src/core/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/nm-initrd-generator.c' object='src/core/initrd/nm_initrd_generator-nm-initrd-generator.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_initrd_nm_initrd_generator_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/nm_initrd_generator-nm-initrd-generator.o `test -f 'src/initrd/nm-initrd-generator.c' || echo '$(srcdir)/'`src/initrd/nm-initrd-generator.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_nm_initrd_generator_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/nm_initrd_generator-nm-initrd-generator.o `test -f 'src/core/initrd/nm-initrd-generator.c' || echo '$(srcdir)/'`src/core/initrd/nm-initrd-generator.c
 
-src/initrd/nm_initrd_generator-nm-initrd-generator.obj: src/initrd/nm-initrd-generator.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_initrd_nm_initrd_generator_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/nm_initrd_generator-nm-initrd-generator.obj -MD -MP -MF src/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Tpo -c -o src/initrd/nm_initrd_generator-nm-initrd-generator.obj `if test -f 'src/initrd/nm-initrd-generator.c'; then $(CYGPATH_W) 'src/initrd/nm-initrd-generator.c'; else $(CYGPATH_W) '$(srcdir)/src/initrd/nm-initrd-generator.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Tpo src/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/nm-initrd-generator.c' object='src/initrd/nm_initrd_generator-nm-initrd-generator.obj' libtool=no @AMDEPBACKSLASH@
+src/core/initrd/nm_initrd_generator-nm-initrd-generator.obj: src/core/initrd/nm-initrd-generator.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_nm_initrd_generator_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/nm_initrd_generator-nm-initrd-generator.obj -MD -MP -MF src/core/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Tpo -c -o src/core/initrd/nm_initrd_generator-nm-initrd-generator.obj `if test -f 'src/core/initrd/nm-initrd-generator.c'; then $(CYGPATH_W) 'src/core/initrd/nm-initrd-generator.c'; else $(CYGPATH_W) '$(srcdir)/src/core/initrd/nm-initrd-generator.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Tpo src/core/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/nm-initrd-generator.c' object='src/core/initrd/nm_initrd_generator-nm-initrd-generator.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_initrd_nm_initrd_generator_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/nm_initrd_generator-nm-initrd-generator.obj `if test -f 'src/initrd/nm-initrd-generator.c'; then $(CYGPATH_W) 'src/initrd/nm-initrd-generator.c'; else $(CYGPATH_W) '$(srcdir)/src/initrd/nm-initrd-generator.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_nm_initrd_generator_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/nm_initrd_generator-nm-initrd-generator.obj `if test -f 'src/core/initrd/nm-initrd-generator.c'; then $(CYGPATH_W) 'src/core/initrd/nm-initrd-generator.c'; else $(CYGPATH_W) '$(srcdir)/src/core/initrd/nm-initrd-generator.c'; fi`
 
-src/initrd/tests/test_cmdline_reader-test-cmdline-reader.o: src/initrd/tests/test-cmdline-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_initrd_tests_test_cmdline_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/tests/test_cmdline_reader-test-cmdline-reader.o -MD -MP -MF src/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Tpo -c -o src/initrd/tests/test_cmdline_reader-test-cmdline-reader.o `test -f 'src/initrd/tests/test-cmdline-reader.c' || echo '$(srcdir)/'`src/initrd/tests/test-cmdline-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Tpo src/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/tests/test-cmdline-reader.c' object='src/initrd/tests/test_cmdline_reader-test-cmdline-reader.o' libtool=no @AMDEPBACKSLASH@
+src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.o: src/core/initrd/tests/test-cmdline-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_cmdline_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.o -MD -MP -MF src/core/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Tpo -c -o src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.o `test -f 'src/core/initrd/tests/test-cmdline-reader.c' || echo '$(srcdir)/'`src/core/initrd/tests/test-cmdline-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Tpo src/core/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/tests/test-cmdline-reader.c' object='src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.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_initrd_tests_test_cmdline_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/tests/test_cmdline_reader-test-cmdline-reader.o `test -f 'src/initrd/tests/test-cmdline-reader.c' || echo '$(srcdir)/'`src/initrd/tests/test-cmdline-reader.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_cmdline_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.o `test -f 'src/core/initrd/tests/test-cmdline-reader.c' || echo '$(srcdir)/'`src/core/initrd/tests/test-cmdline-reader.c
 
-src/initrd/tests/test_cmdline_reader-test-cmdline-reader.obj: src/initrd/tests/test-cmdline-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_initrd_tests_test_cmdline_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/tests/test_cmdline_reader-test-cmdline-reader.obj -MD -MP -MF src/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Tpo -c -o src/initrd/tests/test_cmdline_reader-test-cmdline-reader.obj `if test -f 'src/initrd/tests/test-cmdline-reader.c'; then $(CYGPATH_W) 'src/initrd/tests/test-cmdline-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/initrd/tests/test-cmdline-reader.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Tpo src/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/tests/test-cmdline-reader.c' object='src/initrd/tests/test_cmdline_reader-test-cmdline-reader.obj' libtool=no @AMDEPBACKSLASH@
+src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.obj: src/core/initrd/tests/test-cmdline-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_cmdline_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.obj -MD -MP -MF src/core/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Tpo -c -o src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.obj `if test -f 'src/core/initrd/tests/test-cmdline-reader.c'; then $(CYGPATH_W) 'src/core/initrd/tests/test-cmdline-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/core/initrd/tests/test-cmdline-reader.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Tpo src/core/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/tests/test-cmdline-reader.c' object='src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.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_initrd_tests_test_cmdline_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/tests/test_cmdline_reader-test-cmdline-reader.obj `if test -f 'src/initrd/tests/test-cmdline-reader.c'; then $(CYGPATH_W) 'src/initrd/tests/test-cmdline-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/initrd/tests/test-cmdline-reader.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_cmdline_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/tests/test_cmdline_reader-test-cmdline-reader.obj `if test -f 'src/core/initrd/tests/test-cmdline-reader.c'; then $(CYGPATH_W) 'src/core/initrd/tests/test-cmdline-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/core/initrd/tests/test-cmdline-reader.c'; fi`
 
-src/initrd/tests/test_dt_reader-test-dt-reader.o: src/initrd/tests/test-dt-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_initrd_tests_test_dt_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/tests/test_dt_reader-test-dt-reader.o -MD -MP -MF src/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Tpo -c -o src/initrd/tests/test_dt_reader-test-dt-reader.o `test -f 'src/initrd/tests/test-dt-reader.c' || echo '$(srcdir)/'`src/initrd/tests/test-dt-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Tpo src/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/tests/test-dt-reader.c' object='src/initrd/tests/test_dt_reader-test-dt-reader.o' libtool=no @AMDEPBACKSLASH@
+src/core/initrd/tests/test_dt_reader-test-dt-reader.o: src/core/initrd/tests/test-dt-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_dt_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/tests/test_dt_reader-test-dt-reader.o -MD -MP -MF src/core/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Tpo -c -o src/core/initrd/tests/test_dt_reader-test-dt-reader.o `test -f 'src/core/initrd/tests/test-dt-reader.c' || echo '$(srcdir)/'`src/core/initrd/tests/test-dt-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Tpo src/core/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/tests/test-dt-reader.c' object='src/core/initrd/tests/test_dt_reader-test-dt-reader.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_initrd_tests_test_dt_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/tests/test_dt_reader-test-dt-reader.o `test -f 'src/initrd/tests/test-dt-reader.c' || echo '$(srcdir)/'`src/initrd/tests/test-dt-reader.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_dt_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/tests/test_dt_reader-test-dt-reader.o `test -f 'src/core/initrd/tests/test-dt-reader.c' || echo '$(srcdir)/'`src/core/initrd/tests/test-dt-reader.c
 
-src/initrd/tests/test_dt_reader-test-dt-reader.obj: src/initrd/tests/test-dt-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_initrd_tests_test_dt_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/tests/test_dt_reader-test-dt-reader.obj -MD -MP -MF src/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Tpo -c -o src/initrd/tests/test_dt_reader-test-dt-reader.obj `if test -f 'src/initrd/tests/test-dt-reader.c'; then $(CYGPATH_W) 'src/initrd/tests/test-dt-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/initrd/tests/test-dt-reader.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Tpo src/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/tests/test-dt-reader.c' object='src/initrd/tests/test_dt_reader-test-dt-reader.obj' libtool=no @AMDEPBACKSLASH@
+src/core/initrd/tests/test_dt_reader-test-dt-reader.obj: src/core/initrd/tests/test-dt-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_dt_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/tests/test_dt_reader-test-dt-reader.obj -MD -MP -MF src/core/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Tpo -c -o src/core/initrd/tests/test_dt_reader-test-dt-reader.obj `if test -f 'src/core/initrd/tests/test-dt-reader.c'; then $(CYGPATH_W) 'src/core/initrd/tests/test-dt-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/core/initrd/tests/test-dt-reader.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Tpo src/core/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/tests/test-dt-reader.c' object='src/core/initrd/tests/test_dt_reader-test-dt-reader.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_initrd_tests_test_dt_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/tests/test_dt_reader-test-dt-reader.obj `if test -f 'src/initrd/tests/test-dt-reader.c'; then $(CYGPATH_W) 'src/initrd/tests/test-dt-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/initrd/tests/test-dt-reader.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_dt_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/tests/test_dt_reader-test-dt-reader.obj `if test -f 'src/core/initrd/tests/test-dt-reader.c'; then $(CYGPATH_W) 'src/core/initrd/tests/test-dt-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/core/initrd/tests/test-dt-reader.c'; fi`
 
-src/initrd/tests/test_ibft_reader-test-ibft-reader.o: src/initrd/tests/test-ibft-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_initrd_tests_test_ibft_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/tests/test_ibft_reader-test-ibft-reader.o -MD -MP -MF src/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Tpo -c -o src/initrd/tests/test_ibft_reader-test-ibft-reader.o `test -f 'src/initrd/tests/test-ibft-reader.c' || echo '$(srcdir)/'`src/initrd/tests/test-ibft-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Tpo src/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/tests/test-ibft-reader.c' object='src/initrd/tests/test_ibft_reader-test-ibft-reader.o' libtool=no @AMDEPBACKSLASH@
+src/core/initrd/tests/test_ibft_reader-test-ibft-reader.o: src/core/initrd/tests/test-ibft-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_ibft_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/tests/test_ibft_reader-test-ibft-reader.o -MD -MP -MF src/core/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Tpo -c -o src/core/initrd/tests/test_ibft_reader-test-ibft-reader.o `test -f 'src/core/initrd/tests/test-ibft-reader.c' || echo '$(srcdir)/'`src/core/initrd/tests/test-ibft-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Tpo src/core/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/tests/test-ibft-reader.c' object='src/core/initrd/tests/test_ibft_reader-test-ibft-reader.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_initrd_tests_test_ibft_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/tests/test_ibft_reader-test-ibft-reader.o `test -f 'src/initrd/tests/test-ibft-reader.c' || echo '$(srcdir)/'`src/initrd/tests/test-ibft-reader.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_ibft_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/tests/test_ibft_reader-test-ibft-reader.o `test -f 'src/core/initrd/tests/test-ibft-reader.c' || echo '$(srcdir)/'`src/core/initrd/tests/test-ibft-reader.c
 
-src/initrd/tests/test_ibft_reader-test-ibft-reader.obj: src/initrd/tests/test-ibft-reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_initrd_tests_test_ibft_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/initrd/tests/test_ibft_reader-test-ibft-reader.obj -MD -MP -MF src/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Tpo -c -o src/initrd/tests/test_ibft_reader-test-ibft-reader.obj `if test -f 'src/initrd/tests/test-ibft-reader.c'; then $(CYGPATH_W) 'src/initrd/tests/test-ibft-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/initrd/tests/test-ibft-reader.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Tpo src/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/initrd/tests/test-ibft-reader.c' object='src/initrd/tests/test_ibft_reader-test-ibft-reader.obj' libtool=no @AMDEPBACKSLASH@
+src/core/initrd/tests/test_ibft_reader-test-ibft-reader.obj: src/core/initrd/tests/test-ibft-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_ibft_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/initrd/tests/test_ibft_reader-test-ibft-reader.obj -MD -MP -MF src/core/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Tpo -c -o src/core/initrd/tests/test_ibft_reader-test-ibft-reader.obj `if test -f 'src/core/initrd/tests/test-ibft-reader.c'; then $(CYGPATH_W) 'src/core/initrd/tests/test-ibft-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/core/initrd/tests/test-ibft-reader.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Tpo src/core/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/initrd/tests/test-ibft-reader.c' object='src/core/initrd/tests/test_ibft_reader-test-ibft-reader.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_initrd_tests_test_ibft_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/initrd/tests/test_ibft_reader-test-ibft-reader.obj `if test -f 'src/initrd/tests/test-ibft-reader.c'; then $(CYGPATH_W) 'src/initrd/tests/test-ibft-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/initrd/tests/test-ibft-reader.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_initrd_tests_test_ibft_reader_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/initrd/tests/test_ibft_reader-test-ibft-reader.obj `if test -f 'src/core/initrd/tests/test-ibft-reader.c'; then $(CYGPATH_W) 'src/core/initrd/tests/test-ibft-reader.c'; else $(CYGPATH_W) '$(srcdir)/src/core/initrd/tests/test-ibft-reader.c'; fi`
 
-src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.o: src/ndisc/tests/test-ndisc-fake.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ndisc_tests_test_ndisc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.o -MD -MP -MF src/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Tpo -c -o src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.o `test -f 'src/ndisc/tests/test-ndisc-fake.c' || echo '$(srcdir)/'`src/ndisc/tests/test-ndisc-fake.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Tpo src/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ndisc/tests/test-ndisc-fake.c' object='src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.o' libtool=no @AMDEPBACKSLASH@
+src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.o: src/core/ndisc/tests/test-ndisc-fake.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_ndisc_tests_test_ndisc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.o -MD -MP -MF src/core/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Tpo -c -o src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.o `test -f 'src/core/ndisc/tests/test-ndisc-fake.c' || echo '$(srcdir)/'`src/core/ndisc/tests/test-ndisc-fake.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Tpo src/core/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/ndisc/tests/test-ndisc-fake.c' object='src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.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_ndisc_tests_test_ndisc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.o `test -f 'src/ndisc/tests/test-ndisc-fake.c' || echo '$(srcdir)/'`src/ndisc/tests/test-ndisc-fake.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_ndisc_tests_test_ndisc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.o `test -f 'src/core/ndisc/tests/test-ndisc-fake.c' || echo '$(srcdir)/'`src/core/ndisc/tests/test-ndisc-fake.c
 
-src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.obj: src/ndisc/tests/test-ndisc-fake.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ndisc_tests_test_ndisc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.obj -MD -MP -MF src/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Tpo -c -o src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.obj `if test -f 'src/ndisc/tests/test-ndisc-fake.c'; then $(CYGPATH_W) 'src/ndisc/tests/test-ndisc-fake.c'; else $(CYGPATH_W) '$(srcdir)/src/ndisc/tests/test-ndisc-fake.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Tpo src/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ndisc/tests/test-ndisc-fake.c' object='src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.obj' libtool=no @AMDEPBACKSLASH@
+src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.obj: src/core/ndisc/tests/test-ndisc-fake.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_ndisc_tests_test_ndisc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.obj -MD -MP -MF src/core/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Tpo -c -o src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.obj `if test -f 'src/core/ndisc/tests/test-ndisc-fake.c'; then $(CYGPATH_W) 'src/core/ndisc/tests/test-ndisc-fake.c'; else $(CYGPATH_W) '$(srcdir)/src/core/ndisc/tests/test-ndisc-fake.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Tpo src/core/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/ndisc/tests/test-ndisc-fake.c' object='src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.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_ndisc_tests_test_ndisc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ndisc/tests/test_ndisc_fake-test-ndisc-fake.obj `if test -f 'src/ndisc/tests/test-ndisc-fake.c'; then $(CYGPATH_W) 'src/ndisc/tests/test-ndisc-fake.c'; else $(CYGPATH_W) '$(srcdir)/src/ndisc/tests/test-ndisc-fake.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_ndisc_tests_test_ndisc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/ndisc/tests/test_ndisc_fake-test-ndisc-fake.obj `if test -f 'src/core/ndisc/tests/test-ndisc-fake.c'; then $(CYGPATH_W) 'src/core/ndisc/tests/test-ndisc-fake.c'; else $(CYGPATH_W) '$(srcdir)/src/core/ndisc/tests/test-ndisc-fake.c'; fi`
 
-src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.o: src/ndisc/tests/test-ndisc-linux.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ndisc_tests_test_ndisc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.o -MD -MP -MF src/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Tpo -c -o src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.o `test -f 'src/ndisc/tests/test-ndisc-linux.c' || echo '$(srcdir)/'`src/ndisc/tests/test-ndisc-linux.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Tpo src/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ndisc/tests/test-ndisc-linux.c' object='src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.o' libtool=no @AMDEPBACKSLASH@
+src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.o: src/core/ndisc/tests/test-ndisc-linux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_ndisc_tests_test_ndisc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.o -MD -MP -MF src/core/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Tpo -c -o src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.o `test -f 'src/core/ndisc/tests/test-ndisc-linux.c' || echo '$(srcdir)/'`src/core/ndisc/tests/test-ndisc-linux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Tpo src/core/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/ndisc/tests/test-ndisc-linux.c' object='src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.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_ndisc_tests_test_ndisc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.o `test -f 'src/ndisc/tests/test-ndisc-linux.c' || echo '$(srcdir)/'`src/ndisc/tests/test-ndisc-linux.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_ndisc_tests_test_ndisc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.o `test -f 'src/core/ndisc/tests/test-ndisc-linux.c' || echo '$(srcdir)/'`src/core/ndisc/tests/test-ndisc-linux.c
 
-src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.obj: src/ndisc/tests/test-ndisc-linux.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ndisc_tests_test_ndisc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.obj -MD -MP -MF src/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Tpo -c -o src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.obj `if test -f 'src/ndisc/tests/test-ndisc-linux.c'; then $(CYGPATH_W) 'src/ndisc/tests/test-ndisc-linux.c'; else $(CYGPATH_W) '$(srcdir)/src/ndisc/tests/test-ndisc-linux.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Tpo src/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ndisc/tests/test-ndisc-linux.c' object='src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.obj' libtool=no @AMDEPBACKSLASH@
+src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.obj: src/core/ndisc/tests/test-ndisc-linux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_ndisc_tests_test_ndisc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.obj -MD -MP -MF src/core/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Tpo -c -o src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.obj `if test -f 'src/core/ndisc/tests/test-ndisc-linux.c'; then $(CYGPATH_W) 'src/core/ndisc/tests/test-ndisc-linux.c'; else $(CYGPATH_W) '$(srcdir)/src/core/ndisc/tests/test-ndisc-linux.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Tpo src/core/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/ndisc/tests/test-ndisc-linux.c' object='src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.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_ndisc_tests_test_ndisc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ndisc/tests/test_ndisc_linux-test-ndisc-linux.obj `if test -f 'src/ndisc/tests/test-ndisc-linux.c'; then $(CYGPATH_W) 'src/ndisc/tests/test-ndisc-linux.c'; else $(CYGPATH_W) '$(srcdir)/src/ndisc/tests/test-ndisc-linux.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_ndisc_tests_test_ndisc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/ndisc/tests/test_ndisc_linux-test-ndisc-linux.obj `if test -f 'src/core/ndisc/tests/test-ndisc-linux.c'; then $(CYGPATH_W) 'src/core/ndisc/tests/test-ndisc-linux.c'; else $(CYGPATH_W) '$(srcdir)/src/core/ndisc/tests/test-ndisc-linux.c'; fi`
 
-src/nm_iface_helper-nm-iface-helper.o: src/nm-iface-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_nm_iface_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/nm_iface_helper-nm-iface-helper.o -MD -MP -MF src/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Tpo -c -o src/nm_iface_helper-nm-iface-helper.o `test -f 'src/nm-iface-helper.c' || echo '$(srcdir)/'`src/nm-iface-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Tpo src/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-iface-helper.c' object='src/nm_iface_helper-nm-iface-helper.o' libtool=no @AMDEPBACKSLASH@
+src/core/nm_iface_helper-nm-iface-helper.o: src/core/nm-iface-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_nm_iface_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/nm_iface_helper-nm-iface-helper.o -MD -MP -MF src/core/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Tpo -c -o src/core/nm_iface_helper-nm-iface-helper.o `test -f 'src/core/nm-iface-helper.c' || echo '$(srcdir)/'`src/core/nm-iface-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Tpo src/core/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-iface-helper.c' object='src/core/nm_iface_helper-nm-iface-helper.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_nm_iface_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/nm_iface_helper-nm-iface-helper.o `test -f 'src/nm-iface-helper.c' || echo '$(srcdir)/'`src/nm-iface-helper.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_nm_iface_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/nm_iface_helper-nm-iface-helper.o `test -f 'src/core/nm-iface-helper.c' || echo '$(srcdir)/'`src/core/nm-iface-helper.c
 
-src/nm_iface_helper-nm-iface-helper.obj: src/nm-iface-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_nm_iface_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/nm_iface_helper-nm-iface-helper.obj -MD -MP -MF src/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Tpo -c -o src/nm_iface_helper-nm-iface-helper.obj `if test -f 'src/nm-iface-helper.c'; then $(CYGPATH_W) 'src/nm-iface-helper.c'; else $(CYGPATH_W) '$(srcdir)/src/nm-iface-helper.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Tpo src/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-iface-helper.c' object='src/nm_iface_helper-nm-iface-helper.obj' libtool=no @AMDEPBACKSLASH@
+src/core/nm_iface_helper-nm-iface-helper.obj: src/core/nm-iface-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_nm_iface_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/nm_iface_helper-nm-iface-helper.obj -MD -MP -MF src/core/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Tpo -c -o src/core/nm_iface_helper-nm-iface-helper.obj `if test -f 'src/core/nm-iface-helper.c'; then $(CYGPATH_W) 'src/core/nm-iface-helper.c'; else $(CYGPATH_W) '$(srcdir)/src/core/nm-iface-helper.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Tpo src/core/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/nm-iface-helper.c' object='src/core/nm_iface_helper-nm-iface-helper.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_nm_iface_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/nm_iface_helper-nm-iface-helper.obj `if test -f 'src/nm-iface-helper.c'; then $(CYGPATH_W) 'src/nm-iface-helper.c'; else $(CYGPATH_W) '$(srcdir)/src/nm-iface-helper.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_nm_iface_helper_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/nm_iface_helper-nm-iface-helper.obj `if test -f 'src/core/nm-iface-helper.c'; then $(CYGPATH_W) 'src/core/nm-iface-helper.c'; else $(CYGPATH_W) '$(srcdir)/src/core/nm-iface-helper.c'; fi`
 
-src/platform/tests/monitor-monitor.o: src/platform/tests/monitor.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/monitor-monitor.o -MD -MP -MF src/platform/tests/$(DEPDIR)/monitor-monitor.Tpo -c -o src/platform/tests/monitor-monitor.o `test -f 'src/platform/tests/monitor.c' || echo '$(srcdir)/'`src/platform/tests/monitor.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/monitor-monitor.Tpo src/platform/tests/$(DEPDIR)/monitor-monitor.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/monitor.c' object='src/platform/tests/monitor-monitor.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/monitor-monitor.o: src/core/platform/tests/monitor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/monitor-monitor.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/monitor-monitor.Tpo -c -o src/core/platform/tests/monitor-monitor.o `test -f 'src/core/platform/tests/monitor.c' || echo '$(srcdir)/'`src/core/platform/tests/monitor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/monitor-monitor.Tpo src/core/platform/tests/$(DEPDIR)/monitor-monitor.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/monitor.c' object='src/core/platform/tests/monitor-monitor.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_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/monitor-monitor.o `test -f 'src/platform/tests/monitor.c' || echo '$(srcdir)/'`src/platform/tests/monitor.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/monitor-monitor.o `test -f 'src/core/platform/tests/monitor.c' || echo '$(srcdir)/'`src/core/platform/tests/monitor.c
 
-src/platform/tests/monitor-monitor.obj: src/platform/tests/monitor.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/monitor-monitor.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/monitor-monitor.Tpo -c -o src/platform/tests/monitor-monitor.obj `if test -f 'src/platform/tests/monitor.c'; then $(CYGPATH_W) 'src/platform/tests/monitor.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/monitor.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/monitor-monitor.Tpo src/platform/tests/$(DEPDIR)/monitor-monitor.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/monitor.c' object='src/platform/tests/monitor-monitor.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/monitor-monitor.obj: src/core/platform/tests/monitor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/monitor-monitor.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/monitor-monitor.Tpo -c -o src/core/platform/tests/monitor-monitor.obj `if test -f 'src/core/platform/tests/monitor.c'; then $(CYGPATH_W) 'src/core/platform/tests/monitor.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/monitor.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/monitor-monitor.Tpo src/core/platform/tests/$(DEPDIR)/monitor-monitor.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/monitor.c' object='src/core/platform/tests/monitor-monitor.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_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/monitor-monitor.obj `if test -f 'src/platform/tests/monitor.c'; then $(CYGPATH_W) 'src/platform/tests/monitor.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/monitor.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/monitor-monitor.obj `if test -f 'src/core/platform/tests/monitor.c'; then $(CYGPATH_W) 'src/core/platform/tests/monitor.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/monitor.c'; fi`
 
-src/platform/tests/test_address_fake-test-address.o: src/platform/tests/test-address.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_address_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_address_fake-test-address.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_address_fake-test-address.Tpo -c -o src/platform/tests/test_address_fake-test-address.o `test -f 'src/platform/tests/test-address.c' || echo '$(srcdir)/'`src/platform/tests/test-address.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_address_fake-test-address.Tpo src/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-address.c' object='src/platform/tests/test_address_fake-test-address.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_address_fake-test-address.o: src/core/platform/tests/test-address.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_address_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_address_fake-test-address.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_address_fake-test-address.Tpo -c -o src/core/platform/tests/test_address_fake-test-address.o `test -f 'src/core/platform/tests/test-address.c' || echo '$(srcdir)/'`src/core/platform/tests/test-address.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_address_fake-test-address.Tpo src/core/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-address.c' object='src/core/platform/tests/test_address_fake-test-address.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_address_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_address_fake-test-address.o `test -f 'src/platform/tests/test-address.c' || echo '$(srcdir)/'`src/platform/tests/test-address.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_address_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_address_fake-test-address.o `test -f 'src/core/platform/tests/test-address.c' || echo '$(srcdir)/'`src/core/platform/tests/test-address.c
 
-src/platform/tests/test_address_fake-test-address.obj: src/platform/tests/test-address.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_address_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_address_fake-test-address.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_address_fake-test-address.Tpo -c -o src/platform/tests/test_address_fake-test-address.obj `if test -f 'src/platform/tests/test-address.c'; then $(CYGPATH_W) 'src/platform/tests/test-address.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-address.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_address_fake-test-address.Tpo src/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-address.c' object='src/platform/tests/test_address_fake-test-address.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_address_fake-test-address.obj: src/core/platform/tests/test-address.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_address_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_address_fake-test-address.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_address_fake-test-address.Tpo -c -o src/core/platform/tests/test_address_fake-test-address.obj `if test -f 'src/core/platform/tests/test-address.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-address.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-address.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_address_fake-test-address.Tpo src/core/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-address.c' object='src/core/platform/tests/test_address_fake-test-address.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_address_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_address_fake-test-address.obj `if test -f 'src/platform/tests/test-address.c'; then $(CYGPATH_W) 'src/platform/tests/test-address.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-address.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_address_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_address_fake-test-address.obj `if test -f 'src/core/platform/tests/test-address.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-address.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-address.c'; fi`
 
-src/platform/tests/test_address_linux-test-address.o: src/platform/tests/test-address.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_address_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_address_linux-test-address.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_address_linux-test-address.Tpo -c -o src/platform/tests/test_address_linux-test-address.o `test -f 'src/platform/tests/test-address.c' || echo '$(srcdir)/'`src/platform/tests/test-address.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_address_linux-test-address.Tpo src/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-address.c' object='src/platform/tests/test_address_linux-test-address.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_address_linux-test-address.o: src/core/platform/tests/test-address.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_address_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_address_linux-test-address.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_address_linux-test-address.Tpo -c -o src/core/platform/tests/test_address_linux-test-address.o `test -f 'src/core/platform/tests/test-address.c' || echo '$(srcdir)/'`src/core/platform/tests/test-address.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_address_linux-test-address.Tpo src/core/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-address.c' object='src/core/platform/tests/test_address_linux-test-address.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_address_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_address_linux-test-address.o `test -f 'src/platform/tests/test-address.c' || echo '$(srcdir)/'`src/platform/tests/test-address.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_address_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_address_linux-test-address.o `test -f 'src/core/platform/tests/test-address.c' || echo '$(srcdir)/'`src/core/platform/tests/test-address.c
 
-src/platform/tests/test_address_linux-test-address.obj: src/platform/tests/test-address.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_address_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_address_linux-test-address.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_address_linux-test-address.Tpo -c -o src/platform/tests/test_address_linux-test-address.obj `if test -f 'src/platform/tests/test-address.c'; then $(CYGPATH_W) 'src/platform/tests/test-address.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-address.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_address_linux-test-address.Tpo src/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-address.c' object='src/platform/tests/test_address_linux-test-address.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_address_linux-test-address.obj: src/core/platform/tests/test-address.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_address_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_address_linux-test-address.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_address_linux-test-address.Tpo -c -o src/core/platform/tests/test_address_linux-test-address.obj `if test -f 'src/core/platform/tests/test-address.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-address.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-address.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_address_linux-test-address.Tpo src/core/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-address.c' object='src/core/platform/tests/test_address_linux-test-address.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_address_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_address_linux-test-address.obj `if test -f 'src/platform/tests/test-address.c'; then $(CYGPATH_W) 'src/platform/tests/test-address.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-address.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_address_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_address_linux-test-address.obj `if test -f 'src/core/platform/tests/test-address.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-address.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-address.c'; fi`
 
-src/platform/tests/test_cleanup_fake-test-cleanup.o: src/platform/tests/test-cleanup.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_cleanup_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_cleanup_fake-test-cleanup.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Tpo -c -o src/platform/tests/test_cleanup_fake-test-cleanup.o `test -f 'src/platform/tests/test-cleanup.c' || echo '$(srcdir)/'`src/platform/tests/test-cleanup.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Tpo src/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-cleanup.c' object='src/platform/tests/test_cleanup_fake-test-cleanup.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_cleanup_fake-test-cleanup.o: src/core/platform/tests/test-cleanup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_cleanup_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_cleanup_fake-test-cleanup.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Tpo -c -o src/core/platform/tests/test_cleanup_fake-test-cleanup.o `test -f 'src/core/platform/tests/test-cleanup.c' || echo '$(srcdir)/'`src/core/platform/tests/test-cleanup.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Tpo src/core/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-cleanup.c' object='src/core/platform/tests/test_cleanup_fake-test-cleanup.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_cleanup_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_cleanup_fake-test-cleanup.o `test -f 'src/platform/tests/test-cleanup.c' || echo '$(srcdir)/'`src/platform/tests/test-cleanup.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_cleanup_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_cleanup_fake-test-cleanup.o `test -f 'src/core/platform/tests/test-cleanup.c' || echo '$(srcdir)/'`src/core/platform/tests/test-cleanup.c
 
-src/platform/tests/test_cleanup_fake-test-cleanup.obj: src/platform/tests/test-cleanup.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_cleanup_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_cleanup_fake-test-cleanup.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Tpo -c -o src/platform/tests/test_cleanup_fake-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`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Tpo src/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-cleanup.c' object='src/platform/tests/test_cleanup_fake-test-cleanup.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_cleanup_fake-test-cleanup.obj: src/core/platform/tests/test-cleanup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_cleanup_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_cleanup_fake-test-cleanup.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Tpo -c -o src/core/platform/tests/test_cleanup_fake-test-cleanup.obj `if test -f 'src/core/platform/tests/test-cleanup.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-cleanup.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-cleanup.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Tpo src/core/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-cleanup.c' object='src/core/platform/tests/test_cleanup_fake-test-cleanup.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_cleanup_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_cleanup_fake-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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_cleanup_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_cleanup_fake-test-cleanup.obj `if test -f 'src/core/platform/tests/test-cleanup.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-cleanup.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-cleanup.c'; fi`
 
-src/platform/tests/test_cleanup_linux-test-cleanup.o: src/platform/tests/test-cleanup.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_cleanup_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_cleanup_linux-test-cleanup.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Tpo -c -o src/platform/tests/test_cleanup_linux-test-cleanup.o `test -f 'src/platform/tests/test-cleanup.c' || echo '$(srcdir)/'`src/platform/tests/test-cleanup.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Tpo src/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-cleanup.c' object='src/platform/tests/test_cleanup_linux-test-cleanup.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_cleanup_linux-test-cleanup.o: src/core/platform/tests/test-cleanup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_cleanup_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_cleanup_linux-test-cleanup.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Tpo -c -o src/core/platform/tests/test_cleanup_linux-test-cleanup.o `test -f 'src/core/platform/tests/test-cleanup.c' || echo '$(srcdir)/'`src/core/platform/tests/test-cleanup.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Tpo src/core/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-cleanup.c' object='src/core/platform/tests/test_cleanup_linux-test-cleanup.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_cleanup_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_cleanup_linux-test-cleanup.o `test -f 'src/platform/tests/test-cleanup.c' || echo '$(srcdir)/'`src/platform/tests/test-cleanup.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_cleanup_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_cleanup_linux-test-cleanup.o `test -f 'src/core/platform/tests/test-cleanup.c' || echo '$(srcdir)/'`src/core/platform/tests/test-cleanup.c
 
-src/platform/tests/test_cleanup_linux-test-cleanup.obj: src/platform/tests/test-cleanup.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_cleanup_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_cleanup_linux-test-cleanup.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Tpo -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`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Tpo src/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-cleanup.c' object='src/platform/tests/test_cleanup_linux-test-cleanup.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_cleanup_linux-test-cleanup.obj: src/core/platform/tests/test-cleanup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_cleanup_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_cleanup_linux-test-cleanup.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Tpo -c -o src/core/platform/tests/test_cleanup_linux-test-cleanup.obj `if test -f 'src/core/platform/tests/test-cleanup.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-cleanup.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-cleanup.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Tpo src/core/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-cleanup.c' object='src/core/platform/tests/test_cleanup_linux-test-cleanup.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_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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_cleanup_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_cleanup_linux-test-cleanup.obj `if test -f 'src/core/platform/tests/test-cleanup.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-cleanup.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-cleanup.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-link.c' object='src/platform/tests/test_link_fake-test-link.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_link_fake-test-link.o: src/core/platform/tests/test-link.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_link_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_link_fake-test-link.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_link_fake-test-link.Tpo -c -o src/core/platform/tests/test_link_fake-test-link.o `test -f 'src/core/platform/tests/test-link.c' || echo '$(srcdir)/'`src/core/platform/tests/test-link.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_link_fake-test-link.Tpo src/core/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-link.c' object='src/core/platform/tests/test_link_fake-test-link.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_link_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_link_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_link_fake-test-link.o `test -f 'src/core/platform/tests/test-link.c' || echo '$(srcdir)/'`src/core/platform/tests/test-link.c
 
-src/platform/tests/test_link_fake-test-link.obj: 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.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_link_fake-test-link.Tpo -c -o src/platform/tests/test_link_fake-test-link.obj `if test -f 'src/platform/tests/test-link.c'; then $(CYGPATH_W) 'src/platform/tests/test-link.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-link.c'; fi`
-@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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-link.c' object='src/platform/tests/test_link_fake-test-link.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_link_fake-test-link.obj: src/core/platform/tests/test-link.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_link_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_link_fake-test-link.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_link_fake-test-link.Tpo -c -o src/core/platform/tests/test_link_fake-test-link.obj `if test -f 'src/core/platform/tests/test-link.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-link.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-link.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_link_fake-test-link.Tpo src/core/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-link.c' object='src/core/platform/tests/test_link_fake-test-link.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_link_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_link_fake-test-link.obj `if test -f 'src/platform/tests/test-link.c'; then $(CYGPATH_W) 'src/platform/tests/test-link.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-link.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_link_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_link_fake-test-link.obj `if test -f 'src/core/platform/tests/test-link.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-link.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-link.c'; fi`
 
-src/platform/tests/test_link_linux-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_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_link_linux-test-link.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_link_linux-test-link.Tpo -c -o src/platform/tests/test_link_linux-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_linux-test-link.Tpo src/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-link.c' object='src/platform/tests/test_link_linux-test-link.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_link_linux-test-link.o: src/core/platform/tests/test-link.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_link_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_link_linux-test-link.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_link_linux-test-link.Tpo -c -o src/core/platform/tests/test_link_linux-test-link.o `test -f 'src/core/platform/tests/test-link.c' || echo '$(srcdir)/'`src/core/platform/tests/test-link.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_link_linux-test-link.Tpo src/core/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-link.c' object='src/core/platform/tests/test_link_linux-test-link.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_link_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_link_linux-test-link.o `test -f 'src/platform/tests/test-link.c' || echo '$(srcdir)/'`src/platform/tests/test-link.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_link_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_link_linux-test-link.o `test -f 'src/core/platform/tests/test-link.c' || echo '$(srcdir)/'`src/core/platform/tests/test-link.c
 
-src/platform/tests/test_link_linux-test-link.obj: src/platform/tests/test-link.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_link_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_link_linux-test-link.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_link_linux-test-link.Tpo -c -o src/platform/tests/test_link_linux-test-link.obj `if test -f 'src/platform/tests/test-link.c'; then $(CYGPATH_W) 'src/platform/tests/test-link.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-link.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_link_linux-test-link.Tpo src/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-link.c' object='src/platform/tests/test_link_linux-test-link.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_link_linux-test-link.obj: src/core/platform/tests/test-link.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_link_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_link_linux-test-link.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_link_linux-test-link.Tpo -c -o src/core/platform/tests/test_link_linux-test-link.obj `if test -f 'src/core/platform/tests/test-link.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-link.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-link.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_link_linux-test-link.Tpo src/core/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-link.c' object='src/core/platform/tests/test_link_linux-test-link.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_link_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_link_linux-test-link.obj `if test -f 'src/platform/tests/test-link.c'; then $(CYGPATH_W) 'src/platform/tests/test-link.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-link.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_link_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_link_linux-test-link.obj `if test -f 'src/core/platform/tests/test-link.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-link.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-link.c'; fi`
 
-src/platform/tests/test_nmp_object-test-nmp-object.o: src/platform/tests/test-nmp-object.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_nmp_object_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_nmp_object-test-nmp-object.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Tpo -c -o src/platform/tests/test_nmp_object-test-nmp-object.o `test -f 'src/platform/tests/test-nmp-object.c' || echo '$(srcdir)/'`src/platform/tests/test-nmp-object.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Tpo src/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-nmp-object.c' object='src/platform/tests/test_nmp_object-test-nmp-object.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_nmp_object-test-nmp-object.o: src/core/platform/tests/test-nmp-object.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_nmp_object_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_nmp_object-test-nmp-object.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Tpo -c -o src/core/platform/tests/test_nmp_object-test-nmp-object.o `test -f 'src/core/platform/tests/test-nmp-object.c' || echo '$(srcdir)/'`src/core/platform/tests/test-nmp-object.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Tpo src/core/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-nmp-object.c' object='src/core/platform/tests/test_nmp_object-test-nmp-object.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_nmp_object_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_nmp_object-test-nmp-object.o `test -f 'src/platform/tests/test-nmp-object.c' || echo '$(srcdir)/'`src/platform/tests/test-nmp-object.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_nmp_object_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_nmp_object-test-nmp-object.o `test -f 'src/core/platform/tests/test-nmp-object.c' || echo '$(srcdir)/'`src/core/platform/tests/test-nmp-object.c
 
-src/platform/tests/test_nmp_object-test-nmp-object.obj: src/platform/tests/test-nmp-object.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_nmp_object_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_nmp_object-test-nmp-object.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Tpo -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`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Tpo src/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-nmp-object.c' object='src/platform/tests/test_nmp_object-test-nmp-object.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_nmp_object-test-nmp-object.obj: src/core/platform/tests/test-nmp-object.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_nmp_object_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_nmp_object-test-nmp-object.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Tpo -c -o src/core/platform/tests/test_nmp_object-test-nmp-object.obj `if test -f 'src/core/platform/tests/test-nmp-object.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-nmp-object.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-nmp-object.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Tpo src/core/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-nmp-object.c' object='src/core/platform/tests/test_nmp_object-test-nmp-object.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_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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_nmp_object_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_nmp_object-test-nmp-object.obj `if test -f 'src/core/platform/tests/test-nmp-object.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-nmp-object.c'; else $(CYGPATH_W) '$(srcdir)/src/core/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@
+src/core/platform/tests/test_platform_general-test-platform-general.o: src/core/platform/tests/test-platform-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_platform_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_platform_general-test-platform-general.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Tpo -c -o src/core/platform/tests/test_platform_general-test-platform-general.o `test -f 'src/core/platform/tests/test-platform-general.c' || echo '$(srcdir)/'`src/core/platform/tests/test-platform-general.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Tpo src/core/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-platform-general.c' object='src/core/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
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_platform_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_platform_general-test-platform-general.o `test -f 'src/core/platform/tests/test-platform-general.c' || echo '$(srcdir)/'`src/core/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@
+src/core/platform/tests/test_platform_general-test-platform-general.obj: src/core/platform/tests/test-platform-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_platform_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_platform_general-test-platform-general.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Tpo -c -o src/core/platform/tests/test_platform_general-test-platform-general.obj `if test -f 'src/core/platform/tests/test-platform-general.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-platform-general.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-platform-general.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Tpo src/core/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-platform-general.c' object='src/core/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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_platform_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_platform_general-test-platform-general.obj `if test -f 'src/core/platform/tests/test-platform-general.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-platform-general.c'; else $(CYGPATH_W) '$(srcdir)/src/core/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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-route.c' object='src/platform/tests/test_route_fake-test-route.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_route_fake-test-route.o: src/core/platform/tests/test-route.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_route_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_route_fake-test-route.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_route_fake-test-route.Tpo -c -o src/core/platform/tests/test_route_fake-test-route.o `test -f 'src/core/platform/tests/test-route.c' || echo '$(srcdir)/'`src/core/platform/tests/test-route.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_route_fake-test-route.Tpo src/core/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-route.c' object='src/core/platform/tests/test_route_fake-test-route.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_route_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_route_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_route_fake-test-route.o `test -f 'src/core/platform/tests/test-route.c' || echo '$(srcdir)/'`src/core/platform/tests/test-route.c
 
-src/platform/tests/test_route_fake-test-route.obj: 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.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_route_fake-test-route.Tpo -c -o src/platform/tests/test_route_fake-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`
-@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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-route.c' object='src/platform/tests/test_route_fake-test-route.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_route_fake-test-route.obj: src/core/platform/tests/test-route.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_route_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_route_fake-test-route.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_route_fake-test-route.Tpo -c -o src/core/platform/tests/test_route_fake-test-route.obj `if test -f 'src/core/platform/tests/test-route.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-route.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-route.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_route_fake-test-route.Tpo src/core/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-route.c' object='src/core/platform/tests/test_route_fake-test-route.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_route_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_route_fake-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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_route_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_route_fake-test-route.obj `if test -f 'src/core/platform/tests/test-route.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-route.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-route.c'; fi`
 
-src/platform/tests/test_route_linux-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_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_route_linux-test-route.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_route_linux-test-route.Tpo -c -o src/platform/tests/test_route_linux-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_linux-test-route.Tpo src/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-route.c' object='src/platform/tests/test_route_linux-test-route.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_route_linux-test-route.o: src/core/platform/tests/test-route.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_route_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_route_linux-test-route.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_route_linux-test-route.Tpo -c -o src/core/platform/tests/test_route_linux-test-route.o `test -f 'src/core/platform/tests/test-route.c' || echo '$(srcdir)/'`src/core/platform/tests/test-route.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_route_linux-test-route.Tpo src/core/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-route.c' object='src/core/platform/tests/test_route_linux-test-route.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_route_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_route_linux-test-route.o `test -f 'src/platform/tests/test-route.c' || echo '$(srcdir)/'`src/platform/tests/test-route.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_route_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_route_linux-test-route.o `test -f 'src/core/platform/tests/test-route.c' || echo '$(srcdir)/'`src/core/platform/tests/test-route.c
 
-src/platform/tests/test_route_linux-test-route.obj: src/platform/tests/test-route.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_route_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_route_linux-test-route.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_route_linux-test-route.Tpo -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`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_route_linux-test-route.Tpo src/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-route.c' object='src/platform/tests/test_route_linux-test-route.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_route_linux-test-route.obj: src/core/platform/tests/test-route.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_route_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_route_linux-test-route.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_route_linux-test-route.Tpo -c -o src/core/platform/tests/test_route_linux-test-route.obj `if test -f 'src/core/platform/tests/test-route.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-route.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-route.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_route_linux-test-route.Tpo src/core/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-route.c' object='src/core/platform/tests/test_route_linux-test-route.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_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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_route_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_route_linux-test-route.obj `if test -f 'src/core/platform/tests/test-route.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-route.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-route.c'; fi`
 
-src/platform/tests/test_tc_fake-test-tc.o: src/platform/tests/test-tc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_tc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_tc_fake-test-tc.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Tpo -c -o src/platform/tests/test_tc_fake-test-tc.o `test -f 'src/platform/tests/test-tc.c' || echo '$(srcdir)/'`src/platform/tests/test-tc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Tpo src/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-tc.c' object='src/platform/tests/test_tc_fake-test-tc.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_tc_fake-test-tc.o: src/core/platform/tests/test-tc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_tc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_tc_fake-test-tc.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Tpo -c -o src/core/platform/tests/test_tc_fake-test-tc.o `test -f 'src/core/platform/tests/test-tc.c' || echo '$(srcdir)/'`src/core/platform/tests/test-tc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Tpo src/core/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-tc.c' object='src/core/platform/tests/test_tc_fake-test-tc.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_tc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_tc_fake-test-tc.o `test -f 'src/platform/tests/test-tc.c' || echo '$(srcdir)/'`src/platform/tests/test-tc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_tc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_tc_fake-test-tc.o `test -f 'src/core/platform/tests/test-tc.c' || echo '$(srcdir)/'`src/core/platform/tests/test-tc.c
 
-src/platform/tests/test_tc_fake-test-tc.obj: src/platform/tests/test-tc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_tc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_tc_fake-test-tc.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Tpo -c -o src/platform/tests/test_tc_fake-test-tc.obj `if test -f 'src/platform/tests/test-tc.c'; then $(CYGPATH_W) 'src/platform/tests/test-tc.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-tc.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Tpo src/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-tc.c' object='src/platform/tests/test_tc_fake-test-tc.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_tc_fake-test-tc.obj: src/core/platform/tests/test-tc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_tc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_tc_fake-test-tc.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Tpo -c -o src/core/platform/tests/test_tc_fake-test-tc.obj `if test -f 'src/core/platform/tests/test-tc.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-tc.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-tc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Tpo src/core/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-tc.c' object='src/core/platform/tests/test_tc_fake-test-tc.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_tc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_tc_fake-test-tc.obj `if test -f 'src/platform/tests/test-tc.c'; then $(CYGPATH_W) 'src/platform/tests/test-tc.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-tc.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_tc_fake_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_tc_fake-test-tc.obj `if test -f 'src/core/platform/tests/test-tc.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-tc.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-tc.c'; fi`
 
-src/platform/tests/test_tc_linux-test-tc.o: src/platform/tests/test-tc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_tc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_tc_linux-test-tc.o -MD -MP -MF src/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Tpo -c -o src/platform/tests/test_tc_linux-test-tc.o `test -f 'src/platform/tests/test-tc.c' || echo '$(srcdir)/'`src/platform/tests/test-tc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Tpo src/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-tc.c' object='src/platform/tests/test_tc_linux-test-tc.o' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_tc_linux-test-tc.o: src/core/platform/tests/test-tc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_tc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_tc_linux-test-tc.o -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Tpo -c -o src/core/platform/tests/test_tc_linux-test-tc.o `test -f 'src/core/platform/tests/test-tc.c' || echo '$(srcdir)/'`src/core/platform/tests/test-tc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Tpo src/core/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-tc.c' object='src/core/platform/tests/test_tc_linux-test-tc.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_tc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_tc_linux-test-tc.o `test -f 'src/platform/tests/test-tc.c' || echo '$(srcdir)/'`src/platform/tests/test-tc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_tc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_tc_linux-test-tc.o `test -f 'src/core/platform/tests/test-tc.c' || echo '$(srcdir)/'`src/core/platform/tests/test-tc.c
 
-src/platform/tests/test_tc_linux-test-tc.obj: src/platform/tests/test-tc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_platform_tests_test_tc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/tests/test_tc_linux-test-tc.obj -MD -MP -MF src/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Tpo -c -o src/platform/tests/test_tc_linux-test-tc.obj `if test -f 'src/platform/tests/test-tc.c'; then $(CYGPATH_W) 'src/platform/tests/test-tc.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-tc.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Tpo src/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/platform/tests/test-tc.c' object='src/platform/tests/test_tc_linux-test-tc.obj' libtool=no @AMDEPBACKSLASH@
+src/core/platform/tests/test_tc_linux-test-tc.obj: src/core/platform/tests/test-tc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_tc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/platform/tests/test_tc_linux-test-tc.obj -MD -MP -MF src/core/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Tpo -c -o src/core/platform/tests/test_tc_linux-test-tc.obj `if test -f 'src/core/platform/tests/test-tc.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-tc.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-tc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Tpo src/core/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/platform/tests/test-tc.c' object='src/core/platform/tests/test_tc_linux-test-tc.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_tc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/test_tc_linux-test-tc.obj `if test -f 'src/platform/tests/test-tc.c'; then $(CYGPATH_W) 'src/platform/tests/test-tc.c'; else $(CYGPATH_W) '$(srcdir)/src/platform/tests/test-tc.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_platform_tests_test_tc_linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/platform/tests/test_tc_linux-test-tc.obj `if test -f 'src/core/platform/tests/test-tc.c'; then $(CYGPATH_W) 'src/core/platform/tests/test-tc.c'; else $(CYGPATH_W) '$(srcdir)/src/core/platform/tests/test-tc.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c' object='src/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.o' libtool=no @AMDEPBACKSLASH@
+src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.o: src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.o -MD -MP -MF src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Tpo -c -o src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.o `test -f 'src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Tpo src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c' object='src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.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_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.o `test -f 'src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
 
-src/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.obj: 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.obj -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.obj `if test -f 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; then $(CYGPATH_W) 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; fi`
-@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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c' object='src/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.obj' libtool=no @AMDEPBACKSLASH@
+src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.obj: src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.obj -MD -MP -MF src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Tpo -c -o src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.obj `if test -f 'src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; then $(CYGPATH_W) 'src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; else $(CYGPATH_W) '$(srcdir)/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Tpo src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c' object='src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.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_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.obj `if test -f 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; then $(CYGPATH_W) 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifcfg-rh/tests/test_ifcfg_rh-test-ifcfg-rh.obj `if test -f 'src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; then $(CYGPATH_W) 'src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; else $(CYGPATH_W) '$(srcdir)/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; fi`
 
-src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.o: src/settings/plugins/ifupdown/tests/test-ifupdown.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.o -MD -MP -MF src/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Tpo -c -o src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.o `test -f 'src/settings/plugins/ifupdown/tests/test-ifupdown.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/tests/test-ifupdown.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Tpo src/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifupdown/tests/test-ifupdown.c' object='src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.o' libtool=no @AMDEPBACKSLASH@
+src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.o: src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.o -MD -MP -MF src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Tpo -c -o src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.o `test -f 'src/core/settings/plugins/ifupdown/tests/test-ifupdown.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Tpo src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifupdown/tests/test-ifupdown.c' object='src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.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_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.o `test -f 'src/settings/plugins/ifupdown/tests/test-ifupdown.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/tests/test-ifupdown.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.o `test -f 'src/core/settings/plugins/ifupdown/tests/test-ifupdown.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
 
-src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.obj: src/settings/plugins/ifupdown/tests/test-ifupdown.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.obj -MD -MP -MF src/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Tpo -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`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Tpo src/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifupdown/tests/test-ifupdown.c' object='src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.obj' libtool=no @AMDEPBACKSLASH@
+src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.obj: src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.obj -MD -MP -MF src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Tpo -c -o src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.obj `if test -f 'src/core/settings/plugins/ifupdown/tests/test-ifupdown.c'; then $(CYGPATH_W) 'src/core/settings/plugins/ifupdown/tests/test-ifupdown.c'; else $(CYGPATH_W) '$(srcdir)/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Tpo src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/ifupdown/tests/test-ifupdown.c' object='src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.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_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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.obj `if test -f 'src/core/settings/plugins/ifupdown/tests/test-ifupdown.c'; then $(CYGPATH_W) 'src/core/settings/plugins/ifupdown/tests/test-ifupdown.c'; else $(CYGPATH_W) '$(srcdir)/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c'; fi`
 
-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@
+src/core/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.o: src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.o -MD -MP -MF src/core/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Tpo -c -o src/core/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.o `test -f 'src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Tpo src/core/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c' object='src/core/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_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
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.o `test -f 'src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c' || echo '$(srcdir)/'`src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
 
-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@
+src/core/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.obj: src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.obj -MD -MP -MF src/core/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Tpo -c -o src/core/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.obj `if test -f 'src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c'; then $(CYGPATH_W) 'src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c'; else $(CYGPATH_W) '$(srcdir)/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Tpo src/core/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c' object='src/core/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_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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/keyfile/tests/test_keyfile_settings-test-keyfile-settings.obj `if test -f 'src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c'; then $(CYGPATH_W) 'src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c'; else $(CYGPATH_W) '$(srcdir)/src/core/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
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Tpo src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/supplicant/tests/test-supplicant-config.c' object='src/supplicant/tests/test_supplicant_config-test-supplicant-config.o' libtool=no @AMDEPBACKSLASH@
+src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.o: src/core/supplicant/tests/test-supplicant-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_supplicant_tests_test_supplicant_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.o -MD -MP -MF src/core/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Tpo -c -o src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.o `test -f 'src/core/supplicant/tests/test-supplicant-config.c' || echo '$(srcdir)/'`src/core/supplicant/tests/test-supplicant-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Tpo src/core/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/supplicant/tests/test-supplicant-config.c' object='src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.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_supplicant_tests_test_supplicant_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_supplicant_tests_test_supplicant_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.o `test -f 'src/core/supplicant/tests/test-supplicant-config.c' || echo '$(srcdir)/'`src/core/supplicant/tests/test-supplicant-config.c
 
-src/supplicant/tests/test_supplicant_config-test-supplicant-config.obj: 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.obj -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.obj `if test -f 'src/supplicant/tests/test-supplicant-config.c'; then $(CYGPATH_W) 'src/supplicant/tests/test-supplicant-config.c'; else $(CYGPATH_W) '$(srcdir)/src/supplicant/tests/test-supplicant-config.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Tpo src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/supplicant/tests/test-supplicant-config.c' object='src/supplicant/tests/test_supplicant_config-test-supplicant-config.obj' libtool=no @AMDEPBACKSLASH@
+src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.obj: src/core/supplicant/tests/test-supplicant-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_supplicant_tests_test_supplicant_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.obj -MD -MP -MF src/core/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Tpo -c -o src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.obj `if test -f 'src/core/supplicant/tests/test-supplicant-config.c'; then $(CYGPATH_W) 'src/core/supplicant/tests/test-supplicant-config.c'; else $(CYGPATH_W) '$(srcdir)/src/core/supplicant/tests/test-supplicant-config.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Tpo src/core/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/supplicant/tests/test-supplicant-config.c' object='src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.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_supplicant_tests_test_supplicant_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/supplicant/tests/test_supplicant_config-test-supplicant-config.obj `if test -f 'src/supplicant/tests/test-supplicant-config.c'; then $(CYGPATH_W) 'src/supplicant/tests/test-supplicant-config.c'; else $(CYGPATH_W) '$(srcdir)/src/supplicant/tests/test-supplicant-config.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_supplicant_tests_test_supplicant_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/supplicant/tests/test_supplicant_config-test-supplicant-config.obj `if test -f 'src/core/supplicant/tests/test-supplicant-config.c'; then $(CYGPATH_W) 'src/core/supplicant/tests/test-supplicant-config.c'; else $(CYGPATH_W) '$(srcdir)/src/core/supplicant/tests/test-supplicant-config.c'; fi`
 
-src/tests/config/test_config-nm-test-device.o: src/tests/config/nm-test-device.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/config/test_config-nm-test-device.o -MD -MP -MF src/tests/config/$(DEPDIR)/test_config-nm-test-device.Tpo -c -o src/tests/config/test_config-nm-test-device.o `test -f 'src/tests/config/nm-test-device.c' || echo '$(srcdir)/'`src/tests/config/nm-test-device.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/config/$(DEPDIR)/test_config-nm-test-device.Tpo src/tests/config/$(DEPDIR)/test_config-nm-test-device.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/config/nm-test-device.c' object='src/tests/config/test_config-nm-test-device.o' libtool=no @AMDEPBACKSLASH@
+src/core/tests/config/test_config-nm-test-device.o: src/core/tests/config/nm-test-device.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/config/test_config-nm-test-device.o -MD -MP -MF src/core/tests/config/$(DEPDIR)/test_config-nm-test-device.Tpo -c -o src/core/tests/config/test_config-nm-test-device.o `test -f 'src/core/tests/config/nm-test-device.c' || echo '$(srcdir)/'`src/core/tests/config/nm-test-device.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/config/$(DEPDIR)/test_config-nm-test-device.Tpo src/core/tests/config/$(DEPDIR)/test_config-nm-test-device.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/config/nm-test-device.c' object='src/core/tests/config/test_config-nm-test-device.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_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/config/test_config-nm-test-device.o `test -f 'src/tests/config/nm-test-device.c' || echo '$(srcdir)/'`src/tests/config/nm-test-device.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/config/test_config-nm-test-device.o `test -f 'src/core/tests/config/nm-test-device.c' || echo '$(srcdir)/'`src/core/tests/config/nm-test-device.c
 
-src/tests/config/test_config-nm-test-device.obj: src/tests/config/nm-test-device.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/config/test_config-nm-test-device.obj -MD -MP -MF src/tests/config/$(DEPDIR)/test_config-nm-test-device.Tpo -c -o src/tests/config/test_config-nm-test-device.obj `if test -f 'src/tests/config/nm-test-device.c'; then $(CYGPATH_W) 'src/tests/config/nm-test-device.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/config/nm-test-device.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/config/$(DEPDIR)/test_config-nm-test-device.Tpo src/tests/config/$(DEPDIR)/test_config-nm-test-device.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/config/nm-test-device.c' object='src/tests/config/test_config-nm-test-device.obj' libtool=no @AMDEPBACKSLASH@
+src/core/tests/config/test_config-nm-test-device.obj: src/core/tests/config/nm-test-device.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/config/test_config-nm-test-device.obj -MD -MP -MF src/core/tests/config/$(DEPDIR)/test_config-nm-test-device.Tpo -c -o src/core/tests/config/test_config-nm-test-device.obj `if test -f 'src/core/tests/config/nm-test-device.c'; then $(CYGPATH_W) 'src/core/tests/config/nm-test-device.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/config/nm-test-device.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/config/$(DEPDIR)/test_config-nm-test-device.Tpo src/core/tests/config/$(DEPDIR)/test_config-nm-test-device.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/config/nm-test-device.c' object='src/core/tests/config/test_config-nm-test-device.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_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/config/test_config-nm-test-device.obj `if test -f 'src/tests/config/nm-test-device.c'; then $(CYGPATH_W) 'src/tests/config/nm-test-device.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/config/nm-test-device.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/config/test_config-nm-test-device.obj `if test -f 'src/core/tests/config/nm-test-device.c'; then $(CYGPATH_W) 'src/core/tests/config/nm-test-device.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/config/nm-test-device.c'; fi`
 
-src/tests/config/test_config-test-config.o: src/tests/config/test-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/config/test_config-test-config.o -MD -MP -MF src/tests/config/$(DEPDIR)/test_config-test-config.Tpo -c -o src/tests/config/test_config-test-config.o `test -f 'src/tests/config/test-config.c' || echo '$(srcdir)/'`src/tests/config/test-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/config/$(DEPDIR)/test_config-test-config.Tpo src/tests/config/$(DEPDIR)/test_config-test-config.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/config/test-config.c' object='src/tests/config/test_config-test-config.o' libtool=no @AMDEPBACKSLASH@
+src/core/tests/config/test_config-test-config.o: src/core/tests/config/test-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/config/test_config-test-config.o -MD -MP -MF src/core/tests/config/$(DEPDIR)/test_config-test-config.Tpo -c -o src/core/tests/config/test_config-test-config.o `test -f 'src/core/tests/config/test-config.c' || echo '$(srcdir)/'`src/core/tests/config/test-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/config/$(DEPDIR)/test_config-test-config.Tpo src/core/tests/config/$(DEPDIR)/test_config-test-config.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/config/test-config.c' object='src/core/tests/config/test_config-test-config.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_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/config/test_config-test-config.o `test -f 'src/tests/config/test-config.c' || echo '$(srcdir)/'`src/tests/config/test-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/config/test_config-test-config.o `test -f 'src/core/tests/config/test-config.c' || echo '$(srcdir)/'`src/core/tests/config/test-config.c
 
-src/tests/config/test_config-test-config.obj: src/tests/config/test-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/config/test_config-test-config.obj -MD -MP -MF src/tests/config/$(DEPDIR)/test_config-test-config.Tpo -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`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/config/$(DEPDIR)/test_config-test-config.Tpo src/tests/config/$(DEPDIR)/test_config-test-config.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/config/test-config.c' object='src/tests/config/test_config-test-config.obj' libtool=no @AMDEPBACKSLASH@
+src/core/tests/config/test_config-test-config.obj: src/core/tests/config/test-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/config/test_config-test-config.obj -MD -MP -MF src/core/tests/config/$(DEPDIR)/test_config-test-config.Tpo -c -o src/core/tests/config/test_config-test-config.obj `if test -f 'src/core/tests/config/test-config.c'; then $(CYGPATH_W) 'src/core/tests/config/test-config.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/config/test-config.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/config/$(DEPDIR)/test_config-test-config.Tpo src/core/tests/config/$(DEPDIR)/test_config-test-config.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/config/test-config.c' object='src/core/tests/config/test_config-test-config.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_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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_config_test_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/config/test_config-test-config.obj `if test -f 'src/core/tests/config/test-config.c'; then $(CYGPATH_W) 'src/core/tests/config/test-config.c'; else $(CYGPATH_W) '$(srcdir)/src/core/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@
+src/core/tests/test_core-test-core.o: src/core/tests/test-core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_core_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_core-test-core.o -MD -MP -MF src/core/tests/$(DEPDIR)/test_core-test-core.Tpo -c -o src/core/tests/test_core-test-core.o `test -f 'src/core/tests/test-core.c' || echo '$(srcdir)/'`src/core/tests/test-core.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_core-test-core.Tpo src/core/tests/$(DEPDIR)/test_core-test-core.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-core.c' object='src/core/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
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_core_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_core-test-core.o `test -f 'src/core/tests/test-core.c' || echo '$(srcdir)/'`src/core/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@
+src/core/tests/test_core-test-core.obj: src/core/tests/test-core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_core_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_core-test-core.obj -MD -MP -MF src/core/tests/$(DEPDIR)/test_core-test-core.Tpo -c -o src/core/tests/test_core-test-core.obj `if test -f 'src/core/tests/test-core.c'; then $(CYGPATH_W) 'src/core/tests/test-core.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-core.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_core-test-core.Tpo src/core/tests/$(DEPDIR)/test_core-test-core.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-core.c' object='src/core/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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_core_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_core-test-core.obj `if test -f 'src/core/tests/test-core.c'; then $(CYGPATH_W) 'src/core/tests/test-core.c'; else $(CYGPATH_W) '$(srcdir)/src/core/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@
+src/core/tests/test_core_with_expect-test-core-with-expect.o: src/core/tests/test-core-with-expect.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_core_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_core_with_expect-test-core-with-expect.o -MD -MP -MF src/core/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Tpo -c -o src/core/tests/test_core_with_expect-test-core-with-expect.o `test -f 'src/core/tests/test-core-with-expect.c' || echo '$(srcdir)/'`src/core/tests/test-core-with-expect.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Tpo src/core/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-core-with-expect.c' object='src/core/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
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_core_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_core_with_expect-test-core-with-expect.o `test -f 'src/core/tests/test-core-with-expect.c' || echo '$(srcdir)/'`src/core/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@
+src/core/tests/test_core_with_expect-test-core-with-expect.obj: src/core/tests/test-core-with-expect.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_core_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_core_with_expect-test-core-with-expect.obj -MD -MP -MF src/core/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Tpo -c -o src/core/tests/test_core_with_expect-test-core-with-expect.obj `if test -f 'src/core/tests/test-core-with-expect.c'; then $(CYGPATH_W) 'src/core/tests/test-core-with-expect.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-core-with-expect.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Tpo src/core/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-core-with-expect.c' object='src/core/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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_core_with_expect_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_core_with_expect-test-core-with-expect.obj `if test -f 'src/core/tests/test-core-with-expect.c'; then $(CYGPATH_W) 'src/core/tests/test-core-with-expect.c'; else $(CYGPATH_W) '$(srcdir)/src/core/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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-dcb.c' object='src/tests/test_dcb-test-dcb.o' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_dcb-test-dcb.o: src/core/tests/test-dcb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_dcb-test-dcb.o -MD -MP -MF src/core/tests/$(DEPDIR)/test_dcb-test-dcb.Tpo -c -o src/core/tests/test_dcb-test-dcb.o `test -f 'src/core/tests/test-dcb.c' || echo '$(srcdir)/'`src/core/tests/test-dcb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_dcb-test-dcb.Tpo src/core/tests/$(DEPDIR)/test_dcb-test-dcb.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-dcb.c' object='src/core/tests/test_dcb-test-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) $(src_tests_test_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_dcb-test-dcb.o `test -f 'src/core/tests/test-dcb.c' || echo '$(srcdir)/'`src/core/tests/test-dcb.c
 
-src/tests/test_dcb-test-dcb.obj: 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.obj -MD -MP -MF src/tests/$(DEPDIR)/test_dcb-test-dcb.Tpo -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`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_dcb-test-dcb.Tpo src/tests/$(DEPDIR)/test_dcb-test-dcb.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-dcb.c' object='src/tests/test_dcb-test-dcb.obj' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_dcb-test-dcb.obj: src/core/tests/test-dcb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_dcb-test-dcb.obj -MD -MP -MF src/core/tests/$(DEPDIR)/test_dcb-test-dcb.Tpo -c -o src/core/tests/test_dcb-test-dcb.obj `if test -f 'src/core/tests/test-dcb.c'; then $(CYGPATH_W) 'src/core/tests/test-dcb.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-dcb.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_dcb-test-dcb.Tpo src/core/tests/$(DEPDIR)/test_dcb-test-dcb.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-dcb.c' object='src/core/tests/test_dcb-test-dcb.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_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`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_dcb-test-dcb.obj `if test -f 'src/core/tests/test-dcb.c'; then $(CYGPATH_W) 'src/core/tests/test-dcb.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-dcb.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-ip4-config.c' object='src/tests/test_ip4_config-test-ip4-config.o' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_ip4_config-test-ip4-config.o: src/core/tests/test-ip4-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_ip4_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_ip4_config-test-ip4-config.o -MD -MP -MF src/core/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Tpo -c -o src/core/tests/test_ip4_config-test-ip4-config.o `test -f 'src/core/tests/test-ip4-config.c' || echo '$(srcdir)/'`src/core/tests/test-ip4-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Tpo src/core/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-ip4-config.c' object='src/core/tests/test_ip4_config-test-ip4-config.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_ip4_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_ip4_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_ip4_config-test-ip4-config.o `test -f 'src/core/tests/test-ip4-config.c' || echo '$(srcdir)/'`src/core/tests/test-ip4-config.c
 
-src/tests/test_ip4_config-test-ip4-config.obj: 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.obj -MD -MP -MF src/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Tpo -c -o src/tests/test_ip4_config-test-ip4-config.obj `if test -f 'src/tests/test-ip4-config.c'; then $(CYGPATH_W) 'src/tests/test-ip4-config.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-ip4-config.c'; fi`
-@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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-ip4-config.c' object='src/tests/test_ip4_config-test-ip4-config.obj' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_ip4_config-test-ip4-config.obj: src/core/tests/test-ip4-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_ip4_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_ip4_config-test-ip4-config.obj -MD -MP -MF src/core/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Tpo -c -o src/core/tests/test_ip4_config-test-ip4-config.obj `if test -f 'src/core/tests/test-ip4-config.c'; then $(CYGPATH_W) 'src/core/tests/test-ip4-config.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-ip4-config.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Tpo src/core/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-ip4-config.c' object='src/core/tests/test_ip4_config-test-ip4-config.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_ip4_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_ip4_config-test-ip4-config.obj `if test -f 'src/tests/test-ip4-config.c'; then $(CYGPATH_W) 'src/tests/test-ip4-config.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-ip4-config.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_ip4_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_ip4_config-test-ip4-config.obj `if test -f 'src/core/tests/test-ip4-config.c'; then $(CYGPATH_W) 'src/core/tests/test-ip4-config.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-ip4-config.c'; fi`
 
-src/tests/test_ip6_config-test-ip6-config.o: src/tests/test-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_ip6_config-test-ip6-config.o -MD -MP -MF src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Tpo -c -o src/tests/test_ip6_config-test-ip6-config.o `test -f 'src/tests/test-ip6-config.c' || echo '$(srcdir)/'`src/tests/test-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Tpo src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-ip6-config.c' object='src/tests/test_ip6_config-test-ip6-config.o' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_ip6_config-test-ip6-config.o: src/core/tests/test-ip6-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_ip6_config-test-ip6-config.o -MD -MP -MF src/core/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Tpo -c -o src/core/tests/test_ip6_config-test-ip6-config.o `test -f 'src/core/tests/test-ip6-config.c' || echo '$(srcdir)/'`src/core/tests/test-ip6-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Tpo src/core/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-ip6-config.c' object='src/core/tests/test_ip6_config-test-ip6-config.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_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_ip6_config-test-ip6-config.o `test -f 'src/tests/test-ip6-config.c' || echo '$(srcdir)/'`src/tests/test-ip6-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_ip6_config-test-ip6-config.o `test -f 'src/core/tests/test-ip6-config.c' || echo '$(srcdir)/'`src/core/tests/test-ip6-config.c
 
-src/tests/test_ip6_config-test-ip6-config.obj: src/tests/test-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_ip6_config-test-ip6-config.obj -MD -MP -MF src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Tpo -c -o src/tests/test_ip6_config-test-ip6-config.obj `if test -f 'src/tests/test-ip6-config.c'; then $(CYGPATH_W) 'src/tests/test-ip6-config.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-ip6-config.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Tpo src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-ip6-config.c' object='src/tests/test_ip6_config-test-ip6-config.obj' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_ip6_config-test-ip6-config.obj: src/core/tests/test-ip6-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_ip6_config-test-ip6-config.obj -MD -MP -MF src/core/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Tpo -c -o src/core/tests/test_ip6_config-test-ip6-config.obj `if test -f 'src/core/tests/test-ip6-config.c'; then $(CYGPATH_W) 'src/core/tests/test-ip6-config.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-ip6-config.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Tpo src/core/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-ip6-config.c' object='src/core/tests/test_ip6_config-test-ip6-config.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_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_ip6_config-test-ip6-config.obj `if test -f 'src/tests/test-ip6-config.c'; then $(CYGPATH_W) 'src/tests/test-ip6-config.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-ip6-config.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_ip6_config-test-ip6-config.obj `if test -f 'src/core/tests/test-ip6-config.c'; then $(CYGPATH_W) 'src/core/tests/test-ip6-config.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-ip6-config.c'; fi`
 
-src/tests/test_l3cfg-test-l3cfg.o: src/tests/test-l3cfg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_l3cfg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_l3cfg-test-l3cfg.o -MD -MP -MF src/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Tpo -c -o src/tests/test_l3cfg-test-l3cfg.o `test -f 'src/tests/test-l3cfg.c' || echo '$(srcdir)/'`src/tests/test-l3cfg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Tpo src/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-l3cfg.c' object='src/tests/test_l3cfg-test-l3cfg.o' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_l3cfg-test-l3cfg.o: src/core/tests/test-l3cfg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_l3cfg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_l3cfg-test-l3cfg.o -MD -MP -MF src/core/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Tpo -c -o src/core/tests/test_l3cfg-test-l3cfg.o `test -f 'src/core/tests/test-l3cfg.c' || echo '$(srcdir)/'`src/core/tests/test-l3cfg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Tpo src/core/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-l3cfg.c' object='src/core/tests/test_l3cfg-test-l3cfg.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_l3cfg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_l3cfg-test-l3cfg.o `test -f 'src/tests/test-l3cfg.c' || echo '$(srcdir)/'`src/tests/test-l3cfg.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_l3cfg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_l3cfg-test-l3cfg.o `test -f 'src/core/tests/test-l3cfg.c' || echo '$(srcdir)/'`src/core/tests/test-l3cfg.c
 
-src/tests/test_l3cfg-test-l3cfg.obj: src/tests/test-l3cfg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_l3cfg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_l3cfg-test-l3cfg.obj -MD -MP -MF src/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Tpo -c -o src/tests/test_l3cfg-test-l3cfg.obj `if test -f 'src/tests/test-l3cfg.c'; then $(CYGPATH_W) 'src/tests/test-l3cfg.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-l3cfg.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Tpo src/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-l3cfg.c' object='src/tests/test_l3cfg-test-l3cfg.obj' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_l3cfg-test-l3cfg.obj: src/core/tests/test-l3cfg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_l3cfg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_l3cfg-test-l3cfg.obj -MD -MP -MF src/core/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Tpo -c -o src/core/tests/test_l3cfg-test-l3cfg.obj `if test -f 'src/core/tests/test-l3cfg.c'; then $(CYGPATH_W) 'src/core/tests/test-l3cfg.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-l3cfg.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Tpo src/core/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-l3cfg.c' object='src/core/tests/test_l3cfg-test-l3cfg.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_l3cfg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_l3cfg-test-l3cfg.obj `if test -f 'src/tests/test-l3cfg.c'; then $(CYGPATH_W) 'src/tests/test-l3cfg.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-l3cfg.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_l3cfg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_l3cfg-test-l3cfg.obj `if test -f 'src/core/tests/test-l3cfg.c'; then $(CYGPATH_W) 'src/core/tests/test-l3cfg.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-l3cfg.c'; fi`
 
-src/tests/test_systemd-test-systemd.o: src/tests/test-systemd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_systemd-test-systemd.o -MD -MP -MF src/tests/$(DEPDIR)/test_systemd-test-systemd.Tpo -c -o src/tests/test_systemd-test-systemd.o `test -f 'src/tests/test-systemd.c' || echo '$(srcdir)/'`src/tests/test-systemd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_systemd-test-systemd.Tpo src/tests/$(DEPDIR)/test_systemd-test-systemd.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-systemd.c' object='src/tests/test_systemd-test-systemd.o' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_systemd-test-systemd.o: src/core/tests/test-systemd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_systemd-test-systemd.o -MD -MP -MF src/core/tests/$(DEPDIR)/test_systemd-test-systemd.Tpo -c -o src/core/tests/test_systemd-test-systemd.o `test -f 'src/core/tests/test-systemd.c' || echo '$(srcdir)/'`src/core/tests/test-systemd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_systemd-test-systemd.Tpo src/core/tests/$(DEPDIR)/test_systemd-test-systemd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-systemd.c' object='src/core/tests/test_systemd-test-systemd.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_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_systemd-test-systemd.o `test -f 'src/tests/test-systemd.c' || echo '$(srcdir)/'`src/tests/test-systemd.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_systemd-test-systemd.o `test -f 'src/core/tests/test-systemd.c' || echo '$(srcdir)/'`src/core/tests/test-systemd.c
 
-src/tests/test_systemd-test-systemd.obj: src/tests/test-systemd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_systemd-test-systemd.obj -MD -MP -MF src/tests/$(DEPDIR)/test_systemd-test-systemd.Tpo -c -o src/tests/test_systemd-test-systemd.obj `if test -f 'src/tests/test-systemd.c'; then $(CYGPATH_W) 'src/tests/test-systemd.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-systemd.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_systemd-test-systemd.Tpo src/tests/$(DEPDIR)/test_systemd-test-systemd.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-systemd.c' object='src/tests/test_systemd-test-systemd.obj' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_systemd-test-systemd.obj: src/core/tests/test-systemd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_systemd-test-systemd.obj -MD -MP -MF src/core/tests/$(DEPDIR)/test_systemd-test-systemd.Tpo -c -o src/core/tests/test_systemd-test-systemd.obj `if test -f 'src/core/tests/test-systemd.c'; then $(CYGPATH_W) 'src/core/tests/test-systemd.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-systemd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_systemd-test-systemd.Tpo src/core/tests/$(DEPDIR)/test_systemd-test-systemd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-systemd.c' object='src/core/tests/test_systemd-test-systemd.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_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_systemd-test-systemd.obj `if test -f 'src/tests/test-systemd.c'; then $(CYGPATH_W) 'src/tests/test-systemd.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-systemd.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_systemd-test-systemd.obj `if test -f 'src/core/tests/test-systemd.c'; then $(CYGPATH_W) 'src/core/tests/test-systemd.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-systemd.c'; fi`
 
-src/tests/test_utils-test-utils.o: src/tests/test-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_utils-test-utils.o -MD -MP -MF src/tests/$(DEPDIR)/test_utils-test-utils.Tpo -c -o src/tests/test_utils-test-utils.o `test -f 'src/tests/test-utils.c' || echo '$(srcdir)/'`src/tests/test-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_utils-test-utils.Tpo src/tests/$(DEPDIR)/test_utils-test-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-utils.c' object='src/tests/test_utils-test-utils.o' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_utils-test-utils.o: src/core/tests/test-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_utils-test-utils.o -MD -MP -MF src/core/tests/$(DEPDIR)/test_utils-test-utils.Tpo -c -o src/core/tests/test_utils-test-utils.o `test -f 'src/core/tests/test-utils.c' || echo '$(srcdir)/'`src/core/tests/test-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_utils-test-utils.Tpo src/core/tests/$(DEPDIR)/test_utils-test-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-utils.c' object='src/core/tests/test_utils-test-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_tests_test_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_utils-test-utils.o `test -f 'src/tests/test-utils.c' || echo '$(srcdir)/'`src/tests/test-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_utils-test-utils.o `test -f 'src/core/tests/test-utils.c' || echo '$(srcdir)/'`src/core/tests/test-utils.c
 
-src/tests/test_utils-test-utils.obj: src/tests/test-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_utils-test-utils.obj -MD -MP -MF src/tests/$(DEPDIR)/test_utils-test-utils.Tpo -c -o src/tests/test_utils-test-utils.obj `if test -f 'src/tests/test-utils.c'; then $(CYGPATH_W) 'src/tests/test-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_utils-test-utils.Tpo src/tests/$(DEPDIR)/test_utils-test-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-utils.c' object='src/tests/test_utils-test-utils.obj' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_utils-test-utils.obj: src/core/tests/test-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_utils-test-utils.obj -MD -MP -MF src/core/tests/$(DEPDIR)/test_utils-test-utils.Tpo -c -o src/core/tests/test_utils-test-utils.obj `if test -f 'src/core/tests/test-utils.c'; then $(CYGPATH_W) 'src/core/tests/test-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-utils.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_utils-test-utils.Tpo src/core/tests/$(DEPDIR)/test_utils-test-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-utils.c' object='src/core/tests/test_utils-test-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_tests_test_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_utils-test-utils.obj `if test -f 'src/tests/test-utils.c'; then $(CYGPATH_W) 'src/tests/test-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-utils.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_utils-test-utils.obj `if test -f 'src/core/tests/test-utils.c'; then $(CYGPATH_W) 'src/core/tests/test-utils.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-utils.c'; fi`
 
-src/tests/test_wired_defname-test-wired-defname.o: src/tests/test-wired-defname.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_wired_defname-test-wired-defname.o -MD -MP -MF src/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Tpo -c -o src/tests/test_wired_defname-test-wired-defname.o `test -f 'src/tests/test-wired-defname.c' || echo '$(srcdir)/'`src/tests/test-wired-defname.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Tpo src/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-wired-defname.c' object='src/tests/test_wired_defname-test-wired-defname.o' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_wired_defname-test-wired-defname.o: src/core/tests/test-wired-defname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_wired_defname-test-wired-defname.o -MD -MP -MF src/core/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Tpo -c -o src/core/tests/test_wired_defname-test-wired-defname.o `test -f 'src/core/tests/test-wired-defname.c' || echo '$(srcdir)/'`src/core/tests/test-wired-defname.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Tpo src/core/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-wired-defname.c' object='src/core/tests/test_wired_defname-test-wired-defname.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_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_wired_defname-test-wired-defname.o `test -f 'src/tests/test-wired-defname.c' || echo '$(srcdir)/'`src/tests/test-wired-defname.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_wired_defname-test-wired-defname.o `test -f 'src/core/tests/test-wired-defname.c' || echo '$(srcdir)/'`src/core/tests/test-wired-defname.c
 
-src/tests/test_wired_defname-test-wired-defname.obj: src/tests/test-wired-defname.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/test_wired_defname-test-wired-defname.obj -MD -MP -MF src/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Tpo -c -o src/tests/test_wired_defname-test-wired-defname.obj `if test -f 'src/tests/test-wired-defname.c'; then $(CYGPATH_W) 'src/tests/test-wired-defname.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-wired-defname.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Tpo src/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tests/test-wired-defname.c' object='src/tests/test_wired_defname-test-wired-defname.obj' libtool=no @AMDEPBACKSLASH@
+src/core/tests/test_wired_defname-test-wired-defname.obj: src/core/tests/test-wired-defname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/core/tests/test_wired_defname-test-wired-defname.obj -MD -MP -MF src/core/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Tpo -c -o src/core/tests/test_wired_defname-test-wired-defname.obj `if test -f 'src/core/tests/test-wired-defname.c'; then $(CYGPATH_W) 'src/core/tests/test-wired-defname.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-wired-defname.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/core/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Tpo src/core/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/core/tests/test-wired-defname.c' object='src/core/tests/test_wired_defname-test-wired-defname.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_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/test_wired_defname-test-wired-defname.obj `if test -f 'src/tests/test-wired-defname.c'; then $(CYGPATH_W) 'src/tests/test-wired-defname.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-wired-defname.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_tests_test_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/tests/test_wired_defname-test-wired-defname.obj `if test -f 'src/core/tests/test-wired-defname.c'; then $(CYGPATH_W) 'src/core/tests/test-wired-defname.c'; else $(CYGPATH_W) '$(srcdir)/src/core/tests/test-wired-defname.c'; fi`
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -17027,6 +17506,7 @@ clean-libtool:
 	-rm -rf clients/.libs clients/_libs
 	-rm -rf clients/cli/.libs clients/cli/_libs
 	-rm -rf clients/cloud-setup/.libs clients/cloud-setup/_libs
+	-rm -rf clients/cloud-setup/tests/.libs clients/cloud-setup/tests/_libs
 	-rm -rf clients/common/.libs clients/common/_libs
 	-rm -rf clients/common/tests/.libs clients/common/tests/_libs
 	-rm -rf clients/tui/.libs clients/tui/_libs
@@ -17037,7 +17517,6 @@ clean-libtool:
 	-rm -rf introspection/.libs introspection/_libs
 	-rm -rf libnm/.libs libnm/_libs
 	-rm -rf libnm-core/.libs libnm-core/_libs
-	-rm -rf libnm-core/nm-keyfile/.libs libnm-core/nm-keyfile/_libs
 	-rm -rf libnm-core/nm-libnm-core-aux/.libs libnm-core/nm-libnm-core-aux/_libs
 	-rm -rf libnm-core/nm-libnm-core-intern/.libs libnm-core/nm-libnm-core-intern/_libs
 	-rm -rf libnm-core/tests/.libs libnm-core/tests/_libs
@@ -17050,57 +17529,61 @@ clean-libtool:
 	-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-base/.libs shared/nm-base/_libs
 	-rm -rf shared/nm-glib-aux/.libs shared/nm-glib-aux/_libs
 	-rm -rf shared/nm-glib-aux/tests/.libs shared/nm-glib-aux/tests/_libs
+	-rm -rf shared/nm-log-core/.libs shared/nm-log-core/_libs
+	-rm -rf shared/nm-platform/.libs shared/nm-platform/_libs
+	-rm -rf shared/nm-platform/tests/.libs shared/nm-platform/tests/_libs
 	-rm -rf shared/nm-std-aux/.libs shared/nm-std-aux/_libs
 	-rm -rf shared/nm-udev-aux/.libs shared/nm-udev-aux/_libs
 	-rm -rf shared/nm-utils/.libs shared/nm-utils/_libs
 	-rm -rf shared/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
-	-rm -rf src/devices/bluetooth/.libs src/devices/bluetooth/_libs
-	-rm -rf src/devices/bluetooth/tests/.libs src/devices/bluetooth/tests/_libs
-	-rm -rf src/devices/ovs/.libs src/devices/ovs/_libs
-	-rm -rf src/devices/team/.libs src/devices/team/_libs
-	-rm -rf src/devices/tests/.libs src/devices/tests/_libs
-	-rm -rf src/devices/wifi/.libs src/devices/wifi/_libs
-	-rm -rf src/devices/wifi/tests/.libs src/devices/wifi/tests/_libs
-	-rm -rf src/devices/wwan/.libs src/devices/wwan/_libs
-	-rm -rf src/devices/wwan/tests/.libs src/devices/wwan/tests/_libs
-	-rm -rf src/dhcp/.libs src/dhcp/_libs
-	-rm -rf src/dhcp/tests/.libs src/dhcp/tests/_libs
-	-rm -rf src/dns/.libs src/dns/_libs
-	-rm -rf src/dnsmasq/.libs src/dnsmasq/_libs
-	-rm -rf src/dnsmasq/tests/.libs src/dnsmasq/tests/_libs
-	-rm -rf src/initrd/.libs src/initrd/_libs
-	-rm -rf src/initrd/tests/.libs src/initrd/tests/_libs
-	-rm -rf src/ndisc/.libs src/ndisc/_libs
-	-rm -rf src/ndisc/tests/.libs src/ndisc/tests/_libs
-	-rm -rf src/platform/.libs src/platform/_libs
-	-rm -rf src/platform/tests/.libs src/platform/tests/_libs
-	-rm -rf src/platform/wifi/.libs src/platform/wifi/_libs
-	-rm -rf src/platform/wpan/.libs src/platform/wpan/_libs
-	-rm -rf src/ppp/.libs src/ppp/_libs
-	-rm -rf src/settings/.libs src/settings/_libs
-	-rm -rf src/settings/plugins/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
-	-rm -rf src/settings/plugins/ifupdown/tests/.libs src/settings/plugins/ifupdown/tests/_libs
-	-rm -rf src/settings/plugins/keyfile/.libs src/settings/plugins/keyfile/_libs
-	-rm -rf src/settings/plugins/keyfile/tests/.libs src/settings/plugins/keyfile/tests/_libs
-	-rm -rf src/supplicant/.libs src/supplicant/_libs
-	-rm -rf src/supplicant/tests/.libs src/supplicant/tests/_libs
-	-rm -rf src/systemd/.libs src/systemd/_libs
-	-rm -rf src/systemd/sd-adapt-core/.libs src/systemd/sd-adapt-core/_libs
-	-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/tests/.libs src/tests/_libs
-	-rm -rf src/tests/config/.libs src/tests/config/_libs
-	-rm -rf src/vpn/.libs src/vpn/_libs
+	-rm -rf src/core/.libs src/core/_libs
+	-rm -rf src/core/devices/.libs src/core/devices/_libs
+	-rm -rf src/core/devices/adsl/.libs src/core/devices/adsl/_libs
+	-rm -rf src/core/devices/bluetooth/.libs src/core/devices/bluetooth/_libs
+	-rm -rf src/core/devices/bluetooth/tests/.libs src/core/devices/bluetooth/tests/_libs
+	-rm -rf src/core/devices/ovs/.libs src/core/devices/ovs/_libs
+	-rm -rf src/core/devices/team/.libs src/core/devices/team/_libs
+	-rm -rf src/core/devices/tests/.libs src/core/devices/tests/_libs
+	-rm -rf src/core/devices/wifi/.libs src/core/devices/wifi/_libs
+	-rm -rf src/core/devices/wifi/tests/.libs src/core/devices/wifi/tests/_libs
+	-rm -rf src/core/devices/wwan/.libs src/core/devices/wwan/_libs
+	-rm -rf src/core/devices/wwan/tests/.libs src/core/devices/wwan/tests/_libs
+	-rm -rf src/core/dhcp/.libs src/core/dhcp/_libs
+	-rm -rf src/core/dhcp/tests/.libs src/core/dhcp/tests/_libs
+	-rm -rf src/core/dns/.libs src/core/dns/_libs
+	-rm -rf src/core/dnsmasq/.libs src/core/dnsmasq/_libs
+	-rm -rf src/core/dnsmasq/tests/.libs src/core/dnsmasq/tests/_libs
+	-rm -rf src/core/initrd/.libs src/core/initrd/_libs
+	-rm -rf src/core/initrd/tests/.libs src/core/initrd/tests/_libs
+	-rm -rf src/core/ndisc/.libs src/core/ndisc/_libs
+	-rm -rf src/core/ndisc/tests/.libs src/core/ndisc/tests/_libs
+	-rm -rf src/core/platform/.libs src/core/platform/_libs
+	-rm -rf src/core/platform/tests/.libs src/core/platform/tests/_libs
+	-rm -rf src/core/platform/wifi/.libs src/core/platform/wifi/_libs
+	-rm -rf src/core/platform/wpan/.libs src/core/platform/wpan/_libs
+	-rm -rf src/core/ppp/.libs src/core/ppp/_libs
+	-rm -rf src/core/settings/.libs src/core/settings/_libs
+	-rm -rf src/core/settings/plugins/ifcfg-rh/.libs src/core/settings/plugins/ifcfg-rh/_libs
+	-rm -rf src/core/settings/plugins/ifcfg-rh/tests/.libs src/core/settings/plugins/ifcfg-rh/tests/_libs
+	-rm -rf src/core/settings/plugins/ifupdown/.libs src/core/settings/plugins/ifupdown/_libs
+	-rm -rf src/core/settings/plugins/ifupdown/tests/.libs src/core/settings/plugins/ifupdown/tests/_libs
+	-rm -rf src/core/settings/plugins/keyfile/.libs src/core/settings/plugins/keyfile/_libs
+	-rm -rf src/core/settings/plugins/keyfile/tests/.libs src/core/settings/plugins/keyfile/tests/_libs
+	-rm -rf src/core/supplicant/.libs src/core/supplicant/_libs
+	-rm -rf src/core/supplicant/tests/.libs src/core/supplicant/tests/_libs
+	-rm -rf src/core/systemd/.libs src/core/systemd/_libs
+	-rm -rf src/core/systemd/sd-adapt-core/.libs src/core/systemd/sd-adapt-core/_libs
+	-rm -rf src/core/systemd/src/libsystemd-network/.libs src/core/systemd/src/libsystemd-network/_libs
+	-rm -rf src/core/systemd/src/libsystemd/sd-event/.libs src/core/systemd/src/libsystemd/sd-event/_libs
+	-rm -rf src/core/systemd/src/libsystemd/sd-id128/.libs src/core/systemd/src/libsystemd/sd-id128/_libs
+	-rm -rf src/core/tests/.libs src/core/tests/_libs
+	-rm -rf src/core/tests/config/.libs src/core/tests/config/_libs
+	-rm -rf src/core/vpn/.libs src/core/vpn/_libs
 
 distclean-libtool:
 	-rm -f libtool config.lt
@@ -17857,6 +18340,13 @@ recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES)
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
+shared/nm-platform/tests/test-nm-platform.log: shared/nm-platform/tests/test-nm-platform$(EXEEXT)
+	@p='shared/nm-platform/tests/test-nm-platform$(EXEEXT)'; \
+	b='shared/nm-platform/tests/test-nm-platform'; \
+	$(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)
 shared/nm-glib-aux/tests/test-shared-general.log: shared/nm-glib-aux/tests/test-shared-general$(EXEEXT)
 	@p='shared/nm-glib-aux/tests/test-shared-general$(EXEEXT)'; \
 	b='shared/nm-glib-aux/tests/test-shared-general'; \
@@ -17948,261 +18438,261 @@ libnm/tests/test-secret-agent.log: libnm/tests/test-secret-agent$(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/initrd/tests/test-dt-reader.log: src/initrd/tests/test-dt-reader$(EXEEXT)
-	@p='src/initrd/tests/test-dt-reader$(EXEEXT)'; \
-	b='src/initrd/tests/test-dt-reader'; \
+src/core/initrd/tests/test-dt-reader.log: src/core/initrd/tests/test-dt-reader$(EXEEXT)
+	@p='src/core/initrd/tests/test-dt-reader$(EXEEXT)'; \
+	b='src/core/initrd/tests/test-dt-reader'; \
 	$(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/initrd/tests/test-ibft-reader.log: src/initrd/tests/test-ibft-reader$(EXEEXT)
-	@p='src/initrd/tests/test-ibft-reader$(EXEEXT)'; \
-	b='src/initrd/tests/test-ibft-reader'; \
+src/core/initrd/tests/test-ibft-reader.log: src/core/initrd/tests/test-ibft-reader$(EXEEXT)
+	@p='src/core/initrd/tests/test-ibft-reader$(EXEEXT)'; \
+	b='src/core/initrd/tests/test-ibft-reader'; \
 	$(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/initrd/tests/test-cmdline-reader.log: src/initrd/tests/test-cmdline-reader$(EXEEXT)
-	@p='src/initrd/tests/test-cmdline-reader$(EXEEXT)'; \
-	b='src/initrd/tests/test-cmdline-reader'; \
+src/core/initrd/tests/test-cmdline-reader.log: src/core/initrd/tests/test-cmdline-reader$(EXEEXT)
+	@p='src/core/initrd/tests/test-cmdline-reader$(EXEEXT)'; \
+	b='src/core/initrd/tests/test-cmdline-reader'; \
 	$(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/dhcp/tests/test-dhcp-dhclient.log: src/dhcp/tests/test-dhcp-dhclient$(EXEEXT)
-	@p='src/dhcp/tests/test-dhcp-dhclient$(EXEEXT)'; \
-	b='src/dhcp/tests/test-dhcp-dhclient'; \
+src/core/dhcp/tests/test-dhcp-dhclient.log: src/core/dhcp/tests/test-dhcp-dhclient$(EXEEXT)
+	@p='src/core/dhcp/tests/test-dhcp-dhclient$(EXEEXT)'; \
+	b='src/core/dhcp/tests/test-dhcp-dhclient'; \
 	$(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/dhcp/tests/test-dhcp-utils.log: src/dhcp/tests/test-dhcp-utils$(EXEEXT)
-	@p='src/dhcp/tests/test-dhcp-utils$(EXEEXT)'; \
-	b='src/dhcp/tests/test-dhcp-utils'; \
+src/core/dhcp/tests/test-dhcp-utils.log: src/core/dhcp/tests/test-dhcp-utils$(EXEEXT)
+	@p='src/core/dhcp/tests/test-dhcp-utils$(EXEEXT)'; \
+	b='src/core/dhcp/tests/test-dhcp-utils'; \
 	$(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/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'; \
+src/core/settings/plugins/keyfile/tests/test-keyfile-settings.log: src/core/settings/plugins/keyfile/tests/test-keyfile-settings$(EXEEXT)
+	@p='src/core/settings/plugins/keyfile/tests/test-keyfile-settings$(EXEEXT)'; \
+	b='src/core/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) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.log: src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)
-	@p='src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)'; \
-	b='src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh'; \
+src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.log: src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)
+	@p='src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT)'; \
+	b='src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh'; \
 	$(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/ifupdown/tests/test-ifupdown.log: src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)
-	@p='src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)'; \
-	b='src/settings/plugins/ifupdown/tests/test-ifupdown'; \
+src/core/settings/plugins/ifupdown/tests/test-ifupdown.log: src/core/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)
+	@p='src/core/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT)'; \
+	b='src/core/settings/plugins/ifupdown/tests/test-ifupdown'; \
 	$(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/wwan/tests/test-service-providers.log: src/devices/wwan/tests/test-service-providers$(EXEEXT)
-	@p='src/devices/wwan/tests/test-service-providers$(EXEEXT)'; \
-	b='src/devices/wwan/tests/test-service-providers'; \
+src/core/devices/wwan/tests/test-service-providers.log: src/core/devices/wwan/tests/test-service-providers$(EXEEXT)
+	@p='src/core/devices/wwan/tests/test-service-providers$(EXEEXT)'; \
+	b='src/core/devices/wwan/tests/test-service-providers'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/devices/wifi/tests/test-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'; \
+src/core/devices/wifi/tests/test-devices-wifi.log: src/core/devices/wifi/tests/test-devices-wifi$(EXEEXT)
+	@p='src/core/devices/wifi/tests/test-devices-wifi$(EXEEXT)'; \
+	b='src/core/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) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/dnsmasq/tests/test-dnsmasq-utils.log: src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT)
-	@p='src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT)'; \
-	b='src/dnsmasq/tests/test-dnsmasq-utils'; \
+src/core/dnsmasq/tests/test-dnsmasq-utils.log: src/core/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT)
+	@p='src/core/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT)'; \
+	b='src/core/dnsmasq/tests/test-dnsmasq-utils'; \
 	$(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/core/platform/tests/test-address-fake.log: src/core/platform/tests/test-address-fake$(EXEEXT)
+	@p='src/core/platform/tests/test-address-fake$(EXEEXT)'; \
+	b='src/core/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-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/core/platform/tests/test-address-linux.log: src/core/platform/tests/test-address-linux$(EXEEXT)
+	@p='src/core/platform/tests/test-address-linux$(EXEEXT)'; \
+	b='src/core/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-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'; \
+src/core/platform/tests/test-cleanup-fake.log: src/core/platform/tests/test-cleanup-fake$(EXEEXT)
+	@p='src/core/platform/tests/test-cleanup-fake$(EXEEXT)'; \
+	b='src/core/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'; \
+src/core/platform/tests/test-cleanup-linux.log: src/core/platform/tests/test-cleanup-linux$(EXEEXT)
+	@p='src/core/platform/tests/test-cleanup-linux$(EXEEXT)'; \
+	b='src/core/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'; \
+src/core/platform/tests/test-link-fake.log: src/core/platform/tests/test-link-fake$(EXEEXT)
+	@p='src/core/platform/tests/test-link-fake$(EXEEXT)'; \
+	b='src/core/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-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/core/platform/tests/test-link-linux.log: src/core/platform/tests/test-link-linux$(EXEEXT)
+	@p='src/core/platform/tests/test-link-linux$(EXEEXT)'; \
+	b='src/core/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) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/platform/tests/test-nmp-object.log: src/platform/tests/test-nmp-object$(EXEEXT)
-	@p='src/platform/tests/test-nmp-object$(EXEEXT)'; \
-	b='src/platform/tests/test-nmp-object'; \
+src/core/platform/tests/test-nmp-object.log: src/core/platform/tests/test-nmp-object$(EXEEXT)
+	@p='src/core/platform/tests/test-nmp-object$(EXEEXT)'; \
+	b='src/core/platform/tests/test-nmp-object'; \
 	$(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-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'; \
+src/core/platform/tests/test-platform-general.log: src/core/platform/tests/test-platform-general$(EXEEXT)
+	@p='src/core/platform/tests/test-platform-general$(EXEEXT)'; \
+	b='src/core/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'; \
+src/core/platform/tests/test-route-fake.log: src/core/platform/tests/test-route-fake$(EXEEXT)
+	@p='src/core/platform/tests/test-route-fake$(EXEEXT)'; \
+	b='src/core/platform/tests/test-route-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-route-linux.log: src/platform/tests/test-route-linux$(EXEEXT)
-	@p='src/platform/tests/test-route-linux$(EXEEXT)'; \
-	b='src/platform/tests/test-route-linux'; \
+src/core/platform/tests/test-route-linux.log: src/core/platform/tests/test-route-linux$(EXEEXT)
+	@p='src/core/platform/tests/test-route-linux$(EXEEXT)'; \
+	b='src/core/platform/tests/test-route-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-tc-fake.log: src/platform/tests/test-tc-fake$(EXEEXT)
-	@p='src/platform/tests/test-tc-fake$(EXEEXT)'; \
-	b='src/platform/tests/test-tc-fake'; \
+src/core/platform/tests/test-tc-fake.log: src/core/platform/tests/test-tc-fake$(EXEEXT)
+	@p='src/core/platform/tests/test-tc-fake$(EXEEXT)'; \
+	b='src/core/platform/tests/test-tc-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-tc-linux.log: src/platform/tests/test-tc-linux$(EXEEXT)
-	@p='src/platform/tests/test-tc-linux$(EXEEXT)'; \
-	b='src/platform/tests/test-tc-linux'; \
+src/core/platform/tests/test-tc-linux.log: src/core/platform/tests/test-tc-linux$(EXEEXT)
+	@p='src/core/platform/tests/test-tc-linux$(EXEEXT)'; \
+	b='src/core/platform/tests/test-tc-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'; \
+src/core/devices/tests/test-lldp.log: src/core/devices/tests/test-lldp$(EXEEXT)
+	@p='src/core/devices/tests/test-lldp$(EXEEXT)'; \
+	b='src/core/devices/tests/test-lldp'; \
 	$(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-acd.log: src/devices/tests/test-acd$(EXEEXT)
-	@p='src/devices/tests/test-acd$(EXEEXT)'; \
-	b='src/devices/tests/test-acd'; \
+src/core/devices/tests/test-acd.log: src/core/devices/tests/test-acd$(EXEEXT)
+	@p='src/core/devices/tests/test-acd$(EXEEXT)'; \
+	b='src/core/devices/tests/test-acd'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/ndisc/tests/test-ndisc-fake.log: src/ndisc/tests/test-ndisc-fake$(EXEEXT)
-	@p='src/ndisc/tests/test-ndisc-fake$(EXEEXT)'; \
-	b='src/ndisc/tests/test-ndisc-fake'; \
+src/core/ndisc/tests/test-ndisc-fake.log: src/core/ndisc/tests/test-ndisc-fake$(EXEEXT)
+	@p='src/core/ndisc/tests/test-ndisc-fake$(EXEEXT)'; \
+	b='src/core/ndisc/tests/test-ndisc-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/supplicant/tests/test-supplicant-config.log: src/supplicant/tests/test-supplicant-config$(EXEEXT)
-	@p='src/supplicant/tests/test-supplicant-config$(EXEEXT)'; \
-	b='src/supplicant/tests/test-supplicant-config'; \
+src/core/supplicant/tests/test-supplicant-config.log: src/core/supplicant/tests/test-supplicant-config$(EXEEXT)
+	@p='src/core/supplicant/tests/test-supplicant-config$(EXEEXT)'; \
+	b='src/core/supplicant/tests/test-supplicant-config'; \
 	$(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/config/test-config.log: src/tests/config/test-config$(EXEEXT)
-	@p='src/tests/config/test-config$(EXEEXT)'; \
-	b='src/tests/config/test-config'; \
+src/core/tests/config/test-config.log: src/core/tests/config/test-config$(EXEEXT)
+	@p='src/core/tests/config/test-config$(EXEEXT)'; \
+	b='src/core/tests/config/test-config'; \
 	$(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-core.log: src/tests/test-core$(EXEEXT)
-	@p='src/tests/test-core$(EXEEXT)'; \
-	b='src/tests/test-core'; \
+src/core/tests/test-core.log: src/core/tests/test-core$(EXEEXT)
+	@p='src/core/tests/test-core$(EXEEXT)'; \
+	b='src/core/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-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'; \
+src/core/tests/test-core-with-expect.log: src/core/tests/test-core-with-expect$(EXEEXT)
+	@p='src/core/tests/test-core-with-expect$(EXEEXT)'; \
+	b='src/core/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) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/tests/test-dcb.log: src/tests/test-dcb$(EXEEXT)
-	@p='src/tests/test-dcb$(EXEEXT)'; \
-	b='src/tests/test-dcb'; \
+src/core/tests/test-dcb.log: src/core/tests/test-dcb$(EXEEXT)
+	@p='src/core/tests/test-dcb$(EXEEXT)'; \
+	b='src/core/tests/test-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)
-src/tests/test-ip4-config.log: src/tests/test-ip4-config$(EXEEXT)
-	@p='src/tests/test-ip4-config$(EXEEXT)'; \
-	b='src/tests/test-ip4-config'; \
+src/core/tests/test-ip4-config.log: src/core/tests/test-ip4-config$(EXEEXT)
+	@p='src/core/tests/test-ip4-config$(EXEEXT)'; \
+	b='src/core/tests/test-ip4-config'; \
 	$(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-ip6-config.log: src/tests/test-ip6-config$(EXEEXT)
-	@p='src/tests/test-ip6-config$(EXEEXT)'; \
-	b='src/tests/test-ip6-config'; \
+src/core/tests/test-ip6-config.log: src/core/tests/test-ip6-config$(EXEEXT)
+	@p='src/core/tests/test-ip6-config$(EXEEXT)'; \
+	b='src/core/tests/test-ip6-config'; \
 	$(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-l3cfg.log: src/tests/test-l3cfg$(EXEEXT)
-	@p='src/tests/test-l3cfg$(EXEEXT)'; \
-	b='src/tests/test-l3cfg'; \
+src/core/tests/test-l3cfg.log: src/core/tests/test-l3cfg$(EXEEXT)
+	@p='src/core/tests/test-l3cfg$(EXEEXT)'; \
+	b='src/core/tests/test-l3cfg'; \
 	$(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-systemd.log: src/tests/test-systemd$(EXEEXT)
-	@p='src/tests/test-systemd$(EXEEXT)'; \
-	b='src/tests/test-systemd'; \
+src/core/tests/test-systemd.log: src/core/tests/test-systemd$(EXEEXT)
+	@p='src/core/tests/test-systemd$(EXEEXT)'; \
+	b='src/core/tests/test-systemd'; \
 	$(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-utils.log: src/tests/test-utils$(EXEEXT)
-	@p='src/tests/test-utils$(EXEEXT)'; \
-	b='src/tests/test-utils'; \
+src/core/tests/test-utils.log: src/core/tests/test-utils$(EXEEXT)
+	@p='src/core/tests/test-utils$(EXEEXT)'; \
+	b='src/core/tests/test-utils'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-src/tests/test-wired-defname.log: src/tests/test-wired-defname$(EXEEXT)
-	@p='src/tests/test-wired-defname$(EXEEXT)'; \
-	b='src/tests/test-wired-defname'; \
+src/core/tests/test-wired-defname.log: src/core/tests/test-wired-defname$(EXEEXT)
+	@p='src/core/tests/test-wired-defname$(EXEEXT)'; \
+	b='src/core/tests/test-wired-defname'; \
 	$(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) \
@@ -18228,6 +18718,13 @@ clients/common/tests/test-libnm-core-aux.log: clients/common/tests/test-libnm-co
 	--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/cloud-setup/tests/test-cloud-setup-general.log: clients/cloud-setup/tests/test-cloud-setup-general$(EXEEXT)
+	@p='clients/cloud-setup/tests/test-cloud-setup-general$(EXEEXT)'; \
+	b='clients/cloud-setup/tests/test-cloud-setup-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)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \
@@ -18493,6 +18990,8 @@ distclean-generic:
 	-rm -f clients/cli/$(am__dirstamp)
 	-rm -f clients/cloud-setup/$(DEPDIR)/$(am__dirstamp)
 	-rm -f clients/cloud-setup/$(am__dirstamp)
+	-rm -f clients/cloud-setup/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f clients/cloud-setup/tests/$(am__dirstamp)
 	-rm -f clients/common/$(DEPDIR)/$(am__dirstamp)
 	-rm -f clients/common/$(am__dirstamp)
 	-rm -f clients/common/tests/$(DEPDIR)/$(am__dirstamp)
@@ -18513,8 +19012,6 @@ distclean-generic:
 	-rm -f introspection/$(am__dirstamp)
 	-rm -f libnm-core/$(DEPDIR)/$(am__dirstamp)
 	-rm -f libnm-core/$(am__dirstamp)
-	-rm -f libnm-core/nm-keyfile/$(DEPDIR)/$(am__dirstamp)
-	-rm -f libnm-core/nm-keyfile/$(am__dirstamp)
 	-rm -f libnm-core/nm-libnm-core-aux/$(DEPDIR)/$(am__dirstamp)
 	-rm -f libnm-core/nm-libnm-core-aux/$(am__dirstamp)
 	-rm -f libnm-core/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp)
@@ -18541,10 +19038,18 @@ distclean-generic:
 	-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-base/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/nm-base/$(am__dirstamp)
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-glib-aux/$(am__dirstamp)
 	-rm -f shared/nm-glib-aux/tests/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-glib-aux/tests/$(am__dirstamp)
+	-rm -f shared/nm-log-core/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/nm-log-core/$(am__dirstamp)
+	-rm -f shared/nm-platform/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/nm-platform/$(am__dirstamp)
+	-rm -f shared/nm-platform/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/nm-platform/tests/$(am__dirstamp)
 	-rm -f shared/nm-std-aux/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-std-aux/$(am__dirstamp)
 	-rm -f shared/nm-udev-aux/$(DEPDIR)/$(am__dirstamp)
@@ -18557,92 +19062,92 @@ distclean-generic:
 	-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)
-	-rm -f src/devices/$(am__dirstamp)
-	-rm -f src/devices/adsl/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/devices/adsl/$(am__dirstamp)
-	-rm -f src/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/devices/bluetooth/$(am__dirstamp)
-	-rm -f src/devices/bluetooth/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/devices/bluetooth/tests/$(am__dirstamp)
-	-rm -f src/devices/ovs/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/devices/ovs/$(am__dirstamp)
-	-rm -f src/devices/team/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/devices/team/$(am__dirstamp)
-	-rm -f src/devices/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/devices/tests/$(am__dirstamp)
-	-rm -f src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/devices/wifi/$(am__dirstamp)
-	-rm -f src/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/devices/wifi/tests/$(am__dirstamp)
-	-rm -f src/devices/wwan/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/devices/wwan/$(am__dirstamp)
-	-rm -f src/devices/wwan/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/devices/wwan/tests/$(am__dirstamp)
-	-rm -f src/dhcp/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/dhcp/$(am__dirstamp)
-	-rm -f src/dhcp/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/dhcp/tests/$(am__dirstamp)
-	-rm -f src/dns/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/dns/$(am__dirstamp)
-	-rm -f src/dnsmasq/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/dnsmasq/$(am__dirstamp)
-	-rm -f src/dnsmasq/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/dnsmasq/tests/$(am__dirstamp)
-	-rm -f src/initrd/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/initrd/$(am__dirstamp)
-	-rm -f src/initrd/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/initrd/tests/$(am__dirstamp)
-	-rm -f src/ndisc/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/ndisc/$(am__dirstamp)
-	-rm -f src/ndisc/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/ndisc/tests/$(am__dirstamp)
-	-rm -f src/platform/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/platform/$(am__dirstamp)
-	-rm -f src/platform/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/platform/tests/$(am__dirstamp)
-	-rm -f src/platform/wifi/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/platform/wifi/$(am__dirstamp)
-	-rm -f src/platform/wpan/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/platform/wpan/$(am__dirstamp)
-	-rm -f src/ppp/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/ppp/$(am__dirstamp)
-	-rm -f src/settings/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/settings/$(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)
-	-rm -f src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp)
-	-rm -f src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/settings/plugins/ifupdown/$(am__dirstamp)
-	-rm -f src/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/settings/plugins/ifupdown/tests/$(am__dirstamp)
-	-rm -f src/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/settings/plugins/keyfile/$(am__dirstamp)
-	-rm -f src/settings/plugins/keyfile/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/settings/plugins/keyfile/tests/$(am__dirstamp)
-	-rm -f src/supplicant/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/supplicant/$(am__dirstamp)
-	-rm -f src/supplicant/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/supplicant/tests/$(am__dirstamp)
-	-rm -f src/systemd/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/systemd/$(am__dirstamp)
-	-rm -f src/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/systemd/sd-adapt-core/$(am__dirstamp)
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/systemd/src/libsystemd-network/$(am__dirstamp)
-	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
-	-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/tests/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/tests/$(am__dirstamp)
-	-rm -f src/tests/config/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/tests/config/$(am__dirstamp)
-	-rm -f src/vpn/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/vpn/$(am__dirstamp)
+	-rm -f src/core/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/$(am__dirstamp)
+	-rm -f src/core/devices/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/$(am__dirstamp)
+	-rm -f src/core/devices/adsl/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/adsl/$(am__dirstamp)
+	-rm -f src/core/devices/bluetooth/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/bluetooth/$(am__dirstamp)
+	-rm -f src/core/devices/bluetooth/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/bluetooth/tests/$(am__dirstamp)
+	-rm -f src/core/devices/ovs/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/ovs/$(am__dirstamp)
+	-rm -f src/core/devices/team/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/team/$(am__dirstamp)
+	-rm -f src/core/devices/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/tests/$(am__dirstamp)
+	-rm -f src/core/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/wifi/$(am__dirstamp)
+	-rm -f src/core/devices/wifi/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/wifi/tests/$(am__dirstamp)
+	-rm -f src/core/devices/wwan/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/wwan/$(am__dirstamp)
+	-rm -f src/core/devices/wwan/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/devices/wwan/tests/$(am__dirstamp)
+	-rm -f src/core/dhcp/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/dhcp/$(am__dirstamp)
+	-rm -f src/core/dhcp/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/dhcp/tests/$(am__dirstamp)
+	-rm -f src/core/dns/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/dns/$(am__dirstamp)
+	-rm -f src/core/dnsmasq/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/dnsmasq/$(am__dirstamp)
+	-rm -f src/core/dnsmasq/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/dnsmasq/tests/$(am__dirstamp)
+	-rm -f src/core/initrd/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/initrd/$(am__dirstamp)
+	-rm -f src/core/initrd/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/initrd/tests/$(am__dirstamp)
+	-rm -f src/core/ndisc/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/ndisc/$(am__dirstamp)
+	-rm -f src/core/ndisc/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/ndisc/tests/$(am__dirstamp)
+	-rm -f src/core/platform/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/platform/$(am__dirstamp)
+	-rm -f src/core/platform/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/platform/tests/$(am__dirstamp)
+	-rm -f src/core/platform/wifi/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/platform/wifi/$(am__dirstamp)
+	-rm -f src/core/platform/wpan/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/platform/wpan/$(am__dirstamp)
+	-rm -f src/core/ppp/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/ppp/$(am__dirstamp)
+	-rm -f src/core/settings/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/settings/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/ifcfg-rh/tests/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/ifupdown/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/ifupdown/tests/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/keyfile/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/keyfile/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/settings/plugins/keyfile/tests/$(am__dirstamp)
+	-rm -f src/core/supplicant/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/supplicant/$(am__dirstamp)
+	-rm -f src/core/supplicant/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/supplicant/tests/$(am__dirstamp)
+	-rm -f src/core/systemd/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/systemd/$(am__dirstamp)
+	-rm -f src/core/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/systemd/sd-adapt-core/$(am__dirstamp)
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/systemd/src/libsystemd-network/$(am__dirstamp)
+	-rm -f src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/systemd/src/libsystemd/sd-event/$(am__dirstamp)
+	-rm -f src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/systemd/src/libsystemd/sd-id128/$(am__dirstamp)
+	-rm -f src/core/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/tests/$(am__dirstamp)
+	-rm -f src/core/tests/config/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/tests/config/$(am__dirstamp)
+	-rm -f src/core/vpn/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/core/vpn/$(am__dirstamp)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -18670,18 +19175,20 @@ distclean: distclean-recursive
 	-rm -f clients/cli/$(DEPDIR)/nmcli-polkit-agent.Po
 	-rm -f clients/cli/$(DEPDIR)/nmcli-settings.Po
 	-rm -f clients/cli/$(DEPDIR)/nmcli-utils.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-cloud-setup-utils.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-http-client.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-azure.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-ec2.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-gcp.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider.Po
 	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-main.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-cloud-setup-utils.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-azure.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-gcp.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Po
+	-rm -f clients/cloud-setup/tests/$(DEPDIR)/test_cloud_setup_general-test-cloud-setup-general.Po
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-client-utils.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo
+	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-base-impl.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Plo
 	-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
@@ -18814,6 +19321,9 @@ distclean: distclean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-meta-setting-base-impl.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Plo
@@ -18829,6 +19339,7 @@ distclean: distclean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ethtool.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-generic.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-gsm.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-hostname.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-config.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-tunnel.Plo
@@ -18840,6 +19351,7 @@ distclean: distclean-recursive
 	-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-external-ids.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
@@ -18853,6 +19365,7 @@ distclean: distclean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tun.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-veth.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Plo
@@ -18872,11 +19385,8 @@ distclean: distclean-recursive
 	-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/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Plo
-	-rm -f libnm-core/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Plo
 	-rm -f libnm-core/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo
 	-rm -f libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Plo
-	-rm -f libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo
 	-rm -f libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo
 	-rm -f libnm-core/tests/$(DEPDIR)/test_compare-test-compare.Po
 	-rm -f libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Po
@@ -18886,65 +19396,64 @@ distclean: distclean-recursive
 	-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-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-vrf.Plo
-	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo
-	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo
-	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo
-	-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-enum-types.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-object.Plo
-	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-remote-connection.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_static_la-nm-access-point.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-active-connection.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-checkpoint.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-client.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-dbus-helpers.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-6lowpan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-adsl.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-bond.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-bridge.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-bt.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-dummy.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ethernet.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-generic.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-infiniband.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ip-tunnel.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-macsec.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-macvlan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-modem.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-olpc-mesh.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-bridge.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-interface.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-port.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ppp.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-team.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-tun.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-veth.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-vlan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-vrf.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-vxlan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi-p2p.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-wimax.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-wireguard.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-wpan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-dhcp-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-dhcp4-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-dhcp6-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-dns-manager.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-enum-types.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-ip-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-ip4-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-ip6-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-libnm-utils.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-object.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-remote-connection.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-secret-agent-old.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-vpn-connection.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-vpn-editor.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-vpn-plugin-old.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-vpn-service-plugin.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-wifi-p2p-peer.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-wimax-nsp.Plo
 	-rm -f libnm/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Plo
 	-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_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
@@ -18964,6 +19473,7 @@ distclean: distclean-recursive
 	-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-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.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
@@ -18980,6 +19490,11 @@ distclean: distclean-recursive
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo
 	-rm -f shared/nm-glib-aux/tests/$(DEPDIR)/test_json_aux-test-json-aux.Po
 	-rm -f shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
+	-rm -f shared/nm-log-core/$(DEPDIR)/libnm_log_core_la-nm-logging.Plo
+	-rm -f shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-netlink.Plo
+	-rm -f shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-platform-utils.Plo
+	-rm -f shared/nm-platform/$(DEPDIR)/libnm_platform_la-nmp-netns.Plo
+	-rm -f shared/nm-platform/tests/$(DEPDIR)/test_nm_platform-test-nm-platform.Po
 	-rm -f shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo
 	-rm -f shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-nm-std-utils.Plo
 	-rm -f shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo
@@ -19010,6 +19525,7 @@ distclean: distclean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ratelimit.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo
@@ -19023,235 +19539,232 @@ distclean: distclean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo
 	-rm -f shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo
 	-rm -f shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Plo
-	-rm -f src/$(DEPDIR)/NetworkManager-main.Po
-	-rm -f src/$(DEPDIR)/NetworkManager_all_sym-main.Po
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-logging.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-act-request.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-config-data.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-policy.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo
-	-rm -f src/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Plo
-	-rm -f src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo
-	-rm -f src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Plo
-	-rm -f src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Plo
-	-rm -f src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Plo
-	-rm -f src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Plo
-	-rm -f src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Plo
-	-rm -f src/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po
-	-rm -f src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo
-	-rm -f src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo
-	-rm -f src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo
-	-rm -f src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Plo
-	-rm -f src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Plo
-	-rm -f src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Plo
-	-rm -f src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo
-	-rm -f src/devices/tests/$(DEPDIR)/test_acd-test-acd.Po
-	-rm -f src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo
-	-rm -f src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po
-	-rm -f src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po
-	-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
-	-rm -f src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Plo
-	-rm -f src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Plo
-	-rm -f src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Plo
-	-rm -f src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Plo
-	-rm -f src/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po
-	-rm -f src/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po
-	-rm -f src/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po
-	-rm -f src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Plo
-	-rm -f src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Plo
-	-rm -f src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Plo
-	-rm -f src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Plo
-	-rm -f src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Plo
-	-rm -f src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Plo
-	-rm -f src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Plo
-	-rm -f src/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po
-	-rm -f src/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Plo
-	-rm -f src/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Plo
-	-rm -f src/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Plo
-	-rm -f src/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po
-	-rm -f src/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po
-	-rm -f src/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po
-	-rm -f src/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po
-	-rm -f src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Plo
-	-rm -f src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Plo
-	-rm -f src/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Plo
-	-rm -f src/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po
-	-rm -f src/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-netlink.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform-utils.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo
-	-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)/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
-	-rm -f src/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po
-	-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/tests/$(DEPDIR)/test_tc_fake-test-tc.Po
-	-rm -f src/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po
-	-rm -f src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo
-	-rm -f src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Plo
-	-rm -f src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Plo
-	-rm -f src/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Plo
-	-rm -f src/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Plo
-	-rm -f src/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Plo
-	-rm -f src/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo
-	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Plo
-	-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/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-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-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-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)/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
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo
-	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo
-	-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/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_ip4_config-test-ip4-config.Po
-	-rm -f src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po
-	-rm -f src/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po
-	-rm -f src/tests/$(DEPDIR)/test_systemd-test-systemd.Po
-	-rm -f src/tests/$(DEPDIR)/test_utils-test-utils.Po
-	-rm -f src/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po
-	-rm -f src/tests/config/$(DEPDIR)/test_config-nm-test-device.Po
-	-rm -f src/tests/config/$(DEPDIR)/test_config-test-config.Po
-	-rm -f src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo
-	-rm -f src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo
+	-rm -f src/core/$(DEPDIR)/NetworkManager-main.Po
+	-rm -f src/core/$(DEPDIR)/NetworkManager_all_sym-main.Po
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-ipv4ll.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-act-request.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-config-data.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-policy.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo
+	-rm -f src/core/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Plo
+	-rm -f src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo
+	-rm -f src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Plo
+	-rm -f src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Plo
+	-rm -f src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Plo
+	-rm -f src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Plo
+	-rm -f src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Plo
+	-rm -f src/core/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po
+	-rm -f src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo
+	-rm -f src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo
+	-rm -f src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo
+	-rm -f src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Plo
+	-rm -f src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Plo
+	-rm -f src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Plo
+	-rm -f src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo
+	-rm -f src/core/devices/tests/$(DEPDIR)/test_acd-test-acd.Po
+	-rm -f src/core/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo
+	-rm -f src/core/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po
+	-rm -f src/core/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po
+	-rm -f src/core/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po
+	-rm -f src/core/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po
+	-rm -f src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Plo
+	-rm -f src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Plo
+	-rm -f src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Plo
+	-rm -f src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Plo
+	-rm -f src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Plo
+	-rm -f src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Plo
+	-rm -f src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Plo
+	-rm -f src/core/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po
+	-rm -f src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Plo
+	-rm -f src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Plo
+	-rm -f src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Plo
+	-rm -f src/core/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po
+	-rm -f src/core/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po
+	-rm -f src/core/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po
+	-rm -f src/core/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po
+	-rm -f src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Plo
+	-rm -f src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Plo
+	-rm -f src/core/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Plo
+	-rm -f src/core/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po
+	-rm -f src/core/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po
+	-rm -f src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Plo
+	-rm -f src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo
+	-rm -f src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo
+	-rm -f src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo
+	-rm -f src/core/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo
+	-rm -f src/core/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo
+	-rm -f src/core/platform/tests/$(DEPDIR)/monitor-monitor.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po
+	-rm -f src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo
+	-rm -f src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Plo
+	-rm -f src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Plo
+	-rm -f src/core/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Plo
+	-rm -f src/core/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Plo
+	-rm -f src/core/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Plo
+	-rm -f src/core/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po
+	-rm -f src/core/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo
+	-rm -f src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo
+	-rm -f src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Plo
+	-rm -f src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Plo
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Plo
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Plo
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Plo
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Plo
+	-rm -f src/core/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po
+	-rm -f src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Plo
+	-rm -f src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Plo
+	-rm -f src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo
+	-rm -f src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo
+	-rm -f src/core/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po
+	-rm -f src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo
+	-rm -f src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Plo
+	-rm -f src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo
+	-rm -f src/core/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo
+	-rm -f src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo
+	-rm -f src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo
+	-rm -f src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo
+	-rm -f src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo
+	-rm -f src/core/tests/$(DEPDIR)/test_core-test-core.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_dcb-test-dcb.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_systemd-test-systemd.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_utils-test-utils.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po
+	-rm -f src/core/tests/config/$(DEPDIR)/test_config-nm-test-device.Po
+	-rm -f src/core/tests/config/$(DEPDIR)/test_config-test-config.Po
+	-rm -f src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo
+	-rm -f src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@@ -19322,18 +19835,20 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f clients/cli/$(DEPDIR)/nmcli-polkit-agent.Po
 	-rm -f clients/cli/$(DEPDIR)/nmcli-settings.Po
 	-rm -f clients/cli/$(DEPDIR)/nmcli-utils.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-cloud-setup-utils.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nm-http-client.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-azure.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-ec2.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider-gcp.Po
+	-rm -f clients/cloud-setup/$(DEPDIR)/libnm_cloud_setup_core_a-nmcs-provider.Po
 	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-main.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-cloud-setup-utils.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nm-http-client.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-azure.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-ec2.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider-gcp.Po
-	-rm -f clients/cloud-setup/$(DEPDIR)/nm_cloud_setup-nmcs-provider.Po
+	-rm -f clients/cloud-setup/tests/$(DEPDIR)/test_cloud_setup_general-test-cloud-setup-general.Po
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-client-utils.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-polkit-listener.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_base_la-nm-vpn-helpers.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-access.Plo
+	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-base-impl.Plo
 	-rm -f clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Plo
 	-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
@@ -19466,6 +19981,9 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-meta-setting-base-impl.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Plo
@@ -19481,6 +19999,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ethtool.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-generic.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-gsm.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-hostname.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-config.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-tunnel.Plo
@@ -19492,6 +20011,7 @@ maintainer-clean: maintainer-clean-recursive
 	-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-external-ids.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
@@ -19505,6 +20025,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tun.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-veth.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vrf.Plo
@@ -19524,11 +20045,8 @@ maintainer-clean: maintainer-clean-recursive
 	-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/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile-utils.Plo
-	-rm -f libnm-core/nm-keyfile/$(DEPDIR)/libnm_keyfile_la-nm-keyfile.Plo
 	-rm -f libnm-core/nm-libnm-core-aux/$(DEPDIR)/libnm_libnm_core_aux_la-nm-libnm-core-aux.Plo
 	-rm -f libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-auth-subject.Plo
-	-rm -f libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo
 	-rm -f libnm-core/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo
 	-rm -f libnm-core/tests/$(DEPDIR)/test_compare-test-compare.Po
 	-rm -f libnm-core/tests/$(DEPDIR)/test_crypto-test-crypto.Po
@@ -19538,65 +20056,64 @@ maintainer-clean: maintainer-clean-recursive
 	-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-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-vrf.Plo
-	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-vxlan.Plo
-	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi-p2p.Plo
-	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-device-wifi.Plo
-	-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-enum-types.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-object.Plo
-	-rm -f libnm/$(DEPDIR)/liblibnm_la-nm-remote-connection.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_static_la-nm-access-point.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-active-connection.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-checkpoint.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-client.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-dbus-helpers.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-6lowpan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-adsl.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-bond.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-bridge.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-bt.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-dummy.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ethernet.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-generic.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-infiniband.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ip-tunnel.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-macsec.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-macvlan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-modem.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-olpc-mesh.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-bridge.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-interface.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ovs-port.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-ppp.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-team.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-tun.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-veth.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-vlan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-vrf.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-vxlan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi-p2p.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-wifi.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-wimax.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-wireguard.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device-wpan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-device.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-dhcp-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-dhcp4-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-dhcp6-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-dns-manager.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-enum-types.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-ip-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-ip4-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-ip6-config.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-libnm-utils.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-object.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-remote-connection.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-secret-agent-old.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-vpn-connection.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-vpn-editor.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-vpn-plugin-old.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-vpn-service-plugin.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-wifi-p2p-peer.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_static_la-nm-wimax-nsp.Plo
 	-rm -f libnm/nm-libnm-aux/$(DEPDIR)/libnm_libnm_aux_la-nm-libnm-aux.Plo
 	-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_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
@@ -19616,6 +20133,7 @@ maintainer-clean: maintainer-clean-recursive
 	-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-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.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
@@ -19632,6 +20150,11 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo
 	-rm -f shared/nm-glib-aux/tests/$(DEPDIR)/test_json_aux-test-json-aux.Po
 	-rm -f shared/nm-glib-aux/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
+	-rm -f shared/nm-log-core/$(DEPDIR)/libnm_log_core_la-nm-logging.Plo
+	-rm -f shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-netlink.Plo
+	-rm -f shared/nm-platform/$(DEPDIR)/libnm_platform_la-nm-platform-utils.Plo
+	-rm -f shared/nm-platform/$(DEPDIR)/libnm_platform_la-nmp-netns.Plo
+	-rm -f shared/nm-platform/tests/$(DEPDIR)/test_nm_platform-test-nm-platform.Po
 	-rm -f shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo
 	-rm -f shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-nm-std-utils.Plo
 	-rm -f shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo
@@ -19662,6 +20185,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ratelimit.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-signal-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo
@@ -19675,235 +20199,232 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo
 	-rm -f shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-dns-domain.Plo
 	-rm -f shared/systemd/src/shared/$(DEPDIR)/libnm_systemd_shared_la-web-util.Plo
-	-rm -f src/$(DEPDIR)/NetworkManager-main.Po
-	-rm -f src/$(DEPDIR)/NetworkManager_all_sym-main.Po
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-logging.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-act-request.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-config-data.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-policy.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Plo
-	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo
-	-rm -f src/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo
-	-rm -f src/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Plo
-	-rm -f src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo
-	-rm -f src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Plo
-	-rm -f src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Plo
-	-rm -f src/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Plo
-	-rm -f src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Plo
-	-rm -f src/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Plo
-	-rm -f src/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po
-	-rm -f src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo
-	-rm -f src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo
-	-rm -f src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo
-	-rm -f src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Plo
-	-rm -f src/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Plo
-	-rm -f src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Plo
-	-rm -f src/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo
-	-rm -f src/devices/tests/$(DEPDIR)/test_acd-test-acd.Po
-	-rm -f src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo
-	-rm -f src/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo
-	-rm -f src/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Plo
-	-rm -f src/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po
-	-rm -f src/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po
-	-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
-	-rm -f src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Plo
-	-rm -f src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Plo
-	-rm -f src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Plo
-	-rm -f src/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Plo
-	-rm -f src/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po
-	-rm -f src/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po
-	-rm -f src/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po
-	-rm -f src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Plo
-	-rm -f src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Plo
-	-rm -f src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Plo
-	-rm -f src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Plo
-	-rm -f src/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Plo
-	-rm -f src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Plo
-	-rm -f src/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Plo
-	-rm -f src/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po
-	-rm -f src/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Plo
-	-rm -f src/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Plo
-	-rm -f src/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Plo
-	-rm -f src/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po
-	-rm -f src/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po
-	-rm -f src/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po
-	-rm -f src/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po
-	-rm -f src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Plo
-	-rm -f src/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Plo
-	-rm -f src/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Plo
-	-rm -f src/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po
-	-rm -f src/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-netlink.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform-utils.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo
-	-rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo
-	-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)/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
-	-rm -f src/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po
-	-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/tests/$(DEPDIR)/test_tc_fake-test-tc.Po
-	-rm -f src/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po
-	-rm -f src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo
-	-rm -f src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Plo
-	-rm -f src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Plo
-	-rm -f src/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Plo
-	-rm -f src/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Plo
-	-rm -f src/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Plo
-	-rm -f src/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo
-	-rm -f src/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Plo
-	-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/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-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-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-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)/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
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo
-	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo
-	-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/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_ip4_config-test-ip4-config.Po
-	-rm -f src/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po
-	-rm -f src/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po
-	-rm -f src/tests/$(DEPDIR)/test_systemd-test-systemd.Po
-	-rm -f src/tests/$(DEPDIR)/test_utils-test-utils.Po
-	-rm -f src/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po
-	-rm -f src/tests/config/$(DEPDIR)/test_config-nm-test-device.Po
-	-rm -f src/tests/config/$(DEPDIR)/test_config-test-config.Po
-	-rm -f src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo
-	-rm -f src/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo
+	-rm -f src/core/$(DEPDIR)/NetworkManager-main.Po
+	-rm -f src/core/$(DEPDIR)/NetworkManager_all_sym-main.Po
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-core-utils.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-object.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-dbus-utils.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip4-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-ip6-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-config-data.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3-ipv4ll.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-l3cfg.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManagerBase_la-nm-netns.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-act-request.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-active-connection.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-audit-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-auth-utils.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-checkpoint.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-config-data.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-connectivity.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-dbus-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-dcb.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-dhcp-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-policy.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-proxy-config.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-rfkill-manager.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-session-monitor.Plo
+	-rm -f src/core/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo
+	-rm -f src/core/$(DEPDIR)/nm_iface_helper-nm-iface-helper.Po
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-6lowpan.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bond.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-bridge.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-dummy.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-factory.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-generic.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-infiniband.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ip-tunnel.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macsec.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-macvlan.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ppp.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-tun.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-veth.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vlan.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vrf.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-vxlan.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wireguard.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device-wpan.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo
+	-rm -f src/core/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Plo
+	-rm -f src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo
+	-rm -f src/core/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-device-adsl.Plo
+	-rm -f src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bluez5-dun.Plo
+	-rm -f src/core/devices/bluetooth/$(DEPDIR)/libnm_bluetooth_utils_la-nm-bt-error.Plo
+	-rm -f src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-bluez-manager.Plo
+	-rm -f src/core/devices/bluetooth/$(DEPDIR)/libnm_device_plugin_bluetooth_la-nm-device-bt.Plo
+	-rm -f src/core/devices/bluetooth/tests/$(DEPDIR)/nm_bt_test-nm-bt-test.Po
+	-rm -f src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-bridge.Plo
+	-rm -f src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-interface.Plo
+	-rm -f src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-device-ovs-port.Plo
+	-rm -f src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovs-factory.Plo
+	-rm -f src/core/devices/ovs/$(DEPDIR)/libnm_device_plugin_ovs_la-nm-ovsdb.Plo
+	-rm -f src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-device-team.Plo
+	-rm -f src/core/devices/team/$(DEPDIR)/libnm_device_plugin_team_la-nm-team-factory.Plo
+	-rm -f src/core/devices/tests/$(DEPDIR)/test_acd-test-acd.Po
+	-rm -f src/core/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-iwd.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-olpc-mesh.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi-p2p.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-device-wifi.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-iwd-manager.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-ap.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-common.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-p2p-peer.Plo
+	-rm -f src/core/devices/wifi/$(DEPDIR)/libnm_wifi_base_la-nm-wifi-utils.Plo
+	-rm -f src/core/devices/wifi/tests/$(DEPDIR)/test_devices_wifi-test-devices-wifi.Po
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-device-modem.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_device_plugin_wwan_la-nm-wwan-factory.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-broadband.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-manager.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem-ofono.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-modem.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/libnm_wwan_la-nm-service-providers.Plo
+	-rm -f src/core/devices/wwan/$(DEPDIR)/tests_test_service_providers-nm-service-providers.Po
+	-rm -f src/core/devices/wwan/tests/$(DEPDIR)/test_service_providers-test-service-providers.Po
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-client.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-manager.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-nettools.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-options.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-systemd.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManagerBase_la-nm-dhcp-utils.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient-utils.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhclient.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcanon.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-dhcpcd.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/libNetworkManager_la-nm-dhcp-listener.Plo
+	-rm -f src/core/dhcp/$(DEPDIR)/nm_dhcp_helper-nm-dhcp-helper.Po
+	-rm -f src/core/dhcp/tests/$(DEPDIR)/test_dhcp_dhclient-test-dhcp-dhclient.Po
+	-rm -f src/core/dhcp/tests/$(DEPDIR)/test_dhcp_utils-test-dhcp-utils.Po
+	-rm -f src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-dnsmasq.Plo
+	-rm -f src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-manager.Plo
+	-rm -f src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-plugin.Plo
+	-rm -f src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-systemd-resolved.Plo
+	-rm -f src/core/dns/$(DEPDIR)/libNetworkManager_la-nm-dns-unbound.Plo
+	-rm -f src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-manager.Plo
+	-rm -f src/core/dnsmasq/$(DEPDIR)/libNetworkManager_la-nm-dnsmasq-utils.Plo
+	-rm -f src/core/dnsmasq/tests/$(DEPDIR)/test_dnsmasq_utils-test-dnsmasq-utils.Po
+	-rm -f src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-cmdline-reader.Plo
+	-rm -f src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-dt-reader.Plo
+	-rm -f src/core/initrd/$(DEPDIR)/libnmi_core_la-nmi-ibft-reader.Plo
+	-rm -f src/core/initrd/$(DEPDIR)/nm_initrd_generator-nm-initrd-generator.Po
+	-rm -f src/core/initrd/tests/$(DEPDIR)/test_cmdline_reader-test-cmdline-reader.Po
+	-rm -f src/core/initrd/tests/$(DEPDIR)/test_dt_reader-test-dt-reader.Po
+	-rm -f src/core/initrd/tests/$(DEPDIR)/test_ibft_reader-test-ibft-reader.Po
+	-rm -f src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-lndp-ndisc.Plo
+	-rm -f src/core/ndisc/$(DEPDIR)/libNetworkManagerBase_la-nm-ndisc.Plo
+	-rm -f src/core/ndisc/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-ndisc.Plo
+	-rm -f src/core/ndisc/tests/$(DEPDIR)/test_ndisc_fake-test-ndisc-fake.Po
+	-rm -f src/core/ndisc/tests/$(DEPDIR)/test_ndisc_linux-test-ndisc-linux.Po
+	-rm -f src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-linux-platform.Plo
+	-rm -f src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo
+	-rm -f src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo
+	-rm -f src/core/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo
+	-rm -f src/core/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo
+	-rm -f src/core/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo
+	-rm -f src/core/platform/tests/$(DEPDIR)/monitor-monitor.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_address_fake-test-address.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_address_linux-test-address.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_cleanup_fake-test-cleanup.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_cleanup_linux-test-cleanup.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_link_fake-test-link.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_link_linux-test-link.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_nmp_object-test-nmp-object.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_platform_general-test-platform-general.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_route_fake-test-route.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_route_linux-test-route.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_tc_fake-test-tc.Po
+	-rm -f src/core/platform/tests/$(DEPDIR)/test_tc_linux-test-tc.Po
+	-rm -f src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo
+	-rm -f src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-wext.Plo
+	-rm -f src/core/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils.Plo
+	-rm -f src/core/platform/wpan/$(DEPDIR)/libNetworkManagerBase_la-nm-wpan-utils.Plo
+	-rm -f src/core/ppp/$(DEPDIR)/libNetworkManager_la-nm-ppp-manager-call.Plo
+	-rm -f src/core/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Plo
+	-rm -f src/core/ppp/$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-agent-manager.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-secret-agent.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-connection.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-plugin.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-storage.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings-utils.Plo
+	-rm -f src/core/settings/$(DEPDIR)/libNetworkManager_la-nm-settings.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-storage.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/$(DEPDIR)/libnms_ifcfg_rh_core_la-shvar.Plo
+	-rm -f src/core/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po
+	-rm -f src/core/settings/plugins/ifupdown/$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo
+	-rm -f src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo
+	-rm -f src/core/settings/plugins/ifupdown/$(DEPDIR)/libnms_ifupdown_core_la-nms-ifupdown-parser.Plo
+	-rm -f src/core/settings/plugins/ifupdown/tests/$(DEPDIR)/test_ifupdown-test-ifupdown.Po
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-plugin.Plo
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-reader.Plo
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-storage.Plo
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-utils.Plo
+	-rm -f src/core/settings/plugins/keyfile/$(DEPDIR)/libNetworkManager_la-nms-keyfile-writer.Plo
+	-rm -f src/core/settings/plugins/keyfile/tests/$(DEPDIR)/test_keyfile_settings-test-keyfile-settings.Po
+	-rm -f src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-config.Plo
+	-rm -f src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-interface.Plo
+	-rm -f src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo
+	-rm -f src/core/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo
+	-rm -f src/core/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po
+	-rm -f src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo
+	-rm -f src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-dhcp.Plo
+	-rm -f src/core/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo
+	-rm -f src/core/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo
+	-rm -f src/core/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo
+	-rm -f src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo
+	-rm -f src/core/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo
+	-rm -f src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo
+	-rm -f src/core/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo
+	-rm -f src/core/tests/$(DEPDIR)/test_core-test-core.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_core_with_expect-test-core-with-expect.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_dcb-test-dcb.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_ip4_config-test-ip4-config.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_ip6_config-test-ip6-config.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_l3cfg-test-l3cfg.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_systemd-test-systemd.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_utils-test-utils.Po
+	-rm -f src/core/tests/$(DEPDIR)/test_wired_defname-test-wired-defname.Po
+	-rm -f src/core/tests/config/$(DEPDIR)/test_config-nm-test-device.Po
+	-rm -f src/core/tests/config/$(DEPDIR)/test_config-test-config.Po
+	-rm -f src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo
+	-rm -f src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -20045,13 +20566,17 @@ config-extra.h: config-extra.h.mk config.h config.status
 $(libnm_core_lib_h_pub_mkenums):     config-extra.h
 libnm-core/.dirstamp:                config-extra.h
 shared/.dirstamp:                    config-extra.h
+shared/nm-base/.dirstamp:            config-extra.h
 shared/nm-glib-aux/.dirstamp:        config-extra.h
+shared/nm-glib-aux/tests/.dirstamp:  config-extra.h
+shared/nm-platform/.dirstamp:        config-extra.h
+shared/nm-platform/tests/.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
+src/core/dhcp/.dirstamp:             config-extra.h
 
 dist-configure-check:
 	@echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection'. ***"
@@ -20078,8 +20603,6 @@ $(libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS): $(libnm_c
 
 $(libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(libnm_core_nm_keyfile_libnm_keyfile_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
 $(libnm_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
 
@@ -20098,7 +20621,7 @@ introspection/%.h: introspection/%.c
 docs/api/dbus-%.xml: introspection/%.c
 	$()
 
-$(libnm_liblibnm_la_OBJECTS):                   $(introspection_sources)
+$(libnm_libnm_static_la_OBJECTS):               $(introspection_sources)
 $(libnm_libnm_la_OBJECTS):                      $(introspection_sources)
 
 check-docs:
@@ -20112,13 +20635,13 @@ $(dispatcher_nm_dispatcher_OBJECTS):                                        $(li
 $(libnm_core_libnm_core_la_OBJECTS):                                        $(libnm_core_lib_h_pub_mkenums)
 $(libnm_libnm_la_OBJECTS):                                                  $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS):                      $(libnm_core_lib_h_pub_mkenums)
-$(src_NetworkManager_OBJECTS):                                              $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS):          $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_team_libnm_device_plugin_team_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
-$(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS):                      $(libnm_core_lib_h_pub_mkenums)
+$(src_core_NetworkManager_OBJECTS):                                         $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_team_libnm_device_plugin_team_la_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS):                 $(libnm_core_lib_h_pub_mkenums)
 
 libnm-core/nm-vpn-dbus-types.xml: libnm-core/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl
 	@$(MKDIR_P) libnm-core/
@@ -20141,8 +20664,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_liblibnm_la_OBJECTS) : $(libnm_lib_h_pub_mkenums)
-$(libnm_liblibnm_la_OBJECTS) : $(libnm_core_lib_h_pub_mkenums)
+$(libnm_libnm_static_la_OBJECTS) : $(libnm_lib_h_pub_mkenums)
+$(libnm_libnm_static_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)
@@ -20157,8 +20680,13 @@ 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@clients/cli/generate-docs-nm-settings-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli
-@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) clients/cli/generate-docs-nm-settings-nmcli > $@
+@BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@clients/cli/generate-docs-nm-settings-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli
+@BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) clients/cli/generate-docs-nm-settings-nmcli > "$@"
+@BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@check-local-generate-docs-nm-settings-nmcli: clients/cli/generate-docs-nm-settings-nmcli.xml
+@BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@	$(srcdir)/tools/check-compare-generated.sh "$(srcdir)" "$(builddir)" "$<"
+@BUILD_DOCS_FALSE@@HAVE_INTROSPECTION_TRUE@clients/cli/generate-docs-nm-settings-nmcli.xml: clients/cli/generate-docs-nm-settings-nmcli.xml.in
+@BUILD_DOCS_FALSE@@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) cp $^ $@
+@BUILD_DOCS_FALSE@@HAVE_INTROSPECTION_TRUE@check-local-generate-docs-nm-settings-nmcli:
 
 @HAVE_INTROSPECTION_TRUE@libnm/nm-property-infos-%.xml: tools/generate-docs-nm-property-infos.pl $(libnm_docs_sources)
 @HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(srcdir)/tools/generate-docs-nm-property-infos.pl $(patsubst nm-property-infos-%.xml,%,$(notdir $@)) $@ $(filter-out $<,$^)
@@ -20192,151 +20720,151 @@ $(libnm_tests_test_secret_agent_OBJECTS):           $(libnm_NM_1_0_typelib)
 
 check-config-options:
 	$(srcdir)/tools/check-config-options.sh "$(srcdir)"
-$(src_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_NetworkManager_all_sym_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_NetworkManager_all_sym_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-src/NetworkManager.ver: src/NetworkManager-all-sym $(core_plugins)
+src/core/NetworkManager.ver: src/core/NetworkManager-all-sym $(core_plugins)
 	$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-build "$(srcdir)"
 
-$(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_initrd_libnmi_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_initrd_nm_initrd_generator_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_initrd_tests_test_cmdline_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_initrd_tests_test_ibft_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_initrd_tests_test_dt_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_initrd_libnmi_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_initrd_nm_initrd_generator_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_initrd_tests_test_cmdline_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_initrd_tests_test_ibft_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_initrd_tests_test_dt_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@WITH_PPP_TRUE@$(src_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@WITH_PPP_TRUE@$(src_core_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@WITH_PPP_TRUE@$(src_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@WITH_PPP_TRUE@$(src_core_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_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/
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	@$(MKDIR_P) src/core/settings/plugins/ifcfg-rh/
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(AM_V_GEN) gdbus-codegen \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@		--generate-c-code $(basename $@) \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@		--c-namespace NMDBus \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@		--interface-prefix com.redhat \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@		$<
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	@true
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_core_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/core/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_core_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@check-local-symbols-settings-ifcfg-rh: src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(call check_so_symbols,$(builddir)/src/core/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so)
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_core_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@install-data-hook-ifcfg-rh:
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	$(mkinstalldirs) -m 0755 $(DESTDIR)$(sysconfdir)/sysconfig/network-scripts
 
 dist-hook-settings-ifcfg-rh-alias-files:
-	@for f in $(src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \
-		cp $(abs_srcdir)/$$f $(distdir)/src/settings/plugins/ifcfg-rh/tests/network-scripts/; \
+	@for f in $(src_core_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \
+		cp $(abs_srcdir)/$$f $(distdir)/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/; \
 	done
 
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_core_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@check-local-symbols-settings-ifupdown: src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(call check_so_symbols,$(builddir)/src/core/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so)
 
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_core_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la
-	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver"
-	$(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so)
+check-local-devices-adsl: src/core/devices/adsl/libnm-device-plugin-adsl.la
+	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver"
+	$(call check_so_symbols,$(builddir)/src/core/devices/adsl/.libs/libnm-device-plugin-adsl.so)
 
-@WITH_MODEM_MANAGER_1_TRUE@$(src_devices_wwan_libnm_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@WITH_MODEM_MANAGER_1_TRUE@$(src_core_devices_wwan_libnm_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@WITH_MODEM_MANAGER_1_TRUE@check-local-devices-wwan: src/devices/wwan/libnm-device-plugin-wwan.la src/devices/wwan/libnm-wwan.la
-@WITH_MODEM_MANAGER_1_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(srcdir)/linker-script-devices.ver"
-@WITH_MODEM_MANAGER_1_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so)
-@WITH_MODEM_MANAGER_1_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-wwan.so "$(srcdir)/src/devices/wwan/libnm-wwan.ver"
-@WITH_MODEM_MANAGER_1_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-wwan.so)
+@WITH_MODEM_MANAGER_1_TRUE@check-local-devices-wwan: src/core/devices/wwan/libnm-device-plugin-wwan.la src/core/devices/wwan/libnm-wwan.la
+@WITH_MODEM_MANAGER_1_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(srcdir)/linker-script-devices.ver"
+@WITH_MODEM_MANAGER_1_TRUE@	$(call check_so_symbols,$(builddir)/src/core/devices/wwan/.libs/libnm-device-plugin-wwan.so)
+@WITH_MODEM_MANAGER_1_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/wwan/.libs/libnm-wwan.so "$(srcdir)/src/core/devices/wwan/libnm-wwan.ver"
+@WITH_MODEM_MANAGER_1_TRUE@	$(call check_so_symbols,$(builddir)/src/core/devices/wwan/.libs/libnm-wwan.so)
 
-@WITH_MODEM_MANAGER_1_TRUE@$(src_devices_wwan_tests_test_service_providers_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@WITH_MODEM_MANAGER_1_TRUE@$(src_core_devices_wwan_tests_test_service_providers_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@WITH_MODEM_MANAGER_1_TRUE@$(src_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@WITH_MODEM_MANAGER_1_TRUE@$(src_core_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@WITH_MODEM_MANAGER_1_TRUE@$(src_devices_bluetooth_tests_nm_bt_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@WITH_MODEM_MANAGER_1_TRUE@$(src_core_devices_bluetooth_tests_nm_bt_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
-@WITH_MODEM_MANAGER_1_TRUE@check-local-devices-bluetooth: src/devices/bluetooth/libnm-device-plugin-bluetooth.la
-@WITH_MODEM_MANAGER_1_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(srcdir)/linker-script-devices.ver"
-@WITH_MODEM_MANAGER_1_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so)
+@WITH_MODEM_MANAGER_1_TRUE@check-local-devices-bluetooth: src/core/devices/bluetooth/libnm-device-plugin-bluetooth.la
+@WITH_MODEM_MANAGER_1_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(srcdir)/linker-script-devices.ver"
+@WITH_MODEM_MANAGER_1_TRUE@	$(call check_so_symbols,$(builddir)/src/core/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so)
 
-@WITH_WIFI_TRUE@$(src_devices_wifi_libnm_wifi_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@WITH_WIFI_TRUE@$(src_core_devices_wifi_libnm_wifi_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-@WITH_WIFI_TRUE@check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la
-@WITH_WIFI_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver"
-@WITH_WIFI_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so)
+@WITH_WIFI_TRUE@check-local-devices-wifi: src/core/devices/wifi/libnm-device-plugin-wifi.la
+@WITH_WIFI_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver"
+@WITH_WIFI_TRUE@	$(call check_so_symbols,$(builddir)/src/core/devices/wifi/.libs/libnm-device-plugin-wifi.so)
 
-@WITH_WIFI_TRUE@$(src_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@WITH_WIFI_TRUE@$(src_core_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"
-@WITH_TEAMDCTL_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so)
+@WITH_TEAMDCTL_TRUE@check-local-devices-team: src/core/devices/team/libnm-device-plugin-team.la
+@WITH_TEAMDCTL_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver"
+@WITH_TEAMDCTL_TRUE@	$(call check_so_symbols,$(builddir)/src/core/devices/team/.libs/libnm-device-plugin-team.so)
 
-@WITH_OPENVSWITCH_TRUE@check-local-devices-ovs: src/devices/ovs/libnm-device-plugin-ovs.la
-@WITH_OPENVSWITCH_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so "$(srcdir)/linker-script-devices.ver"
-@WITH_OPENVSWITCH_TRUE@	$(call check_so_symbols,$(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so)
+@WITH_OPENVSWITCH_TRUE@check-local-devices-ovs: src/core/devices/ovs/libnm-device-plugin-ovs.la
+@WITH_OPENVSWITCH_TRUE@	$(srcdir)/tools/check-exports.sh $(builddir)/src/core/devices/ovs/.libs/libnm-device-plugin-ovs.so "$(srcdir)/linker-script-devices.ver"
+@WITH_OPENVSWITCH_TRUE@	$(call check_so_symbols,$(builddir)/src/core/devices/ovs/.libs/libnm-device-plugin-ovs.so)
 
-$(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_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_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_platform_tests_test_tc_fake_OBJECTS):          $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_tc_linux_OBJECTS):         $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_monitor_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_address_fake_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_address_linux_OBJECTS):    $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_cleanup_fake_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_cleanup_linux_OBJECTS):    $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_link_fake_OBJECTS):        $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_link_linux_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_nmp_object_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_route_fake_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_route_linux_OBJECTS):      $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_tc_fake_OBJECTS):          $(libnm_core_lib_h_pub_mkenums)
+$(src_core_platform_tests_test_tc_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)
+$(src_core_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_config_test_config_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_dcb_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_l3cfg_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_core_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_l3cfg_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
-$(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_core_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml
 	@$(MKDIR_P) dispatcher/
@@ -20376,13 +20904,13 @@ $(clients_nm_online_OBJECTS): $(libnm_lib_h_pub_mkenums)
 $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
 $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
-@HAVE_INTROSPECTION_TRUE@$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-settings-docs-gir.xml clients/common/.dirstamp
-@HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
-@HAVE_INTROSPECTION_TRUE@check-local-settings-docs: $(clients_common_settings_doc_h)
-@HAVE_INTROSPECTION_TRUE@	$(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
-@HAVE_INTROSPECTION_FALSE@$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
-@HAVE_INTROSPECTION_FALSE@	$(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)"
-@HAVE_INTROSPECTION_FALSE@check-local-settings-docs:
+@BUILD_DOCS_TRUE@$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-settings-docs-gir.xml clients/common/.dirstamp
+@BUILD_DOCS_TRUE@	$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
+@BUILD_DOCS_TRUE@check-local-settings-docs: $(clients_common_settings_doc_h)
+@BUILD_DOCS_TRUE@	$(srcdir)/tools/check-compare-generated.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
+@BUILD_DOCS_FALSE@$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
+@BUILD_DOCS_FALSE@	$(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)"
+@BUILD_DOCS_FALSE@check-local-settings-docs:
 
 $(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h)
@@ -20420,6 +20948,9 @@ $(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenum
 @BUILD_NMTUI_TRUE@		rm -f "$(DESTDIR)$(bindir)/$$link"; \
 @BUILD_NMTUI_TRUE@	done
 
+@BUILD_NM_CLOUD_SETUP_TRUE@$(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@BUILD_NM_CLOUD_SETUP_TRUE@$(clients_cloud_setup_libnm_cloud_setup_core_a_OBJECTS): $(libnm_lib_h_pub_mkenums)
+
 @BUILD_NM_CLOUD_SETUP_TRUE@$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 @BUILD_NM_CLOUD_SETUP_TRUE@$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(libnm_lib_h_pub_mkenums)
 
@@ -20434,6 +20965,9 @@ $(clients_cli_generate_docs_nm_settings_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenum
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	rm -f "$(DESTDIR)$(nmlibdir)/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh"
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	rm -f "$(DESTDIR)$(nmlibdir)/dispatcher.d/90-nm-cloud-setup.sh"
 
+@BUILD_NM_CLOUD_SETUP_TRUE@$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+@BUILD_NM_CLOUD_SETUP_TRUE@$(clients_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(libnm_lib_h_pub_mkenums)
+
 ###############################################################################
 # clients/tests
 ###############################################################################
@@ -20450,6 +20984,9 @@ check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-clie
 	cat "$(builddir)/clients/tests/test-client.log"; \
 	test "$$r" = ok
 
+check-local-gitlab-ci:
+	"$(srcdir)/tools/check-gitlab-ci.sh" "$(srcdir)"
+
 @HAVE_SYSTEMD_TRUE@data/NetworkManager.service: $(srcdir)/data/NetworkManager.service.in
 @HAVE_SYSTEMD_TRUE@	$(AM_V_GEN) $(data_edit) $< >$@
 
@@ -20517,6 +21054,9 @@ $(examples_C_glib_list_connections_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenum
 
 ###############################################################################
 
+check-tree:
+	"$(top_srcdir)/tools/check-tree.sh"
+
 check-po-msgfmt:
 	@echo "check-po-msgfmt: check $(top_srcdir)/po/*.po files with msgfmt -vc"
 	@for f in "$(top_srcdir)/po"/*.po ; do \
@@ -20548,9 +21088,13 @@ cscope:
 
 ###############################################################################
 
+check-progs: all $(check_PROGRAMS) $(check_LTLIBRARIES)
+
+###############################################################################
+
 .PRECIOUS: test-suite.log
 .DELETE_ON_ERROR:
-.PHONY: cscope dist-configure-check $(check_local) $(dist_hook)
+.PHONY: check-progs cscope dist-configure-check $(check_local) $(dist_hook)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.