pamlibdir=@pamlibdir@
pkgconfigdatadir=$(datadir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
-bashcompletiondir=${sysconfdir}/bash_completion.d
+bashcompletiondir=$(sysconfdir)/bash_completion.d
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
-sessionunitdir=$(pkgdatadir)/session
+userunitdir=$(pkgdatadir)/user
tmpfilesdir=$(sysconfdir)/tmpfiles.d
+usergeneratordir=$(pkglibexecdir)/user-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 \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
- -DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
- -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
- -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
- -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
+ -DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
+ -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
+ -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
+ -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=\"/sbin/kexec\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
+ -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
+ -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
-I $(top_srcdir)/src
if TARGET_GENTOO
systemd-user-sessions \
systemd-fsck \
systemd-quotacheck \
- systemd-cryptsetup \
- systemd-cryptsetup-generator \
systemd-timestamp \
systemd-ac-power
+if HAVE_LIBCRYPTSETUP
+rootlibexec_PROGRAMS += \
+ systemd-cryptsetup
+
+systemgenerator_PROGRAMS = \
+ systemd-cryptsetup-generator
+endif
+
noinst_PROGRAMS = \
test-engine \
test-job-type \
test-hostname \
test-daemon \
test-cgroup \
- test-env-replace
+ test-env-replace \
+ test-strv
if HAVE_PAM
pamlib_LTLIBRARIES = \
units/halt.target \
units/kexec.target \
units/local-fs.target \
+ units/cryptsetup.target \
units/network.target \
units/nss-lookup.target \
units/mail-transfer-agent.target \
units/sys-kernel-debug.mount \
units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
- units/tmp.mount \
units/var-lock.mount \
units/var-run.mount \
units/hwclock-load.service \
units/quotacheck.service \
units/rescue.service
-dist_sessionunit_DATA = \
- units/session/default.target \
- units/session/exit.target
+dist_userunit_DATA = \
+ units/user/default.target \
+ units/user/exit.target
-nodist_sessionunit_DATA = \
- units/session/remote-fs.target \
- units/session/exit.service
+nodist_userunit_DATA = \
+ units/user/remote-fs.target \
+ units/user/exit.service
EXTRA_DIST = \
units/getty@.service.m4 \
units/poweroff.service.in \
units/reboot.service.in \
units/kexec.service.in \
- units/session/exit.service.in \
+ units/user/exit.service.in \
units/fsck@.service.in \
units/fsck-root.service.in \
units/quotacheck.service.in \
units/fedora/plymouth-halt.service
endif
-if TARGET_DEBIAN_OR_UBUNTU
-dist_systemunit_DATA += \
- units/debian/umountfs.service \
- units/debian/umountnfs.service \
- units/debian/umountroot.service
-endif
-
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/xdm.service
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 \
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 \
$(UDEV_LIBS)
systemd_cryptsetup_SOURCES = \
- src/cryptsetup.c
+ 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 = \
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
systemd_gnome_ask_password_agent_CFLAGS = \
$(AM_CFLAGS) \
$(DBUSGLIB_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
$(GTK_CFLAGS) \
-Wno-unused-variable \
-Wno-unused-function \
systemd_gnome_ask_password_agent_LDADD = \
$(DBUSGLIB_LIBS) \
+ $(LIBNOTIFY_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 = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
-M4_PROCESS_SESSION = \
+M4_PROCESS_USER = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@ || rm $@
+ $(M4) -P $(M4_DISTRO_FLAG) -DFOR_USER=1 < $< > $@ || rm $@
units/%: units/%.m4 Makefile
$(M4_PROCESS_SYSTEM)
-units/session/%: units/%.m4 Makefile
- $(M4_PROCESS_SESSION)
+units/user/%: units/%.m4 Makefile
+ $(M4_PROCESS_USER)
CLEANFILES = \
$(nodist_systemunit_DATA) \
- $(nodist_sessionunit_DATA) \
+ $(nodist_userunit_DATA) \
$(nodist_man_MANS) \
${XML_IN_FILES:.xml.in=.html} \
$(pkgconfigdata_DATA)
install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
- $(DESTDIR)$(sessionunitdir) \
+ $(DESTDIR)$(userunitdir) \
$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
$(DESTDIR)$(systemunitdir)/basic.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
- $(DESTDIR)$(pkgsysconfdir)/session \
+ $(DESTDIR)$(pkgsysconfdir)/user \
$(DESTDIR)$(sysconfdir)/xdg/systemd
( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
- rm -f session && \
- $(LN_S) $(pkgsysconfdir)/session session )
+ rm -f user && \
+ $(LN_S) $(pkgsysconfdir)/user user )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
fsck-root.service \
remount-rootfs.service \
var-run.mount \
- var-lock.mount && \
+ var-lock.mount \
+ cryptsetup.target && \
$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
$(LN_S) ../fsck-root.service fsck-root.service && \
$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
$(LN_S) ../var-run.mount var-run.mount && \
- $(LN_S) ../var-lock.mount var-lock.mount )
- ( cd $(DESTDIR)$(sessionunitdir) && \
+ $(LN_S) ../var-lock.mount var-lock.mount && \
+ $(LN_S) ../cryptsetup.target )
+ ( cd $(DESTDIR)$(userunitdir) && \
rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_DEBIAN_OR_UBUNTU
- $(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 )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel5.target && \
$(LN_S) multi-user.target runlevel5.target )
~ianmdlvl / elogind.git / blobdiff