X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=015640f535d8de649b271811d37e00e72893d6db;hp=08f8bfc534cb74868ba0dcfbaf04ba94b4356026;hb=e51240886f54e0128b1711c7dd0454b23e3f7d5e;hpb=6b1dc2bd3cdb3bd932b0692be636ddd2879edb92

diff --git a/Makefile.am b/Makefile.am
index 08f8bfc53..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@
@@ -238,7 +238,8 @@ rootlibexec_PROGRAMS = \
 
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
-	systemd-fstab-generator
+	systemd-fstab-generator \
+	systemd-system-update-generator
 
 dist_bashcompletion_DATA = \
 	bash-completion/systemd-bash-completion.sh
@@ -306,7 +307,8 @@ dist_systemunit_DATA = \
 	units/syslog.target \
 	units/systemd-udev-control.socket \
 	units/systemd-udev-kernel.socket \
-	units/systemd-timedated-ntp.target
+	units/systemd-timedated-ntp.target  \
+	units/system-update.target
 
 nodist_systemunit_DATA = \
 	units/getty@.service \
@@ -1143,6 +1145,14 @@ systemd_fstab_generator_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_system_update_generator_SOURCES = \
+	src/system-update-generator/system-update-generator.c
+
+systemd_system_update_generator_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
 	src/rc-local-generator/rc-local-generator.c
@@ -2073,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
@@ -2253,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
 
@@ -2369,6 +2387,7 @@ rootlibexec_PROGRAMS += \
 	systemd-readahead-replay
 
 dist_systemunit_DATA += \
+	units/systemd-readahead-drop.service \
 	units/systemd-readahead-done.timer
 
 nodist_systemunit_DATA += \
@@ -2647,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 \
@@ -2862,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