chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
unit: add ConditionNull= condition
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 7f8df05da724bdd68a4d635cd17cdc8d38191080..69faa5581a7dfbd478024d64ca0d953686e142b2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,9 +53,11 @@ AM_CPPFLAGS = \
        -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\" \
+       -DKEXEC_BINARY_PATH=\"/sbin/kexec\" \
+       -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -111,7 +113,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 \
@@ -162,6 +168,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 \
@@ -214,7 +221,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 \
@@ -246,7 +252,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 \
@@ -257,12 +264,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 \
@@ -298,10 +305,11 @@ dist_systemunit_DATA += \
        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
@@ -398,6 +406,7 @@ libsystemd_core_la_SOURCES = \
        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 \
@@ -482,7 +491,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 \
@@ -706,6 +716,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
@@ -921,7 +970,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)
@@ -934,11 +983,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)
@@ -1034,6 +1083,7 @@ install-data-hook:
        $(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 \
@@ -1044,11 +1094,11 @@ install-data-hook:
                $(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
@@ -1135,10 +1185,10 @@ install-data-hook:
        ( 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 \
@@ -1148,8 +1198,7 @@ install-data-hook:
                        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 && \
@@ -1159,7 +1208,9 @@ install-data-hook:
                $(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 && \
@@ -1168,33 +1219,30 @@ if TARGET_FEDORA
        $(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)/multi-user.target.wants && \
-               rm -f plymouth-quit.service systemd-ask-password-plymouth.path && \
-               $(LN_S) ../plymouth-quit.service plymouth-quit.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  && \
+               $(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 )
@@ -1202,18 +1250,19 @@ if TARGET_FEDORA
                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) xdm.service display-manager.service )
+       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
                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) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 if TARGET_DEBIAN_OR_UBUNTU
        $(MKDIR_P) -m 0755 \
@@ -1247,5 +1296,5 @@ git-tag:
 
 # 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
Unnamed repository; edit this file 'description' to name the repository.