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
-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-I $(top_srcdir)/src \
-I $(top_srcdir)/src/readahead \
- -I $(top_srcdir)/src/login
+ -I $(top_srcdir)/src/login \
+ -I $(top_srcdir)/src/journal
if TARGET_GENTOO
AM_CPPFLAGS += \
systemd-cgroups-agent \
systemd-initctl \
systemd-update-utmp \
- systemd-random-seed \
systemd-shutdownd \
systemd-shutdown \
systemd-modules-load \
systemd-kmsg-syslogd \
systemd-reply-password \
systemd-fsck \
- systemd-quotacheck \
systemd-timestamp \
systemd-ac-power \
systemd-detect-virt \
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 \
units/kexec.service \
units/fsck@.service \
units/fsck-root.service \
- units/quotacheck.service \
units/rescue.service \
units/user@.service
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 \
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 \
$(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
$(UDEV_LIBS) \
$(DBUS_LIBS)
-systemd_quotacheck_SOURCES = \
- src/quotacheck.c
-
-systemd_quotacheck_LDADD = \
- libsystemd-basic.la
-
systemd_timestamp_SOURCES = \
src/timestamp.c
src/unit-name.c \
src/pager.c \
src/install.c \
- src/spawn-agent.c
+ src/spawn-agent.c \
+ src/logs-show.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
systemctl_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
+ libsystemd-journal.la \
$(DBUS_LIBS)
systemd_notify_SOURCES = \
systemd_journald_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
+ libsystemd-login.la \
$(ACL_LIBS)
if HAVE_XZ
systemd_journalctl_SOURCES = \
src/journal/journalctl.c \
- src/journal/sd-journal.c \
- src/journal/journal-file.c \
- src/journal/lookup3.c \
- src/sd-id128.c \
- src/pager.c
+ src/pager.c \
+ src/logs-show.c
systemd_journalctl_LDADD = \
- libsystemd-basic.la
+ libsystemd-basic.la \
+ libsystemd-journal.la
if HAVE_XZ
systemd_journalctl_SOURCES += \
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 += \
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 \
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
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 \
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 \
$(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 && \