pamlibdir=@pamlibdir@
pkgconfigdatadir=$(datadir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
+bashcompletiondir=$(sysconfdir)/bash_completion.d
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
sessionunitdir=$(pkgdatadir)/session
tmpfilesdir=$(sysconfdir)/tmpfiles.d
+sessiongeneratordir=$(pkglibexecdir)/session-generators
# And these are the special ones for /
rootdir=@rootdir@
rootsbindir=$(rootdir)/sbin
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
+systemgeneratordir=$(rootdir)/lib/systemd/system-generators
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
- -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
+ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
+ -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DRUNTIME_DIR=\"$(localstatedir)/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
- -DKEXEC_BINARY_PATH=\"$(rootsbindir)/kexec\" \
+ -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
+ -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
+ -DSESSION_GENERATOR_PATH=\"$(sessiongeneratordir)\" \
-I $(top_srcdir)/src
if TARGET_GENTOO
systemd \
systemctl \
systemd-notify \
- systemd-ask-password
+ systemd-ask-password \
+ systemd-tty-ask-password-agent
bin_PROGRAMS = \
systemd-cgls
if HAVE_GTK
bin_PROGRAMS += \
systemadm \
- systemd-ask-password-agent
+ systemd-gnome-ask-password-agent
endif
rootlibexec_PROGRAMS = \
systemd-tmpfiles \
systemd-user-sessions \
systemd-fsck \
- systemd-quotacheck
+ systemd-quotacheck \
+ systemd-timestamp \
+ systemd-ac-power
+
+if HAVE_LIBCRYPTSETUP
+rootlibexec_PROGRAMS += \
+ systemd-cryptsetup
+
+systemgenerator_PROGRAMS = \
+ systemd-cryptsetup-generator
+endif
noinst_PROGRAMS = \
test-engine \
test-hostname \
test-daemon \
test-cgroup \
- test-env-replace
+ test-env-replace \
+ test-strv
if HAVE_PAM
pamlib_LTLIBRARIES = \
org.freedesktop.systemd1.Swap.xml \
org.freedesktop.systemd1.Path.xml
+dist_bashcompletion_DATA = \
+ src/systemctl-bash-completion.sh
+
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
tmpfiles.d/x11.conf
dist_systemunit_DATA = \
units/emergency.service \
units/emergency.target \
+ units/sysinit.target \
units/basic.target \
units/getty.target \
units/halt.target \
units/smartcard.target \
units/systemd-readahead-done.timer \
units/systemd-tmpfiles-clean.timer \
- units/quotaon.service
+ units/quotaon.service \
+ units/systemd-ask-password-wall.path \
+ units/systemd-ask-password-plymouth.path
nodist_systemunit_DATA = \
- units/sysinit.target \
units/getty@.service \
units/serial-getty@.service \
units/graphical.target \
units/systemd-tmpfiles-setup.service \
units/systemd-tmpfiles-clean.service \
units/systemd-user-sessions.service \
+ units/systemd-ask-password-wall.service \
+ units/systemd-ask-password-plymouth.service \
units/syslog.target \
units/halt.service \
units/poweroff.service \
units/kexec.service \
units/fsck@.service \
units/fsck-root.service \
- units/quotacheck.service
+ units/quotacheck.service \
+ units/rescue.service
dist_sessionunit_DATA = \
units/session/default.target \
units/session/exit.service
EXTRA_DIST = \
- units/sysinit.target.m4 \
units/getty@.service.m4 \
units/serial-getty@.service.m4 \
units/graphical.target.m4 \
units/multi-user.target.m4 \
units/remote-fs.target.m4 \
+ units/rescue.service.m4 \
units/systemd-initctl.service.in \
units/systemd-logger.service.in \
units/systemd-shutdownd.service.in \
units/systemd-tmpfiles-setup.service.in \
units/systemd-tmpfiles-clean.service.in \
units/systemd-user-sessions.service.in \
+ units/systemd-ask-password-wall.service.in \
+ units/systemd-ask-password-plymouth.service.in \
units/syslog.target.in \
units/halt.service.in \
units/poweroff.service.in \
units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service \
- units/fedora/sysinit.service \
- units/fedora/single.service \
+ units/fedora/plymouth-start.service \
+ units/fedora/plymouth-read-write.service \
units/fedora/plymouth-quit.service \
units/fedora/plymouth-reboot.service \
+ units/fedora/plymouth-kexec.service \
units/fedora/plymouth-poweroff.service \
units/fedora/plymouth-halt.service
endif
-if TARGET_DEBIAN
-dist_systemunit_DATA += \
- units/debian/fsck.target \
- units/debian/umountfs.service \
- units/debian/umountnfs.service \
- units/debian/umountroot.service
-endif
-
-if TARGET_SUSE
-dist_systemunit_DATA += \
- units/suse/fsck.target
-endif
-
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/xdm.service
if TARGET_ARCH
dist_systemunit_DATA += \
- units/arch/sysinit.service \
units/arch/rc-local.service
endif
src/cgroup.c \
src/mount-setup.c \
src/hostname-setup.c \
+ src/selinux-setup.c \
src/loopback-setup.c \
src/kmod-setup.c \
src/locale-setup.c \
src/build.h \
src/shutdownd.h \
src/umount.h \
- src/readahead-common.h
+ src/readahead-common.h \
+ src/ask-password-api.h
MANPAGES = \
man/systemd.1 \
man/halt.8 \
man/shutdown.8 \
man/pam_systemd.8 \
- man/systemd.conf.5
+ man/systemd.conf.5 \
+ man/tmpfiles.d.5
MANPAGES_ALIAS = \
man/reboot.8 \
test_env_replace_LDADD = \
libsystemd-basic.la
+test_strv_SOURCES = \
+ src/test-strv.c
+
+test_strv_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_strv_LDADD = \
+ libsystemd-basic.la
+
systemd_logger_SOURCES = \
src/logger.c \
src/sd-daemon.c \
systemd_quotacheck_LDADD = \
libsystemd-basic.la
+systemd_timestamp_SOURCES = \
+ src/timestamp.c
+
+systemd_timestamp_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_timestamp_LDADD = \
+ libsystemd-basic.la
+
+systemd_ac_power_SOURCES = \
+ src/ac-power.c
+
+systemd_ac_power_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(UDEV_CFLAGS)
+
+systemd_ac_power_LDADD = \
+ libsystemd-basic.la \
+ $(UDEV_LIBS)
+
+systemd_cryptsetup_SOURCES = \
+ src/cryptsetup.c \
+ src/ask-password-api.c
+
+systemd_cryptsetup_CFLAGS = \
+ $(LIBCRYPTSETUP_CFLAGS) \
+ $(AM_CFLAGS)
+
+systemd_cryptsetup_LDADD = \
+ $(LIBCRYPTSETUP_LIBS) \
+ libsystemd-basic.la
+
+systemd_cryptsetup_generator_SOURCES = \
+ src/cryptsetup-generator.c \
+ src/unit-name.c
+
+systemd_cryptsetup_generator_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_cryptsetup_generator_LDADD = \
+ libsystemd-basic.la
+
systemd_user_sessions_SOURCES = \
src/user-sessions.c \
src/cgroup-util.c
libsystemd-basic.la
systemd_ask_password_SOURCES = \
- src/ask-password.c
+ src/ask-password.c \
+ src/ask-password-api.c
systemd_ask_password_LDADD = \
libsystemd-basic.la
$(DBUSGLIB_LIBS) \
$(GTK_LIBS)
-systemd_ask_password_agent_SOURCES = \
- src/ask-password-agent.vala
+systemd_gnome_ask_password_agent_SOURCES = \
+ src/gnome-ask-password-agent.vala
-systemd_ask_password_agent_CFLAGS = \
+systemd_gnome_ask_password_agent_CFLAGS = \
$(AM_CFLAGS) \
$(DBUSGLIB_CFLAGS) \
$(GTK_CFLAGS) \
-Wno-shadow \
-Wno-format-nonliteral
-systemd_ask_password_agent_VALAFLAGS = \
+systemd_gnome_ask_password_agent_VALAFLAGS = \
--pkg=dbus-glib-1 \
--pkg=posix \
--pkg=gtk+-2.0 \
--pkg=libnotify \
-g
-systemd_ask_password_agent_LDADD = \
+systemd_gnome_ask_password_agent_LDADD = \
$(DBUSGLIB_LIBS) \
$(GTK_LIBS)
+systemd_tty_ask_password_agent_SOURCES = \
+ src/tty-ask-password-agent.c \
+ src/ask-password-api.c \
+ src/utmp-wtmp.c
+
+systemd_tty_ask_password_agent_LDADD = \
+ libsystemd-basic.la
+
pam_systemd_la_SOURCES = \
src/pam-module.c \
src/cgroup-util.c \
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
+ -e 's,@rootbindir\@,$(rootbindir),g' \
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
-e 's,@prefix\@,$(prefix),g' \
- < $< > $@
+ < $< > $@ || rm $@
units/%: units/%.in Makefile
$(SED_PROCESS)
M4_PROCESS_SYSTEM = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
+ $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
M4_PROCESS_SESSION = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@
+ $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@ || rm $@
units/%: units/%.m4 Makefile
$(M4_PROCESS_SYSTEM)
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(sessionunitdir) \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
$(DESTDIR)$(systemunitdir)/basic.target.wants \
$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
$(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
$(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+ $(DESTDIR)$(systemunitdir)/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system \
- $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants \
+ $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
- $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd
$(LN_S) graphical.target default.target && \
$(LN_S) reboot.target ctrl-alt-del.target )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f getty.target systemd-user-sessions.service && \
+ rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
$(LN_S) ../getty.target getty.target && \
- $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
+ $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
+ $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path )
( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f remote-fs.target && \
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants && \
+ ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
rm -f hwclock-load.service && \
$(LN_S) $(systemunitdir)/hwclock-load.service hwclock-load.service )
- ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f dev-hugepages.automount \
dev-mqueue.automount \
proc-sys-fs-binfmt_misc.automount \
systemd-modules-load.service \
systemd-random-seed-load.service \
systemd-tmpfiles-setup.service \
- sysctl.service \
- systemd-tmpfiles-clean.timer && \
+ sysctl.service && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
$(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) ../sysctl.service sysctl.service && \
+ $(LN_S) ../sysctl.service sysctl.service )
+ ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+ rm -f systemd-tmpfiles-clean.timer && \
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
( cd $(DESTDIR)$(dbussessionservicedir) && \
rm -f org.freedesktop.systemd1.service && \
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
$(DESTDIR)$(systemunitdir)/reboot.target.wants \
+ $(DESTDIR)$(systemunitdir)/kexec.target.wants \
$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
$(DESTDIR)$(systemunitdir)/halt.target.wants \
- $(DESTDIR)$(systemunitdir)/rescue.target.wants \
- $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
$(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
- rm -f prefdm.service && \
- $(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f rc-local.service && \
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
rm -f halt-local.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
- ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
- rm -f single.service && \
- $(LN_S) $(systemunitdir)/single.service single.service )
+ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+ rm -f plymouth-start.service systemd-ask-password-plymouth.path plymouth-read-write.service && \
+ $(LN_S) ../plymouth-start.service plymouth-start.service && \
+ $(LN_S) ../plymouth-read-write.service plymouth-read-write.service && \
+ $(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f plymouth-quit.service && \
+ rm -f plymouth-quit.service && \
$(LN_S) ../plymouth-quit.service plymouth-quit.service )
( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
rm -f plymouth-reboot.service && \
$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
+ ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
+ rm -f plymouth-kexec.service && \
+ $(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
rm -f plymouth-poweroff.service && \
$(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
rm -f plymouth-halt.service && \
$(LN_S) ../plymouth-halt.service plymouth-halt.service )
( cd $(DESTDIR)$(systemunitdir) && \
- rm -f local.service && \
- $(LN_S) rc-local.service local.service )
- ( cd $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) && \
- $(LN_S) halt reboot > /dev/null 2>&1 || true )
+ rm -f display-manager.service && \
+ $(LN_S) prefdm.service display-manager.service )
+ ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
+ rm -f display-manager.service && \
+ $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_GENTOO
- ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+ ( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/xdm.service display-manager.service )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
- rm -f xdm.service && \
- $(LN_S) $(systemunitdir)/xdm.service xdm.service )
+ $(LN_S) xdm.service display-manager.service )
+ ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
+ rm -f display-manager.service && \
+ $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
-if TARGET_DEBIAN
- $(MKDIR_P) -m 0755 \
- $(DESTDIR)$(systemunitdir)/umount.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
- rm -f umountfs.service umountnfs.service umountroot.service && \
- $(LN_S) ../umountfs.service umountfs.service && \
- $(LN_S) ../umountnfs.service umountnfs.service && \
- $(LN_S) ../umountroot.service umountroot.service )
+if TARGET_DEBIAN_OR_UBUNTU
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel5.target && \
$(LN_S) multi-user.target runlevel5.target )
endif
-if !TARGET_SUSE
-if !TARGET_DEBIAN
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f fsck.target && \
- $(LN_S) sysinit.target fsck.target )
-endif
-endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
fedora: install
- rm /lib/systemd/system/local-fs.target.wants/var-run.mount
- rm /lib/systemd/system/local-fs.target.wants/var-lock.mount
+ rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
+ rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount
~ianmdlvl / elogind.git / blobdiff