chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add bash completion for systemctl --system
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 683376b9208b76e76307f4fe8592adea227e31fb..f2d20c7db327c25e7ab5066589f794f8a7e17043 100644 (file)
--- 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
@@ -163,6 +172,7 @@ dist_tmpfiles_DATA = \
 dist_systemunit_DATA = \
        units/emergency.service \
        units/emergency.target \
+       units/sysinit.target \
        units/basic.target \
        units/getty.target \
        units/halt.target \
@@ -215,7 +225,6 @@ dist_systemunit_DATA = \
        units/systemd-ask-password-plymouth.path
 
 nodist_systemunit_DATA = \
-       units/sysinit.target \
        units/getty@.service \
        units/serial-getty@.service \
        units/graphical.target \
@@ -247,7 +256,8 @@ nodist_systemunit_DATA = \
        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 \
@@ -258,12 +268,12 @@ nodist_sessionunit_DATA = \
        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 \
@@ -299,8 +309,8 @@ dist_systemunit_DATA += \
        units/fedora/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.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 \
@@ -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
@@ -924,7 +974,7 @@ SED_PROCESS = \
                -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)
@@ -937,11 +987,11 @@ man/%: man/%.in Makefile
 
 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)
@@ -1176,7 +1226,6 @@ if TARGET_FEDORA
                $(DESTDIR)$(systemunitdir)/kexec.target.wants \
                $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
                $(DESTDIR)$(systemunitdir)/halt.target.wants \
-               $(DESTDIR)$(systemunitdir)/rescue.target.wants \
                $(DESTDIR)$(systemunitdir)/final.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
                rm -f rc-local.service && \
@@ -1184,16 +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)/rescue.target.wants && \
-               rm -f single.service && \
-               $(LN_S) $(systemunitdir)/single.service single.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 )
@@ -1255,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
Unnamed repository; edit this file 'description' to name the repository.