Imported Upstream version 1.2.4 upstream/1.2.4

1 files changed, 1 insertions, 9 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index aa35eefb..48af5a06 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -305,8 +305,6 @@ libNetworkManager_la_SOURCES = \
 	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 \
@@ -438,6 +436,7 @@ libNetworkManager_la_SOURCES = \
 	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 \
@@ -446,13 +445,6 @@ libNetworkManager_la_SOURCES = \
 	NetworkManagerUtils.h
 
 
-if SUSPEND_RESUME_UPOWER
-libNetworkManager_la_SOURCES += nm-sleep-monitor-upower.c
-else
-# systemd/consolekit suspend/resume used whenever upower is not enabled
-libNetworkManager_la_SOURCES += nm-sleep-monitor-systemd.c
-endif
-
 if WITH_WEXT
 libNetworkManager_la_SOURCES += \
 	platform/wifi/wifi-utils-wext.c \