X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=c06f1ecb5603552cd636880a522ce74c10619c34;hb=9b85fc6a89386582bfe792dba881800b0a093839;hp=342b2b241ba0377ee9d4133977cdcabd939ee29e;hpb=5008d5815a6223f01c9fc4c803ec6ec18c8f4e54;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 342b2b241..c06f1ecb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ polkitpolicydir=$(datadir)/polkit-1/actions
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 sessionunitdir=$(pkgdatadir)/session
+tmpfilesdir=$(sysconfdir)/tmpfiles.d
 
 # And these are the special ones for /
 rootdir=@rootdir@
@@ -95,7 +96,7 @@ rootlibexec_PROGRAMS = \
 	systemd-reply-password \
 	systemd-readahead-collect \
 	systemd-readahead-replay \
-	systemd-tempfiles
+	systemd-tmpfiles
 
 noinst_PROGRAMS = \
 	test-engine \
@@ -139,6 +140,10 @@ dbusinterface_DATA = \
 	org.freedesktop.systemd1.Swap.xml \
 	org.freedesktop.systemd1.Path.xml
 
+dist_tmpfiles_DATA = \
+	tmpfiles.d/systemd.conf \
+	tmpfiles.d/x11.conf
+
 dist_systemunit_DATA = \
 	units/emergency.service \
 	units/emergency.target \
@@ -176,11 +181,8 @@ dist_systemunit_DATA = \
 	units/sys-kernel-security.automount \
 	units/sys-kernel-security.mount \
 	units/tmp.mount \
-	units/tmp.service \
 	units/var-lock.mount \
-	units/var-lock.service \
 	units/var-run.mount \
-	units/var-run.service \
 	units/hwclock-load.service \
 	units/hwclock-save.service \
 	units/sysctl.service \
@@ -189,7 +191,8 @@ dist_systemunit_DATA = \
 	units/bluetooth.target \
 	units/smartcard.target \
 	units/tmpwatch.service \
-	units/tmpwatch.timer
+	units/tmpwatch.timer \
+	units/systemd-readahead-done.timer
 
 nodist_systemunit_DATA = \
 	units/sysinit.target \
@@ -209,6 +212,10 @@ nodist_systemunit_DATA = \
 	units/systemd-update-utmp-shutdown.service \
 	units/systemd-random-seed-save.service \
 	units/systemd-random-seed-load.service \
+	units/systemd-readahead-collect.service \
+	units/systemd-readahead-replay.service \
+	units/systemd-readahead-done.service \
+	units/systemd-tmpfiles.service \
 	units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -236,6 +243,10 @@ EXTRA_DIST = \
 	units/systemd-update-utmp-shutdown.service.in \
 	units/systemd-random-seed-save.service.in \
 	units/systemd-random-seed-load.service.in \
+	units/systemd-readahead-collect.service.in \
+	units/systemd-readahead-replay.service.in \
+	units/systemd-readahead-done.service.in \
+	units/systemd-tmpfiles.service.in \
 	units/syslog.target.in \
 	units/session/exit.service.in \
 	systemd.pc.in
@@ -299,7 +310,9 @@ dist_doc_DATA = \
 	LICENSE \
 	DISTRO_PORTING \
 	src/sd-daemon.h \
-	src/sd-daemon.c
+	src/sd-daemon.c \
+	src/sd-readahead.h \
+	src/sd-readahead.c
 
 pkgconfigdata_DATA = \
 	systemd.pc
@@ -405,15 +418,18 @@ EXTRA_DIST += \
 	src/list.h \
 	src/securebits.h \
 	src/linux/auto_dev-ioctl.h \
+	src/linux/fanotify.h \
 	src/initreq.h \
 	src/sd-daemon.h \
+	src/sd-readahead.h \
 	src/special.h \
 	src/dbus-common.h \
 	src/bus-errors.h \
 	src/cgroup-show.h \
 	src/utmp-wtmp.h \
 	src/build.h \
-	src/shutdownd.h
+	src/shutdownd.h \
+	src/readahead-common.h
 
 MANPAGES = \
 	man/systemd.1 \
@@ -440,6 +456,7 @@ MANPAGES = \
 	man/systemd.exec.5 \
 	man/daemon.7 \
 	man/sd-daemon.7 \
+	man/sd-readahead.7 \
 	man/runlevel.8 \
 	man/telinit.8 \
 	man/halt.8 \
@@ -621,13 +638,13 @@ systemd_modules_load_SOURCES = \
 systemd_modules_load_CFLAGS = \
 	$(AM_CFLAGS)
 
-systemd_tempfiles_LDADD = \
+systemd_tmpfiles_LDADD = \
 	libsystemd-basic.la
 
-systemd_tempfiles_SOURCES = \
-	src/tempfiles.c
+systemd_tmpfiles_SOURCES = \
+	src/tmpfiles.c
 
-systemd_tempfiles_CFLAGS = \
+systemd_tmpfiles_CFLAGS = \
 	$(AM_CFLAGS)
 
 systemd_modules_load_LDADD = \
@@ -695,7 +712,8 @@ systemctl_LDADD = \
 
 systemd_notify_SOURCES = \
 	src/notify.c \
-	src/sd-daemon.c
+	src/sd-daemon.c \
+	src/sd-readahead.c
 
 systemd_notify_LDADD = \
 	libsystemd-basic.la
@@ -820,6 +838,7 @@ SED_PROCESS = \
 	$(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
 		-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
 		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
+		-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
 		-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
 		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
 		-e 's,@systemunitdir\@,$(systemunitdir),g' \
@@ -941,7 +960,7 @@ install-data-hook:
 		$(DESTDIR)$(systemunitdir) \
 		$(DESTDIR)$(sessionunitdir) \
 		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
-		$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
+		$(DESTDIR)$(systemunitdir)/basic.target.wants \
 		$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
 		$(DESTDIR)$(systemunitdir)/local-fs.target.wants \
 		$(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
@@ -987,11 +1006,14 @@ install-data-hook:
 		$(LN_S) ../hwclock-save.service hwclock-save.service && \
 		$(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
 	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-		rm -f systemd-update-utmp-shutdown.service \
-			var-run.service \
-			var-lock.service && \
-		$(LN_S) ../var-run.service var-run.service && \
-		$(LN_S) ../var-lock.service var-lock.service )
+		rm -f systemd-remount-api-vfs.service \
+			remount-rootfs.service \
+			var-run.mount \
+			var-lock.mount && \
+		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
+		$(LN_S) ../var-run.mount var-run.mount && \
+		$(LN_S) ../var-lock.mount var-lock.mount )
 	( cd $(DESTDIR)$(sessionunitdir) && \
 		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -1027,7 +1049,7 @@ 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)$(systemunitdir)/sysinit.target.wants && \
+	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
 		rm -f dev-hugepages.automount \
 			dev-mqueue.automount \
 			proc-sys-fs-binfmt_misc.automount \
@@ -1036,6 +1058,7 @@ install-data-hook:
 			systemd-vconsole-setup.service \
 			systemd-modules-load.service \
 			systemd-random-seed-load.service \
+			systemd-tmpfiles.service \
 			sysctl.service \
 			tmpwatch.timer \
 			tmpwatch.service && \
@@ -1047,6 +1070,7 @@ 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) ../sysctl.service sysctl.service && \
 		$(LN_S) ../tmpwatch.timer tmpwatch.timer && \
 		$(LN_S) ../tmpwatch.service tmpwatch.service )
@@ -1135,3 +1159,8 @@ upload: all distcheck
 
 git-tag:
 	git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+# 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