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
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 \
systemgenerator_PROGRAMS = \
systemd-getty-generator
-if HAVE_LIBCRYPTSETUP
-rootlibexec_PROGRAMS += \
- systemd-cryptsetup
-
-systemgenerator_PROGRAMS += \
- systemd-cryptsetup-generator
-endif
-
noinst_PROGRAMS = \
test-engine \
test-job-type \
units/local-fs-pre.target \
units/remote-fs.target \
units/remote-fs-pre.target \
- units/cryptsetup.target \
units/network.target \
units/nss-lookup.target \
units/mail-transfer-agent.target \
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 \
$(CAP_LIBS)
# This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs. We therefore can't
+# rules for C programs, but not Vala programs. We therefore can't
# list the .h files as dependencies if we want make dist to work.
EXTRA_DIST += \
$(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
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 \
$(UDEV_LIBS) \
$(DBUS_LIBS)
-systemd_quotacheck_SOURCES = \
- src/quotacheck.c
-
-systemd_quotacheck_LDADD = \
- libsystemd-basic.la
-
systemd_timestamp_SOURCES = \
src/timestamp.c
systemd_detect_virt_LDADD = \
libsystemd-basic.la
-systemd_cryptsetup_SOURCES = \
- src/cryptsetup.c \
- src/ask-password-api.c
-
-systemd_cryptsetup_CFLAGS = \
- $(AM_CFLAGS) \
- $(LIBCRYPTSETUP_CFLAGS) \
- $(UDEV_CFLAGS)
-
-systemd_cryptsetup_LDADD = \
- $(LIBCRYPTSETUP_LIBS) \
- $(UDEV_LIBS) \
- libsystemd-basic.la
-
-systemd_cryptsetup_generator_SOURCES = \
- src/cryptsetup-generator.c \
- src/unit-name.c
-
-systemd_cryptsetup_generator_LDADD = \
- libsystemd-basic.la
-
systemd_getty_generator_SOURCES = \
src/getty-generator.c \
src/unit-name.c
pkgconfiglib_DATA += \
libsystemd-daemon.pc
-dist_doc_DATA += \
- src/sd-daemon.h \
- src/sd-daemon.c
-
MANPAGES += \
man/sd-daemon.7 \
man/sd_notify.3 \
man/sd_notifyf.3: man/sd_notify.3
EXTRA_DIST += \
- ${libsystemd_daemon_la_SOURCES:.c=.h} \
libsystemd-daemon.pc.in \
src/libsystemd-daemon.sym
units/systemd-readahead-replay.service.in \
units/systemd-readahead-done.service.in
-dist_doc_DATA += \
- src/readahead/sd-readahead.h \
- src/readahead/sd-readahead.c
-
MANPAGES += \
man/sd_readahead.3 \
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 += \
+ systemd-cryptsetup
+
+systemgenerator_PROGRAMS += \
+ systemd-cryptsetup-generator
+
+dist_systemunit_DATA += \
+ units/cryptsetup.target
+
+systemd_cryptsetup_SOURCES = \
+ src/cryptsetup/cryptsetup.c \
+ src/ask-password-api.c
+
+systemd_cryptsetup_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(LIBCRYPTSETUP_CFLAGS) \
+ $(UDEV_CFLAGS)
+
+systemd_cryptsetup_LDADD = \
+ $(LIBCRYPTSETUP_LIBS) \
+ $(UDEV_LIBS) \
+ libsystemd-basic.la
+
+systemd_cryptsetup_generator_SOURCES = \
+ src/cryptsetup/cryptsetup-generator.c \
+ src/unit-name.c
+
+systemd_cryptsetup_generator_LDADD = \
+ libsystemd-basic.la
+
+cryptsetup-install-data-hook:
+ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+ rm -f cryptsetup.target && \
+ $(LN_S) ../cryptsetup.target cryptsetup.target )
+
+INSTALL_DATA_HOOKS += \
+ cryptsetup-install-data-hook
+endif
+
# ------------------------------------------------------------------------------
if ENABLE_HOSTNAMED
systemd_hostnamed_SOURCES = \
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
# ------------------------------------------------------------------------------
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_session.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
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
+ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-e 's,@rootbindir\@,$(rootbindir),g' \
-e 's,@bindir\@,$(bindir),g' \
-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
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 \
- systemd-kmsg-syslogd.service \
- cryptsetup.target && \
+ systemd-kmsg-syslogd.service && \
$(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
$(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
$(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
$(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 && \
- $(LN_S) ../systemd-kmsg-syslogd.service && \
- $(LN_S) ../cryptsetup.target cryptsetup.target )
+ $(LN_S) ../systemd-kmsg-syslogd.service )
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
rm -f systemd-tmpfiles-clean.timer && \
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
-
-update-kbd-model-map:
- src/generate-kbd-model-map > src/kbd-model-map