X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=a4e3433c36e2376926cb6232673af392ec7d939f;hp=33b51d8e30d3c2c38403f4fbdb1a5cb42688e1f5;hb=6e92b23f0d6dd398848376bbaf47e54a90ed3389;hpb=7c1d34c5d460a6c1acb39a0ab96338fcb1386ed4

diff --git a/Makefile.am b/Makefile.am
index 33b51d8e3..a4e3433c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,7 @@ usergeneratordir=$(pkglibexecdir)/user-generators
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
+systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
 udevlibexecdir=$(rootprefix)/lib/udev
 udevhomedir = $(libexecdir)/udev
@@ -101,6 +102,7 @@ check_PROGRAMS =
 check_DATA =
 noinst_PROGRAMS =
 TESTS =
+udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
@@ -116,6 +118,7 @@ AM_CPPFLAGS = \
 	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
 	-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
 	-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
+	-DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
 	-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
 	-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
@@ -136,7 +139,8 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/journal \
 	-I $(top_srcdir)/src/systemd \
 	-I $(top_srcdir)/src/core \
-	-I $(top_srcdir)/src/libudev
+	-I $(top_srcdir)/src/libudev \
+	-I $(top_srcdir)/src/udev
 
 AM_CFLAGS = $(WARNINGFLAGS)
 AM_LDFLAGS = $(GCLDFLAGS)
@@ -223,12 +227,13 @@ rootlibexec_PROGRAMS = \
 	systemd-shutdownd \
 	systemd-shutdown \
 	systemd-modules-load \
-	systemd-remount-api-vfs \
+	systemd-remount-fs \
 	systemd-reply-password \
 	systemd-fsck \
 	systemd-timestamp \
 	systemd-ac-power \
-	systemd-sysctl
+	systemd-sysctl \
+	systemd-sleep
 
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator
@@ -264,6 +269,7 @@ dist_systemunit_DATA = \
 	units/nss-lookup.target \
 	units/nss-user-lookup.target \
 	units/mail-transfer-agent.target \
+	units/hibernate.target \
 	units/http-daemon.target \
 	units/poweroff.target \
 	units/reboot.target \
@@ -274,7 +280,9 @@ dist_systemunit_DATA = \
 	units/final.target \
 	units/umount.target \
 	units/sigpwr.target \
+	units/sleep.target \
 	units/sockets.target \
+	units/suspend.target \
 	units/swap.target \
 	units/systemd-initctl.socket \
 	units/systemd-shutdownd.socket \
@@ -285,7 +293,6 @@ dist_systemunit_DATA = \
 	units/sys-kernel-debug.mount \
 	units/sys-fs-fuse-connections.mount \
 	units/tmp.mount \
-	units/remount-rootfs.service \
 	units/printer.target \
 	units/sound.target \
 	units/bluetooth.target \
@@ -295,17 +302,19 @@ dist_systemunit_DATA = \
 	units/systemd-ask-password-wall.path \
 	units/systemd-ask-password-console.path \
 	units/syslog.target \
-	units/udev-control.socket \
-	units/udev-kernel.socket
+	units/systemd-udev-control.socket \
+	units/systemd-udev-kernel.socket \
+	units/systemd-timedated-ntp.target
 
 nodist_systemunit_DATA = \
 	units/getty@.service \
 	units/serial-getty@.service \
 	units/console-shell.service \
+	units/console-getty.service \
 	units/systemd-initctl.service \
 	units/systemd-shutdownd.service \
 	units/systemd-modules-load.service \
-	units/systemd-remount-api-vfs.service \
+	units/systemd-remount-fs.service \
 	units/systemd-update-utmp-runlevel.service \
 	units/systemd-update-utmp-shutdown.service \
 	units/systemd-tmpfiles-setup.service \
@@ -315,16 +324,18 @@ nodist_systemunit_DATA = \
 	units/systemd-sysctl.service \
 	units/halt.service \
 	units/emergency.service \
+	units/hibernate.service \
 	units/poweroff.service \
 	units/reboot.service \
 	units/kexec.service \
 	units/fsck@.service \
 	units/fsck-root.service \
 	units/rescue.service \
+	units/suspend.service \
 	units/user@.service \
-	units/udev.service \
-	units/udev-trigger.service \
-	units/udev-settle.service
+	units/systemd-udev.service \
+	units/systemd-udev-trigger.service \
+	units/systemd-udev-settle.service
 
 dist_userunit_DATA = \
 	units/user/default.target \
@@ -337,11 +348,12 @@ EXTRA_DIST += \
 	units/getty@.service.m4 \
 	units/serial-getty@.service.m4 \
 	units/console-shell.service.m4.in \
+	units/console-getty.service.m4.in \
 	units/rescue.service.m4.in \
 	units/systemd-initctl.service.in \
 	units/systemd-shutdownd.service.in \
 	units/systemd-modules-load.service.in \
-	units/systemd-remount-api-vfs.service.in \
+	units/systemd-remount-fs.service.in \
 	units/systemd-update-utmp-runlevel.service.in \
 	units/systemd-update-utmp-shutdown.service.in \
 	units/systemd-tmpfiles-setup.service.in \
@@ -358,9 +370,11 @@ EXTRA_DIST += \
 	units/fsck@.service.in \
 	units/fsck-root.service.in \
 	units/user@.service.in \
-	units/udev.service \
-	units/udev-trigger.service \
-	units/udev-settle.service \
+	units/systemd-udev.service \
+	units/systemd-udev-trigger.service \
+	units/systemd-udev-settle.service \
+	units/hibernate.service.in \
+	units/suspend.service.in \
 	introspect.awk \
 	man/custom-html.xsl
 
@@ -477,7 +491,8 @@ MANPAGES = \
 	man/systemd-machine-id-setup.1 \
 	man/systemd-detect-virt.1 \
 	man/journald.conf.5 \
-	man/journalctl.1
+	man/journalctl.1 \
+	man/systemd-inhibit.1
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -521,6 +536,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/util.h \
 	src/shared/virt.c \
 	src/shared/virt.h \
+	src/shared/path-util.c \
+	src/shared/path-util.h \
 	src/shared/hashmap.c \
 	src/shared/hashmap.h \
 	src/shared/set.c \
@@ -542,6 +559,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/ioprio.h \
 	src/shared/socket-util.c \
 	src/shared/socket-util.h \
+	src/shared/conf-files.c \
+	src/shared/conf-files.h \
 	src/shared/cgroup-util.c \
 	src/shared/cgroup-util.h \
 	src/shared/cgroup-show.c \
@@ -557,11 +576,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/specifier.c \
 	src/shared/specifier.h \
 	src/shared/spawn-polkit-agent.c \
-	src/shared/spawn-polkit-agent.h
-
-libsystemd_shared_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
+	src/shared/spawn-polkit-agent.h \
+	src/shared/hwclock.c \
+	src/shared/hwclock.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -598,7 +615,9 @@ libsystemd_label_la_SOURCES = \
 	src/shared/mkdir.c \
 	src/shared/mkdir.h \
 	src/shared/ask-password-api.c \
-	src/shared/ask-password-api.h
+	src/shared/ask-password-api.h \
+	src/shared/dev-setup.c \
+	src/shared/dev-setup.h
 
 libsystemd_label_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -677,6 +696,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/job.h \
 	src/core/manager.c \
 	src/core/manager.h \
+	src/core/transaction.c \
+	src/core/transaction.h \
 	src/core/load-fragment.c \
 	src/core/load-fragment.h \
 	src/core/service.c \
@@ -896,7 +917,8 @@ test_job_type_CFLAGS = \
 	$(DBUS_CFLAGS)
 
 test_job_type_LDADD = \
-	libsystemd-core.la
+	libsystemd-core.la \
+	libsystemd-daemon.la
 
 test_ns_SOURCES = \
 	src/test/test-ns.c
@@ -1050,6 +1072,13 @@ systemd_sysctl_SOURCES = \
 systemd_sysctl_LDADD = \
 	libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_sleep_SOURCES = \
+	src/sleep/sleep.c
+
+systemd_sleep_LDADD = \
+	libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_fsck_SOURCES = \
 	src/fsck/fsck.c
@@ -1102,12 +1131,12 @@ systemd_rc_local_generator_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-systemd_remount_api_vfs_SOURCES = \
-	src/remount-api-vfs/remount-api-vfs.c \
+systemd_remount_fs_SOURCES = \
+	src/remount-fs/remount-fs.c \
 	src/core/mount-setup.c \
 	src/core/mount-setup.h
 
-systemd_remount_api_vfs_LDADD = \
+systemd_remount_fs_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1274,8 +1303,10 @@ EXTRA_DIST += \
 	src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
+if ENABLE_GTK_DOC
 SUBDIRS += \
 	docs/libudev
+endif
 
 include_HEADERS += \
 	src/libudev/libudev.h
@@ -1301,6 +1332,9 @@ libudev_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
+libudev_la_LIBADD = \
+	libsystemd-shared.la
+
 pkgconfiglib_DATA += \
 	src/libudev/libudev.pc
 
@@ -1332,28 +1366,21 @@ noinst_LTLIBRARIES += \
 
 libudev_private_la_SOURCES =\
 	$(libudev_la_SOURCES) \
-	src/libudev/libudev-util-private.c \
 	src/libudev/libudev-device-private.c \
 	src/libudev/libudev-queue-private.c
 
-if HAVE_SELINUX
-libudev_private_la_SOURCES +=\
-	src/libudev/libudev-selinux-private.c
-endif
-
 libudev_private_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SELINUX_CFLAGS)
 	-fvisibility=default
 
 libudev_private_la_LIBADD = \
-	$(SELINUX_LIBS)
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 MANPAGES += \
 	man/udev.7 \
 	man/udevadm.8 \
-	man/udevd.8
+	man/systemd-udevd.8
 
 udev-confdirs:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
@@ -1393,30 +1420,30 @@ CLEANFILES += \
 	src/udev/udev.pc
 
 EXTRA_DIST += \
-	units/udev.service.in \
-	units/udev-trigger.service.in \
-	units/udev-settle.service.in
+	units/systemd-udev.service.in \
+	units/systemd-udev-trigger.service.in \
+	units/systemd-udev-settle.service.in
 
 CLEANFILES += \
-	units/udev.service \
-	units/udev-trigger.service \
-	units/udev-settle.service
+	units/systemd-udev.service \
+	units/systemd-udev-trigger.service \
+	units/systemd-udev-settle.service
 
 systemd-install-hook:
 	mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
-	ln -sf ../udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-control.socket
-	ln -sf ../udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-kernel.socket
+	ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
+	ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
 	mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants
-	ln -sf ../udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev.service
-	ln -sf ../udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev-trigger.service
+	ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service
+	ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
 
 bin_PROGRAMS += \
 	udevadm
 
-udevlibexec_PROGRAMS = \
-	udevd
+rootlibexec_PROGRAMS += \
+	systemd-udevd
 
 noinst_LTLIBRARIES += \
 	libudev-core.la
@@ -1445,6 +1472,7 @@ libudev_core_la_CFLAGS = \
 
 libudev_core_la_LIBADD = \
 	libudev-private.la \
+	libsystemd-label.la \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
@@ -1464,10 +1492,10 @@ libudev_core_la_LIBADD += \
 	libsystemd-acl.la
 endif
 
-udevd_SOURCES = \
+systemd_udevd_SOURCES = \
 	src/udev/udevd.c
 
-udevd_LDADD = \
+systemd_udevd_LDADD = \
 	libudev-core.la
 
 udevadm_SOURCES = \
@@ -1486,43 +1514,64 @@ udevadm_LDADD = \
 
 # ------------------------------------------------------------------------------
 TESTS += \
-	src/udev/test/udev-test.pl \
-	src/udev/test/rules-test.sh
+	test/udev-test.pl \
+	test/rules-test.sh
 
 noinst_PROGRAMS += \
 	test-libudev \
 	test-udev
 
 test_libudev_SOURCES = \
-	src/udev/test-libudev.c
+	src/test/test-libudev.c
 
 test_libudev_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libudev.la
 
 test_udev_SOURCES = \
-	src/udev/test-udev.c
+	src/test/test-udev.c \
+	$(libudev_core_la_SOURCES) \
+	$(libudev_private_la_SOURCES)
+
+# The test-udev program needs everything compiled with relative path
+# names for /sys, /dev, /run prefixed, pointing to our test/ directory.
+test_udev_CFLAGS = \
+	-DTEST_PREFIX=\"test\" \
+	$(libudev_core_la_CFLAGS) \
+	$(libudev_private_la_CFLAGS)
+
+test_udev_CPPFLAGS =\
+	$(libudev_core_la_CPPFLAGS)
 
 test_udev_LDADD = \
-	libudev-core.la \
-	libudev-private.la \
-	libsystemd-shared.la
+	libsystemd-label.la \
+	libsystemd-shared.la \
+	$(BLKID_LIBS) \
+	$(KMOD_LIBS) \
+	$(SELINUX_LIBS)
+
+if HAVE_ACL
+test_udev_LDADD += \
+	libsystemd-acl.la
+endif
 
 check_DATA += \
-	src/udev/test/sys
+	test/sys
 
 # packed sysfs test tree
-src/udev/test/sys:
-	$(AM_V_GEN)mkdir -p src/udev/test && tar -C src/udev/test/ -xJf $(top_srcdir)/src/udev/test/sys.tar.xz
+test/sys:
+	$(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
 
 test-sys-distclean:
-	-rm -rf src/udev/test/sys
+	-rm -rf test/sys
 DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
 
 EXTRA_DIST += \
-	src/udev/test/sys.tar.xz \
-	src/udev/test/udev-test.pl \
-	src/udev/test/rules-test.sh \
-	src/udev/test/rule-syntax-check.py
+	test/sys.tar.xz \
+	test/udev-test.pl \
+	test/rules-test.sh \
+	test/rule-syntax-check.py
 
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = \
@@ -1547,7 +1596,7 @@ udevlibexec_PROGRAMS += \
 	cdrom_id
 
 dist_udevrules_DATA += \
-	src/udev/cdrom_id/60-cdrom_id.rules
+	rules/60-cdrom_id.rules
 
 # ------------------------------------------------------------------------------
 collect_SOURCES = \
@@ -1587,7 +1636,7 @@ udevlibexec_PROGRAMS += \
 	v4l_id
 
 dist_udevrules_DATA += \
-	src/udev/v4l_id/60-persistent-v4l.rules
+	rules/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------
 accelerometer_SOURCES = \
@@ -1601,12 +1650,14 @@ udevlibexec_PROGRAMS += \
 	accelerometer
 
 dist_udevrules_DATA += \
-	src/udev/accelerometer/61-accelerometer.rules
+	rules/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
+if ENABLE_GTK_DOC
 SUBDIRS += \
 	docs/gudev
+endif
 
 libgudev_includedir = \
 	$(includedir)/gudev-1.0/gudev
@@ -1777,6 +1828,9 @@ keymap_SOURCES = \
 keymap_CPPFLAGS = \
 	$(AM_CPPFLAGS) -I src/udev/keymap
 
+keymap_LDADD = \
+	libsystemd-shared.la
+
 nodist_keymap_SOURCES = \
 	src/udev/keymap/keys-from-name.h \
 	src/udev/keymap/keys-to-name.h
@@ -1872,12 +1926,12 @@ dist_udevkeymap_DATA = \
 
 udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
-	src/udev/keymap/force-release-maps/dell-touchpad \
-	src/udev/keymap/force-release-maps/dell-xps \
-	src/udev/keymap/force-release-maps/hp-other \
-	src/udev/keymap/force-release-maps/samsung-other \
-	src/udev/keymap/force-release-maps/samsung-90x3a \
-	src/udev/keymap/force-release-maps/common-volume-keys
+	keymaps-force-release/dell-touchpad \
+	keymaps-force-release/dell-xps \
+	keymaps-force-release/hp-other \
+	keymaps-force-release/samsung-other \
+	keymaps-force-release/samsung-90x3a \
+	keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
 	$(AM_V_at)mkdir -p src/udev/keymap
@@ -1903,7 +1957,7 @@ mtd_probe_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 dist_udevrules_DATA += \
-	src/udev/mtd_probe/75-probe_mtd.rules
+	rules/75-probe_mtd.rules
 
 udevlibexec_PROGRAMS += \
 	mtd_probe
@@ -2576,6 +2630,8 @@ systemd_logind_SOURCES = \
 	src/login/logind-session.h \
 	src/login/logind-user.c \
 	src/login/logind-user.h \
+	src/login/logind-inhibit.c \
+	src/login/logind-inhibit.h \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
@@ -2630,6 +2686,20 @@ loginctl_LDADD = \
 rootbin_PROGRAMS += \
 	loginctl
 
+systemd_inhibit_SOURCES = \
+	src/login/inhibit.c
+
+systemd_inhibit_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+systemd_inhibit_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-dbus.la
+
+rootbin_PROGRAMS += \
+	systemd-inhibit
+
 test_login_SOURCES = \
 	src/login/test-login.c
 
@@ -2637,8 +2707,20 @@ test_login_LDADD = \
 	libsystemd-login.la \
 	libsystemd-shared.la
 
+test_inhibit_SOURCES = \
+	src/login/test-inhibit.c
+
+test_inhibit_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-dbus.la
+
+test_inhibit_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
 noinst_PROGRAMS += \
-	test-login
+	test-login \
+	test-inhibit
 
 libsystemd_login_la_SOURCES = \
 	src/login/sd-login.c
@@ -2841,6 +2923,7 @@ SED_PROCESS = \
 		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
+		-e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \
 		-e 's,@prefix\@,$(prefix),g' \
 		-e 's,@exec_prefix\@,$(exec_prefix),g' \
 		-e 's,@libdir\@,$(libdir),g' \
@@ -2961,6 +3044,7 @@ systemd-install-data-hook:
 		$(DESTDIR)$(prefix)/lib/sysctl.d \
 		$(DESTDIR)$(sysconfdir)/sysctl.d \
 		$(DESTDIR)$(systemshutdowndir) \
+		$(DESTDIR)$(systemsleepdir) \
 		$(DESTDIR)$(systemgeneratordir) \
 		$(DESTDIR)$(usergeneratordir)
 	$(MKDIR_P) -m 0755 \
@@ -3012,13 +3096,11 @@ systemd-install-data-hook:
 		rm -f systemd-update-utmp-shutdown.service && \
 		$(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
 	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-		rm -f systemd-remount-api-vfs.service \
+		rm -f systemd-remount-fs.service \
 			fsck-root.service \
-			remount-rootfs.service \
 			tmp.mount && \
-		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+		$(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
 		$(LN_S) ../fsck-root.service fsck-root.service && \
-		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
 		$(LN_S) ../tmp.mount tmp.mount )
 	( cd $(DESTDIR)$(userunitdir) && \
 		rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
@@ -3078,7 +3160,6 @@ systemd-install-data-hook:
 		$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 if HAVE_PLYMOUTH
 	$(MKDIR_P) -m 0755 \
-		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
 		$(DESTDIR)$(systemunitdir)/reboot.target.wants \
 		$(DESTDIR)$(systemunitdir)/kexec.target.wants \
 		$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
@@ -3120,10 +3201,6 @@ if TARGET_MEEGO
 endif
 
 if TARGET_FEDORA
-	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f display-manager.service single.service && \
 		$(LN_S) prefdm.service display-manager.service && \
@@ -3134,10 +3211,6 @@ if TARGET_FEDORA
 endif
 
 if TARGET_MANDRIVA
-	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f display-manager.service dm.service single.service && \
 		$(LN_S) prefdm.service display-manager.service && \
@@ -3155,20 +3228,12 @@ if TARGET_DEBIAN_OR_UBUNTU
 endif
 
 if TARGET_SUSE
-	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f local.service && \
 		$(LN_S) rc-local.service local.service )
-	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 endif
 
 if TARGET_MAGEIA
-	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f display-manager.service && \
 		$(LN_S) prefdm.service display-manager.service && \
@@ -3186,6 +3251,9 @@ install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
 
 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
+clean-local:
+	rm -rf $(abs_srcdir)/install-tree
+
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
 	--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
@@ -3193,8 +3261,12 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-rootprefix=$$dc_install_base \
-	--disable-split-usr \
+	--disable-split-usr
+
+if ENABLE_GTK_DOC
+DISTCHECK_CONFIGURE_FLAGS += \
 	--enable-gtk-doc
+endif
 
 upload: all distcheck
 	cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
@@ -3202,9 +3274,16 @@ upload: all distcheck
 	scp man/*.html tango:public/systemd-man/
 
 doc-sync: all
-	rsync -av --delete docs/libudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
-	rsync -av --delete docs/gudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
-	rsync -av --delete man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
+	gtkdoc-rebase --html-dir=docs/libudev/html --online
+	rsync -av --delete docs/libudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
+	gtkdoc-rebase --html-dir=docs/gudev/html --online
+	rsync -av --delete docs/gudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
+	rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
 
 git-tag:
 	git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+install-tree: all
+	rm -rf $(abs_srcdir)/install-tree
+	make install DESTDIR=$(abs_srcdir)/install-tree
+	tree $(abs_srcdir)/install-tree