chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
journal: never fail if we cannot access /var, just print a warning
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 0c3e970603c3c76e9927a53bf9c3797915ea50cd..8bb5b9d9491dbc9fc539a3f5acd7c8c92e2f41d9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,9 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = po
 
-LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=6
-LIBSYSTEMD_LOGIN_AGE=0
+LIBSYSTEMD_LOGIN_CURRENT=1
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=1
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=0
@@ -182,7 +182,6 @@ rootlibexec_PROGRAMS = \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
-       systemd-random-seed \
        systemd-shutdownd \
        systemd-shutdown \
        systemd-modules-load \
@@ -190,7 +189,6 @@ rootlibexec_PROGRAMS = \
        systemd-kmsg-syslogd \
        systemd-reply-password \
        systemd-fsck \
-       systemd-quotacheck \
        systemd-timestamp \
        systemd-ac-power \
        systemd-detect-virt \
@@ -325,8 +323,6 @@ nodist_systemunit_DATA = \
        units/systemd-remount-api-vfs.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
-       units/systemd-random-seed-save.service \
-       units/systemd-random-seed-load.service \
        units/systemd-tmpfiles-setup.service \
        units/systemd-tmpfiles-clean.service \
        units/systemd-ask-password-wall.service \
@@ -338,7 +334,6 @@ nodist_systemunit_DATA = \
        units/kexec.service \
        units/fsck@.service \
        units/fsck-root.service \
-       units/quotacheck.service \
        units/rescue.service \
        units/user@.service
 
@@ -362,8 +357,6 @@ EXTRA_DIST += \
        units/systemd-remount-api-vfs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
-       units/systemd-random-seed-save.service.in \
-       units/systemd-random-seed-load.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in \
        units/systemd-ask-password-wall.service.in \
@@ -376,7 +369,6 @@ EXTRA_DIST += \
        units/user/exit.service.in \
        units/fsck@.service.in \
        units/fsck-root.service.in \
-       units/quotacheck.service.in \
        units/user@.service.in \
        systemd.pc.in \
        introspect.awk \
@@ -792,12 +784,6 @@ systemd_update_utmp_LDADD = \
        $(DBUS_LIBS) \
        $(AUDIT_LIBS)
 
-systemd_random_seed_SOURCES = \
-       src/random-seed.c
-
-systemd_random_seed_LDADD = \
-       libsystemd-basic.la
-
 systemd_shutdownd_SOURCES = \
        src/utmp-wtmp.c \
        src/shutdownd.c
@@ -809,12 +795,6 @@ systemd_shutdownd_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
 
-dist_pkgdata_DATA = \
-       src/kbd-model-map
-
-dist_noinst_SCRIPT = \
-       src/generate-kbd-model-map
-
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
        src/umount.c \
@@ -868,12 +848,6 @@ systemd_fsck_LDADD = \
        $(UDEV_LIBS) \
        $(DBUS_LIBS)
 
-systemd_quotacheck_SOURCES = \
-       src/quotacheck.c
-
-systemd_quotacheck_LDADD = \
-       libsystemd-basic.la
-
 systemd_timestamp_SOURCES = \
        src/timestamp.c
 
@@ -1201,6 +1175,7 @@ systemd_journald_CFLAGS = \
 systemd_journald_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
+       libsystemd-login.la \
        $(ACL_LIBS)
 
 if HAVE_XZ
@@ -1457,6 +1432,55 @@ MANPAGES += \
        man/sd-readahead.7
 endif
 
+# ------------------------------------------------------------------------------
+if ENABLE_QUOTACHECK
+rootlibexec_PROGRAMS += \
+       systemd-quotacheck
+
+nodist_systemunit_DATA += \
+       units/quotacheck.service
+
+EXTRA_DIST += \
+       units/quotacheck.service.in
+
+systemd_quotacheck_SOURCES = \
+       src/quotacheck.c
+
+systemd_quotacheck_LDADD = \
+       libsystemd-basic.la
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_RANDOMSEED
+rootlibexec_PROGRAMS += \
+       systemd-random-seed
+
+nodist_systemunit_DATA += \
+       units/systemd-random-seed-save.service \
+       units/systemd-random-seed-load.service
+
+EXTRA_DIST += \
+       units/systemd-random-seed-save.service.in \
+       units/systemd-random-seed-load.service.in
+
+systemd_random_seed_SOURCES = \
+       src/random-seed.c
+
+systemd_random_seed_LDADD = \
+       libsystemd-basic.la
+
+randomseed-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
+               rm -f systemd-random-seed-save.service && \
+               $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f systemd-random-seed-load.service && \
+               $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service )
+
+INSTALL_DATA_HOOKS += \
+       randomseed-install-data-hook
+endif
+
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -1598,6 +1622,16 @@ INSTALL_DATA_HOOKS += \
 
 EXTRA_DIST += \
        units/systemd-localed.service.in
+
+dist_pkgdata_DATA = \
+       src/locale/kbd-model-map
+
+dist_noinst_SCRIPT = \
+       src/locale/generate-kbd-model-map
+
+update-kbd-model-map:
+       src/locale/generate-kbd-model-map > src/locale/kbd-model-map
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -1877,6 +1911,7 @@ MANPAGES_ALIAS += \
        man/sd_session_get_uid.3 \
        man/sd_session_get_seat.3 \
        man/sd_pid_get_owner_uid.3 \
+       man/sd_pid_get_service.3 \
        man/sd_uid_is_on_seat.3 \
        man/sd_uid_get_sessions.3 \
        man/sd_uid_get_seats.3 \
@@ -1891,6 +1926,7 @@ man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
 man/sd_session_get_uid.3: man/sd_session_is_active.3
 man/sd_session_get_seat.3: man/sd_session_is_active.3
 man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
+man/sd_pid_get_service.3: man/sd_pid_get_session.3
 man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
 man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
 man/sd_uid_get_seats.3: man/sd_uid_get_state.3
@@ -2133,10 +2169,8 @@ systemd-install-data-hook:
                rm -f systemd-update-utmp-runlevel.service && \
                $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
        ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
-               rm -f systemd-update-utmp-shutdown.service \
-                       systemd-random-seed-save.service && \
-               $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service && \
-               $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
+               rm -f systemd-update-utmp-shutdown.service && \
+               $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f systemd-remount-api-vfs.service \
                        fsck-root.service \
@@ -2187,7 +2221,6 @@ systemd-install-data-hook:
                        sys-kernel-security.mount \
                        sys-fs-fuse-connections.mount \
                        systemd-modules-load.service \
-                       systemd-random-seed-load.service \
                        systemd-tmpfiles-setup.service \
                        systemd-sysctl.service \
                        systemd-ask-password-console.path \
@@ -2199,7 +2232,6 @@ systemd-install-data-hook:
                $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \
                $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
-               $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
                $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
                $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
@@ -2340,6 +2372,3 @@ upload: all distcheck
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
-
-update-kbd-model-map:
-       src/generate-kbd-model-map > src/kbd-model-map
Unnamed repository; edit this file 'description' to name the repository.