X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=f2d20c7db327c25e7ab5066589f794f8a7e17043;hp=2268a62f63e20bd1617695a32b6b21f6f1a30818;hb=6ee5bbf85ce18cf07269a674d96f3a1d0ec7bf6b;hpb=5d474b8848d7f6b34f5a0bc1397100ad0667ec2f

diff --git a/Makefile.am b/Makefile.am
index 2268a62f6..f2d20c7db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ udevrulesdir=@udevrulesdir@
 pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
+bashcompletiondir=${sysconfdir}/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -57,6 +58,7 @@ AM_CPPFLAGS = \
 	-DRUNTIME_DIR=\"$(localstatedir)/run\" \
 	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
 	-DKEXEC_BINARY_PATH=\"/sbin/kexec\" \
+	-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
 	-I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -112,7 +114,11 @@ rootlibexec_PROGRAMS = \
 	systemd-tmpfiles \
 	systemd-user-sessions \
 	systemd-fsck \
-	systemd-quotacheck
+	systemd-quotacheck \
+	systemd-cryptsetup \
+	systemd-cryptsetup-generator \
+	systemd-timestamp \
+	systemd-ac-power
 
 noinst_PROGRAMS = \
 	test-engine \
@@ -156,6 +162,9 @@ dbusinterface_DATA = \
 	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
@@ -301,6 +310,7 @@ dist_systemunit_DATA += \
 	units/fedora/rc-local.service \
 	units/fedora/halt-local.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 \
@@ -485,7 +495,8 @@ MANPAGES = \
 	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 \
@@ -709,6 +720,45 @@ systemd_quotacheck_CFLAGS = \
 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
+
+systemd_cryptsetup_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_cryptsetup_LDADD = \
+	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
@@ -1183,13 +1233,14 @@ if TARGET_FEDORA
 	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
 		rm -f halt-local.service && \
 		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
-	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-		rm -f plymouth-quit.service  && \
-		$(LN_S) ../plymouth-quit.service plymouth-quit.service )
 	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-		rm -f plymouth-start.service systemd-ask-password-plymouth.path && \
+		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  && \
+		$(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 )
@@ -1251,5 +1302,3 @@ git-tag:
 fedora: install
 	rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
 	rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount
-	sed -i -e 's/^#MountAuto=yes$$/MountAuto=no/' \
-		-e 's/^#SwapAuto=yes$$/SwapAuto=no/' $(DESTDIR)/etc/systemd/system.conf