Imported Upstream version 0.9.10.0 upstream/0.9.10.0

1 files changed, 315 insertions, 289 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3ea6241c..2929e18c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,115 +1,46 @@
-SUBDIRS= \
-	generated \
-	logging \
-	posix-signals \
-	dns-manager \
-	vpn-manager \
-	dhcp-manager \
-	ip6-manager \
-	supplicant-manager \
-	ppp-manager \
-	dnsmasq-manager \
-	modem-manager \
-	bluez-manager \
-	firewall-manager \
-	wifi \
-	settings
+include $(GLIB_MAKEFILE)
 
-if WITH_WIMAX
-SUBDIRS += wimax
-endif
-
-SUBDIRS += . tests
-
-AM_CPPFLAGS = \
-           -I${top_srcdir} \
-           -I${top_builddir}/include \
-           -I${top_srcdir}/include \
-           -I${top_builddir}/src/generated \
-           -I${top_srcdir}/src/generated \
-           -I${top_srcdir}/src/logging \
-           -I${top_srcdir}/src/posix-signals \
-           -I${top_srcdir}/src/dns-manager \
-           -I${top_srcdir}/src/vpn-manager \
-           -I${top_srcdir}/src/dhcp-manager \
-           -I${top_srcdir}/src/ip6-manager \
-           -I${top_srcdir}/src/supplicant-manager \
-           -I${top_srcdir}/src/dnsmasq-manager \
-           -I${top_srcdir}/src/modem-manager \
-           -I$(top_srcdir)/src/bluez-manager \
-           -I$(top_srcdir)/src/firewall-manager \
-           -I$(top_srcdir)/src/settings \
-           -I$(top_srcdir)/src/wifi \
-           -I${top_srcdir}/libnm-util \
-           -I${top_builddir}/libnm-util \
-           -I${top_srcdir}/callouts
-
-###########################################
-# Test libraries
-###########################################
-
-noinst_LTLIBRARIES = \
-	libtest-dhcp.la \
-	libtest-policy-hosts.la \
-	libtest-wifi-ap-utils.la
-
-###########################################
-# DHCP test library
-###########################################
-
-libtest_dhcp_la_SOURCES = \
-	nm-ip4-config.c \
-	nm-ip6-config.c \
-	nm-hostname-provider.c \
-	nm-dbus-manager.c
+@GNOME_CODE_COVERAGE_RULES@
 
-libtest_dhcp_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(LIBNL_CFLAGS) \
-	$(AM_CPPFLAGS)
+SUBDIRS =				\
+	.				\
+	devices/adsl			\
+	devices/wwan			\
+	devices/bluetooth		\
+	devices/wifi                    \
+	dhcp-manager			\
+	ppp-manager			\
+	settings/plugins
 
-libtest_dhcp_la_LIBADD = \
-	$(top_builddir)/src/generated/libnm-generated.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS) \
-	$(LIBNL_LIBS)
-
-###########################################
-# Hosts policy test library
-###########################################
-
-libtest_policy_hosts_la_SOURCES = \
-	nm-policy-hosts.c \
-	nm-policy-hosts.h
-
-libtest_policy_hosts_la_CPPFLAGS = \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	$(GLIB_CFLAGS) \
-	$(AM_CPPFLAGS)
-
-libtest_policy_hosts_la_LIBADD = \
-	${top_builddir}/src/logging/libnm-logging.la \
-	$(GLIB_LIBS)
-
-
-###########################################
-# Wifi ap utils
-###########################################
-
-libtest_wifi_ap_utils_la_SOURCES = \
-	nm-wifi-ap-utils.c \
-	nm-wifi-ap-utils.h
+if WITH_WIMAX
+SUBDIRS += devices/wimax
+endif
 
-libtest_wifi_ap_utils_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(AM_CPPFLAGS)
+if ENABLE_TESTS
+SUBDIRS += \
+	config/tests \
+	dhcp-manager/tests \
+	dnsmasq-manager/tests \
+	platform \
+	rdisc \
+	settings/tests \
+	supplicant-manager/tests \
+	tests
+endif
 
-libtest_wifi_ap_utils_la_LIBADD = \
-	${top_builddir}/libnm-util/libnm-util.la \
-	$(GLIB_LIBS)
+AM_CPPFLAGS =				\
+	-I$(top_srcdir)/include		\
+	-I$(top_builddir)/include	\
+	-I${top_srcdir}/libgsystem	\
+	-I$(top_srcdir)/libnm-util	\
+	-I$(top_builddir)/libnm-util	\
+	-I$(top_srcdir)/callouts	\
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
 
+# add each subdirectory that contains a libNM source file. $(sort) is being used
+# primarily for its side effect of removing duplicates.
+AM_CPPFLAGS += $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d)
 
 ###########################################
 # NetworkManager
@@ -118,227 +49,314 @@ libtest_wifi_ap_utils_la_LIBADD = \
 sbin_PROGRAMS = NetworkManager
 
 NetworkManager_SOURCES = \
-		nm-types.h \
-		nm-call-store.c \
-		nm-call-store.h \
-		nm-device.c \
-		nm-device.h \
-		nm-device-private.h \
-		nm-device-ethernet.c \
-		nm-device-ethernet.h \
-		nm-device-adsl.c \
-		nm-device-adsl.h \
-		nm-device-wifi.c \
-		nm-device-wifi.h \
-		nm-device-wired.c \
-		nm-device-wired.h \
-		nm-device-olpc-mesh.c	\
-		nm-device-olpc-mesh.h	\
-		nm-device-bt.c \
-		nm-device-bt.h \
-		nm-device-modem.h \
-		nm-device-modem.c \
-		nm-device-infiniband.c \
-		nm-device-infiniband.h \
-		nm-device-bond.c \
-		nm-device-bond.h \
-		nm-device-bridge.c \
-		nm-device-bridge.h \
-		nm-device-vlan.c \
-		nm-device-vlan.h \
-		nm-wifi-ap.c \
-		nm-wifi-ap.h \
-		nm-wifi-ap-utils.c \
-		nm-wifi-ap-utils.h \
-		nm-dbus-manager.h \
-		nm-dbus-manager.c \
-		nm-udev-manager.c \
-		nm-udev-manager.h \
-		nm-device-factory.h \
-		nm-hostname-provider.c \
-		nm-hostname-provider.h \
-		nm-ip4-config.c \
-		nm-ip4-config.h \
-		nm-ip6-config.c \
-		nm-ip6-config.h \
-		nm-active-connection.h \
-		nm-active-connection.c \
-		nm-config.h \
-		nm-config.c \
-		main.c \
-		nm-policy.c \
-		nm-policy.h \
-		nm-policy-hosts.c \
-		nm-policy-hosts.h \
-		nm-policy-hostname.c \
-		nm-policy-hostname.h \
-		NetworkManagerUtils.c \
-		NetworkManagerUtils.h \
-		nm-system.c \
-		nm-system.h \
-		nm-manager.c \
-		nm-manager.h \
-		nm-manager-auth.c \
-		nm-manager-auth.h \
-		nm-netlink-monitor.c \
-		nm-netlink-monitor.h \
-		nm-netlink-utils.c \
-		nm-netlink-utils.h \
-		nm-netlink-compat.h \
-		nm-netlink-compat.c \
-		nm-activation-request.c \
-		nm-activation-request.h \
-		nm-properties-changed-signal.c \
-		nm-properties-changed-signal.h \
-		nm-dhcp4-config.c \
-		nm-dhcp4-config.h \
-		nm-dhcp6-config.c \
-		nm-dhcp6-config.h \
-		nm-rfkill.h \
-		nm-session-monitor.h \
-		nm-session-utils.c \
-		nm-session-utils.h \
-		nm-sleep-monitor.h \
-		nm-connection-provider.h \
-		nm-connection-provider.c \
-		nm-dispatcher.c \
-		nm-dispatcher.h \
-		nm-connectivity.c \
-		nm-connectivity.h
+	main.c
+
+NetworkManager_LDADD = libNetworkManager.la $(top_builddir)/libgsystem.la $(LIBNDP_LIBS)
+
+noinst_LTLIBRARIES = libNetworkManager.la
+
+nm_sources = \
+	config/nm-config.c \
+	config/nm-config.h \
+	config/nm-config-device.c \
+	config/nm-config-device.h \
+	\
+	devices/nm-device.c \
+	devices/nm-device.h \
+	devices/nm-device-bond.c \
+	devices/nm-device-bond.h \
+	devices/nm-device-bridge.c \
+	devices/nm-device-bridge.h \
+	devices/nm-device-ethernet.c \
+	devices/nm-device-ethernet.h \
+	devices/nm-device-factory.c \
+	devices/nm-device-factory.h \
+	devices/nm-device-generic.c \
+	devices/nm-device-generic.h \
+	devices/nm-device-gre.c \
+	devices/nm-device-gre.h \
+	devices/nm-device-infiniband.c \
+	devices/nm-device-infiniband.h \
+	devices/nm-device-macvlan.c \
+	devices/nm-device-macvlan.h \
+	devices/nm-device-private.h \
+	devices/nm-device-team.c \
+	devices/nm-device-team.h \
+	devices/nm-device-tun.c \
+	devices/nm-device-tun.h \
+	devices/nm-device-veth.c \
+	devices/nm-device-veth.h \
+	devices/nm-device-vlan.c \
+	devices/nm-device-vlan.h \
+	devices/nm-device-vxlan.c \
+	devices/nm-device-vxlan.h \
+	\
+	dhcp-manager/nm-dhcp-client.c \
+	dhcp-manager/nm-dhcp-client.h \
+	dhcp-manager/nm-dhcp-dhclient.c \
+	dhcp-manager/nm-dhcp-dhclient.h \
+	dhcp-manager/nm-dhcp-dhclient-utils.c \
+	dhcp-manager/nm-dhcp-dhclient-utils.h \
+	dhcp-manager/nm-dhcp-dhcpcd.c \
+	dhcp-manager/nm-dhcp-dhcpcd.h \
+	dhcp-manager/nm-dhcp-manager.c \
+	dhcp-manager/nm-dhcp-manager.h \
+	\
+	dns-manager/nm-dns-dnsmasq.c \
+	dns-manager/nm-dns-dnsmasq.h \
+	dns-manager/nm-dns-unbound.c \
+	dns-manager/nm-dns-unbound.h \
+	dns-manager/nm-dns-manager.c \
+	dns-manager/nm-dns-manager.h \
+	dns-manager/nm-dns-plugin.c \
+	dns-manager/nm-dns-plugin.h \
+	dns-manager/nm-dns-utils.c \
+	dns-manager/nm-dns-utils.h \
+	\
+	dnsmasq-manager/nm-dnsmasq-manager.c \
+	dnsmasq-manager/nm-dnsmasq-manager.h \
+	dnsmasq-manager/nm-dnsmasq-utils.c \
+	dnsmasq-manager/nm-dnsmasq-utils.h \
+	\
+	firewall-manager/nm-firewall-manager.c \
+	firewall-manager/nm-firewall-manager.h \
+	\
+	logging/nm-logging.c \
+	logging/nm-logging.h \
+	\
+	platform/nm-fake-platform.c \
+	platform/nm-fake-platform.h \
+	platform/nm-linux-platform.c \
+	platform/nm-linux-platform.h \
+	platform/nm-platform.c \
+	platform/nm-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 \
+	rdisc/nm-lndp-rdisc.h \
+	rdisc/nm-rdisc.c \
+	rdisc/nm-rdisc.h \
+	\
+	posix-signals/nm-posix-signals.c \
+	posix-signals/nm-posix-signals.h \
+	\
+	ppp-manager/nm-ppp-manager.c \
+	ppp-manager/nm-ppp-manager.h \
+	ppp-manager/nm-ppp-status.h \
+	\
+	settings/nm-agent-manager.c \
+	settings/nm-agent-manager.h \
+	settings/nm-inotify-helper.c \
+	settings/nm-inotify-helper.h \
+	settings/nm-secret-agent.c \
+	settings/nm-secret-agent.h \
+	settings/nm-settings-connection.c \
+	settings/nm-settings-connection.h \
+	settings/nm-settings-error.c \
+	settings/nm-settings-error.h \
+	settings/nm-settings-utils.c \
+	settings/nm-settings-utils.h \
+	settings/nm-settings.c \
+	settings/nm-settings.h \
+	settings/nm-system-config-interface.c \
+	settings/nm-system-config-interface.h \
+	\
+	settings/plugins/keyfile/common.h \
+	settings/plugins/keyfile/errors.c \
+	settings/plugins/keyfile/nm-keyfile-connection.c \
+	settings/plugins/keyfile/nm-keyfile-connection.h \
+	settings/plugins/keyfile/plugin.c \
+	settings/plugins/keyfile/plugin.h \
+	settings/plugins/keyfile/reader.c \
+	settings/plugins/keyfile/reader.h \
+	settings/plugins/keyfile/utils.c \
+	settings/plugins/keyfile/utils.h \
+	settings/plugins/keyfile/writer.c \
+	settings/plugins/keyfile/writer.h \
+	\
+	supplicant-manager/nm-supplicant-config.c \
+	supplicant-manager/nm-supplicant-config.h \
+	supplicant-manager/nm-supplicant-interface.c \
+	supplicant-manager/nm-supplicant-interface.h \
+	supplicant-manager/nm-supplicant-manager.c \
+	supplicant-manager/nm-supplicant-manager.h \
+	supplicant-manager/nm-supplicant-settings-verify.c \
+	supplicant-manager/nm-supplicant-settings-verify.h \
+	supplicant-manager/nm-supplicant-types.h \
+	supplicant-manager/nm-call-store.c \
+	supplicant-manager/nm-call-store.h \
+	\
+	vpn-manager/nm-vpn-connection.c \
+	vpn-manager/nm-vpn-connection.h \
+	vpn-manager/nm-vpn-manager.c \
+	vpn-manager/nm-vpn-manager.h \
+	vpn-manager/nm-vpn-service.c \
+	vpn-manager/nm-vpn-service.h \
+	\
+	nm-activation-request.c \
+	nm-activation-request.h \
+	nm-active-connection.c \
+	nm-active-connection.h \
+	nm-connection-provider.c \
+	nm-connection-provider.h \
+	nm-connectivity.c \
+	nm-connectivity.h \
+	nm-dbus-manager.c \
+	nm-dbus-manager.h \
+	nm-dcb.c \
+	nm-dcb.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-ip4-config.c \
+	nm-ip4-config.h \
+	nm-ip6-config.c \
+	nm-ip6-config.h \
+	nm-manager-auth.c \
+	nm-manager-auth.h \
+	nm-auth-subject.c \
+	nm-auth-subject.h \
+	nm-manager.c \
+	nm-manager.h \
+	nm-policy.c \
+	nm-policy.h \
+	nm-properties-changed-signal.c \
+	nm-properties-changed-signal.h \
+	nm-rfkill-manager.c \
+	nm-rfkill-manager.h \
+	nm-session-monitor.h \
+	nm-session-utils.c \
+	nm-session-utils.h \
+	nm-sleep-monitor.h \
+	nm-types.h \
+	NetworkManagerUtils.c \
+	NetworkManagerUtils.h
 
 if SESSION_TRACKING_SYSTEMD
-NetworkManager_SOURCES += nm-session-monitor-systemd.c
+nm_sources += nm-session-monitor-systemd.c
 else
 if SESSION_TRACKING_CK
-NetworkManager_SOURCES += nm-session-monitor-ck.c
+nm_sources += nm-session-monitor-ck.c
 else
-NetworkManager_SOURCES += nm-session-monitor-null.c
+nm_sources += nm-session-monitor-null.c
 endif
 endif
 
 if SUSPEND_RESUME_SYSTEMD
-NetworkManager_SOURCES += nm-sleep-monitor-systemd.c
+nm_sources += nm-sleep-monitor-systemd.c
 else
 # UPower suspend/resume used whenever systemd is not enabled
-NetworkManager_SOURCES += nm-sleep-monitor-upower.c
+nm_sources += nm-sleep-monitor-upower.c
 endif
 
-nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_access_point --mode=glib-server --output=$@ $<
-
-nm-manager-glue.h: $(top_srcdir)/introspection/nm-manager.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_manager --mode=glib-server --output=$@ $<
-
-nm-device-interface-glue.h: $(top_srcdir)/introspection/nm-device.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_interface --mode=glib-server --output=$@ $<
-
-nm-device-ethernet-glue.h: $(top_srcdir)/introspection/nm-device-ethernet.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_ethernet --mode=glib-server --output=$@ $<
-
-nm-device-infiniband-glue.h: $(top_srcdir)/introspection/nm-device-infiniband.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_infiniband --mode=glib-server --output=$@ $<
-
-nm-device-adsl-glue.h: $(top_srcdir)/introspection/nm-device-adsl.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_adsl --mode=glib-server --output=$@ $<
-
-nm-device-wifi-glue.h: $(top_srcdir)/introspection/nm-device-wifi.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_wifi --mode=glib-server --output=$@ $<
-
-nm-device-bt-glue.h: $(top_srcdir)/introspection/nm-device-bt.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_bt --mode=glib-server --output=$@ $<
-
-nm-device-olpc-mesh-glue.h: $(top_srcdir)/introspection/nm-device-olpc-mesh.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_olpc_mesh --mode=glib-server --output=$@ $<
-
-nm-device-bond-glue.h: $(top_srcdir)/introspection/nm-device-bond.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_bond --mode=glib-server --output=$@ $<
-
-nm-device-bridge-glue.h: $(top_srcdir)/introspection/nm-device-bridge.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_bridge --mode=glib-server --output=$@ $<
-
-nm-device-vlan-glue.h: $(top_srcdir)/introspection/nm-device-vlan.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_vlan --mode=glib-server --output=$@ $<
-
-nm-ip4-config-glue.h: $(top_srcdir)/introspection/nm-ip4-config.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_ip4_config --mode=glib-server --output=$@ $<
+if WITH_WEXT
+nm_sources += \
+	platform/wifi/wifi-utils-wext.c \
+	platform/wifi/wifi-utils-wext.h
+endif
 
-nm-ip6-config-glue.h: $(top_srcdir)/introspection/nm-ip6-config.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_ip6_config --mode=glib-server --output=$@ $<
 
-nm-active-connection-glue.h: $(top_srcdir)/introspection/nm-active-connection.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_active_connection --mode=glib-server --output=$@ $<
+GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
+GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
+GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
+nm_enum_types_sources = $(nm_sources)
 
-nm-dhcp4-config-glue.h: $(top_srcdir)/introspection/nm-dhcp4-config.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_dhcp4_config --mode=glib-server --output=$@ $<
+if WITH_WIMAX
+nm_enum_types_sources += devices/wimax/nm-device-wimax.h
+AM_CPPFLAGS += -I$(top_srcdir)/src/devices/wimax
+endif
 
-nm-dhcp6-config-glue.h: $(top_srcdir)/introspection/nm-dhcp6-config.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_dhcp6_config --mode=glib-server --output=$@ $<
+BUILT_SOURCES = $(GLIB_GENERATED)
 
-nm-device-modem-glue.h: $(top_srcdir)/introspection/nm-device-modem.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_modem --mode=glib-server --output=$@ $<
 
-BUILT_SOURCES = \
+glue_sources = \
 	nm-access-point-glue.h \
-	nm-manager-glue.h \
-	nm-device-interface-glue.h \
-	nm-device-ethernet-glue.h \
-	nm-device-infiniband-glue.h \
+	nm-active-connection-glue.h \
+	nm-agent-manager-glue.h \
 	nm-device-bond-glue.h \
 	nm-device-bridge-glue.h \
+	nm-device-ethernet-glue.h \
+	nm-device-generic-glue.h \
+	nm-device-glue.h \
+	nm-device-gre-glue.h \
+	nm-device-infiniband-glue.h \
+	nm-device-macvlan-glue.h \
+	nm-device-team-glue.h \
+	nm-device-tun-glue.h \
+	nm-device-veth-glue.h \
 	nm-device-vlan-glue.h \
-	nm-device-adsl-glue.h \
-	nm-device-wifi-glue.h \
-	nm-device-olpc-mesh-glue.h \
-	nm-device-bt-glue.h \
-	nm-device-modem-glue.h \
+	nm-device-vxlan-glue.h \
+	nm-dhcp4-config-glue.h \
+	nm-dhcp6-config-glue.h \
 	nm-ip4-config-glue.h \
 	nm-ip6-config-glue.h \
-	nm-active-connection-glue.h \
-	nm-dhcp4-config-glue.h \
-	nm-dhcp6-config-glue.h
+	nm-manager-glue.h \
+	nm-ppp-manager-glue.h \
+	nm-settings-connection-glue.h \
+	nm-settings-glue.h \
+	nm-vpn-connection-glue.h
 
-NetworkManager_CPPFLAGS = \
+BUILT_SOURCES += $(glue_sources)
+
+%-glue.h: $(top_srcdir)/introspection/%.xml
+	$(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(subst -glue.h,,$@)) --mode=glib-server --output=$@ $<
+
+
+AM_CPPFLAGS += \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GUDEV_CFLAGS) \
 	$(LIBNL_CFLAGS) \
+	$(LIBNDP_CFLAGS) \
+	$(LIBSOUP_CFLAGS) \
 	$(POLKIT_CFLAGS) \
 	$(SYSTEMD_LOGIN_CFLAGS) \
-	$(LIBSOUP_CFLAGS) \
-	$(AM_CPPFLAGS) \
+	\
 	-DBINDIR=\"$(bindir)\" \
-	-DSBINDIR=\"$(sbindir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DDATADIR=\"$(datadir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
+	-DSBINDIR=\"$(sbindir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DRUNDIR=\"$(rundir)\" \
+	\
+	-DNMCONFDIR=\"$(nmconfdir)\" \
 	-DNMLOCALEDIR=\"$(datadir)/locale\" \
 	-DNMPLUGINDIR=\"$(pkglibdir)\" \
-	-DNMCONFDIR=\"$(nmconfdir)\" \
 	-DNMRUNDIR=\"$(nmrundir)\" \
 	-DNMSTATEDIR=\"$(nmstatedir)\" \
-	-DARP_DEBUG
+	\
+	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
+	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
+	-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
+	\
+	$(NULL)
 
 if SESSION_TRACKING_CK
-NetworkManager_CPPFLAGS += -DCKDB_PATH=\"${CKDB_PATH}\"
+AM_CPPFLAGS += -DCKDB_PATH=\"${CKDB_PATH}\"
 endif
 
-NetworkManager_LDADD = \
-	./generated/libnm-generated.la \
-	./logging/libnm-logging.la \
-	./posix-signals/libnm-posix-signals.la \
-	./dns-manager/libdns-manager.la \
-	./vpn-manager/libvpn-manager.la \
-	./dhcp-manager/libdhcp-manager.la \
-	./ip6-manager/libip6-manager.la \
-	./supplicant-manager/libsupplicant-manager.la \
-	./dnsmasq-manager/libdnsmasq-manager.la \
-	./ppp-manager/libppp-manager.la \
-	./modem-manager/libmodem-manager.la \
-	./bluez-manager/libbluez-manager.la \
-	./wifi/libwifi-utils.la \
-	./firewall-manager/libfirewall-manager.la \
-	./settings/libsettings.la \
+if WITH_TEAMDCTL
+AM_CPPFLAGS += ${LIBTEAMDCTL_CFLAGS}
+endif
+
+libNetworkManager_la_SOURCES = \
+	$(nm_sources) \
+	$(glue_sources)
+
+libNetworkManager_la_LIBADD = \
+	$(top_builddir)/libgsystem.la \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
@@ -346,9 +364,16 @@ NetworkManager_LDADD = \
 	$(LIBNL_LIBS) \
 	$(POLKIT_LIBS) \
 	$(SYSTEMD_LOGIN_LIBS) \
-	$(LIBSOUP_LIBS) \
-	$(LIBM) \
-	$(LIBDL)
+	$(LIBDL) \
+	$(LIBM)
+
+if WITH_CONCHECK
+libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS)
+endif
+
+if WITH_TEAMDCTL
+libNetworkManager_la_LIBADD += $(LIBTEAMDCTL_LIBS)
+endif
 
 NetworkManager_LDFLAGS = -rdynamic
 
@@ -368,6 +393,7 @@ install-data-hook:
 
 CLEANFILES = \
 	$(BUILT_SOURCES) \
-	nm-enum-types.c \
-	nm-enum-types.h
+	settings/*-glue.h \
+	devices/*-glue.h \
+	devices/*/*-glue.h