X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=015640f535d8de649b271811d37e00e72893d6db;hp=d5cf3095f489b43dfb80aa57fcf70b86d2f1b143;hb=ba1261bc02693ac8a7712ade14aab8e22989ba88;hpb=d360705f0f1262d49cccb6507abeafb7cfb5bbe0

diff --git a/Makefile.am b/Makefile.am
index d5cf3095f..015640f53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,20 +32,20 @@ LIBGUDEV_REVISION=1
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_REVISION=2
 LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=1
+LIBSYSTEMD_DAEMON_REVISION=2
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=3
+LIBSYSTEMD_ID128_REVISION=4
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=3
-LIBSYSTEMD_JOURNAL_AGE=0
+LIBSYSTEMD_JOURNAL_CURRENT=1
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=1
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -2083,9 +2083,13 @@ systemd_journald_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
-	libsystemd-login.la \
 	libsystemd-id128.la
 
+if ENABLE_LOGIND
+systemd_journald_LDADD += \
+	libsystemd-login.la
+endif
+
 if HAVE_ACL
 systemd_journald_LDADD += \
 	libsystemd-acl.la
@@ -2263,10 +2267,14 @@ systemd_coredump_SOURCES = \
 
 systemd_coredump_LDADD = \
 	libsystemd-journal.la \
-	libsystemd-login.la \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
+if ENABLE_LOGIND
+systemd_coredump_LDADD += \
+	libsystemd-login.la
+endif
+
 rootlibexec_PROGRAMS += \
 	systemd-coredump
 
@@ -2379,6 +2387,7 @@ rootlibexec_PROGRAMS += \
 	systemd-readahead-replay
 
 dist_systemunit_DATA += \
+	units/systemd-readahead-drop.service \
 	units/systemd-readahead-done.timer
 
 nodist_systemunit_DATA += \
@@ -2657,6 +2666,8 @@ systemd_logind_SOURCES = \
 	src/login/logind-dbus.c \
 	src/login/logind-device.c \
 	src/login/logind-device.h \
+	src/login/logind-button.c \
+	src/login/logind-button.h \
 	src/login/logind-seat.c \
 	src/login/logind-seat.h \
 	src/login/logind-session.c \
@@ -2872,7 +2883,8 @@ rootlibexec_PROGRAMS += \
 
 dist_udevrules_DATA += \
 	src/login/70-uaccess.rules \
-	src/login/71-seat.rules
+	src/login/71-seat.rules \
+	src/login/70-power-switch.rules
 
 nodist_udevrules_DATA += \
 	src/login/73-seat-late.rules