about summary refs log tree commit diff
path: root/src/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in607
1 files changed, 334 insertions, 273 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 1047880d..7f4cf252 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -102,28 +102,22 @@ host_triplet = @host@
 @ENABLE_TESTS_TRUE@	supplicant-manager/tests \
 @ENABLE_TESTS_TRUE@	tests
 
-
-######################
-# libsystemd-nm-base
-######################
-@ENABLE_TESTS_TRUE@am__append_5 = \
-@ENABLE_TESTS_TRUE@	libNetworkManager-base.la
-
 sbin_PROGRAMS = NetworkManager$(EXEEXT)
-@WITH_WEXT_TRUE@am__append_6 = \
+libexec_PROGRAMS = nm-iface-helper$(EXEEXT)
+@WITH_WEXT_TRUE@am__append_5 = \
 @WITH_WEXT_TRUE@	platform/wifi/wifi-utils-wext.c \
 @WITH_WEXT_TRUE@	platform/wifi/wifi-utils-wext.h
 
-@WITH_LIBSOUP_TRUE@am__append_7 = $(LIBSOUP_LIBS)
-@WITH_WEXT_TRUE@am__append_8 = \
+@WITH_LIBSOUP_TRUE@am__append_6 = $(LIBSOUP_LIBS)
+@WITH_WEXT_TRUE@am__append_7 = \
 @WITH_WEXT_TRUE@	platform/wifi/wifi-utils-wext.c \
 @WITH_WEXT_TRUE@	platform/wifi/wifi-utils-wext.h
 
-libexec_PROGRAMS = nm-iface-helper$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
-	$(top_srcdir)/m4/compiler_warnings.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_lib_readline.m4 \
+	$(top_srcdir)/m4/compiler_options.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnome-code-coverage.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -144,39 +138,20 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-@ENABLE_TESTS_TRUE@libNetworkManager_base_la_DEPENDENCIES =  \
-@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-core/libnm-core.la \
-@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
-am__libNetworkManager_base_la_SOURCES_DIST = nm-core-utils.c \
-	nm-core-utils.h nm-logging.c nm-logging.h
-@ENABLE_TESTS_TRUE@am_libNetworkManager_base_la_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	libNetworkManager_base_la-nm-core-utils.lo \
-@ENABLE_TESTS_TRUE@	libNetworkManager_base_la-nm-logging.lo
-libNetworkManager_base_la_OBJECTS =  \
-	$(am_libNetworkManager_base_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-@ENABLE_TESTS_TRUE@am_libNetworkManager_base_la_rpath =
 @WITH_LIBSOUP_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 libNetworkManager_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-core/libnm-core.la \
-	$(top_builddir)/introspection/libnmdbus.la libsystemd-nm.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/introspection/libnmdbus.la \
+	libNetworkManagerBase.la libsystemd-nm.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_2)
-am__libNetworkManager_la_SOURCES_DIST = devices/nm-device-bond.h \
-	devices/nm-device-bridge.h devices/nm-device-ethernet.h \
-	devices/nm-device-infiniband.h devices/nm-device-ip-tunnel.h \
-	devices/nm-device-macvlan.h devices/nm-device-tun.h \
-	devices/nm-device-veth.h devices/nm-device-vlan.h \
-	devices/nm-device-vxlan.h dhcp-manager/nm-dhcp-dhclient.h \
-	dhcp-manager/nm-dhcp-dhclient-utils.h \
-	dhcp-manager/nm-dhcp-dhcpcd.h dhcp-manager/nm-dhcp-systemd.h \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+am__libNetworkManager_la_SOURCES_DIST =  \
+	dhcp-manager/nm-dhcp-dhclient-utils.c \
+	dhcp-manager/nm-dhcp-dhclient-utils.h nm-checkpoint-manager.c \
+	nm-checkpoint-manager.h nm-checkpoint.c nm-checkpoint.h \
 	devices/nm-device.c devices/nm-device.h \
 	devices/nm-lldp-listener.c devices/nm-lldp-listener.h \
 	devices/nm-arping-manager.c devices/nm-arping-manager.h \
@@ -203,12 +178,11 @@ am__libNetworkManager_la_SOURCES_DIST = devices/nm-device-bond.h \
 	platform/nmp-object.h platform/nm-platform-utils.c \
 	platform/nm-platform-utils.h platform/nm-platform.c \
 	platform/nm-platform.h platform/nm-linux-platform.c \
-	platform/nm-linux-platform.h platform/nm-fake-platform.c \
-	platform/nm-fake-platform.h platform/wifi/wifi-utils-nl80211.c \
+	platform/nm-linux-platform.h \
+	platform/wifi/wifi-utils-nl80211.c \
 	platform/wifi/wifi-utils-nl80211.h \
 	platform/wifi/wifi-utils-private.h platform/wifi/wifi-utils.c \
-	platform/wifi/wifi-utils.h rdisc/nm-fake-rdisc.c \
-	rdisc/nm-fake-rdisc.h rdisc/nm-lndp-rdisc.c \
+	platform/wifi/wifi-utils.h rdisc/nm-lndp-rdisc.c \
 	rdisc/nm-lndp-rdisc.h rdisc/nm-rdisc.c rdisc/nm-rdisc.h \
 	rdisc/nm-rdisc-private.h ppp-manager/nm-ppp-manager.c \
 	ppp-manager/nm-ppp-manager.h ppp-manager/nm-ppp-status.h \
@@ -244,59 +218,72 @@ am__libNetworkManager_la_SOURCES_DIST = devices/nm-device-bond.h \
 	nm-activation-request.h nm-active-connection.c \
 	nm-active-connection.h nm-audit-manager.c nm-audit-manager.h \
 	nm-bus-manager.c nm-bus-manager.h nm-config.c nm-config.h \
-	nm-config-data.c nm-config-data.h nm-connection-provider.c \
-	nm-connection-provider.h nm-connectivity.c nm-connectivity.h \
-	nm-dcb.c nm-dcb.h nm-route-manager.c nm-route-manager.h \
-	nm-default-route-manager.c nm-default-route-manager.h \
-	nm-dhcp4-config.c nm-dhcp4-config.h nm-dhcp6-config.c \
-	nm-dhcp6-config.h nm-dispatcher.c nm-dispatcher.h \
-	nm-enum-types.c nm-enum-types.h nm-exported-object.c \
-	nm-exported-object.h nm-firewall-manager.c \
-	nm-firewall-manager.h nm-ip4-config.c nm-ip4-config.h \
-	nm-ip6-config.c nm-ip6-config.h nm-logging.c nm-logging.h \
+	nm-config-data.c nm-config-data.h nm-connectivity.c \
+	nm-connectivity.h nm-dcb.c nm-dcb.h nm-route-manager.c \
+	nm-route-manager.h nm-default-route-manager.c \
+	nm-default-route-manager.h nm-dhcp4-config.c nm-dhcp4-config.h \
+	nm-dhcp6-config.c nm-dhcp6-config.h nm-dispatcher.c \
+	nm-dispatcher.h nm-enum-types.c nm-enum-types.h \
+	nm-exported-object.c nm-exported-object.h \
+	nm-firewall-manager.c nm-firewall-manager.h nm-ip4-config.c \
+	nm-ip4-config.h nm-ip6-config.c nm-ip6-config.h \
 	nm-auth-manager.c nm-auth-manager.h nm-auth-subject.c \
 	nm-auth-subject.h nm-auth-utils.c nm-auth-utils.h nm-manager.c \
 	nm-manager.h nm-multi-index.c nm-multi-index.h nm-policy.c \
 	nm-policy.h nm-rfkill-manager.c nm-rfkill-manager.h \
 	nm-session-monitor.h nm-session-monitor.c nm-sleep-monitor.c \
-	nm-sleep-monitor.h nm-types.h nm-core-utils.c nm-core-utils.h \
-	NetworkManagerUtils.c NetworkManagerUtils.h \
-	platform/wifi/wifi-utils-wext.c \
+	nm-sleep-monitor.h nm-types.h NetworkManagerUtils.c \
+	NetworkManagerUtils.h platform/wifi/wifi-utils-wext.c \
 	platform/wifi/wifi-utils-wext.h
-am__objects_1 =
-@WITH_WEXT_TRUE@am__objects_2 = wifi-utils-wext.lo
-am_libNetworkManager_la_OBJECTS = $(am__objects_1) $(am__objects_1) \
-	nm-device.lo nm-lldp-listener.lo nm-arping-manager.lo \
+@WITH_WEXT_TRUE@am__objects_1 = wifi-utils-wext.lo
+am_libNetworkManager_la_OBJECTS = nm-dhcp-dhclient-utils.lo \
+	nm-checkpoint-manager.lo nm-checkpoint.lo nm-device.lo \
+	nm-lldp-listener.lo nm-arping-manager.lo \
 	nm-device-ethernet-utils.lo nm-device-factory.lo \
 	nm-device-generic.lo nm-dhcp-client.lo nm-dhcp-utils.lo \
 	nm-dhcp-listener.lo nm-dhcp-manager.lo nm-dns-dnsmasq.lo \
 	nm-dns-unbound.lo nm-dns-manager.lo nm-dns-plugin.lo \
 	nm-dnsmasq-manager.lo nm-dnsmasq-utils.lo nmp-netns.lo \
 	nmp-object.lo nm-platform-utils.lo nm-platform.lo \
-	nm-linux-platform.lo nm-fake-platform.lo wifi-utils-nl80211.lo \
-	wifi-utils.lo nm-fake-rdisc.lo nm-lndp-rdisc.lo nm-rdisc.lo \
-	nm-ppp-manager.lo nm-agent-manager.lo nm-inotify-helper.lo \
-	nm-secret-agent.lo nm-settings-connection.lo \
-	nm-settings-plugin.lo nm-settings.lo nm-keyfile-connection.lo \
-	plugin.lo reader.lo utils.lo writer.lo nm-supplicant-config.lo \
-	nm-supplicant-interface.lo nm-supplicant-manager.lo \
-	nm-supplicant-settings-verify.lo nm-vpn-connection.lo \
-	nm-vpn-manager.lo nm-activation-request.lo \
-	nm-active-connection.lo nm-audit-manager.lo nm-bus-manager.lo \
-	nm-config.lo nm-config-data.lo nm-connection-provider.lo \
-	nm-connectivity.lo nm-dcb.lo nm-route-manager.lo \
-	nm-default-route-manager.lo nm-dhcp4-config.lo \
-	nm-dhcp6-config.lo nm-dispatcher.lo nm-enum-types.lo \
-	nm-exported-object.lo nm-firewall-manager.lo nm-ip4-config.lo \
-	nm-ip6-config.lo nm-logging.lo nm-auth-manager.lo \
+	nm-linux-platform.lo wifi-utils-nl80211.lo wifi-utils.lo \
+	nm-lndp-rdisc.lo nm-rdisc.lo nm-ppp-manager.lo \
+	nm-agent-manager.lo nm-inotify-helper.lo nm-secret-agent.lo \
+	nm-settings-connection.lo nm-settings-plugin.lo nm-settings.lo \
+	nm-keyfile-connection.lo plugin.lo reader.lo utils.lo \
+	writer.lo nm-supplicant-config.lo nm-supplicant-interface.lo \
+	nm-supplicant-manager.lo nm-supplicant-settings-verify.lo \
+	nm-vpn-connection.lo nm-vpn-manager.lo \
+	nm-activation-request.lo nm-active-connection.lo \
+	nm-audit-manager.lo nm-bus-manager.lo nm-config.lo \
+	nm-config-data.lo nm-connectivity.lo nm-dcb.lo \
+	nm-route-manager.lo nm-default-route-manager.lo \
+	nm-dhcp4-config.lo nm-dhcp6-config.lo nm-dispatcher.lo \
+	nm-enum-types.lo nm-exported-object.lo nm-firewall-manager.lo \
+	nm-ip4-config.lo nm-ip6-config.lo nm-auth-manager.lo \
 	nm-auth-subject.lo nm-auth-utils.lo nm-manager.lo \
 	nm-multi-index.lo nm-policy.lo nm-rfkill-manager.lo \
-	nm-session-monitor.lo nm-sleep-monitor.lo nm-core-utils.lo \
-	NetworkManagerUtils.lo $(am__objects_2)
+	nm-session-monitor.lo nm-sleep-monitor.lo \
+	NetworkManagerUtils.lo $(am__objects_1)
 libNetworkManager_la_OBJECTS = $(am_libNetworkManager_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libNetworkManagerBase_la_DEPENDENCIES =  \
+	$(top_builddir)/libnm-core/libnm-core.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am_libNetworkManagerBase_la_OBJECTS = nm-core-utils.lo nm-logging.lo
+libNetworkManagerBase_la_OBJECTS =  \
+	$(am_libNetworkManagerBase_la_OBJECTS)
+libNetworkManagerTest_la_DEPENDENCIES = libNetworkManager.la
+am_libNetworkManagerTest_la_OBJECTS = nm-fake-rdisc.lo \
+	nm-fake-platform.lo
+libNetworkManagerTest_la_OBJECTS =  \
+	$(am_libNetworkManagerTest_la_OBJECTS)
 libnm_iface_helper_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-core/libnm-core.la \
-	$(top_builddir)/introspection/libnmdbus.la libsystemd-nm.la \
+	$(top_builddir)/introspection/libnmdbus.la \
+	libNetworkManagerBase.la libsystemd-nm.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -313,33 +300,31 @@ am__libnm_iface_helper_la_SOURCES_DIST =  \
 	platform/wifi/wifi-utils-nl80211.c \
 	platform/wifi/wifi-utils-nl80211.h \
 	platform/wifi/wifi-utils-private.h platform/wifi/wifi-utils.c \
-	platform/wifi/wifi-utils.h rdisc/nm-fake-rdisc.c \
-	rdisc/nm-fake-rdisc.h rdisc/nm-lndp-rdisc.c \
+	platform/wifi/wifi-utils.h rdisc/nm-lndp-rdisc.c \
 	rdisc/nm-lndp-rdisc.h rdisc/nm-rdisc.c rdisc/nm-rdisc.h \
 	nm-route-manager.c nm-route-manager.h nm-exported-object.c \
 	nm-exported-object.h nm-ip4-config.c nm-ip4-config.h \
 	nm-ip6-config.c nm-ip6-config.h nm-enum-types.c \
-	nm-enum-types.h nm-logging.c nm-logging.h nm-multi-index.c \
-	nm-multi-index.h nm-core-utils.c nm-core-utils.h \
+	nm-enum-types.h nm-multi-index.c nm-multi-index.h \
 	NetworkManagerUtils.c NetworkManagerUtils.h \
 	platform/wifi/wifi-utils-wext.c \
 	platform/wifi/wifi-utils-wext.h
 am_libnm_iface_helper_la_OBJECTS = nm-dhcp-client.lo nm-dhcp-utils.lo \
 	nm-dhcp-manager.lo nmp-netns.lo nmp-object.lo \
 	nm-platform-utils.lo nm-platform.lo nm-linux-platform.lo \
-	wifi-utils-nl80211.lo wifi-utils.lo nm-fake-rdisc.lo \
-	nm-lndp-rdisc.lo nm-rdisc.lo nm-route-manager.lo \
-	nm-exported-object.lo nm-ip4-config.lo nm-ip6-config.lo \
-	nm-enum-types.lo nm-logging.lo nm-multi-index.lo \
-	nm-core-utils.lo NetworkManagerUtils.lo $(am__objects_2)
+	wifi-utils-nl80211.lo wifi-utils.lo nm-lndp-rdisc.lo \
+	nm-rdisc.lo nm-route-manager.lo nm-exported-object.lo \
+	nm-ip4-config.lo nm-ip6-config.lo nm-enum-types.lo \
+	nm-multi-index.lo NetworkManagerUtils.lo $(am__objects_1)
 libnm_iface_helper_la_OBJECTS = $(am_libnm_iface_helper_la_OBJECTS)
 libsystemd_nm_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libsystemd_nm_la_OBJECTS = libsystemd_nm_la-nm-sd.lo \
 	libsystemd_nm_la-nm-sd-adapt.lo libsystemd_nm_la-alloc-util.lo \
 	libsystemd_nm_la-escape.lo libsystemd_nm_la-ether-addr-util.lo \
-	libsystemd_nm_la-fd-util.lo libsystemd_nm_la-fileio.lo \
-	libsystemd_nm_la-fs-util.lo libsystemd_nm_la-hash-funcs.lo \
-	libsystemd_nm_la-hashmap.lo libsystemd_nm_la-hexdecoct.lo \
+	libsystemd_nm_la-extract-word.lo libsystemd_nm_la-fd-util.lo \
+	libsystemd_nm_la-fileio.lo libsystemd_nm_la-fs-util.lo \
+	libsystemd_nm_la-hash-funcs.lo libsystemd_nm_la-hashmap.lo \
+	libsystemd_nm_la-hexdecoct.lo \
 	libsystemd_nm_la-hostname-util.lo \
 	libsystemd_nm_la-in-addr-util.lo libsystemd_nm_la-io-util.lo \
 	libsystemd_nm_la-mempool.lo libsystemd_nm_la-parse-util.lo \
@@ -365,21 +350,22 @@ am_libsystemd_nm_la_OBJECTS = libsystemd_nm_la-nm-sd.lo \
 	libsystemd_nm_la-sd-dhcp6-lease.lo \
 	libsystemd_nm_la-sd-ipv4acd.lo libsystemd_nm_la-sd-ipv4ll.lo \
 	libsystemd_nm_la-sd-lldp.lo libsystemd_nm_la-sd-event.lo \
-	libsystemd_nm_la-sd-id128.lo libsystemd_nm_la-dns-domain.lo
+	libsystemd_nm_la-id128-util.lo libsystemd_nm_la-sd-id128.lo \
+	libsystemd_nm_la-dns-domain.lo
 libsystemd_nm_la_OBJECTS = $(am_libsystemd_nm_la_OBJECTS)
 am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" \
 	"$(DESTDIR)$(dbusservicedir)"
 PROGRAMS = $(libexec_PROGRAMS) $(sbin_PROGRAMS)
-am__objects_3 = nm-device-bond.$(OBJEXT) nm-device-bridge.$(OBJEXT) \
+am__objects_2 = nm-device-bond.$(OBJEXT) nm-device-bridge.$(OBJEXT) \
 	nm-device-ethernet.$(OBJEXT) nm-device-infiniband.$(OBJEXT) \
 	nm-device-ip-tunnel.$(OBJEXT) nm-device-macvlan.$(OBJEXT) \
 	nm-device-tun.$(OBJEXT) nm-device-veth.$(OBJEXT) \
 	nm-device-vlan.$(OBJEXT) nm-device-vxlan.$(OBJEXT)
-am__objects_4 = nm-dhcp-dhclient.$(OBJEXT) \
-	nm-dhcp-dhclient-utils.$(OBJEXT) nm-dhcp-dhcpcd.$(OBJEXT) \
+am__objects_3 =
+am__objects_4 = nm-dhcp-dhclient.$(OBJEXT) nm-dhcp-dhcpcd.$(OBJEXT) \
 	nm-dhcp-systemd.$(OBJEXT)
-am_NetworkManager_OBJECTS = $(am__objects_3) $(am__objects_1) \
-	$(am__objects_4) $(am__objects_1) main-utils.$(OBJEXT) \
+am_NetworkManager_OBJECTS = $(am__objects_2) $(am__objects_3) \
+	$(am__objects_4) $(am__objects_3) main-utils.$(OBJEXT) \
 	main.$(OBJEXT)
 NetworkManager_OBJECTS = $(am_NetworkManager_OBJECTS)
 NetworkManager_DEPENDENCIES = libNetworkManager.la
@@ -391,8 +377,7 @@ am_nm_iface_helper_OBJECTS = nm-dhcp-systemd.$(OBJEXT) \
 	nm-iface-helper.$(OBJEXT) main-utils.$(OBJEXT)
 nm_iface_helper_OBJECTS = $(am_nm_iface_helper_OBJECTS)
 nm_iface_helper_DEPENDENCIES =  \
-	$(top_builddir)/libnm-core/libnm-core.la libsystemd-nm.la \
-	libnm-iface-helper.la $(am__DEPENDENCIES_1) \
+	$(top_builddir)/libnm-core/libnm-core.la libnm-iface-helper.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
@@ -434,12 +419,14 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libNetworkManager_base_la_SOURCES) \
-	$(libNetworkManager_la_SOURCES) \
+SOURCES = $(libNetworkManager_la_SOURCES) \
+	$(libNetworkManagerBase_la_SOURCES) \
+	$(libNetworkManagerTest_la_SOURCES) \
 	$(libnm_iface_helper_la_SOURCES) $(libsystemd_nm_la_SOURCES) \
 	$(NetworkManager_SOURCES) $(nm_iface_helper_SOURCES)
-DIST_SOURCES = $(am__libNetworkManager_base_la_SOURCES_DIST) \
-	$(am__libNetworkManager_la_SOURCES_DIST) \
+DIST_SOURCES = $(am__libNetworkManager_la_SOURCES_DIST) \
+	$(libNetworkManagerBase_la_SOURCES) \
+	$(libNetworkManagerTest_la_SOURCES) \
 	$(am__libnm_iface_helper_la_SOURCES_DIST) \
 	$(libsystemd_nm_la_SOURCES) $(NetworkManager_SOURCES) \
 	$(nm_iface_helper_SOURCES)
@@ -577,6 +564,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
 DNSMASQ_PATH = @DNSMASQ_PATH@
 DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
@@ -633,13 +621,14 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
 LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
-LIBDL = @LIBDL@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -651,6 +640,8 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
 LIBSOUP_LIBS = @LIBSOUP_LIBS@
+LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
+LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
 LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@
 LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
@@ -711,6 +702,8 @@ QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
+SANITIZERS = @SANITIZERS@
+SANITIZER_ENV = @SANITIZER_ENV@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
@@ -746,6 +739,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_RANLIB = @ac_ct_RANLIB@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -810,49 +804,88 @@ with_valgrind = @with_valgrind@
 SUBDIRS = . dhcp-manager ppp-manager settings/plugins devices/adsl \
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4)
-
-# add each subdirectory that contains a libNM source file. $(sort) is being used
-# primarily for its side effect of removing duplicates.
-AM_CPPFLAGS = -I$(top_srcdir)/shared -I$(top_builddir)/shared \
-	-I$(top_builddir)/introspection -I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core -I$(top_srcdir)/callouts \
-	-DPREFIX=\"$(prefix)\" -DG_LOG_DOMAIN=\""NetworkManager"\" \
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I$(top_builddir)/introspection \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
+	\
+	 $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d) \
+	\
+	-DPREFIX=\"$(prefix)\"          \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	$(foreach d,$(sort $(dir \
-	$(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d) \
-	$(GLIB_CFLAGS) $(GUDEV_CFLAGS) $(LIBNL_CFLAGS) \
-	$(LIBNDP_CFLAGS) $(LIBSOUP_CFLAGS) $(SELINUX_CFLAGS) \
-	$(LIBAUDIT_CFLAGS) $(SYSTEMD_LOGIN_CFLAGS) \
-	$(SYSTEMD_JOURNAL_CFLAGS) $(SYSTEMD_NM_CFLAGS_PATHS) \
-	-DBINDIR=\"$(bindir)\" -DDATADIR=\"$(datadir)\" \
+	\
+	-DBINDIR=\"$(bindir)\" \
+	-DDATADIR=\"$(datadir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DRUNSTATEDIR=\"$(runstatedir)\" -DSBINDIR=\"$(sbindir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" -DRUNDIR=\"$(rundir)\" \
+	-DRUNSTATEDIR=\"$(runstatedir)\" \
+	-DSBINDIR=\"$(sbindir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DRUNDIR=\"$(rundir)\" \
+	\
 	-DNMCONFDIR=\"$(nmconfdir)\" \
 	-DNMLOCALEDIR=\"$(datadir)/locale\" \
-	-DNMPLUGINDIR=\"$(pkglibdir)\" -DNMRUNDIR=\"$(nmrundir)\" \
-	-DNMSTATEDIR=\"$(nmstatedir)\" -DNMLIBDIR=\"$(nmlibdir)\" \
+	-DNMPLUGINDIR=\"$(pkglibdir)\" \
+	-DNMRUNDIR=\"$(nmrundir)\" \
+	-DNMSTATEDIR=\"$(nmstatedir)\" \
+	-DNMLIBDIR=\"$(nmlibdir)\" \
+	\
 	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
 	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
-	-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" $(NULL)
-noinst_LTLIBRARIES = libNetworkManager.la libnm-iface-helper.la \
-	libsystemd-nm.la $(am__append_5)
-
-######################
-# libsystemd-nm
-######################
-SYSTEMD_NM_CFLAGS_PATHS = \
-	-I$(top_srcdir)/src/systemd/src/systemd \
-	-I$(top_srcdir)/src/systemd/src/libsystemd-network \
-	-I$(top_srcdir)/src/systemd/src/basic \
-	-I$(top_srcdir)/src/systemd
+	-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
+	\
+	$(GLIB_CFLAGS) \
+	$(GUDEV_CFLAGS) \
+	$(LIBNL_CFLAGS) \
+	$(LIBNDP_CFLAGS) \
+	$(LIBSOUP_CFLAGS) \
+	$(SELINUX_CFLAGS) \
+	$(LIBAUDIT_CFLAGS) \
+	$(SYSTEMD_LOGIN_CFLAGS) \
+	$(SYSTEMD_JOURNAL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
+	\
+	-I$(top_srcdir)/src/systemd/src/systemd/ \
+	-I$(top_srcdir)/src/systemd/ \
+	\
+	$(NULL)
+
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+noinst_LTLIBRARIES = \
+	libNetworkManagerBase.la \
+	libNetworkManager.la \
+	libNetworkManagerTest.la \
+	libnm-iface-helper.la \
+	libsystemd-nm.la
+
 
+###############################################################################
 libsystemd_nm_la_SOURCES = \
 	systemd/nm-sd.c \
 	systemd/nm-sd.h \
-	systemd/nm-sd-adapt.c \
-	systemd/nm-sd-adapt.h \
+	systemd/sd-adapt/nm-sd-adapt.c \
+	systemd/sd-adapt/nm-sd-adapt.h \
+	systemd/sd-adapt/build.h \
+	systemd/sd-adapt/cgroup-util.h \
+	systemd/sd-adapt/condition.h \
+	systemd/sd-adapt/conf-parser.h \
+	systemd/sd-adapt/def.h \
+	systemd/sd-adapt/dirent-util.h \
+	systemd/sd-adapt/formats-util.h \
+	systemd/sd-adapt/gunicode.h \
+	systemd/sd-adapt/libudev.h \
+	systemd/sd-adapt/missing.h \
+	systemd/sd-adapt/mkdir.h \
+	systemd/sd-adapt/process-util.h \
+	systemd/sd-adapt/sd-daemon.h \
+	systemd/sd-adapt/stat-util.h \
+	systemd/sd-adapt/udev-util.h \
+	systemd/sd-adapt/udev.h \
+	systemd/sd-adapt/user-util.h \
+	systemd/sd-adapt/virt.h \
 	systemd/src/basic/alloc-util.c \
 	systemd/src/basic/alloc-util.h \
 	systemd/src/basic/async.h \
@@ -860,6 +893,8 @@ libsystemd_nm_la_SOURCES = \
 	systemd/src/basic/escape.h \
 	systemd/src/basic/ether-addr-util.c \
 	systemd/src/basic/ether-addr-util.h \
+	systemd/src/basic/extract-word.c \
+	systemd/src/basic/extract-word.h \
 	systemd/src/basic/fd-util.c \
 	systemd/src/basic/fd-util.h \
 	systemd/src/basic/fileio.c \
@@ -893,6 +928,7 @@ libsystemd_nm_la_SOURCES = \
 	systemd/src/basic/random-util.h \
 	systemd/src/basic/refcnt.h \
 	systemd/src/basic/set.h \
+	systemd/src/basic/signal-util.h \
 	systemd/src/basic/siphash24.c \
 	systemd/src/basic/siphash24.h \
 	systemd/src/basic/socket-util.c \
@@ -943,6 +979,8 @@ libsystemd_nm_la_SOURCES = \
 	systemd/src/libsystemd-network/sd-ipv4ll.c \
 	systemd/src/libsystemd-network/sd-lldp.c \
 	systemd/src/libsystemd/sd-event/sd-event.c \
+	systemd/src/libsystemd/sd-id128/id128-util.c \
+	systemd/src/libsystemd/sd-id128/id128-util.h \
 	systemd/src/libsystemd/sd-id128/sd-id128.c \
 	systemd/src/shared/dns-domain.c \
 	systemd/src/shared/dns-domain.h \
@@ -959,49 +997,41 @@ libsystemd_nm_la_SOURCES = \
 	systemd/src/systemd/sd-ndisc.h
 
 libsystemd_nm_la_CPPFLAGS = \
-	-I$(top_srcdir)/shared \
-	-I$(top_builddir)/shared \
+	-I$(top_srcdir)/shared/ \
+	-I$(top_builddir)/shared/ \
 	-I$(top_srcdir)/libnm-core \
 	-I$(top_builddir)/libnm-core \
-	$(SYSTEMD_NM_CFLAGS_PATHS) \
-	-I$(top_srcdir)/src/systemd/src/shared \
+	-I$(top_srcdir)/src/systemd/sd-adapt/ \
+	-I$(top_srcdir)/src/systemd/src/systemd/ \
+	-I$(top_srcdir)/src/systemd/src/basic/ \
+	-I$(top_srcdir)/src/systemd/src/shared/ \
+	-I$(top_srcdir)/src/systemd/src/libsystemd-network/ \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
 	$(GLIB_CFLAGS)
 
 libsystemd_nm_la_LIBADD = \
 	$(GLIB_LIBS)
 
-@ENABLE_TESTS_TRUE@libNetworkManager_base_la_SOURCES = \
-@ENABLE_TESTS_TRUE@	nm-core-utils.c \
-@ENABLE_TESTS_TRUE@	nm-core-utils.h \
-@ENABLE_TESTS_TRUE@	nm-logging.c \
-@ENABLE_TESTS_TRUE@	nm-logging.h
-
-@ENABLE_TESTS_TRUE@libNetworkManager_base_la_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/shared \
-@ENABLE_TESTS_TRUE@	-I$(top_builddir)/shared \
-@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-core \
-@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-core \
-@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/platform \
-@ENABLE_TESTS_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-@ENABLE_TESTS_TRUE@	-DNO_SYSTEMD_JOURNAL \
-@ENABLE_TESTS_TRUE@	-DPREFIX=\"$(prefix)\" \
-@ENABLE_TESTS_TRUE@	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-@ENABLE_TESTS_TRUE@	-DNMSTATEDIR=\"$(nmstatedir)\" \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
-
-@ENABLE_TESTS_TRUE@libNetworkManager_base_la_LIBADD = \
-@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-core/libnm-core.la \
-@ENABLE_TESTS_TRUE@	$(GLIB_LIBS)
 
-NetworkManager_SOURCES = \
-	$(nm_device_sources) $(nm_device_headers) \
-	$(nm_dhcp_client_sources) $(nm_dhcp_client_headers) \
-	main-utils.c \
-	main-utils.h \
-	main.c
+###############################################################################
+libNetworkManagerBase_la_SOURCES = \
+	nm-core-utils.c \
+	nm-core-utils.h \
+	nm-logging.c \
+	nm-logging.h
+
+libNetworkManagerBase_la_LIBADD = \
+	$(top_builddir)/libnm-core/libnm-core.la \
+	$(GLIB_LIBS) \
+	$(SYSTEMD_JOURNAL_LIBS) \
+	$(NULL)
+
+
+###############################################################################
 
-NetworkManager_LDADD = libNetworkManager.la
+# These source files have a attribute((constructor)) to register their factories.
+# This gets stripped out from the resulting binary if we add them to libNetworkManager.la.
+# Instead, add them to the binary. An alternative would be to link with --as-needed.
 nm_device_sources = \
 	devices/nm-device-bond.c \
 	devices/nm-device-bridge.c \
@@ -1025,25 +1055,30 @@ nm_device_headers = \
 	devices/nm-device-tun.h \
 	devices/nm-device-veth.h \
 	devices/nm-device-vlan.h \
-	devices/nm-device-vxlan.h
+	devices/nm-device-vxlan.h \
+	$(NULL)
 
 nm_dhcp_client_sources = \
 	dhcp-manager/nm-dhcp-dhclient.c \
-	dhcp-manager/nm-dhcp-dhclient-utils.c \
 	dhcp-manager/nm-dhcp-dhcpcd.c \
-	dhcp-manager/nm-dhcp-systemd.c
+	dhcp-manager/nm-dhcp-systemd.c \
+	$(NULL)
 
 nm_dhcp_client_headers = \
 	dhcp-manager/nm-dhcp-dhclient.h \
-	dhcp-manager/nm-dhcp-dhclient-utils.h \
 	dhcp-manager/nm-dhcp-dhcpcd.h \
-	dhcp-manager/nm-dhcp-systemd.h
+	dhcp-manager/nm-dhcp-systemd.h \
+	$(NULL)
 
-libNetworkManager_la_SOURCES = $(nm_device_headers) \
-	$(nm_dhcp_client_headers) devices/nm-device.c \
-	devices/nm-device.h devices/nm-lldp-listener.c \
-	devices/nm-lldp-listener.h devices/nm-arping-manager.c \
-	devices/nm-arping-manager.h devices/nm-device-ethernet-utils.c \
+
+###############################################################################
+libNetworkManager_la_SOURCES = dhcp-manager/nm-dhcp-dhclient-utils.c \
+	dhcp-manager/nm-dhcp-dhclient-utils.h nm-checkpoint-manager.c \
+	nm-checkpoint-manager.h nm-checkpoint.c nm-checkpoint.h \
+	devices/nm-device.c devices/nm-device.h \
+	devices/nm-lldp-listener.c devices/nm-lldp-listener.h \
+	devices/nm-arping-manager.c devices/nm-arping-manager.h \
+	devices/nm-device-ethernet-utils.c \
 	devices/nm-device-ethernet-utils.h devices/nm-device-factory.c \
 	devices/nm-device-factory.h devices/nm-device-generic.c \
 	devices/nm-device-generic.h devices/nm-device-logging.h \
@@ -1066,12 +1101,11 @@ libNetworkManager_la_SOURCES = $(nm_device_headers) \
 	platform/nmp-object.h platform/nm-platform-utils.c \
 	platform/nm-platform-utils.h platform/nm-platform.c \
 	platform/nm-platform.h platform/nm-linux-platform.c \
-	platform/nm-linux-platform.h platform/nm-fake-platform.c \
-	platform/nm-fake-platform.h platform/wifi/wifi-utils-nl80211.c \
+	platform/nm-linux-platform.h \
+	platform/wifi/wifi-utils-nl80211.c \
 	platform/wifi/wifi-utils-nl80211.h \
 	platform/wifi/wifi-utils-private.h platform/wifi/wifi-utils.c \
-	platform/wifi/wifi-utils.h rdisc/nm-fake-rdisc.c \
-	rdisc/nm-fake-rdisc.h rdisc/nm-lndp-rdisc.c \
+	platform/wifi/wifi-utils.h rdisc/nm-lndp-rdisc.c \
 	rdisc/nm-lndp-rdisc.h rdisc/nm-rdisc.c rdisc/nm-rdisc.h \
 	rdisc/nm-rdisc-private.h ppp-manager/nm-ppp-manager.c \
 	ppp-manager/nm-ppp-manager.h ppp-manager/nm-ppp-status.h \
@@ -1107,47 +1141,63 @@ libNetworkManager_la_SOURCES = $(nm_device_headers) \
 	nm-activation-request.h nm-active-connection.c \
 	nm-active-connection.h nm-audit-manager.c nm-audit-manager.h \
 	nm-bus-manager.c nm-bus-manager.h nm-config.c nm-config.h \
-	nm-config-data.c nm-config-data.h nm-connection-provider.c \
-	nm-connection-provider.h nm-connectivity.c nm-connectivity.h \
-	nm-dcb.c nm-dcb.h nm-route-manager.c nm-route-manager.h \
-	nm-default-route-manager.c nm-default-route-manager.h \
-	nm-dhcp4-config.c nm-dhcp4-config.h nm-dhcp6-config.c \
-	nm-dhcp6-config.h nm-dispatcher.c nm-dispatcher.h \
-	nm-enum-types.c nm-enum-types.h nm-exported-object.c \
-	nm-exported-object.h nm-firewall-manager.c \
-	nm-firewall-manager.h nm-ip4-config.c nm-ip4-config.h \
-	nm-ip6-config.c nm-ip6-config.h nm-logging.c nm-logging.h \
+	nm-config-data.c nm-config-data.h nm-connectivity.c \
+	nm-connectivity.h nm-dcb.c nm-dcb.h nm-route-manager.c \
+	nm-route-manager.h nm-default-route-manager.c \
+	nm-default-route-manager.h nm-dhcp4-config.c nm-dhcp4-config.h \
+	nm-dhcp6-config.c nm-dhcp6-config.h nm-dispatcher.c \
+	nm-dispatcher.h nm-enum-types.c nm-enum-types.h \
+	nm-exported-object.c nm-exported-object.h \
+	nm-firewall-manager.c nm-firewall-manager.h nm-ip4-config.c \
+	nm-ip4-config.h nm-ip6-config.c nm-ip6-config.h \
 	nm-auth-manager.c nm-auth-manager.h nm-auth-subject.c \
 	nm-auth-subject.h nm-auth-utils.c nm-auth-utils.h nm-manager.c \
 	nm-manager.h nm-multi-index.c nm-multi-index.h nm-policy.c \
 	nm-policy.h nm-rfkill-manager.c nm-rfkill-manager.h \
 	nm-session-monitor.h nm-session-monitor.c nm-sleep-monitor.c \
-	nm-sleep-monitor.h nm-types.h nm-core-utils.c nm-core-utils.h \
-	NetworkManagerUtils.c NetworkManagerUtils.h $(am__append_6)
-GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
-GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
-GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
-nm_enum_types_sources = $(filter-out \
-                              %/nm-device-private.h \
-                              %/nm-rdisc-private.h \
-                              %/wifi-utils-private.h \
-                              %/nm-dhcp-client-logging.h \
-                              %/nm-device-logging.h \
-                              , $(libNetworkManager_la_SOURCES))
-
-BUILT_SOURCES = $(GLIB_GENERATED)
+	nm-sleep-monitor.h nm-types.h NetworkManagerUtils.c \
+	NetworkManagerUtils.h $(NULL) $(am__append_5)
 libNetworkManager_la_LIBADD =  \
 	$(top_builddir)/libnm-core/libnm-core.la \
-	$(top_builddir)/introspection/libnmdbus.la libsystemd-nm.la \
-	$(GLIB_LIBS) $(GUDEV_LIBS) $(LIBNL_LIBS) $(SYSTEMD_LOGIN_LIBS) \
-	$(SYSTEMD_JOURNAL_LIBS) $(LIBNDP_LIBS) $(LIBDL) $(LIBM) \
-	$(SELINUX_LIBS) $(LIBAUDIT_LIBS) $(am__append_7)
+	$(top_builddir)/introspection/libnmdbus.la \
+	libNetworkManagerBase.la libsystemd-nm.la $(GLIB_LIBS) \
+	$(GUDEV_LIBS) $(LIBNL_LIBS) $(SYSTEMD_LOGIN_LIBS) \
+	$(LIBNDP_LIBS) $(DL_LIBS) $(LIBM) $(SELINUX_LIBS) \
+	$(LIBAUDIT_LIBS) $(am__append_6)
+
+###############################################################################
+libNetworkManagerTest_la_SOURCES = \
+	rdisc/nm-fake-rdisc.c \
+	rdisc/nm-fake-rdisc.h \
+	platform/nm-fake-platform.c \
+	platform/nm-fake-platform.h
+
+libNetworkManagerTest_la_LIBADD = \
+	libNetworkManager.la
+
+
+###############################################################################
+NetworkManager_SOURCES = \
+	\
+	$(nm_device_sources) \
+	$(nm_device_headers) \
+	\
+	$(nm_dhcp_client_sources) \
+	$(nm_dhcp_client_headers) \
+	\
+	main-utils.c \
+	main-utils.h \
+	main.c
+
+NetworkManager_LDADD = \
+	libNetworkManager.la
+
 NetworkManager_LDFLAGS = \
 	-rdynamic \
 	-Wl,--version-script="$(srcdir)/NetworkManager.ver"
 
 
-######################
+###############################################################################
 libnm_iface_helper_la_SOURCES = dhcp-manager/nm-dhcp-client.c \
 	dhcp-manager/nm-dhcp-client.h \
 	dhcp-manager/nm-dhcp-client-logging.h \
@@ -1161,24 +1211,23 @@ libnm_iface_helper_la_SOURCES = dhcp-manager/nm-dhcp-client.c \
 	platform/wifi/wifi-utils-nl80211.c \
 	platform/wifi/wifi-utils-nl80211.h \
 	platform/wifi/wifi-utils-private.h platform/wifi/wifi-utils.c \
-	platform/wifi/wifi-utils.h rdisc/nm-fake-rdisc.c \
-	rdisc/nm-fake-rdisc.h rdisc/nm-lndp-rdisc.c \
+	platform/wifi/wifi-utils.h rdisc/nm-lndp-rdisc.c \
 	rdisc/nm-lndp-rdisc.h rdisc/nm-rdisc.c rdisc/nm-rdisc.h \
 	nm-route-manager.c nm-route-manager.h nm-exported-object.c \
 	nm-exported-object.h nm-ip4-config.c nm-ip4-config.h \
 	nm-ip6-config.c nm-ip6-config.h nm-enum-types.c \
-	nm-enum-types.h nm-logging.c nm-logging.h nm-multi-index.c \
-	nm-multi-index.h nm-core-utils.c nm-core-utils.h \
-	NetworkManagerUtils.c NetworkManagerUtils.h $(am__append_8)
+	nm-enum-types.h nm-multi-index.c nm-multi-index.h \
+	NetworkManagerUtils.c NetworkManagerUtils.h $(am__append_7)
 libnm_iface_helper_la_LIBADD = \
 	$(top_builddir)/libnm-core/libnm-core.la \
 	$(top_builddir)/introspection/libnmdbus.la \
+	libNetworkManagerBase.la \
 	libsystemd-nm.la \
 	$(GLIB_LIBS) \
 	$(GUDEV_LIBS) \
 	$(LIBNL_LIBS) \
 	$(LIBNDP_LIBS) \
-	$(LIBDL) \
+	$(DL_LIBS) \
 	$(LIBM)
 
 nm_iface_helper_SOURCES = \
@@ -1190,23 +1239,38 @@ nm_iface_helper_SOURCES = \
 
 nm_iface_helper_LDADD = \
 	$(top_builddir)/libnm-core/libnm-core.la \
-	libsystemd-nm.la \
 	libnm-iface-helper.la \
 	$(GLIB_LIBS) \
 	$(GUDEV_LIBS) \
-	$(SYSTEMD_JOURNAL_LIBS) \
 	$(LIBNL_LIBS) \
 	$(LIBNDP_LIBS) \
 	$(LIBM)
 
-nm_iface_helper_LDFLAGS = -rdynamic
+nm_iface_helper_LDFLAGS = \
+	-rdynamic
+
 
-######################
+###############################################################################
+GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
+GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
+GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
+nm_enum_types_sources = $(filter-out \
+                              %/nm-device-private.h \
+                              %/nm-rdisc-private.h \
+                              %/wifi-utils-private.h \
+                              %/nm-dhcp-client-logging.h \
+                              %/nm-device-logging.h \
+                              , $(libNetworkManager_la_SOURCES))
+
+BUILT_SOURCES = $(GLIB_GENERATED)
+
+###############################################################################
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = org.freedesktop.NetworkManager.conf
 EXTRA_DIST = \
 	$(dbusservice_DATA) \
 	$(NetworkManager_DATA) \
+	nm-test-utils-core.h \
 	NetworkManager.ver
 
 rundir = $(runstatedir)/NetworkManager
@@ -1260,12 +1324,15 @@ clean-noinstLTLIBRARIES:
 	  rm -f $${locs}; \
 	}
 
-libNetworkManager-base.la: $(libNetworkManager_base_la_OBJECTS) $(libNetworkManager_base_la_DEPENDENCIES) $(EXTRA_libNetworkManager_base_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK) $(am_libNetworkManager_base_la_rpath) $(libNetworkManager_base_la_OBJECTS) $(libNetworkManager_base_la_LIBADD) $(LIBS)
-
 libNetworkManager.la: $(libNetworkManager_la_OBJECTS) $(libNetworkManager_la_DEPENDENCIES) $(EXTRA_libNetworkManager_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK)  $(libNetworkManager_la_OBJECTS) $(libNetworkManager_la_LIBADD) $(LIBS)
 
+libNetworkManagerBase.la: $(libNetworkManagerBase_la_OBJECTS) $(libNetworkManagerBase_la_DEPENDENCIES) $(EXTRA_libNetworkManagerBase_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libNetworkManagerBase_la_OBJECTS) $(libNetworkManagerBase_la_LIBADD) $(LIBS)
+
+libNetworkManagerTest.la: $(libNetworkManagerTest_la_OBJECTS) $(libNetworkManagerTest_la_DEPENDENCIES) $(EXTRA_libNetworkManagerTest_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libNetworkManagerTest_la_OBJECTS) $(libNetworkManagerTest_la_LIBADD) $(LIBS)
+
 libnm-iface-helper.la: $(libnm_iface_helper_la_OBJECTS) $(libnm_iface_helper_la_DEPENDENCIES) $(EXTRA_libnm_iface_helper_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK)  $(libnm_iface_helper_la_OBJECTS) $(libnm_iface_helper_la_LIBADD) $(LIBS)
 
@@ -1385,8 +1452,6 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkManagerUtils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNetworkManager_base_la-nm-core-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libNetworkManager_base_la-nm-logging.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-alloc-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-arp-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-dhcp-identifier.Plo@am__quote@
@@ -1398,6 +1463,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-dns-domain.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-escape.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-ether-addr-util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-extract-word.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-fd-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-fileio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-fs-util.Plo@am__quote@
@@ -1405,6 +1471,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-hashmap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-hexdecoct.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-hostname-util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-id128-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-in-addr-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-io-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsystemd_nm_la-lldp-neighbor.Plo@am__quote@
@@ -1445,9 +1512,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-auth-subject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-auth-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-bus-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-checkpoint-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-checkpoint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-config-data.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-connection-provider.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-connectivity.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-core-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-dcb.Plo@am__quote@
@@ -1467,7 +1535,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-device-vxlan.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-device.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-dhcp-client.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-dhcp-dhclient-utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-dhcp-dhclient-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-dhcp-dhclient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-dhcp-dhcpcd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-dhcp-listener.Plo@am__quote@
@@ -1549,19 +1617,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-libNetworkManager_base_la-nm-core-utils.lo: 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) $(libNetworkManager_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libNetworkManager_base_la-nm-core-utils.lo -MD -MP -MF $(DEPDIR)/libNetworkManager_base_la-nm-core-utils.Tpo -c -o libNetworkManager_base_la-nm-core-utils.lo `test -f 'nm-core-utils.c' || echo '$(srcdir)/'`nm-core-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libNetworkManager_base_la-nm-core-utils.Tpo $(DEPDIR)/libNetworkManager_base_la-nm-core-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-core-utils.c' object='libNetworkManager_base_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) $(libNetworkManager_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libNetworkManager_base_la-nm-core-utils.lo `test -f 'nm-core-utils.c' || echo '$(srcdir)/'`nm-core-utils.c
-
-libNetworkManager_base_la-nm-logging.lo: 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) $(libNetworkManager_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libNetworkManager_base_la-nm-logging.lo -MD -MP -MF $(DEPDIR)/libNetworkManager_base_la-nm-logging.Tpo -c -o libNetworkManager_base_la-nm-logging.lo `test -f 'nm-logging.c' || echo '$(srcdir)/'`nm-logging.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libNetworkManager_base_la-nm-logging.Tpo $(DEPDIR)/libNetworkManager_base_la-nm-logging.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-logging.c' object='libNetworkManager_base_la-nm-logging.lo' libtool=yes @AMDEPBACKSLASH@
+nm-dhcp-dhclient-utils.lo: dhcp-manager/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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-dhcp-dhclient-utils.lo -MD -MP -MF $(DEPDIR)/nm-dhcp-dhclient-utils.Tpo -c -o nm-dhcp-dhclient-utils.lo `test -f 'dhcp-manager/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`dhcp-manager/nm-dhcp-dhclient-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-dhcp-dhclient-utils.Tpo $(DEPDIR)/nm-dhcp-dhclient-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dhcp-manager/nm-dhcp-dhclient-utils.c' object='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) $(libNetworkManager_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libNetworkManager_base_la-nm-logging.lo `test -f 'nm-logging.c' || echo '$(srcdir)/'`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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-dhcp-dhclient-utils.lo `test -f 'dhcp-manager/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`dhcp-manager/nm-dhcp-dhclient-utils.c
 
 nm-device.lo: 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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-device.lo -MD -MP -MF $(DEPDIR)/nm-device.Tpo -c -o nm-device.lo `test -f 'devices/nm-device.c' || echo '$(srcdir)/'`devices/nm-device.c
@@ -1710,13 +1771,6 @@ nm-linux-platform.lo: platform/nm-linux-platform.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-linux-platform.lo `test -f 'platform/nm-linux-platform.c' || echo '$(srcdir)/'`platform/nm-linux-platform.c
 
-nm-fake-platform.lo: 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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-fake-platform.lo -MD -MP -MF $(DEPDIR)/nm-fake-platform.Tpo -c -o nm-fake-platform.lo `test -f 'platform/nm-fake-platform.c' || echo '$(srcdir)/'`platform/nm-fake-platform.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-fake-platform.Tpo $(DEPDIR)/nm-fake-platform.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='platform/nm-fake-platform.c' object='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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-fake-platform.lo `test -f 'platform/nm-fake-platform.c' || echo '$(srcdir)/'`platform/nm-fake-platform.c
-
 wifi-utils-nl80211.lo: platform/wifi/wifi-utils-nl80211.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wifi-utils-nl80211.lo -MD -MP -MF $(DEPDIR)/wifi-utils-nl80211.Tpo -c -o wifi-utils-nl80211.lo `test -f 'platform/wifi/wifi-utils-nl80211.c' || echo '$(srcdir)/'`platform/wifi/wifi-utils-nl80211.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wifi-utils-nl80211.Tpo $(DEPDIR)/wifi-utils-nl80211.Plo
@@ -1731,13 +1785,6 @@ wifi-utils.lo: platform/wifi/wifi-utils.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wifi-utils.lo `test -f 'platform/wifi/wifi-utils.c' || echo '$(srcdir)/'`platform/wifi/wifi-utils.c
 
-nm-fake-rdisc.lo: rdisc/nm-fake-rdisc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-fake-rdisc.lo -MD -MP -MF $(DEPDIR)/nm-fake-rdisc.Tpo -c -o nm-fake-rdisc.lo `test -f 'rdisc/nm-fake-rdisc.c' || echo '$(srcdir)/'`rdisc/nm-fake-rdisc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-fake-rdisc.Tpo $(DEPDIR)/nm-fake-rdisc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rdisc/nm-fake-rdisc.c' object='nm-fake-rdisc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-fake-rdisc.lo `test -f 'rdisc/nm-fake-rdisc.c' || echo '$(srcdir)/'`rdisc/nm-fake-rdisc.c
-
 nm-lndp-rdisc.lo: rdisc/nm-lndp-rdisc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-lndp-rdisc.lo -MD -MP -MF $(DEPDIR)/nm-lndp-rdisc.Tpo -c -o nm-lndp-rdisc.lo `test -f 'rdisc/nm-lndp-rdisc.c' || echo '$(srcdir)/'`rdisc/nm-lndp-rdisc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-lndp-rdisc.Tpo $(DEPDIR)/nm-lndp-rdisc.Plo
@@ -1885,6 +1932,20 @@ wifi-utils-wext.lo: platform/wifi/wifi-utils-wext.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wifi-utils-wext.lo `test -f 'platform/wifi/wifi-utils-wext.c' || echo '$(srcdir)/'`platform/wifi/wifi-utils-wext.c
 
+nm-fake-rdisc.lo: rdisc/nm-fake-rdisc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-fake-rdisc.lo -MD -MP -MF $(DEPDIR)/nm-fake-rdisc.Tpo -c -o nm-fake-rdisc.lo `test -f 'rdisc/nm-fake-rdisc.c' || echo '$(srcdir)/'`rdisc/nm-fake-rdisc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-fake-rdisc.Tpo $(DEPDIR)/nm-fake-rdisc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rdisc/nm-fake-rdisc.c' object='nm-fake-rdisc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-fake-rdisc.lo `test -f 'rdisc/nm-fake-rdisc.c' || echo '$(srcdir)/'`rdisc/nm-fake-rdisc.c
+
+nm-fake-platform.lo: 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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-fake-platform.lo -MD -MP -MF $(DEPDIR)/nm-fake-platform.Tpo -c -o nm-fake-platform.lo `test -f 'platform/nm-fake-platform.c' || echo '$(srcdir)/'`platform/nm-fake-platform.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-fake-platform.Tpo $(DEPDIR)/nm-fake-platform.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='platform/nm-fake-platform.c' object='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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-fake-platform.lo `test -f 'platform/nm-fake-platform.c' || echo '$(srcdir)/'`platform/nm-fake-platform.c
+
 libsystemd_nm_la-nm-sd.lo: 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) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsystemd_nm_la-nm-sd.lo -MD -MP -MF $(DEPDIR)/libsystemd_nm_la-nm-sd.Tpo -c -o libsystemd_nm_la-nm-sd.lo `test -f 'systemd/nm-sd.c' || echo '$(srcdir)/'`systemd/nm-sd.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsystemd_nm_la-nm-sd.Tpo $(DEPDIR)/libsystemd_nm_la-nm-sd.Plo
@@ -1892,12 +1953,12 @@ libsystemd_nm_la-nm-sd.lo: systemd/nm-sd.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsystemd_nm_la-nm-sd.lo `test -f 'systemd/nm-sd.c' || echo '$(srcdir)/'`systemd/nm-sd.c
 
-libsystemd_nm_la-nm-sd-adapt.lo: systemd/nm-sd-adapt.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsystemd_nm_la-nm-sd-adapt.lo -MD -MP -MF $(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Tpo -c -o libsystemd_nm_la-nm-sd-adapt.lo `test -f 'systemd/nm-sd-adapt.c' || echo '$(srcdir)/'`systemd/nm-sd-adapt.c
+libsystemd_nm_la-nm-sd-adapt.lo: systemd/sd-adapt/nm-sd-adapt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsystemd_nm_la-nm-sd-adapt.lo -MD -MP -MF $(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Tpo -c -o libsystemd_nm_la-nm-sd-adapt.lo `test -f 'systemd/sd-adapt/nm-sd-adapt.c' || echo '$(srcdir)/'`systemd/sd-adapt/nm-sd-adapt.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Tpo $(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='systemd/nm-sd-adapt.c' object='libsystemd_nm_la-nm-sd-adapt.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='systemd/sd-adapt/nm-sd-adapt.c' object='libsystemd_nm_la-nm-sd-adapt.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsystemd_nm_la-nm-sd-adapt.lo `test -f 'systemd/nm-sd-adapt.c' || echo '$(srcdir)/'`systemd/nm-sd-adapt.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsystemd_nm_la-nm-sd-adapt.lo `test -f 'systemd/sd-adapt/nm-sd-adapt.c' || echo '$(srcdir)/'`systemd/sd-adapt/nm-sd-adapt.c
 
 libsystemd_nm_la-alloc-util.lo: systemd/src/basic/alloc-util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsystemd_nm_la-alloc-util.lo -MD -MP -MF $(DEPDIR)/libsystemd_nm_la-alloc-util.Tpo -c -o libsystemd_nm_la-alloc-util.lo `test -f 'systemd/src/basic/alloc-util.c' || echo '$(srcdir)/'`systemd/src/basic/alloc-util.c
@@ -1920,6 +1981,13 @@ libsystemd_nm_la-ether-addr-util.lo: systemd/src/basic/ether-addr-util.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) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsystemd_nm_la-ether-addr-util.lo `test -f 'systemd/src/basic/ether-addr-util.c' || echo '$(srcdir)/'`systemd/src/basic/ether-addr-util.c
 
+libsystemd_nm_la-extract-word.lo: systemd/src/basic/extract-word.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsystemd_nm_la-extract-word.lo -MD -MP -MF $(DEPDIR)/libsystemd_nm_la-extract-word.Tpo -c -o libsystemd_nm_la-extract-word.lo `test -f 'systemd/src/basic/extract-word.c' || echo '$(srcdir)/'`systemd/src/basic/extract-word.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsystemd_nm_la-extract-word.Tpo $(DEPDIR)/libsystemd_nm_la-extract-word.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='systemd/src/basic/extract-word.c' object='libsystemd_nm_la-extract-word.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsystemd_nm_la-extract-word.lo `test -f 'systemd/src/basic/extract-word.c' || echo '$(srcdir)/'`systemd/src/basic/extract-word.c
+
 libsystemd_nm_la-fd-util.lo: systemd/src/basic/fd-util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsystemd_nm_la-fd-util.lo -MD -MP -MF $(DEPDIR)/libsystemd_nm_la-fd-util.Tpo -c -o libsystemd_nm_la-fd-util.lo `test -f 'systemd/src/basic/fd-util.c' || echo '$(srcdir)/'`systemd/src/basic/fd-util.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsystemd_nm_la-fd-util.Tpo $(DEPDIR)/libsystemd_nm_la-fd-util.Plo
@@ -2200,6 +2268,13 @@ libsystemd_nm_la-sd-event.lo: systemd/src/libsystemd/sd-event/sd-event.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) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsystemd_nm_la-sd-event.lo `test -f 'systemd/src/libsystemd/sd-event/sd-event.c' || echo '$(srcdir)/'`systemd/src/libsystemd/sd-event/sd-event.c
 
+libsystemd_nm_la-id128-util.lo: 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) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsystemd_nm_la-id128-util.lo -MD -MP -MF $(DEPDIR)/libsystemd_nm_la-id128-util.Tpo -c -o libsystemd_nm_la-id128-util.lo `test -f 'systemd/src/libsystemd/sd-id128/id128-util.c' || echo '$(srcdir)/'`systemd/src/libsystemd/sd-id128/id128-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsystemd_nm_la-id128-util.Tpo $(DEPDIR)/libsystemd_nm_la-id128-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='systemd/src/libsystemd/sd-id128/id128-util.c' object='libsystemd_nm_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) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsystemd_nm_la-id128-util.lo `test -f 'systemd/src/libsystemd/sd-id128/id128-util.c' || echo '$(srcdir)/'`systemd/src/libsystemd/sd-id128/id128-util.c
+
 libsystemd_nm_la-sd-id128.lo: 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) $(libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsystemd_nm_la-sd-id128.lo -MD -MP -MF $(DEPDIR)/libsystemd_nm_la-sd-id128.Tpo -c -o libsystemd_nm_la-sd-id128.lo `test -f 'systemd/src/libsystemd/sd-id128/sd-id128.c' || echo '$(srcdir)/'`systemd/src/libsystemd/sd-id128/sd-id128.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsystemd_nm_la-sd-id128.Tpo $(DEPDIR)/libsystemd_nm_la-sd-id128.Plo
@@ -2368,20 +2443,6 @@ nm-dhcp-dhclient.obj: dhcp-manager/nm-dhcp-dhclient.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-dhcp-dhclient.obj `if test -f 'dhcp-manager/nm-dhcp-dhclient.c'; then $(CYGPATH_W) 'dhcp-manager/nm-dhcp-dhclient.c'; else $(CYGPATH_W) '$(srcdir)/dhcp-manager/nm-dhcp-dhclient.c'; fi`
 
-nm-dhcp-dhclient-utils.o: dhcp-manager/nm-dhcp-dhclient-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-dhcp-dhclient-utils.o -MD -MP -MF $(DEPDIR)/nm-dhcp-dhclient-utils.Tpo -c -o nm-dhcp-dhclient-utils.o `test -f 'dhcp-manager/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`dhcp-manager/nm-dhcp-dhclient-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-dhcp-dhclient-utils.Tpo $(DEPDIR)/nm-dhcp-dhclient-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dhcp-manager/nm-dhcp-dhclient-utils.c' object='nm-dhcp-dhclient-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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-dhcp-dhclient-utils.o `test -f 'dhcp-manager/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`dhcp-manager/nm-dhcp-dhclient-utils.c
-
-nm-dhcp-dhclient-utils.obj: dhcp-manager/nm-dhcp-dhclient-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-dhcp-dhclient-utils.obj -MD -MP -MF $(DEPDIR)/nm-dhcp-dhclient-utils.Tpo -c -o nm-dhcp-dhclient-utils.obj `if test -f 'dhcp-manager/nm-dhcp-dhclient-utils.c'; then $(CYGPATH_W) 'dhcp-manager/nm-dhcp-dhclient-utils.c'; else $(CYGPATH_W) '$(srcdir)/dhcp-manager/nm-dhcp-dhclient-utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-dhcp-dhclient-utils.Tpo $(DEPDIR)/nm-dhcp-dhclient-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dhcp-manager/nm-dhcp-dhclient-utils.c' object='nm-dhcp-dhclient-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) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-dhcp-dhclient-utils.obj `if test -f 'dhcp-manager/nm-dhcp-dhclient-utils.c'; then $(CYGPATH_W) 'dhcp-manager/nm-dhcp-dhclient-utils.c'; else $(CYGPATH_W) '$(srcdir)/dhcp-manager/nm-dhcp-dhclient-utils.c'; fi`
-
 nm-dhcp-dhcpcd.o: dhcp-manager/nm-dhcp-dhcpcd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-dhcp-dhcpcd.o -MD -MP -MF $(DEPDIR)/nm-dhcp-dhcpcd.Tpo -c -o nm-dhcp-dhcpcd.o `test -f 'dhcp-manager/nm-dhcp-dhcpcd.c' || echo '$(srcdir)/'`dhcp-manager/nm-dhcp-dhcpcd.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-dhcp-dhcpcd.Tpo $(DEPDIR)/nm-dhcp-dhcpcd.Po