X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=f27bed2a1fa58857c5da71254674d731c85d8801;hp=f2d20c7db327c25e7ab5066589f794f8a7e17043;hb=761163046260b42c0bed075c17d43e0e6c3dd3a4;hpb=42bb3074fe9632d7aa0fee825ad30d2083c3c629

diff --git a/Makefile.am b/Makefile.am
index f2d20c7db..f27bed2a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,12 +26,13 @@ udevrulesdir=@udevrulesdir@
 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
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
+sessiongeneratordir=$(pkglibexecdir)/session-generators
 
 # And these are the special ones for /
 rootdir=@rootdir@
@@ -39,6 +40,7 @@ rootbindir=$(rootdir)/bin
 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 \
@@ -50,15 +52,16 @@ AM_CPPFLAGS = \
 	-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=\"/sbin/kexec\" \
 	-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
+	-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
+	-DSESSION_GENERATOR_PATH=\"$(sessiongeneratordir)\" \
 	-I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -115,11 +118,17 @@ rootlibexec_PROGRAMS = \
 	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 \
@@ -128,7 +137,8 @@ noinst_PROGRAMS = \
 	test-hostname \
 	test-daemon \
 	test-cgroup \
-	test-env-replace
+	test-env-replace \
+	test-strv
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -318,13 +328,6 @@ dist_systemunit_DATA += \
 	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
@@ -462,7 +465,8 @@ EXTRA_DIST += \
 	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 \
@@ -609,6 +613,15 @@ test_env_replace_CFLAGS = \
 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 \
@@ -741,12 +754,15 @@ systemd_ac_power_LDADD = \
 	$(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 = \
@@ -839,7 +855,8 @@ systemd_notify_LDADD = \
 	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
@@ -935,6 +952,7 @@ systemd_gnome_ask_password_agent_LDADD = \
 
 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 = \
@@ -1269,13 +1287,6 @@ if TARGET_GENTOO
 		$(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 )