diff --git a/configure.ac b/configure.ac index 5e8a3e7a9..8d3276bb4 100644 --- a/configure.ac +++ b/configure.ac @@ -639,7 +639,7 @@ AS_IF([test "$with_valgrind" == "yes"], AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" != "no") AM_CONDITIONAL(RUN_ROOT_TESTS, test "$enable_tests" == "root") AS_IF([test "$with_valgrind" != "no"], - AC_SUBST(VALGRIND_RULES, "TESTS_ENVIRONMENT = G_SLICE=always-malloc G_DEBUG=gc-friendly $with_valgrind --quiet --error-exitcode=1 --leak-check=full --gen-suppressions=all --suppressions=\$(top_srcdir)/valgrind.suppressions"), + AC_SUBST(VALGRIND_RULES, "TESTS_ENVIRONMENT = G_SLICE=always-malloc G_DEBUG=gc-friendly \$(LIBTOOL) --mode=execute $with_valgrind --quiet --error-exitcode=1 --leak-check=full --gen-suppressions=all --suppressions=\$(top_srcdir)/valgrind.suppressions"), AC_SUBST(VALGRIND_RULES, [])) AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" = "yes") # Add gtk-doc conditionals @@ -652,25 +652,11 @@ include/Makefile include/nm-version.h src/Makefile src/tests/Makefile -src/generated/Makefile -src/logging/Makefile -src/config/Makefile src/config/tests/Makefile -src/posix-signals/Makefile -src/dns-manager/Makefile -src/vpn-manager/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile -src/ip6-manager/Makefile -src/supplicant-manager/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile -src/dnsmasq-manager/Makefile -src/modem-manager/Makefile -src/bluez-manager/Makefile -src/wifi/Makefile -src/firewall-manager/Makefile -src/settings/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile @@ -685,7 +671,6 @@ src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile -src/platform/Makefile src/platform/tests/Makefile src/wimax/Makefile libnm-util/libnm-util.pc diff --git a/src/Makefile.am b/src/Makefile.am index df4142531..52c88e71a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,118 +1,37 @@ -SUBDIRS= \ - generated \ - logging \ - config \ - posix-signals \ - platform \ - 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) @GNOME_CODE_COVERAGE_RULES@ +SUBDIRS = \ + . \ + dhcp-manager \ + ppp-manager \ + settings/plugins + if WITH_WIMAX SUBDIRS += wimax endif -SUBDIRS += . tests +if ENABLE_TESTS +SUBDIRS += \ + config/tests \ + dhcp-manager/tests \ + platform/tests \ + settings/tests \ + supplicant-manager/tests \ + tests +endif -INCLUDES = -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/config \ - -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/platform \ - -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 - -libtest_dhcp_la_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBNL_CFLAGS) \ - -DNMRUNDIR=\"$(nmrundir)\" - -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) - -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 - -libtest_wifi_ap_utils_la_CPPFLAGS = \ - $(GLIB_CFLAGS) - -libtest_wifi_ap_utils_la_LIBADD = \ - ${top_builddir}/libnm-util/libnm-util.la \ - $(GLIB_LIBS) +INCLUDES = \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ + -I$(top_srcdir)/callouts +# add each subdirectory that contains a libNM source file. $(sort) is being used +# primarily for its side effect of removing duplicates. +INCLUDES += $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d) ########################################### # NetworkManager @@ -121,107 +40,280 @@ 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-device-generic.c \ - nm-device-generic.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 \ - main.c \ - nm-policy.c \ - nm-policy.h \ - nm-policy-hosts.c \ - nm-policy-hosts.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-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 + main.c + +NetworkManager_LDADD = libNetworkManager.la + +noinst_LTLIBRARIES = libNetworkManager.la + +libNetworkManager_la_SOURCES = \ + bluez-manager/nm-bluez-adapter.c \ + bluez-manager/nm-bluez-adapter.h \ + bluez-manager/nm-bluez-common.h \ + bluez-manager/nm-bluez-device.c \ + bluez-manager/nm-bluez-device.h \ + bluez-manager/nm-bluez-manager.c \ + bluez-manager/nm-bluez-manager.h \ + \ + config/nm-config.c \ + config/nm-config.h \ + config/nm-config-device.c \ + config/nm-config-device.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-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 \ + \ + firewall-manager/nm-firewall-manager.c \ + firewall-manager/nm-firewall-manager.h \ + \ + ip6-manager/nm-ip6-manager.c \ + ip6-manager/nm-ip6-manager.h \ + \ + logging/nm-logging.c \ + logging/nm-logging.h \ + \ + modem-manager/nm-modem-cdma.c \ + modem-manager/nm-modem-cdma.h \ + modem-manager/nm-modem-generic.c \ + modem-manager/nm-modem-generic.h \ + modem-manager/nm-modem-gsm.c \ + modem-manager/nm-modem-gsm.h \ + modem-manager/nm-modem-manager.c \ + modem-manager/nm-modem-manager.h \ + modem-manager/nm-modem-types.h \ + modem-manager/nm-modem.c \ + modem-manager/nm-modem.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 \ + \ + posix-signals/nm-posix-signals.c \ + posix-signals/nm-posix-signals.h \ + \ + ppp-manager/nm-ppp-manager-glue.h \ + ppp-manager/nm-ppp-manager.c \ + ppp-manager/nm-ppp-manager.h \ + ppp-manager/nm-ppp-status.h \ + \ + settings/nm-agent-manager-glue.h \ + settings/nm-agent-manager.c \ + settings/nm-agent-manager.h \ + settings/nm-default-wired-connection.c \ + settings/nm-default-wired-connection.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-glue.h \ + settings/nm-settings-connection.c \ + settings/nm-settings-connection.h \ + settings/nm-settings-error.c \ + settings/nm-settings-error.h \ + settings/nm-settings-glue.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 \ + \ + vpn-manager/nm-vpn-connection-glue.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 \ + \ + wifi/wifi-utils-nl80211.c \ + wifi/wifi-utils-nl80211.h \ + wifi/wifi-utils-private.h \ + wifi/wifi-utils.c \ + wifi/wifi-utils.h \ + \ + nm-access-point-glue.h \ + nm-activation-request.c \ + nm-activation-request.h \ + nm-active-connection-glue.h \ + nm-active-connection.c \ + nm-active-connection.h \ + nm-agent-manager-glue.h \ + nm-call-store.c \ + nm-call-store.h \ + nm-connection-provider.c \ + nm-connection-provider.h \ + nm-dbus-manager.c \ + nm-dbus-manager.h \ + nm-device-adsl-glue.h \ + nm-device-adsl.c \ + nm-device-adsl.h \ + nm-device-bond-glue.h \ + nm-device-bond.c \ + nm-device-bond.h \ + nm-device-bridge-glue.h \ + nm-device-bridge.c \ + nm-device-bridge.h \ + nm-device-bt-glue.h \ + nm-device-bt.c \ + nm-device-bt.h \ + nm-device-ethernet-glue.h \ + nm-device-ethernet.c \ + nm-device-ethernet.h \ + nm-device-factory.h \ + nm-device-generic-glue.h \ + nm-device-generic.c \ + nm-device-generic.h \ + nm-device-infiniband-glue.h \ + nm-device-infiniband.c \ + nm-device-infiniband.h \ + nm-device-interface-glue.h \ + nm-device-modem-glue.h \ + nm-device-modem.c \ + nm-device-modem.h \ + nm-device-olpc-mesh-glue.h \ + nm-device-olpc-mesh.c \ + nm-device-olpc-mesh.h \ + nm-device-private.h \ + nm-device-vlan-glue.h \ + nm-device-vlan.c \ + nm-device-vlan.h \ + nm-device-wifi-glue.h \ + nm-device-wifi.c \ + nm-device-wifi.h \ + nm-device-wired.c \ + nm-device-wired.h \ + nm-device.c \ + nm-device.h \ + nm-dhcp4-config-glue.h \ + nm-dhcp4-config.c \ + nm-dhcp4-config.h \ + nm-dhcp6-config-glue.h \ + nm-dhcp6-config.c \ + nm-dhcp6-config.h \ + nm-dispatcher.c \ + nm-dispatcher.h \ + nm-enum-types.c \ + nm-enum-types.h \ + nm-hostname-provider.c \ + nm-hostname-provider.h \ + nm-ip4-config-glue.h \ + nm-ip4-config.c \ + nm-ip4-config.h \ + nm-ip6-config-glue.h \ + nm-ip6-config.c \ + nm-ip6-config.h \ + nm-manager-auth.c \ + nm-manager-auth.h \ + nm-manager-glue.h \ + nm-manager.c \ + nm-manager.h \ + nm-netlink-monitor.c \ + nm-netlink-monitor.h \ + nm-netlink-utils.c \ + nm-netlink-utils.h \ + nm-policy-hosts.c \ + nm-policy-hosts.h \ + nm-policy.c \ + nm-policy.h \ + nm-ppp-manager-glue.h \ + nm-properties-changed-signal.c \ + nm-properties-changed-signal.h \ + nm-rfkill.h \ + nm-session-monitor.h \ + nm-session-utils.c \ + nm-session-utils.h \ + nm-settings-connection-glue.h \ + nm-settings-glue.h \ + nm-sleep-monitor.h \ + nm-system.c \ + nm-system.h \ + nm-types.h \ + nm-udev-manager.c \ + nm-udev-manager.h \ + nm-vpn-connection-glue.h \ + nm-wifi-ap-utils.c \ + nm-wifi-ap-utils.h \ + nm-wifi-ap.c \ + nm-wifi-ap.h \ + NetworkManagerUtils.c \ + NetworkManagerUtils.h if WITH_CONCHECK -NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h +libNetworkManager_la_SOURCES += nm-connectivity.c nm-connectivity.h +endif + +if WITH_MODEM_MANAGER_1 +libNetworkManager_la_SOURCES += \ + modem-manager/nm-modem-broadband.c \ + modem-manager/nm-modem-broadband.h endif if SESSION_TRACKING_SYSTEMD -NetworkManager_SOURCES += nm-session-monitor-systemd.c +libNetworkManager_la_SOURCES += nm-session-monitor-systemd.c else if SESSION_TRACKING_CK -NetworkManager_SOURCES += nm-session-monitor-ck.c +libNetworkManager_la_SOURCES += nm-session-monitor-ck.c else -NetworkManager_SOURCES += nm-session-monitor-null.c +libNetworkManager_la_SOURCES += nm-session-monitor-null.c endif endif if SUSPEND_RESUME_SYSTEMD -NetworkManager_SOURCES += nm-sleep-monitor-systemd.c +libNetworkManager_la_SOURCES += nm-sleep-monitor-systemd.c else # UPower suspend/resume used whenever systemd is not enabled -NetworkManager_SOURCES += nm-sleep-monitor-upower.c +libNetworkManager_la_SOURCES += nm-sleep-monitor-upower.c +endif + +if WITH_WEXT +libNetworkManager_la_SOURCES += wifi/wifi-utils-wext.c wifi/wifi-utils-wext.h endif # dbus-glib glue. We define nm-device-interface-glue.h specially, because its @@ -234,86 +326,76 @@ $(1): $$(top_srcdir)/introspection/$(notdir $(subst -glue.h,,$(1))).xml $$(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(notdir $(subst -glue.h,,$(1)))) --mode=glib-server --output=$$@ $$< endef -$(foreach f,$(filter-out nm-device-interface-glue.h,$(filter %-glue.h,$(BUILT_SOURCES))),$(eval $(call glue_rule,$(f)))) +$(foreach f,$(filter-out nm-device-interface-glue.h,$(filter %-glue.h,$(libNetworkManager_la_SOURCES))),$(eval $(call glue_rule,$(f)))) + + +GLIB_GENERATED = nm-enum-types.h nm-enum-types.c +GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM +GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM BUILT_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-device-bond-glue.h \ - nm-device-bridge-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-generic-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-enum-types.c \ + nm-enum-types.h \ + $(filter %-glue.h,$(libNetworkManager_la_SOURCES)) -NetworkManager_CPPFLAGS = \ + +nm_enum_types_sources = \ + $(filter-out %-glue.h, $(libNetworkManager_la_SOURCES)) + +if WITH_WIMAX +nm_enum_types_sources += wimax/nm-device-wimax.h +INCLUDES += -Iwimax +endif + +AM_CPPFLAGS = \ + $(BLUEZ_CFLAGS) \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ $(LIBNL_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(MM_GLIB_CFLAGS) \ $(POLKIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ + \ -DBINDIR=\"$(bindir)\" \ - -DSBINDIR=\"$(sbindir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ -DDATADIR=\"$(datadir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ -DLOCALSTATEDIR=\"$(localstatedir)\" \ + -DSBINDIR=\"$(sbindir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + \ + -DNMCONFDIR=\"$(nmconfdir)\" \ -DNMLOCALEDIR=\"$(datadir)/locale\" \ -DNMPLUGINDIR=\"$(pkglibdir)\" \ - -DNMCONFDIR=\"$(nmconfdir)\" \ -DNMRUNDIR=\"$(nmrundir)\" \ - -DNMSTATEDIR=\"$(nmstatedir)\" - -if WITH_CONCHECK -NetworkManager_CPPFLAGS += $(LIBSOUP_CFLAGS) -endif + -DNMSTATEDIR=\"$(nmstatedir)\" \ + \ + -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 \ - ./config/libnm-config.la \ - ./posix-signals/libnm-posix-signals.la \ - ./platform/libnm-platform.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 \ +libNetworkManager_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ + $(BLUEZ_LIBS) \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ $(GUDEV_LIBS) \ $(LIBNL_LIBS) \ + $(MM_GLIB_LIBS) \ $(POLKIT_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ - $(LIBM) \ - $(LIBDL) + $(LIBDL) \ + $(LIBM) if WITH_CONCHECK -NetworkManager_LDADD += $(LIBSOUP_LIBS) +libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS) endif NetworkManager_LDFLAGS = -rdynamic diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am deleted file mode 100644 index 7e7ed9a02..000000000 --- a/src/bluez-manager/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -INCLUDES = \ - -I${top_srcdir} \ - -I${top_builddir}/include \ - -I${top_srcdir}/include \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util \ - -I${top_srcdir}/src \ - -I${top_builddir}/src/generated \ - -I${top_srcdir}/src/generated \ - -I${top_srcdir}/src/logging - -noinst_LTLIBRARIES = libbluez-manager.la - -libbluez_manager_la_SOURCES = \ - nm-bluez-manager.c \ - nm-bluez-manager.h \ - nm-bluez-adapter.c \ - nm-bluez-adapter.h \ - nm-bluez-device.c \ - nm-bluez-device.h \ - nm-bluez-common.h - -libbluez_manager_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(BLUEZ_CFLAGS) \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLOCALSTATEDIR=\"$(localstatedir)\" - -libbluez_manager_la_LIBADD = \ - $(top_builddir)/src/generated/libnm-generated.la \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(BLUEZ_LIBS) - diff --git a/src/config/Makefile.am b/src/config/Makefile.am deleted file mode 100644 index 767630483..000000000 --- a/src/config/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -SUBDIRS = . tests - -noinst_LTLIBRARIES = libnm-config.la - -libnm_config_la_SOURCES = \ - nm-config.c \ - nm-config.h \ - nm-config-device.c \ - nm-config-device.h - -libnm_config_la_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util \ - -I$(top_srcdir)/src/logging \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMSTATEDIR=\"$(nmstatedir)\" - -libnm_config_la_LIBADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) - diff --git a/src/config/tests/Makefile.am b/src/config/tests/Makefile.am index 5b394907b..1846eaeec 100644 --- a/src/config/tests/Makefile.am +++ b/src/config/tests/Makefile.am @@ -1,5 +1,3 @@ -if ENABLE_TESTS - INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ @@ -20,8 +18,7 @@ test_config_CPPFLAGS = \ $(GLIB_CFLAGS) test_config_LDADD = \ - $(top_builddir)/src/config/libnm-config.la \ - $(top_builddir)/src/logging/libnm-logging.la + $(top_builddir)/src/libNetworkManager.la check-local: test-config $(abs_builddir)/test-config @@ -32,5 +29,3 @@ EXTRA_DIST = \ conf.d/00-overrides.conf \ conf.d/10-more.conf \ conf.d/90-last.conf - -endif diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index d1faf4ab5..000e5ca58 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -1,76 +1,3 @@ -SUBDIRS = . tests - -INCLUDES = \ - -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/config \ - -I${top_srcdir}/src/posix-signals \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util \ - -I${top_srcdir}/src - -noinst_LTLIBRARIES = libdhcp-manager.la libdhcp-dhclient.la - -################## dhclient ################## - -libdhcp_dhclient_la_SOURCES = \ - nm-dhcp-dhclient-utils.h \ - nm-dhcp-dhclient-utils.c \ - nm-dhcp-dhclient.h \ - nm-dhcp-dhclient.c - -libdhcp_dhclient_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLOCALSTATEDIR=\"$(localstatedir)\" \ - -DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \ - -DNMSTATEDIR=\"$(nmstatedir)\" \ - -DNMCONFDIR=\"$(nmconfdir)\" - -libdhcp_dhclient_la_LIBADD = \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - -################## main lib ################## - -libdhcp_manager_la_SOURCES = \ - nm-dhcp-client.c \ - nm-dhcp-client.h \ - nm-dhcp-manager.c \ - nm-dhcp-manager.h \ - nm-dhcp-dhcpcd.h \ - nm-dhcp-dhcpcd.c - -libdhcp_manager_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLOCALSTATEDIR=\"$(localstatedir)\" \ - -DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \ - -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \ - -DNMSTATEDIR=\"$(nmstatedir)\" \ - -DNMRUNDIR=\"$(nmrundir)\" - -libdhcp_manager_la_LIBADD = \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(top_builddir)/src/config/libnm-config.la \ - $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ - $(builddir)/libdhcp-dhclient.la \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - -################### dhclient helper ################### - libexec_PROGRAMS = nm-dhcp-helper nm_dhcp_helper_SOURCES = nm-dhcp-helper.c diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am index 8c9d06c15..e9b958fbb 100644 --- a/src/dhcp-manager/tests/Makefile.am +++ b/src/dhcp-manager/tests/Makefile.am @@ -1,5 +1,3 @@ -if ENABLE_TESTS - INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ @@ -19,16 +17,11 @@ test_dhcp_dhclient_CPPFLAGS = \ -DTESTDIR="\"$(abs_srcdir)\"" test_dhcp_dhclient_LDADD = \ - -ldl \ - $(top_builddir)/src/dhcp-manager/libdhcp-dhclient.la \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) + $(top_builddir)/src/libNetworkManager.la check-local: test-dhcp-dhclient $(abs_builddir)/test-dhcp-dhclient -endif - EXTRA_DIST = \ test-dhclient-duid.leases \ test-dhclient-commented-duid.leases diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am deleted file mode 100644 index 9cf1c0e00..000000000 --- a/src/dns-manager/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -INCLUDES = \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src/config \ - -I${top_srcdir}/src/posix-signals \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/src \ - -I${top_srcdir}/include \ - -I${top_builddir}/include - -noinst_LTLIBRARIES = libdns-manager.la - -libdns_manager_la_SOURCES = \ - nm-dns-manager.h \ - nm-dns-manager.c \ - nm-dns-plugin.h \ - nm-dns-plugin.c \ - nm-dns-dnsmasq.h \ - nm-dns-dnsmasq.c \ - nm-dns-utils.h \ - nm-dns-utils.c - -libdns_manager_la_CPPFLAGS = \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DLOCALSTATEDIR=\"$(localstatedir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMRUNDIR=\"$(nmrundir)\" - -libdns_manager_la_LIBADD = \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(top_builddir)/src/config/libnm-config.la \ - $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - diff --git a/src/dnsmasq-manager/Makefile.am b/src/dnsmasq-manager/Makefile.am deleted file mode 100644 index 8b7dd683c..000000000 --- a/src/dnsmasq-manager/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDES = \ - -I${top_srcdir}/libnm-util \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src/posix-signals \ - -I${top_srcdir}/src \ - -I${top_srcdir}/include - -noinst_LTLIBRARIES = libdnsmasq-manager.la - -libdnsmasq_manager_la_SOURCES = \ - nm-dnsmasq-manager.h \ - nm-dnsmasq-manager.c - -libdnsmasq_manager_la_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - -DLOCALSTATEDIR=\"$(localstatedir)\" - -libdnsmasq_manager_la_LIBADD = \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ - $(GLIB_LIBS) diff --git a/src/firewall-manager/Makefile.am b/src/firewall-manager/Makefile.am deleted file mode 100644 index 2cfe32d05..000000000 --- a/src/firewall-manager/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -INCLUDES = \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/include \ - -I${top_srcdir}/libnm-util - -noinst_LTLIBRARIES = libfirewall-manager.la - -libfirewall_manager_la_SOURCES = \ - nm-firewall-manager.h \ - nm-firewall-manager.c - -libfirewall_manager_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DNM_PKGDATADIR=\"$(pkgdatadir)\" \ - -DNM_LOCALSTATEDIR=\"$(localstatedir)\" - -libfirewall_manager_la_LIBADD = \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am deleted file mode 100644 index 0e241fa92..000000000 --- a/src/generated/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -include $(GLIB_MAKEFILE) - -noinst_LTLIBRARIES = libnm-generated.la - -libnm_generated_la_SOURCES = \ - nm-enum-types.c \ - nm-enum-types.h - -nm_daemon_all_sources = \ - $(top_srcdir)/src/*.[ch] \ - $(top_srcdir)/src/logging/*.[ch] \ - $(top_srcdir)/src/config/*.[ch] \ - $(top_srcdir)/src/dns-manager/*.[ch] \ - $(top_srcdir)/src/vpn-manager/*.[ch] \ - $(top_srcdir)/src/dhcp-manager/*.[ch] \ - $(top_srcdir)/src/ip6-manager/*.[ch] \ - $(top_srcdir)/src/supplicant-manager/*.[ch] \ - $(top_srcdir)/src/ppp-manager/*.[ch] \ - $(top_srcdir)/src/dnsmasq-manager/*.[ch] \ - $(top_srcdir)/src/modem-manager/*.[ch] \ - $(top_srcdir)/src/bluez-manager/*.[ch] \ - $(top_srcdir)/src/firewall-manager/*.[ch] \ - $(top_srcdir)/src/settings/*.[ch] \ - $(top_srcdir)/src/platform/*.[ch] - -if WITH_WIMAX -nm_daemon_all_sources += $(top_srcdir)/src/wimax/*.[ch] -endif - -nm_daemon_sources_no_bindings = \ - $(filter-out %-glue.h %-bindings.h, $(wildcard $(nm_daemon_all_sources))) - -# Don't include ModemManager1-specific headers if we're not compiling with -# ModemManager1 support. -nm_daemon_sources = \ - $(filter-out $(top_srcdir)/src/modem-manager/nm-modem-broadband.h, $(wildcard $(nm_daemon_sources_no_bindings))) - -GLIB_GENERATED = nm-enum-types.h nm-enum-types.c -nm_enum_types_sources = $(nm_daemon_sources) -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM - -INCLUDES = \ - -I${top_srcdir}/include \ - -I${top_builddir}/include \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src/config \ - -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/ppp-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/platform \ - -I$(top_srcdir)/src/wifi \ - -I$(top_srcdir)/libnm-util - -if WITH_WIMAX -INCLUDES += -I$(top_srcdir)/src/wimax -endif - -libnm_generated_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(POLKIT_CFLAGS) \ - $(SYSTEMD_LOGIN_CFLAGS) \ - $(IWMX_SDK_CFLAGS) - -if WITH_MODEM_MANAGER_1 - libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS) -endif - -libnm_generated_la_LIBADD = \ - $(GLIB_LIBS) - -BUILT_SOURCES = $(GLIB_GENERATED) - diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am deleted file mode 100644 index eb730394e..000000000 --- a/src/ip6-manager/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -INCLUDES = \ - -I${top_srcdir} \ - -I${top_builddir}/include \ - -I${top_srcdir}/include \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/src/generated \ - -I${top_srcdir}/src/generated \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src - -noinst_LTLIBRARIES = libip6-manager.la - -libip6_manager_la_SOURCES = \ - nm-ip6-manager.c \ - nm-ip6-manager.h - -libip6_manager_la_CPPFLAGS = \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) - -libip6_manager_la_LIBADD = \ - $(top_builddir)/src/generated/libnm-generated.la \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - diff --git a/src/logging/Makefile.am b/src/logging/Makefile.am deleted file mode 100644 index e8fe60ee7..000000000 --- a/src/logging/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -noinst_LTLIBRARIES = libnm-logging.la - -libnm_logging_la_SOURCES = \ - nm-logging.c \ - nm-logging.h - -libnm_logging_la_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - -DLIBEXECDIR=\"$(libexecdir)\" - -libnm_logging_la_LIBADD = \ - -ldl \ - $(GLIB_LIBS) - diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am deleted file mode 100644 index aa5534fcd..000000000 --- a/src/modem-manager/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -include $(GLIB_MAKEFILE) - -INCLUDES = \ - -I${top_srcdir}/src \ - -I${top_builddir}/src/generated \ - -I${top_srcdir}/src/generated \ - -I${top_srcdir}/src/logging \ - -I${top_builddir}/include \ - -I${top_srcdir}/include \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util - -noinst_LTLIBRARIES = libmodem-manager.la - -libmodem_manager_la_SOURCES = \ - nm-modem.c \ - nm-modem.h \ - nm-modem-generic.c \ - nm-modem-generic.h \ - nm-modem-cdma.c \ - nm-modem-cdma.h \ - nm-modem-gsm.c \ - nm-modem-gsm.h \ - nm-modem-manager.h \ - nm-modem-manager.c \ - nm-modem-types.h - -libmodem_manager_la_CPPFLAGS = \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) - -libmodem_manager_la_LIBADD = \ - $(top_builddir)/src/generated/libnm-generated.la \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) - -# Support for the new ModemManager1 interface -if WITH_MODEM_MANAGER_1 -libmodem_manager_la_SOURCES += \ - nm-modem-broadband.h \ - nm-modem-broadband.c -libmodem_manager_la_CPPFLAGS += $(MM_GLIB_CFLAGS) -libmodem_manager_la_LIBADD += $(MM_GLIB_LIBS) -endif diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am deleted file mode 100644 index e32651fc6..000000000 --- a/src/platform/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -SUBDIRS = . tests - -AM_CPPFLAGS = \ - -I${top_srcdir} \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src/generated \ - -I${top_builddir}/src/generated \ - -I${top_srcdir}/libnm-util \ - -DKERNEL_HACKS=1 - -@GNOME_CODE_COVERAGE_RULES@ - -noinst_LTLIBRARIES = libnm-platform.la - -libnm_platform_la_SOURCES = \ - nm-platform.h \ - nm-platform.c \ - nm-fake-platform.h \ - nm-fake-platform.c \ - nm-linux-platform.h \ - nm-linux-platform.c - -libnm_platform_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(GLIB_CFLAGS) \ - $(LIBNL_CFLAGS) - -libnm_platform_la_LIBADD = \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(top_builddir)/src/generated/libnm-generated.la \ - $(GLIB_LIBS) \ - $(LIBNL_LIBS) diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am index 01f922944..9dbba3afb 100644 --- a/src/platform/tests/Makefile.am +++ b/src/platform/tests/Makefile.am @@ -1,11 +1,7 @@ -if ENABLE_TESTS - AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/src \ -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src/generated \ - -I${top_builddir}/src/generated \ -I${top_srcdir}/libnm-util \ -I${srcdir}/.. \ $(GLIB_CFLAGS) \ @@ -13,10 +9,8 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) AM_LDFLAGS = $(GLIB_LIBS) $(LIBNL_LIBS) $(CODE_COVERAGE_LDFLAGS) -COMMON_LDADD = \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(top_builddir)/src/generated/libnm-generated.la -PLATFORM_LDADD = $(COMMON_LDADD) $(top_builddir)/src/platform/libnm-platform.la +PLATFORM_LDADD = \ + $(top_builddir)/src/libNetworkManager.la @GNOME_CODE_COVERAGE_RULES@ @@ -54,7 +48,7 @@ test_link_fake_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DSETUP=nm_fake_platform_setup \ -DKERNEL_HACKS=0 -test_link_fake_LDADD = $(COMMON_LDADD) +test_link_fake_LDADD = $(PLATFORM_LDADD) test_link_linux_SOURCES = \ test-link.c \ @@ -65,7 +59,7 @@ test_link_linux_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DSETUP=nm_linux_platform_setup \ -DKERNEL_HACKS=1 -test_link_linux_LDADD = $(COMMON_LDADD) +test_link_linux_LDADD = $(PLATFORM_LDADD) test_address_fake_SOURCES = \ test-address.c \ @@ -76,7 +70,7 @@ test_address_fake_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DSETUP=nm_fake_platform_setup \ -DKERNEL_HACKS=0 -test_address_fake_LDADD = $(COMMON_LDADD) +test_address_fake_LDADD = $(PLATFORM_LDADD) test_address_linux_SOURCES = \ test-address.c \ @@ -87,7 +81,7 @@ test_address_linux_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DSETUP=nm_linux_platform_setup \ -DKERNEL_HACKS=1 -test_address_linux_LDADD = $(COMMON_LDADD) +test_address_linux_LDADD = $(PLATFORM_LDADD) test_route_fake_SOURCES = \ test-route.c \ @@ -98,7 +92,7 @@ test_route_fake_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DSETUP=nm_fake_platform_setup \ -DKERNEL_HACKS=0 -test_route_fake_LDADD = $(COMMON_LDADD) +test_route_fake_LDADD = $(PLATFORM_LDADD) test_route_linux_SOURCES = \ test-route.c \ @@ -109,7 +103,7 @@ test_route_linux_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DSETUP=nm_linux_platform_setup \ -DKERNEL_HACKS=1 -test_route_linux_LDADD = $(COMMON_LDADD) +test_route_linux_LDADD = $(PLATFORM_LDADD) # Unfortunately, we cannot run nm-linux-platform-test as an automatic test # program by default, as it requires root access and modifies kernel @@ -117,6 +111,7 @@ test_route_linux_LDADD = $(COMMON_LDADD) # # However, we can check whether the fake platform fakes platform behavior # correctly. + @VALGRIND_RULES@ TESTS = ./test-link-fake ./test-address-fake ./test-route-fake ROOTTESTS = ./test-link-linux ./test-address-linux ./test-route-linux @@ -125,5 +120,3 @@ ROOTTESTS = ./test-link-linux ./test-address-linux ./test-route-linux if RUN_ROOT_TESTS TESTS += $(ROOTTESTS) endif - -endif diff --git a/src/posix-signals/Makefile.am b/src/posix-signals/Makefile.am deleted file mode 100644 index 183214bd7..000000000 --- a/src/posix-signals/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -noinst_LTLIBRARIES = libnm-posix-signals.la - -libnm_posix_signals_la_SOURCES = \ - nm-posix-signals.c \ - nm-posix-signals.h - -libnm_posix_signals_la_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - -DLIBEXECDIR=\"$(libexecdir)\" - -libnm_posix_signals_la_LIBADD = \ - -ldl \ - $(GLIB_LIBS) - diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index 7e8102a51..55f1c683c 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -1,44 +1,9 @@ -INCLUDES = \ - -I${top_srcdir} \ - -I${top_builddir}/include \ - -I${top_srcdir}/include \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util \ - -I${top_srcdir}/src \ - -I${top_builddir}/src/generated \ - -I${top_srcdir}/src/generated \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src/posix-signals - -noinst_LTLIBRARIES = libppp-manager.la - -libppp_manager_la_SOURCES = \ - nm-ppp-manager.c \ - nm-ppp-manager.h \ - nm-ppp-status.h - -nm-ppp-manager-glue.h: $(top_srcdir)/introspection/nm-ppp-manager.xml - $(AM_V_GEN) dbus-binding-tool --prefix=nm_ppp_manager --mode=glib-server --output=$@ $< - -built_sources = nm-ppp-manager-glue.h - -$(libppp_manager_la_OBJECTS): $(built_sources) - -libppp_manager_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" - -libppp_manager_la_LIBADD = \ - $(top_builddir)/src/generated/libnm-generated.la \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - if WITH_PPP +INCLUDES = \ + -I${top_builddir}/include \ + -I${top_srcdir}/include + pppd_plugindir = $(PPPD_PLUGIN_DIR) pppd_plugin_LTLIBRARIES = nm-pppd-plugin.la @@ -59,8 +24,3 @@ nm_pppd_plugin_la_LIBADD = \ $(GLIB_LIBS) endif - -BUILT_SOURCES = nm-ppp-manager-glue.h - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 866398ee8..8202b9f3b 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -69,7 +69,7 @@ static gboolean impl_ppp_manager_set_ip4_config (NMPPPManager *manager, static void _ppp_cleanup (NMPPPManager *manager); -#define NM_PPPD_PLUGIN PLUGINDIR "/nm-pppd-plugin.so" +#define NM_PPPD_PLUGIN PPPD_PLUGIN_DIR "/nm-pppd-plugin.so" #define PPP_MANAGER_SECRET_TRIES "ppp-manager-secret-tries" typedef struct { diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am deleted file mode 100644 index ad2197f6b..000000000 --- a/src/settings/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ -SUBDIRS = plugins . tests - -@GNOME_CODE_COVERAGE_RULES@ - -INCLUDES = -I${top_srcdir} \ - -I${top_builddir}/include \ - -I${top_srcdir}/include \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/src/generated \ - -I${top_srcdir}/src/generated \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src/config \ - -I${top_srcdir}/src - -noinst_LTLIBRARIES = libsettings.la libtest-settings-utils.la - -libtest_settings_utils_la_SOURCES = \ - nm-settings-utils.c \ - nm-settings-utils.h - -libtest_settings_utils_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) - -libtest_settings_utils_la_LIBADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - -BUILT_SOURCES = \ - nm-settings-glue.h \ - nm-settings-connection-glue.h \ - nm-agent-manager-glue.h - -libsettings_la_SOURCES = \ - nm-settings.c \ - nm-settings.h \ - nm-inotify-helper.c \ - nm-inotify-helper.h \ - nm-settings-error.c \ - nm-settings-error.h \ - nm-system-config-interface.c \ - nm-system-config-interface.h \ - nm-settings-connection.c \ - nm-settings-connection.h \ - nm-default-wired-connection.c \ - nm-default-wired-connection.h \ - nm-agent-manager.c \ - nm-agent-manager.h \ - nm-secret-agent.c \ - nm-secret-agent.h \ - nm-settings-utils.h \ - nm-settings-utils.c - -libsettings_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(POLKIT_CFLAGS) \ - -DBINDIR=\"$(bindir)\" \ - -DSBINDIR=\"$(sbindir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DNMSTATEDIR=\"$(nmstatedir)\" \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DPLUGINDIR=\"$(pkglibdir)\" - -libsettings_la_LIBADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/src/generated/libnm-generated.la \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(builddir)/plugins/keyfile/libnm-settings-plugin-keyfile.la \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(POLKIT_LIBS) - -libsettings_la_LDFLAGS = -rdynamic - -nm-settings-glue.h: $(top_srcdir)/introspection/nm-settings.xml - $(AM_V_GEN) dbus-binding-tool --prefix=nm_settings --mode=glib-server --output=$@ $< - -nm-settings-connection-glue.h: $(top_srcdir)/introspection/nm-settings-connection.xml - $(AM_V_GEN) dbus-binding-tool --prefix=nm_settings_connection --mode=glib-server --output=$@ $< - -nm-agent-manager-glue.h: $(top_srcdir)/introspection/nm-agent-manager.xml - $(AM_V_GEN) dbus-binding-tool --prefix=nm_agent_manager --mode=glib-server --output=$@ $< - -CLEANFILES = \ - $(BUILT_SOURCES) - diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 0afe100ec..fdb811232 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -608,7 +608,7 @@ load_plugins (NMSettings *self, const char **plugins, GError **error) } full_name = g_strdup_printf ("nm-settings-plugin-%s", pname); - path = g_module_build_path (PLUGINDIR, full_name); + path = g_module_build_path (NMPLUGINDIR, full_name); plugin = g_module_open (path, G_MODULE_BIND_LOCAL); if (!plugin) { diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am index 8b1d3947b..829378d12 100644 --- a/src/settings/plugins/ifcfg-rh/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/Makefile.am @@ -41,13 +41,6 @@ libifcfg_rh_io_la_CPPFLAGS = \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DSBINDIR=\"$(sbindir)\" -libifcfg_rh_io_la_LIBADD = \ - $(top_builddir)/src/wifi/libwifi-utils.la \ - $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(NSS_LIBS) - libnm_settings_plugin_ifcfg_rh_la_SOURCES = \ plugin.c \ plugin.h \ diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am index daf3fa23e..4f9a8d177 100644 --- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am @@ -45,10 +45,7 @@ test_ifcfg_rh_CPPFLAGS = \ -DSBINDIR=\"nonexistent\" test_ifcfg_rh_LDADD = \ - $(AM_LDADD) \ - $(top_builddir)/src/wifi/libwifi-utils.la \ - $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ - $(LIBM) + $(top_builddir)/src/libNetworkManager.la test_ifcfg_rh_utils_SOURCES = \ test-ifcfg-rh-utils.c \ diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am index 5ccad905c..234d4adbb 100644 --- a/src/settings/plugins/ifnet/Makefile.am +++ b/src/settings/plugins/ifnet/Makefile.am @@ -54,6 +54,5 @@ lib_ifnet_io_la_CPPFLAGS = \ -DSBINDIR=\"$(sbindir)\" lib_ifnet_io_la_LIBADD = \ - $(top_builddir)/src/wifi/libwifi-utils.la \ $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am index 0bfb5b3da..2c39ed633 100644 --- a/src/settings/plugins/ifnet/tests/Makefile.am +++ b/src/settings/plugins/ifnet/tests/Makefile.am @@ -30,11 +30,7 @@ check_ifnet_CPPFLAGS = \ check_ifnet_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) -check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \ - $(CHECK_LIBS) \ - $(GLIB_LIBS) \ - $(LIBM) \ - $(top_builddir)/src/wifi/libwifi-utils.la +check_ifnet_LDADD = $(top_builddir)/src/libNetworkManager.la check-local: check_ifnet $(abs_builddir)/check_ifnet $(abs_srcdir) $(abs_builddir) diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am index b511ff02d..2942b140f 100644 --- a/src/settings/plugins/ifupdown/Makefile.am +++ b/src/settings/plugins/ifupdown/Makefile.am @@ -46,7 +46,6 @@ libnm_settings_plugin_ifupdown_la_CPPFLAGS = \ libnm_settings_plugin_ifupdown_la_LDFLAGS = -module -avoid-version libnm_settings_plugin_ifupdown_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/src/logging/libnm-logging.la \ libifupdown-io.la \ $(GLIB_LIBS) \ $(GUDEV_LIBS) diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am index 5c0c45658..1796b2aa2 100644 --- a/src/settings/tests/Makefile.am +++ b/src/settings/tests/Makefile.am @@ -1,5 +1,3 @@ -if ENABLE_TESTS - INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ @@ -19,14 +17,9 @@ test_wired_defname_CPPFLAGS = \ $(DBUS_CFLAGS) test_wired_defname_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/src/settings/libtest-settings-utils.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) + $(top_builddir)/src/libNetworkManager.la ########################################### check-local: test-wired-defname $(abs_builddir)/test-wired-defname - -endif diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am deleted file mode 100644 index 74ec9c38c..000000000 --- a/src/supplicant-manager/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -SUBDIRS = . tests - -INCLUDES = \ - -I${top_srcdir}/src \ - -I${top_builddir}/src/generated \ - -I${top_srcdir}/src/generated \ - -I${top_srcdir}/src/logging \ - -I${top_builddir}/include \ - -I${top_srcdir}/include \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util - -noinst_LTLIBRARIES = libsupplicant-manager.la - -libsupplicant_manager_la_SOURCES = \ - nm-supplicant-types.h \ - nm-supplicant-manager.h \ - nm-supplicant-manager.c \ - nm-supplicant-config.h \ - nm-supplicant-config.c \ - nm-supplicant-interface.c \ - nm-supplicant-interface.h \ - nm-supplicant-settings-verify.h \ - nm-supplicant-settings-verify.c - -libsupplicant_manager_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DNM_PKGDATADIR=\"$(pkgdatadir)\" \ - -DNM_LOCALSTATEDIR=\"$(localstatedir)\" - -libsupplicant_manager_la_LIBADD = \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index 20ba9cc57..baa493b87 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -1,5 +1,3 @@ -if ENABLE_TESTS - INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ @@ -18,11 +16,7 @@ test_supplicant_config_CPPFLAGS = \ $(DBUS_CFLAGS) test_supplicant_config_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \ - $(DBUS_LIBS) + $(top_builddir)/src/libNetworkManager.la check-local: test-supplicant-config $(abs_builddir)/test-supplicant-config - -endif diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index e173069c9..ffda8ea00 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,5 +1,3 @@ -if ENABLE_TESTS - INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ @@ -26,12 +24,7 @@ test_dhcp_options_CPPFLAGS = \ -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" test_dhcp_options_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/src/dhcp-manager/libdhcp-manager.la \ - $(top_builddir)/src/libtest-dhcp.la \ - $(top_builddir)/src/platform/libnm-platform.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) + $(top_builddir)/src/libNetworkManager.la ####### policy /etc/hosts test ####### @@ -42,9 +35,7 @@ test_policy_hosts_CPPFLAGS = \ $(GLIB_CFLAGS) test_policy_hosts_LDADD = \ - -ldl \ - $(top_builddir)/src/libtest-policy-hosts.la \ - $(GLIB_LIBS) + $(top_builddir)/src/libNetworkManager.la ####### wifi ap utils test ####### @@ -56,10 +47,7 @@ test_wifi_ap_utils_CPPFLAGS = \ $(DBUS_CFLAGS) test_wifi_ap_utils_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/src/libtest-wifi-ap-utils.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) + $(top_builddir)/src/libNetworkManager.la ####### secret agent interface test ####### @@ -71,5 +59,3 @@ check-local: test-dhcp-options test-policy-hosts test-wifi-ap-utils $(abs_builddir)/test-dhcp-options $(abs_builddir)/test-policy-hosts $(abs_builddir)/test-wifi-ap-utils - -endif diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am deleted file mode 100644 index cdd301329..000000000 --- a/src/vpn-manager/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -INCLUDES = \ - -I${top_srcdir} \ - -I${top_builddir}/include \ - -I${top_srcdir}/include \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-util \ - -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 \ - -I${top_srcdir}/src/dns-manager \ - -DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" - - -noinst_LTLIBRARIES = libvpn-manager.la - -libvpn_manager_la_SOURCES = \ - nm-vpn-manager.c \ - nm-vpn-manager.h \ - nm-vpn-service.c \ - nm-vpn-service.h \ - nm-vpn-connection.c \ - nm-vpn-connection.h - -libvpn_manager_la_CPPFLAGS = \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) - -libvpn_manager_la_LIBADD = \ - $(top_builddir)/src/generated/libnm-generated.la \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - -nm-vpn-connection-glue.h: $(top_srcdir)/introspection/nm-vpn-connection.xml - $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_connection --mode=glib-server --output=$@ $< - -BUILT_SOURCES = \ - nm-vpn-connection-glue.h - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 5fab5d586..9cd140e54 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -31,6 +31,8 @@ #include "nm-enum-types.h" #include "nm-logging.h" +#define VPN_NAME_FILES_DIR NMCONFDIR "/VPN" + G_DEFINE_TYPE (NMVPNManager, nm_vpn_manager, G_TYPE_OBJECT) #define NM_VPN_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_MANAGER, NMVPNManagerPrivate)) diff --git a/src/wifi/Makefile.am b/src/wifi/Makefile.am deleted file mode 100644 index c9a1b4749..000000000 --- a/src/wifi/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -INCLUDES = \ - -I${top_srcdir}/include \ - -I${top_builddir}/include \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/src - -noinst_LTLIBRARIES = libwifi-utils.la - -libwifi_utils_la_SOURCES = \ - wifi-utils.c \ - wifi-utils.h \ - wifi-utils-private.h \ - wifi-utils-nl80211.c \ - wifi-utils-nl80211.h - -if WITH_WEXT -libwifi_utils_la_SOURCES += wifi-utils-wext.c wifi-utils-wext.h -endif - -libwifi_utils_la_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(LIBNL_CFLAGS) - -libwifi_utils_la_LIBADD = \ - $(top_builddir)/src/logging/libnm-logging.la \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(LIBNL_LIBS) - diff --git a/src/wimax/Makefile.am b/src/wimax/Makefile.am index caf017d8c..b2e67663f 100644 --- a/src/wimax/Makefile.am +++ b/src/wimax/Makefile.am @@ -1,7 +1,5 @@ INCLUDES = \ -I${top_srcdir}/src \ - -I${top_builddir}/src/generated \ - -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_builddir}/include \ -I${top_srcdir}/include \ @@ -32,8 +30,7 @@ libnm_device_plugin_wimax_la_LDFLAGS = -module -avoid-version libnm_device_plugin_wimax_la_LIBADD = \ $(DBUS_LIBS) \ $(IWMX_SDK_LIBS) \ - $(GUDEV_LIBS) \ - $(top_builddir)/src/generated/libnm-generated.la + $(GUDEV_LIBS) nm-wimax-nsp-glue.h: $(top_srcdir)/introspection/nm-wimax-nsp.xml dbus-binding-tool --prefix=nm_wimax_nsp --mode=glib-server --output=$@ $<