X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e1fe9e657f2308a1ba04cbed08deb667eb37a4f3;hp=c766356094ab53bdc25bb31d357bd853fcfa8533;hb=e082d6c8d80f3f06d72ae838ee4a1213f108a5e4;hpb=c88f64bd1ae833f3674b8945f5b31b102bdc0923

diff --git a/Makefile.am b/Makefile.am
index c76635609..e1fe9e657 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ AM_CPPFLAGS = \
 	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
 	-DRUNTIME_DIR=\"$(localstatedir)/run\" \
+	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
 	-I $(top_srcdir)/src
 
 rootbin_PROGRAMS = \
@@ -69,13 +70,19 @@ rootlibexec_PROGRAMS = \
 	systemd-logger \
 	systemd-cgroups-agent \
 	systemd-initctl \
-	systemd-update-utmp
+	systemd-update-utmp \
+	systemd-random-seed \
+	systemd-shutdownd \
+	systemd-modules-load \
+	systemd-remount-api-vfs \
+	systemd-kmsg-syslogd
 
 noinst_PROGRAMS = \
 	test-engine \
 	test-job-type \
 	test-ns \
 	test-loopback \
+	test-hostname \
 	test-daemon \
 	test-cgroup \
 	test-env-replace
@@ -135,6 +142,8 @@ dist_systemunit_DATA = \
 	units/dbus.target \
 	units/systemd-initctl.socket \
 	units/systemd-logger.socket \
+	units/systemd-shutdownd.socket \
+	units/systemd-kmsg-syslogd.socket \
 	units/dev-hugepages.automount \
 	units/dev-hugepages.mount \
 	units/dev-mqueue.automount \
@@ -145,8 +154,15 @@ dist_systemunit_DATA = \
 	units/sys-kernel-debug.mount \
 	units/sys-kernel-security.automount \
 	units/sys-kernel-security.mount \
+	units/tmp.mount \
 	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 \
+	units/remount-rootfs.service \
 	units/printer.target \
 	units/bluetooth.target \
 	units/smartcard.target
@@ -154,13 +170,20 @@ dist_systemunit_DATA = \
 nodist_systemunit_DATA = \
 	units/sysinit.target \
 	units/getty@.service \
+	units/serial-getty@.service \
 	units/graphical.target \
 	units/remote-fs.target \
 	units/multi-user.target \
 	units/systemd-initctl.service \
 	units/systemd-logger.service \
+	units/systemd-shutdownd.service \
+	units/systemd-kmsg-syslogd.service \
+	units/systemd-modules-load.service \
+	units/systemd-remount-api-vfs.service \
 	units/systemd-update-utmp-runlevel.service \
 	units/systemd-update-utmp-shutdown.service \
+	units/systemd-random-seed-save.service \
+	units/systemd-random-seed-load.service \
 	units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -173,13 +196,20 @@ nodist_sessionunit_DATA = \
 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/systemd-initctl.service.in \
 	units/systemd-logger.service.in \
+	units/systemd-shutdownd.service.in \
+	units/systemd-kmsg-syslogd.service.in \
+	units/systemd-modules-load.service.in \
+	units/systemd-remount-api-vfs.service.in \
 	units/systemd-update-utmp-runlevel.service.in \
 	units/systemd-update-utmp-shutdown.service.in \
+	units/systemd-random-seed-save.service.in \
+	units/systemd-random-seed-load.service.in \
 	units/syslog.target.in \
 	units/session/exit.service.in \
 	systemd.pc.in
@@ -200,6 +230,18 @@ dist_systemunit_DATA += \
 	units/fedora/plymouth-halt.service
 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 \
+	units/debian/umountroot.service
+endif
+
 if TARGET_SUSE
 dist_systemunit_DATA += \
 	units/suse/halt.service \
@@ -276,6 +318,7 @@ libsystemd_core_la_SOURCES = \
 	src/path.c \
         src/load-dropin.c \
         src/execute.c \
+	src/exit-status.c \
         src/dbus.c \
         src/dbus-manager.c \
         src/dbus-unit.c \
@@ -296,7 +339,6 @@ libsystemd_core_la_SOURCES = \
 	src/hostname-setup.c \
 	src/loopback-setup.c \
 	src/kmod-setup.c \
-	src/modprobe-setup.c \
 	src/specifier.c \
 	src/unit-name.c \
 	src/fdset.c \
@@ -340,7 +382,8 @@ EXTRA_DIST += \
 	src/bus-errors.h \
 	src/cgroup-show.h \
 	src/utmp-wtmp.h \
-	src/build.h
+	src/build.h \
+	src/shutdownd.h
 
 MANPAGES = \
 	man/systemd.1 \
@@ -451,6 +494,13 @@ test_loopback_SOURCES = \
 test_loopback_LDADD = \
 	libsystemd-basic.la
 
+test_hostname_SOURCES = \
+	src/test-hostname.c \
+	src/hostname-setup.c
+
+test_hostname_LDADD = \
+	libsystemd-basic.la
+
 test_daemon_SOURCES = \
 	src/test-daemon.c \
 	src/sd-daemon.c
@@ -514,6 +564,45 @@ systemd_update_utmp_LDADD = \
 	$(DBUS_LIBS) \
 	$(AUDIT_LIBS)
 
+systemd_random_seed_SOURCES = \
+	src/random-seed.c
+
+systemd_random_seed_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_random_seed_LDADD = \
+	libsystemd-basic.la
+
+systemd_shutdownd_SOURCES = \
+	src/utmp-wtmp.c \
+	src/sd-daemon.c \
+	src/shutdownd.c
+
+systemd_shutdownd_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_shutdownd_LDADD = \
+	libsystemd-basic.la
+
+systemd_modules_load_SOURCES = \
+	src/modules-load.c
+
+systemd_modules_load_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_modules_load_LDADD = \
+	libsystemd-basic.la
+
+systemd_remount_api_vfs_SOURCES = \
+	src/remount-api-vfs.c \
+	src/mount-setup.c
+
+systemd_remount_api_vfs_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_remount_api_vfs_LDADD = \
+	libsystemd-basic.la
+
 systemd_cgroups_agent_SOURCES = \
 	src/cgroups-agent.c \
 	src/dbus-common.c
@@ -526,6 +615,17 @@ systemd_cgroups_agent_LDADD = \
 	libsystemd-basic.la \
 	$(DBUS_LIBS)
 
+systemd_kmsg_syslogd_SOURCES = \
+	src/kmsg-syslogd.c \
+	src/sd-daemon.c \
+	src/fdset.c
+
+systemd_kmsg_syslogd_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_kmsg_syslogd_LDADD = \
+	libsystemd-basic.la
+
 systemctl_SOURCES = \
 	src/systemctl.c \
 	src/utmp-wtmp.c \
@@ -533,7 +633,8 @@ systemctl_SOURCES = \
 	src/path-lookup.c \
 	src/sd-daemon.c \
 	src/cgroup-show.c \
-	src/cgroup-util.c
+	src/cgroup-util.c \
+	src/exit-status.c
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -743,15 +844,14 @@ install-data-hook:
 		$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/session \
 		$(DESTDIR)$(sysconfdir)/xdg/systemd
-	$(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \
-		echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway."
 	( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
 		rm -f session && \
 		$(LN_S) $(pkgsysconfdir)/session session )
 	( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-		rm -f systemd-initctl.socket systemd-logger.socket && \
+		rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket && \
 		$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
-		$(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
+		$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
+		$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
 	( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
 		rm -f systemd-update-utmp-runlevel.service && \
 		$(LN_S) ../systemd-update-utmp-runlevel.service )
@@ -821,10 +921,11 @@ install-data-hook:
 if TARGET_FEDORA
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
-		$(DESTDIR)$(pkgsysconfdir)/system/reboot.target.wants \
-		$(DESTDIR)$(pkgsysconfdir)/system/poweroff.target.wants \
-		$(DESTDIR)$(pkgsysconfdir)/system/halt.target.wants \
-		$(DESTDIR)$(systemunitdir)/rescue.target.wants
+		$(DESTDIR)$(systemunitdir)/reboot.target.wants \
+		$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
+		$(DESTDIR)$(systemunitdir)/halt.target.wants \
+		$(DESTDIR)$(systemunitdir)/rescue.target.wants \
+		$(DESTDIR)$(systemunitdir)/multi-user.target.wants
 	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@@ -832,21 +933,23 @@ if TARGET_FEDORA
 		rm -f prefdm.service && \
 		$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-		rm -f rc-local.service plymouth-quit.service && \
-		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service && \
-		$(LN_S) $(systemunitdir)/plymouth-quit.service plymouth-quit.service )
+		rm -f rc-local.service && \
+		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
 	( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
 		rm -f single.service && \
 		$(LN_S) $(systemunitdir)/single.service single.service )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/reboot.target.wants && \
+	( 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) $(systemunitdir)/plymouth-reboot.service plymouth-reboot.service )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/poweroff.target.wants && \
+		$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
+	( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
 		rm -f plymouth-poweroff.service && \
-		$(LN_S) $(systemunitdir)/plymouth-poweroff.service plymouth-poweroff.service )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/halt.target.wants && \
+		$(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
+	( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
 		rm -f plymouth-halt.service && \
-		$(LN_S) $(systemunitdir)/plymouth-halt.service 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 )
@@ -861,11 +964,25 @@ if TARGET_GENTOO
 		rm -f xdm.service && \
 		$(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
+if TARGET_DEBIAN
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(systemunitdir)/umount.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
+		rm -f umountfs.service umountnfs.service umountroot.service && \
+		$(LN_S) ../umountfs.service umountfs.service && \
+		$(LN_S) ../umountnfs.service umountnfs.service && \
+		$(LN_S) ../umountroot.service umountroot.service )
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f runlevel5.target && \
+		$(LN_S) multi-user.target runlevel5.target )
+endif
 if !TARGET_SUSE
+if !TARGET_DEBIAN
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f fsck.target && \
 		$(LN_S) sysinit.target fsck.target )
 endif
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@ -877,7 +994,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-rootdir=$$dc_install_base/$(rootdir)
 
 upload: all distcheck
-	cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/
+	cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
 	scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
 	scp man/*.html tango:public/systemd-man/