X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3ab79ba87595458b782bef35b799d8848cecaba2;hp=c5568e211ecb8b714529bbe1b26ff60d4f76b6cf;hb=5bfcc1c6ef48af20996412dbaac1daa0492a4d41;hpb=eec575d8eb739b9146c49084097d4eed889b66c7

diff --git a/Makefile.am b/Makefile.am
index c5568e211..3ab79ba87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ dbusinterfacedir=@dbusinterfacedir@
 udevrulesdir=@udevrulesdir@
 pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
+polkitpolicydir=$(datadir)/polkit-1/actions
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -38,49 +39,79 @@ systemunitdir=$(rootdir)/lib/systemd/system
 
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
+	-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
 	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
 	-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
 	-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
 	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
+	-DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
 	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
 	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
 	-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
 	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
 	-DRUNTIME_DIR=\"$(localstatedir)/run\" \
+	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
 	-I $(top_srcdir)/src
 
+if TARGET_GENTOO
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/usr/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/bin/setfont\" \
+	-DDEFAULT_FONT=\"latarcyrheb-sun16\"
+endif
+
 rootbin_PROGRAMS = \
 	systemd \
 	systemctl \
-	systemd-notify
+	systemd-notify \
+	systemd-ask-password
 
 bin_PROGRAMS = \
-	systemd-install
+	systemd-cgls
 
 if HAVE_GTK
 bin_PROGRAMS += \
-	systemadm
+	systemadm \
+	systemd-ask-password-agent
 endif
 
 rootlibexec_PROGRAMS = \
 	systemd-logger \
 	systemd-cgroups-agent \
-	systemd-initctl
+	systemd-initctl \
+	systemd-update-utmp \
+	systemd-random-seed \
+	systemd-shutdownd \
+	systemd-modules-load \
+	systemd-remount-api-vfs \
+	systemd-kmsg-syslogd \
+	systemd-vconsole-setup \
+	systemd-reply-password
 
 noinst_PROGRAMS = \
 	test-engine \
 	test-job-type \
 	test-ns \
 	test-loopback \
+	test-hostname \
 	test-daemon \
-	test-cgroup
+	test-cgroup \
+	test-env-replace
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
 	pam_systemd.la
 endif
 
+dist_pkgsysconf_DATA = \
+	src/system.conf
+
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.conf
 
@@ -107,6 +138,7 @@ dbusinterface_DATA = \
 
 dist_systemunit_DATA = \
 	units/emergency.service \
+	units/emergency.target \
 	units/basic.target \
 	units/getty.target \
 	units/halt.target \
@@ -114,17 +146,22 @@ dist_systemunit_DATA = \
 	units/network.target \
 	units/nss-lookup.target \
 	units/mail-transfer-agent.target \
+	units/http-daemon.target \
 	units/poweroff.target \
 	units/reboot.target \
 	units/rescue.target \
 	units/rpcbind.target \
 	units/rtc-set.target \
 	units/shutdown.target \
+	units/umount.target \
 	units/sigpwr.target \
 	units/sockets.target \
 	units/swap.target \
+	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 \
@@ -135,17 +172,37 @@ 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-run.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
 
 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-vconsole-setup.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 = \
@@ -158,11 +215,21 @@ 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-vconsole-setup.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
@@ -175,14 +242,32 @@ dist_systemunit_DATA += \
 	units/fedora/prefdm.service \
 	units/fedora/rc-local.service \
 	units/fedora/reboot.service \
-	units/fedora/sysinit.service
+	units/fedora/sysinit.service \
+	units/fedora/single.service \
+	units/fedora/plymouth-quit.service \
+	units/fedora/plymouth-reboot.service \
+	units/fedora/plymouth-poweroff.service \
+	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 \
 	units/suse/poweroff.service \
-	units/suse/reboot.service
+	units/suse/reboot.service \
+	units/suse/fsck.target
 endif
 
 if TARGET_GENTOO
@@ -213,16 +298,16 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
 	systemd.pc
 
+dist_polkitpolicy_DATA = \
+	src/org.freedesktop.systemd1.policy
+
 noinst_LTLIBRARIES = \
 	libsystemd-basic.la \
 	libsystemd-core.la
 
-# This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs.  We therefore can't
-# list the .h files as dependencies if we want make dist to work.
-
 libsystemd_basic_la_SOURCES = \
         src/util.c \
+	src/label.c \
         src/hashmap.c \
         src/set.c \
         src/strv.c \
@@ -231,6 +316,13 @@ libsystemd_basic_la_SOURCES = \
         src/log.c \
         src/ratelimit.c
 
+libsystemd_basic_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(SELINUX_CFLAGS)
+
+libsystemd_basic_la_LIBADD = \
+	$(SELINUX_LIBS)
+
 libsystemd_core_la_SOURCES = \
 	src/unit.c \
         src/job.c \
@@ -249,6 +341,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 \
@@ -269,7 +362,7 @@ libsystemd_core_la_SOURCES = \
 	src/hostname-setup.c \
 	src/loopback-setup.c \
 	src/kmod-setup.c \
-	src/utmp-wtmp.c \
+	src/locale-setup.c \
 	src/specifier.c \
 	src/unit-name.c \
 	src/fdset.c \
@@ -281,15 +374,21 @@ libsystemd_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(UDEV_CFLAGS) \
-	$(CGROUP_CFLAGS)
+	$(LIBWRAP_CFLAGS) \
+	$(PAM_CFLAGS) \
+	$(AUDIT_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
 	libsystemd-basic.la \
 	$(DBUS_LIBS) \
 	$(UDEV_LIBS) \
-	$(CGROUP_LIBS) \
 	$(LIBWRAP_LIBS) \
-	$(PAM_LIBS)
+	$(PAM_LIBS) \
+	$(AUDIT_LIBS)
+
+# This is needed because automake is buggy in how it generates the
+# rules for C programs, but not Vala programs.  We therefore can't
+# list the .h files as dependencies if we want make dist to work.
 
 EXTRA_DIST += \
 	${libsystemd_basic_la_SOURCES:.c=.h} \
@@ -302,14 +401,19 @@ EXTRA_DIST += \
 	src/linux/auto_dev-ioctl.h \
 	src/initreq.h \
 	src/sd-daemon.h \
-	src/special.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
 
 MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
 	man/systemadm.1 \
-	man/systemd-install.1 \
+	man/systemd-cgls.1 \
 	man/systemd-notify.1 \
 	man/sd_notify.3 \
 	man/sd_booted.3 \
@@ -325,13 +429,16 @@ MANPAGES = \
 	man/systemd.path.5 \
 	man/systemd.target.5 \
 	man/systemd.device.5 \
+	man/systemd.snapshot.5 \
+	man/systemd.exec.5 \
 	man/daemon.7 \
 	man/sd-daemon.7 \
 	man/runlevel.8 \
 	man/telinit.8 \
 	man/halt.8 \
 	man/shutdown.8 \
-	man/pam_systemd.8
+	man/pam_systemd.8 \
+	man/systemd.conf.5
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -381,8 +488,7 @@ systemd_SOURCES = \
 systemd_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(UDEV_CFLAGS) \
-	$(CGROUP_CFLAGS)
+	$(UDEV_CFLAGS)
 
 systemd_LDADD = \
 	libsystemd-core.la
@@ -412,6 +518,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
@@ -424,12 +537,19 @@ test_cgroup_SOURCES = \
 	src/cgroup-util.c
 
 test_cgroup_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(CGROUP_CFLAGS)
+	$(AM_CFLAGS)
 
 test_cgroup_LDADD = \
-	libsystemd-basic.la \
-	$(CGROUP_LIBS)
+	libsystemd-basic.la
+
+test_env_replace_SOURCES = \
+	src/test-env-replace.c
+
+test_env_replace_CFLAGS = \
+	$(AM_CFLAGS)
+
+test_env_replace_LDADD = \
+	libsystemd-basic.la
 
 systemd_logger_SOURCES = \
 	src/logger.c \
@@ -442,7 +562,8 @@ systemd_logger_LDADD = \
 
 systemd_initctl_SOURCES = \
 	src/initctl.c \
-	src/sd-daemon.c
+	src/sd-daemon.c \
+	src/dbus-common.c
 
 systemd_initctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -452,8 +573,72 @@ systemd_initctl_LDADD = \
 	libsystemd-basic.la \
 	$(DBUS_LIBS)
 
+systemd_update_utmp_SOURCES = \
+	src/update-utmp.c \
+	src/dbus-common.c \
+	src/utmp-wtmp.c
+
+systemd_update_utmp_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(AUDIT_CFLAGS)
+
+systemd_update_utmp_LDADD = \
+	libsystemd-basic.la \
+	$(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_vconsole_setup_SOURCES = \
+	src/vconsole-setup.c
+
+systemd_vconsole_setup_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_vconsole_setup_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/cgroups-agent.c \
+	src/dbus-common.c
 
 systemd_cgroups_agent_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -463,9 +648,26 @@ 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
+	src/utmp-wtmp.c \
+	src/dbus-common.c \
+	src/path-lookup.c \
+	src/sd-daemon.c \
+	src/cgroup-show.c \
+	src/cgroup-util.c \
+	src/exit-status.c
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -482,17 +684,28 @@ systemd_notify_SOURCES = \
 systemd_notify_LDADD = \
 	libsystemd-basic.la
 
-systemd_install_SOURCES = \
-	src/install.c \
-	src/path-lookup.c
+systemd_ask_password_SOURCES = \
+	src/ask-password.c
 
-systemd_install_LDADD = \
+systemd_ask_password_LDADD = \
 	libsystemd-basic.la
 
-# We don't really link here against D-Bus, however we indirectly include D-Bus header files
-systemd_install_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
+systemd_reply_password_SOURCES = \
+	src/reply-password.c
+
+systemd_reply_password_LDADD = \
+	libsystemd-basic.la
+
+systemd_cgls_SOURCES = \
+	src/cgls.c \
+	src/cgroup-show.c \
+	src/cgroup-util.c
+
+systemd_cgls_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_cgls_LDADD = \
+	libsystemd-basic.la
 
 systemadm_SOURCES = \
 	src/systemadm.vala \
@@ -517,14 +730,38 @@ systemadm_LDADD = \
 	$(DBUSGLIB_LIBS) \
 	$(GTK_LIBS)
 
+systemd_ask_password_agent_SOURCES = \
+	src/ask-password-agent.vala
+
+systemd_ask_password_agent_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUSGLIB_CFLAGS) \
+	$(GTK_CFLAGS) \
+	-Wno-unused-variable \
+	-Wno-unused-function \
+	-Wno-shadow \
+	-Wno-format-nonliteral
+
+systemd_ask_password_agent_VALAFLAGS = \
+	--pkg=dbus-glib-1 \
+	--pkg=posix \
+	--pkg=gtk+-2.0 \
+	--pkg=linux \
+	--pkg=gio-unix-2.0 \
+	--pkg=libnotify \
+	-g
+
+systemd_ask_password_agent_LDADD = \
+	$(DBUSGLIB_LIBS) \
+	$(GTK_LIBS)
+
 pam_systemd_la_SOURCES = \
 	src/pam-module.c \
 	src/cgroup-util.c \
 	src/sd-daemon.c
 
 pam_systemd_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(CGROUP_CFLAGS) \
+	$(AM_CFLAGS)
 	-fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -536,14 +773,12 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
 	libsystemd-basic.la \
-	$(PAM_LIBS) \
-	$(CGROUP_LIBS)
+	$(PAM_LIBS)
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
 		-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-		-e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
 		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
 		-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
 		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
@@ -656,7 +891,7 @@ CLEANFILES += \
 endif
 
 org.freedesktop.systemd1.%.xml: systemd
-	$(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
+	$(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@
 
 CLEANFILES += \
 	$(dbusinterface_DATA)
@@ -667,42 +902,66 @@ install-data-hook:
 		$(DESTDIR)$(sessionunitdir) \
 		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
 		$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
+		$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+		$(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
+		$(DESTDIR)$(systemunitdir)/runlevel2.target.wants \
+		$(DESTDIR)$(systemunitdir)/runlevel3.target.wants \
+		$(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
+		$(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system \
 		$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
 		$(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 )
+	( cd $(DESTDIR)$(systemunitdir)/runlevel2.target.wants && \
+		rm -f systemd-update-utmp-runlevel.service && \
+		$(LN_S) ../systemd-update-utmp-runlevel.service )
+	( cd $(DESTDIR)$(systemunitdir)/runlevel3.target.wants && \
+		rm -f systemd-update-utmp-runlevel.service && \
+		$(LN_S) ../systemd-update-utmp-runlevel.service )
+	( cd $(DESTDIR)$(systemunitdir)/runlevel4.target.wants && \
+		rm -f systemd-update-utmp-runlevel.service && \
+		$(LN_S) ../systemd-update-utmp-runlevel.service )
+	( cd $(DESTDIR)$(systemunitdir)/runlevel5.target.wants && \
+		rm -f systemd-update-utmp-runlevel.service && \
+		$(LN_S) ../systemd-update-utmp-runlevel.service )
+	( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
+		rm -f systemd-update-utmp-shutdown.service && \
+		$(LN_S) ../systemd-update-utmp-shutdown.service )
 	( cd $(DESTDIR)$(sessionunitdir) && \
-		rm -f shutdown.target sockets.target local-fs.target swap.target && \
+		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
 		$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
 		$(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
-		$(LN_S) $(systemunitdir)/swap.target swap.target )
+		$(LN_S) $(systemunitdir)/swap.target swap.target && \
+		$(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
+		$(LN_S) $(systemunitdir)/printer.target printer.target)
 	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f runlevel0.target runlevel1.target runlevel6.target && \
+		rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \
 		$(LN_S) poweroff.target runlevel0.target && \
 		$(LN_S) rescue.target runlevel1.target && \
+		$(LN_S) multi-user.target runlevel2.target && \
+		$(LN_S) multi-user.target runlevel3.target && \
+		$(LN_S) multi-user.target runlevel4.target && \
+		$(LN_S) graphical.target runlevel5.target && \
 		$(LN_S) reboot.target runlevel6.target )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
 		rm -f default.target ctrl-alt-del.target kbrequest.target && \
 		$(LN_S) $(systemunitdir)/graphical.target default.target && \
 		$(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \
-		$(LN_S) $(systemunitdir)/rescue.target kbrequest.target && \
-		rm -f runlevel2.target runlevel3.target runlevel4.target runlevel5.target && \
-		$(LN_S) $(systemunitdir)/multi-user.target runlevel2.target && \
-		$(LN_S) $(systemunitdir)/multi-user.target runlevel3.target && \
-		$(LN_S) $(systemunitdir)/multi-user.target runlevel4.target && \
-		$(LN_S) $(systemunitdir)/graphical.target runlevel5.target )
+		$(LN_S) $(systemunitdir)/rescue.target kbrequest.target )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
 		rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
@@ -731,16 +990,36 @@ install-data-hook:
 		$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 if TARGET_FEDORA
 	$(MKDIR_P) -m 0755 \
-		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH)
+		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
+		$(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 )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) ../display-manager.service display-manager.service )
+		rm -f prefdm.service && \
+		$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
 	( 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)/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)/reboot.target.wants && \
+		rm -f plymouth-reboot.service && \
+		$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
+	( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
+		rm -f plymouth-poweroff.service && \
+		$(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
+	( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
+		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 )
@@ -752,8 +1031,27 @@ if TARGET_GENTOO
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/xdm.service display-manager.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) ../display-manager.service display-manager.service )
+		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 = \
@@ -764,3 +1062,11 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-rootdir=$$dc_install_base/$(rootdir)
+
+upload: all distcheck
+	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/
+
+git-tag:
+	git tag "v$(VERSION)" -m "systemd $(VERSION)"