service: introduce WatchdogSec and hook up the watchdog with the existing failure...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d6fcd23823fccd9cc9bb7ec58da32750009a9717..e4e3510ddf9d9f255f3d1064fe10b6fc98143b41 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,19 +21,19 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=1
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=1

-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1

 LIBSYSTEMD_LOGIN_AGE=1
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_LOGIN_AGE=1
 
 LIBSYSTEMD_DAEMON_CURRENT=0

-LIBSYSTEMD_DAEMON_REVISION=0
+LIBSYSTEMD_DAEMON_REVISION=1

 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0

-LIBSYSTEMD_ID128_REVISION=0
+LIBSYSTEMD_ID128_REVISION=1

 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=0
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=0

-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=1

 LIBSYSTEMD_JOURNAL_AGE=0
 
 # Dirs of external packages
 LIBSYSTEMD_JOURNAL_AGE=0
 
 # Dirs of external packages


@@ -161,7 +161,6 @@ endif
 endif
 
 rootbin_PROGRAMS = \
 endif
 
 rootbin_PROGRAMS = \

-       systemd \

        systemctl \
        systemd-notify \
        systemd-ask-password \
        systemctl \
        systemd-notify \
        systemd-ask-password \


@@ -185,6 +184,7 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
 endif
 
 rootlibexec_PROGRAMS = \

+       systemd \

        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \


@@ -432,6 +432,7 @@ endif
 
 dist_doc_DATA = \
        README \
 
 dist_doc_DATA = \
        README \

+        NEWS \

        LICENSE \
        DISTRO_PORTING
 
        LICENSE \
        DISTRO_PORTING
 


@@ -653,6 +654,7 @@ MANPAGES = \
        man/systemctl.1 \
        man/systemadm.1 \
        man/systemd-cgls.1 \
        man/systemctl.1 \
        man/systemadm.1 \
        man/systemd-cgls.1 \

+       man/systemd-cgtop.1 \

        man/systemd-nspawn.1 \
        man/systemd-tmpfiles.8 \
        man/systemd-notify.1 \
        man/systemd-nspawn.1 \
        man/systemd-tmpfiles.8 \
        man/systemd-notify.1 \


@@ -1977,7 +1979,8 @@ polkitpolicy_in_files += \
 
 logind-install-data-hook:
        $(MKDIR_P) -m 0755 \
 
 logind-install-data-hook:
        $(MKDIR_P) -m 0755 \

-               $(DESTDIR)$(systemunitdir)/multi-user.target.wants
+               $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+                $(DESTDIR)$(localstatedir)/lib/systemd

        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.login1.service && \
                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.login1.service && \
                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)