X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=6cad9adc4b9ac1bf9d2929a7c610b34c87fa0cc4;hp=13c6ffa4dbfcc409c21eab36cede339eef18aaf1;hb=7d1316aa29ea6757336e434a8b07266f7f2dc67a;hpb=447be1550523114f96c7f9eacb9d6a1ff6ca4197 diff --git a/Makefile.am b/Makefile.am index 13c6ffa4d..6cad9adc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,7 +108,9 @@ rootlibexec_PROGRAMS = \ systemd-readahead-collect \ systemd-readahead-replay \ systemd-tmpfiles \ - systemd-user-sessions + systemd-user-sessions \ + systemd-fsck \ + systemd-quotacheck noinst_PROGRAMS = \ test-engine \ @@ -162,6 +164,7 @@ dist_systemunit_DATA = \ units/basic.target \ units/getty.target \ units/halt.target \ + units/kexec.target \ units/local-fs.target \ units/network.target \ units/nss-lookup.target \ @@ -173,6 +176,7 @@ dist_systemunit_DATA = \ units/rpcbind.target \ units/rtc-set.target \ units/shutdown.target \ + units/final.target \ units/umount.target \ units/sigpwr.target \ units/sockets.target \ @@ -202,9 +206,9 @@ dist_systemunit_DATA = \ units/printer.target \ units/bluetooth.target \ units/smartcard.target \ - units/tmpwatch.service \ - units/tmpwatch.timer \ - units/systemd-readahead-done.timer + units/systemd-readahead-done.timer \ + units/systemd-tmpfiles-clean.timer \ + units/quotaon.service nodist_systemunit_DATA = \ units/sysinit.target \ @@ -227,12 +231,21 @@ nodist_systemunit_DATA = \ units/systemd-readahead-collect.service \ units/systemd-readahead-replay.service \ units/systemd-readahead-done.service \ - units/systemd-tmpfiles.service \ + units/systemd-tmpfiles-setup.service \ + units/systemd-tmpfiles-clean.service \ units/systemd-user-sessions.service \ - units/syslog.target + units/syslog.target \ + units/halt.service \ + units/poweroff.service \ + units/reboot.service \ + units/kexec.service \ + units/fsck@.service \ + units/fsck-root.service \ + units/quotacheck.service dist_sessionunit_DATA = \ - units/session/default.target + units/session/default.target \ + units/session/exit.target nodist_sessionunit_DATA = \ units/session/remote-fs.target \ @@ -259,20 +272,25 @@ EXTRA_DIST = \ units/systemd-readahead-collect.service.in \ units/systemd-readahead-replay.service.in \ units/systemd-readahead-done.service.in \ - units/systemd-tmpfiles.service.in \ + units/systemd-tmpfiles-setup.service.in \ + units/systemd-tmpfiles-clean.service.in \ units/systemd-user-sessions.service.in \ units/syslog.target.in \ + units/halt.service.in \ + units/poweroff.service.in \ + units/reboot.service.in \ + units/kexec.service.in \ units/session/exit.service.in \ + units/fsck@.service.in \ + units/fsck-root.service.in \ + units/quotacheck.service.in \ systemd.pc.in if TARGET_FEDORA dist_systemunit_DATA += \ - units/fedora/halt.service \ - units/fedora/killall.service \ - units/fedora/poweroff.service \ units/fedora/prefdm.service \ units/fedora/rc-local.service \ - units/fedora/reboot.service \ + units/fedora/halt-local.service \ units/fedora/sysinit.service \ units/fedora/single.service \ units/fedora/plymouth-quit.service \ @@ -283,10 +301,6 @@ endif if TARGET_DEBIAN dist_systemunit_DATA += \ - units/debian/halt.service \ - units/debian/killall.service \ - units/debian/poweroff.service \ - units/debian/reboot.service \ units/debian/fsck.target \ units/debian/umountfs.service \ units/debian/umountnfs.service \ @@ -295,28 +309,18 @@ endif if TARGET_SUSE dist_systemunit_DATA += \ - units/suse/halt.service \ - units/suse/poweroff.service \ - units/suse/reboot.service \ units/suse/fsck.target endif if TARGET_GENTOO dist_systemunit_DATA += \ - units/gentoo/halt.service \ - units/gentoo/killall.service \ - units/gentoo/poweroff.service \ - units/gentoo/reboot.service \ units/gentoo/xdm.service endif if TARGET_ARCH dist_systemunit_DATA += \ units/arch/sysinit.service \ - units/arch/rc-local.service \ - units/arch/halt.service \ - units/arch/poweroff.service \ - units/arch/reboot.service + units/arch/rc-local.service endif dist_doc_DATA = \ @@ -374,6 +378,7 @@ libsystemd_core_la_SOURCES = \ src/path.c \ src/load-dropin.c \ src/execute.c \ + src/utmp-wtmp.c \ src/exit-status.c \ src/dbus.c \ src/dbus-manager.c \ @@ -401,7 +406,8 @@ libsystemd_core_la_SOURCES = \ src/fdset.c \ src/namespace.c \ src/tcpwrap.c \ - src/cgroup-util.c + src/cgroup-util.c \ + src/condition.c libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -440,9 +446,9 @@ EXTRA_DIST += \ src/dbus-common.h \ src/bus-errors.h \ src/cgroup-show.h \ - src/utmp-wtmp.h \ src/build.h \ src/shutdownd.h \ + src/umount.h \ src/readahead-common.h MANPAGES = \ @@ -665,7 +671,7 @@ systemd_modules_load_SOURCES = \ systemd_modules_load_CFLAGS = \ $(AM_CFLAGS) -systemd_tmpfiles_LDADD = \ +systemd_modules_load_LDADD = \ libsystemd-basic.la systemd_tmpfiles_SOURCES = \ @@ -674,7 +680,30 @@ systemd_tmpfiles_SOURCES = \ systemd_tmpfiles_CFLAGS = \ $(AM_CFLAGS) -systemd_user_sessions_LDADD = \ +systemd_tmpfiles_LDADD = \ + libsystemd-basic.la + +systemd_fsck_SOURCES = \ + src/fsck.c \ + src/dbus-common.c + +systemd_fsck_CFLAGS = \ + $(AM_CFLAGS) \ + $(UDEV_CFLAGS) \ + $(DBUS_CFLAGS) + +systemd_fsck_LDADD = \ + libsystemd-basic.la \ + $(UDEV_LIBS) \ + $(DBUS_LIBS) + +systemd_quotacheck_SOURCES = \ + src/quotacheck.c + +systemd_quotacheck_CFLAGS = \ + $(AM_CFLAGS) + +systemd_quotacheck_LDADD = \ libsystemd-basic.la systemd_user_sessions_SOURCES = \ @@ -684,7 +713,7 @@ systemd_user_sessions_SOURCES = \ systemd_user_sessions_CFLAGS = \ $(AM_CFLAGS) -systemd_modules_load_LDADD = \ +systemd_user_sessions_LDADD = \ libsystemd-basic.la systemd_vconsole_setup_SOURCES = \ @@ -1097,10 +1126,9 @@ install-data-hook: systemd-vconsole-setup.service \ systemd-modules-load.service \ systemd-random-seed-load.service \ - systemd-tmpfiles.service \ + systemd-tmpfiles-setup.service \ sysctl.service \ - tmpwatch.timer \ - tmpwatch.service && \ + systemd-tmpfiles-clean.timer && \ $(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 && \ @@ -1109,10 +1137,9 @@ install-data-hook: $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \ $(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.service systemd-tmpfiles.service && \ + $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \ $(LN_S) ../sysctl.service sysctl.service && \ - $(LN_S) ../tmpwatch.timer tmpwatch.timer && \ - $(LN_S) ../tmpwatch.service tmpwatch.service ) + $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer ) ( cd $(DESTDIR)$(dbussessionservicedir) && \ rm -f org.freedesktop.systemd1.service && \ $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) @@ -1123,7 +1150,8 @@ if TARGET_FEDORA $(DESTDIR)$(systemunitdir)/poweroff.target.wants \ $(DESTDIR)$(systemunitdir)/halt.target.wants \ $(DESTDIR)$(systemunitdir)/rescue.target.wants \ - $(DESTDIR)$(systemunitdir)/multi-user.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 ) @@ -1133,6 +1161,9 @@ if TARGET_FEDORA ( cd $(DESTDIR)$(pkgsysconfdir)/system/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 )