chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
udev: network device renaming - immediately give up if the target name isn't available
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 13c4ed1699b6fee05fa7bf133d9467a7d66c9ecf..3b7ec0b7ba24526bbb0bc2b341b4b311b3fed0ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,29 +23,29 @@ AM_MAKEFLAGS = --no-print-directory
 
 SUBDIRS = . po
 
-LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=13
+LIBUDEV_CURRENT=1
+LIBUDEV_REVISION=2
+LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=1
+LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=1
-LIBSYSTEMD_LOGIN_AGE=2
+LIBSYSTEMD_LOGIN_CURRENT=3
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=1
+LIBSYSTEMD_DAEMON_REVISION=2
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=3
+LIBSYSTEMD_ID128_REVISION=6
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=3
-LIBSYSTEMD_JOURNAL_AGE=0
+LIBSYSTEMD_JOURNAL_CURRENT=2
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=2
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -57,20 +57,22 @@ pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=$(sysconfdir)/bash_completion.d
+rpmmacrosdir=$(sysconfdir)/rpm
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-usergeneratordir=$(pkglibexecdir)/user-generators
+usergeneratordir=$(prefix)/lib/systemd/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
-udevrulesdir = $(libexecdir)/udev/rules.d
+udevhomedir = $(udevlibexecdir)
+udevrulesdir = $(udevlibexecdir)/rules.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -94,6 +96,7 @@ dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_man_MANS =
 dist_pkgsysconf_DATA =
+dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dbusinterface_DATA =
 dist_dbussystemservice_DATA =
@@ -117,6 +120,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\" \
@@ -127,9 +131,10 @@ AM_CPPFLAGS = \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+       -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
-       -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
+       -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/shared \
@@ -212,7 +217,8 @@ bin_PROGRAMS = \
        systemd-cgtop \
        systemd-stdio-bridge \
        systemd-nspawn \
-       systemd-detect-virt
+       systemd-detect-virt \
+       systemd-delta
 
 dist_bin_SCRIPTS = \
        src/analyze/systemd-analyze
@@ -225,15 +231,18 @@ 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
+       systemd-getty-generator \
+       systemd-fstab-generator \
+       systemd-system-update-generator
 
 dist_bashcompletion_DATA = \
        bash-completion/systemd-bash-completion.sh
@@ -266,6 +275,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 \
@@ -276,7 +286,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 \
@@ -287,7 +299,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 \
@@ -297,17 +308,19 @@ dist_systemunit_DATA = \
        units/systemd-ask-password-wall.path \
        units/systemd-ask-password-console.path \
        units/syslog.target \
-       units/systemd-udev-control.socket \
-       units/systemd-udev-kernel.socket
+       units/systemd-udevd-control.socket \
+       units/systemd-udevd-kernel.socket \
+       units/system-update.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,35 +328,39 @@ nodist_systemunit_DATA = \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
-       units/halt.service \
        units/emergency.service \
-       units/poweroff.service \
-       units/reboot.service \
-       units/kexec.service \
-       units/fsck@.service \
-       units/fsck-root.service \
        units/rescue.service \
        units/user@.service \
-       units/systemd-udev.service \
+       units/systemd-hibernate.service \
+       units/systemd-suspend.service \
+       units/systemd-halt.service \
+       units/systemd-poweroff.service \
+       units/systemd-reboot.service \
+       units/systemd-kexec.service \
+       units/systemd-fsck@.service \
+       units/systemd-fsck-root.service \
+       units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
-       units/systemd-udev-settle.service
+       units/systemd-udev-settle.service \
+       units/debug-shell.service
 
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
 
 nodist_userunit_DATA = \
-       units/user/exit.service
+       units/user/systemd-exit.service
 
 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 \
@@ -352,17 +369,20 @@ EXTRA_DIST += \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
        units/emergency.service.in \
-       units/halt.service.in \
-       units/poweroff.service.in \
-       units/reboot.service.in \
-       units/kexec.service.in \
-       units/user/exit.service.in \
-       units/fsck@.service.in \
-       units/fsck-root.service.in \
+       units/systemd-halt.service.in \
+       units/systemd-poweroff.service.in \
+       units/systemd-reboot.service.in \
+       units/systemd-kexec.service.in \
+       units/user/systemd-exit.service.in \
+       units/systemd-fsck@.service.in \
+       units/systemd-fsck-root.service.in \
        units/user@.service.in \
-       units/systemd-udev.service \
+       units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
+       units/debug-shell.service.in \
+       units/systemd-hibernate.service.in \
+       units/systemd-suspend.service.in \
        introspect.awk \
        man/custom-html.xsl
 
@@ -406,25 +426,6 @@ systemgenerator_PROGRAMS += \
        systemd-rc-local-generator
 endif
 
-if HAVE_PLYMOUTH
-dist_systemunit_DATA += \
-       units/plymouth-start.service \
-       units/plymouth-read-write.service \
-       units/plymouth-quit.service \
-       units/plymouth-quit-wait.service \
-       units/plymouth-reboot.service \
-       units/plymouth-kexec.service \
-       units/plymouth-poweroff.service \
-       units/plymouth-halt.service \
-       units/systemd-ask-password-plymouth.path
-
-nodist_systemunit_DATA += \
-       units/systemd-ask-password-plymouth.service
-
-EXTRA_DIST += \
-       units/systemd-ask-password-plymouth.service.in
-endif
-
 dist_doc_DATA = \
        README \
        NEWS \
@@ -440,6 +441,7 @@ MANPAGES = \
        man/systemd.1 \
        man/systemctl.1 \
        man/systemd-cgls.1 \
+       man/systemd-delta.1 \
        man/systemd-cgtop.1 \
        man/systemd-nspawn.1 \
        man/systemd-tmpfiles.8 \
@@ -458,7 +460,9 @@ MANPAGES = \
        man/systemd.exec.5 \
        man/systemd.special.7 \
        man/systemd.journal-fields.7 \
+       man/kernel-command-line.7 \
        man/daemon.7 \
+       man/bootup.7 \
        man/runlevel.8 \
        man/telinit.8 \
        man/halt.8 \
@@ -473,22 +477,88 @@ MANPAGES = \
        man/os-release.5 \
        man/machine-info.5 \
        man/modules-load.d.5 \
+       man/systemd-modules-load.service.8 \
        man/sysctl.d.5 \
+       man/systemd-sysctl.service.8 \
        man/systemd-ask-password.1 \
        man/systemd-cat.1 \
        man/systemd-machine-id-setup.1 \
        man/systemd-detect-virt.1 \
        man/journald.conf.5 \
-       man/journalctl.1
+       man/systemd-journald.service.8 \
+       man/journalctl.1 \
+       man/systemd-inhibit.1 \
+       man/systemd-remount-fs.service.8 \
+       man/systemd-update-utmp-runlevel.service.8 \
+       man/systemd-initctl.service.8 \
+       man/systemd-shutdownd.service.8 \
+       man/systemd-suspend.service.8 \
+       man/systemd-halt.service.8 \
+       man/systemd-fsck@.service.8 \
+       man/systemd-ask-password-console.service.8 \
+       man/systemd-analyze.1 \
+       man/systemd-tty-ask-password-agent.1 \
+       man/systemd-getty-generator.8 \
+       man/systemd-system-update-generator.8 \
+       man/systemd-fstab-generator.8 \
+       man/systemd.preset.5
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
        man/poweroff.8 \
-       man/init.1
+       man/init.1 \
+       man/systemd-modules-load.8 \
+       man/systemd-sysctl.8 \
+       man/systemd-journald.socket.8 \
+       man/systemd-journald.8 \
+       man/systemd-remount-fs.8 \
+       man/systemd-update-utmp-shutdown.service.8 \
+       man/systemd-update-utmp.8 \
+       man/systemd-initctl.socket.8 \
+       man/systemd-initctl.8 \
+       man/systemd-shutdownd.socket.8 \
+       man/systemd-shutdownd.8 \
+       man/systemd-hibernate.service.8 \
+       man/systemd-sleep.8 \
+       man/systemd-shutdown.8 \
+       man/systemd-poweroff.service.8 \
+       man/systemd-reboot.service.8 \
+       man/systemd-kexec.service.8 \
+       man/systemd-fsck-root.service.8 \
+       man/systemd-ask-password-console.path.8 \
+       man/systemd-ask-password-wall.service.8 \
+       man/systemd-ask-password-wall.path.8 \
+       man/systemd-tmpfiles-setup.service.8 \
+       man/systemd-tmpfiles-clean.service.8 \
+       man/systemd-tmpfiles-clean.timer.8
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
+man/systemd-modules-load.8: man/systemd-modules-load.service.8
+man/systemd-sysctl.8: man/systemd-sysctl.service.8
+man/systemd-journald.socket.8: man/systemd-journald.service.8
+man/systemd-journald.8: man/systemd-journald.service.8
+man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
+man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-initctl.socket.8: man/systemd-initctl.service.8
+man/systemd-initctl.8: man/systemd-initctl.service.8
+man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8
+man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
+man/systemd-hibernate.service.8: man/systemd-suspend.service.8
+man/systemd-sleep.8: man/systemd-suspend.service.8
+man/systemd-shutdown.8: man/systemd-halt.service.8
+man/systemd-poweroff.service.8: man/systemd-halt.service.8
+man/systemd-reboot.service.8: man/systemd-halt.service.8
+man/systemd-kexec.service.8: man/systemd-halt.service.8
+man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
+man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
+man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
+man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
+man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -523,6 +593,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 \
@@ -544,6 +616,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 \
@@ -559,11 +633,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 += \
@@ -586,13 +658,23 @@ libsystemd_dbus_la_LIBADD = \
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-       libsystemd-label.la
+       libsystemd-units.la
 
-libsystemd_label_la_SOURCES = \
+libsystemd_units_la_SOURCES = \
        src/shared/install.c \
        src/shared/install.h \
        src/shared/path-lookup.c \
-       src/shared/path-lookup.h \
+       src/shared/path-lookup.h
+
+libsystemd_units_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-label.la
+
+libsystemd_label_la_SOURCES = \
        src/shared/cgroup-label.c \
        src/shared/socket-label.c \
        src/shared/label.c \
@@ -600,11 +682,12 @@ 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) \
-       $(DBUS_CFLAGS) \
        $(SELINUX_CFLAGS)
 
 libsystemd_label_la_LIBADD = \
@@ -679,6 +762,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 \
@@ -768,7 +853,9 @@ libsystemd_core_la_SOURCES = \
        src/core/special.h \
        src/core/bus-errors.h \
        src/core/build.h \
-       src/core/sysfs-show.h
+       src/core/sysfs-show.h \
+       src/core/switch-root.h \
+       src/core/switch-root.c
 
 nodist_libsystemd_core_la_SOURCES = \
        src/core/load-fragment-gperf.c \
@@ -784,6 +871,7 @@ libsystemd_core_la_CFLAGS = \
 
 libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-dbus.la \
@@ -856,8 +944,15 @@ org.freedesktop.systemd1.%.xml: systemd
 pkgconfigdata_DATA = \
        src/core/systemd.pc
 
+nodist_rpmmacros_DATA = \
+       src/core/macros.systemd
+
 EXTRA_DIST += \
-       src/core/systemd.pc.in
+       src/core/systemd.pc.in \
+       src/core/macros.systemd.in
+
+CLEANFILES += \
+       src/core/macros.systemd
 
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
@@ -871,7 +966,8 @@ noinst_PROGRAMS += \
        test-env-replace \
        test-strv \
        test-install \
-       test-watchdog
+       test-watchdog \
+       test-unit-name
 
 TESTS += \
        test-job-type \
@@ -898,7 +994,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
@@ -919,6 +1016,12 @@ test_hostname_SOURCES = \
 test_hostname_LDADD = \
        libsystemd-core.la
 
+test_unit_name_SOURCES = \
+       src/test/test-unit-name.c
+
+test_unit_name_LDADD = \
+       libsystemd-core.la
+
 test_daemon_SOURCES = \
        src/test/test-daemon.c
 
@@ -953,6 +1056,7 @@ test_install_CFLAGS = \
        $(DBUS_CFLAGS)
 
 test_install_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
@@ -1052,6 +1156,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
@@ -1087,6 +1198,13 @@ systemd_detect_virt_SOURCES = \
 systemd_detect_virt_LDADD = \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_delta_SOURCES = \
+       src/delta/delta.c
+
+systemd_delta_LDADD = \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
        src/getty-generator/getty-generator.c
@@ -1095,6 +1213,23 @@ systemd_getty_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_fstab_generator_SOURCES = \
+       src/fstab-generator/fstab-generator.c \
+       src/core/mount-setup.c
+
+systemd_fstab_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_system_update_generator_SOURCES = \
+       src/system-update-generator/system-update-generator.c
+
+systemd_system_update_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
        src/rc-local-generator/rc-local-generator.c
@@ -1104,12 +1239,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
 
 # ------------------------------------------------------------------------------
@@ -1133,6 +1268,7 @@ systemctl_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemctl_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
@@ -1276,8 +1412,10 @@ EXTRA_DIST += \
        src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
+if ENABLE_GTK_DOC
 SUBDIRS += \
        docs/libudev
+endif
 
 include_HEADERS += \
        src/libudev/libudev.h
@@ -1301,7 +1439,8 @@ libudev_la_CFLAGS = \
 
 libudev_la_LDFLAGS = \
        $(AM_LDFLAGS) \
-       -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
+       -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
 
 libudev_la_LIBADD = \
        libsystemd-shared.la
@@ -1310,7 +1449,8 @@ pkgconfiglib_DATA += \
        src/libudev/libudev.pc
 
 EXTRA_DIST += \
-       src/libudev/libudev.pc.in
+       src/libudev/libudev.pc.in \
+       src/libudev/libudev.sym
 
 CLEANFILES += \
        src/libudev/libudev.pc
@@ -1351,11 +1491,13 @@ libudev_private_la_LIBADD = \
 MANPAGES += \
        man/udev.7 \
        man/udevadm.8 \
+       man/systemd-udevd.service.8
+
+MANPAGES_ALIAS += \
        man/systemd-udevd.8
 
 udev-confdirs:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
-       -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices
 
 INSTALL_DATA_HOOKS += udev-confdirs
 
@@ -1391,22 +1533,22 @@ CLEANFILES += \
        src/udev/udev.pc
 
 EXTRA_DIST += \
-       units/systemd-udev.service.in \
+       units/systemd-udevd.service.in \
        units/systemd-udev-trigger.service.in \
        units/systemd-udev-settle.service.in
 
 CLEANFILES += \
-       units/systemd-udev.service \
+       units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service
 
 systemd-install-hook:
        mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
-       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 ../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
+       ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
+       ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
+       mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
+       ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
+       ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
 
@@ -1625,8 +1767,10 @@ dist_udevrules_DATA += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
+if ENABLE_GTK_DOC
 SUBDIRS += \
        docs/gudev
+endif
 
 libgudev_includedir = \
        $(includedir)/gudev-1.0/gudev
@@ -1825,14 +1969,16 @@ TESTS += \
        src/udev/keymap/check-keymaps.sh
 
 EXTRA_DIST += \
-       src/udev/keymap/check-keymaps.sh
+       src/udev/keymap/check-keymaps.sh \
+       src/udev/keymap/keyboard-force-release.sh.in
 
 CLEANFILES += \
        $(nodist_keymap_SOURCES) \
        src/udev/keymap/keys.txt \
-       src/udev/keymap/keys-from-name.gperf
+       src/udev/keymap/keys-from-name.gperf \
+       src/udev/keymap/keyboard-force-release.sh
 
-udevkeymapdir = $(libexecdir)/udev/keymaps
+udevkeymapdir = $(udevlibexecdir)/keymaps
 dist_udevkeymap_DATA = \
        keymaps/acer \
        keymaps/acer-aspire_5720 \
@@ -1893,7 +2039,7 @@ dist_udevkeymap_DATA = \
        keymaps/toshiba-satellite_m30x \
        keymaps/zepto-znote
 
-udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
+udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
        keymaps-force-release/dell-touchpad \
        keymaps-force-release/dell-xps \
@@ -2019,9 +2165,13 @@ systemd_journald_LDADD = \
        libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
-       libsystemd-login.la \
        libsystemd-id128.la
 
+if ENABLE_LOGIND
+systemd_journald_LDADD += \
+       libsystemd-login.la
+endif
+
 if HAVE_ACL
 systemd_journald_LDADD += \
        libsystemd-acl.la
@@ -2199,10 +2349,14 @@ systemd_coredump_SOURCES = \
 
 systemd_coredump_LDADD = \
        libsystemd-journal.la \
-       libsystemd-login.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
+if ENABLE_LOGIND
+systemd_coredump_LDADD += \
+       libsystemd-login.la
+endif
+
 rootlibexec_PROGRAMS += \
        systemd-coredump
 
@@ -2249,7 +2403,13 @@ INSTALL_DATA_HOOKS += \
        binfmt-install-data-hook
 
 MANPAGES += \
-       man/binfmt.d.5
+       man/binfmt.d.5 \
+       man/systemd-binfmt.service.8
+
+MANPAGES_ALIAS +=  \
+       man/systemd-binfmt.8
+
+man/systemd-binfmt.8: man/systemd-binfmt.service.8
 
 EXTRA_DIST += \
        units/systemd-binfmt.service.in
@@ -2280,7 +2440,13 @@ INSTALL_DATA_HOOKS += \
        vconsole-install-data-hook
 
 MANPAGES += \
-       man/vconsole.conf.5
+       man/vconsole.conf.5 \
+       man/systemd-vconsole-setup.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-vconsole-setup.8
+
+man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8
 
 EXTRA_DIST += \
        units/systemd-vconsole-setup.service.in
@@ -2288,21 +2454,15 @@ endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_READAHEAD
-systemd_readahead_collect_SOURCES = \
+systemd_readahead_SOURCES = \
+       src/readahead/readahead.c \
        src/readahead/readahead-collect.c \
+       src/readahead/readahead-replay.c \
+       src/readahead/readahead-analyze.c \
        src/readahead/readahead-common.c \
        src/readahead/readahead-common.h
 
-systemd_readahead_collect_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
-       libudev.la
-
-systemd_readahead_replay_SOURCES = \
-       src/readahead/readahead-replay.c \
-       src/readahead/readahead-common.c
-
-systemd_readahead_replay_LDADD = \
+systemd_readahead_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
        libudev.la
@@ -2311,10 +2471,10 @@ pkginclude_HEADERS += \
        src/systemd/sd-readahead.h
 
 rootlibexec_PROGRAMS += \
-       systemd-readahead-collect \
-       systemd-readahead-replay
+       systemd-readahead
 
 dist_systemunit_DATA += \
+       units/systemd-readahead-drop.service \
        units/systemd-readahead-done.timer
 
 nodist_systemunit_DATA += \
@@ -2329,7 +2489,20 @@ EXTRA_DIST += \
 
 MANPAGES += \
        man/sd_readahead.3 \
-       man/sd-readahead.7
+       man/sd-readahead.7 \
+       man/systemd-readahead-replay.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-readahead-collect.service.8 \
+       man/systemd-readahead-done.service.8 \
+       man/systemd-readahead-done.timer.8 \
+       man/systemd-readahead.8
+
+man/systemd-readahead-collect.service.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead-done.service.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead-done.timer.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead.8: man/systemd-readahead-replay.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2338,16 +2511,25 @@ rootlibexec_PROGRAMS += \
        systemd-quotacheck
 
 nodist_systemunit_DATA += \
-       units/quotacheck.service
+       units/systemd-quotacheck.service
 
 EXTRA_DIST += \
-       units/quotacheck.service.in
+       units/systemd-quotacheck.service.in
 
 systemd_quotacheck_SOURCES = \
        src/quotacheck/quotacheck.c
 
 systemd_quotacheck_LDADD = \
        libsystemd-shared.la
+
+MANPAGES += \
+       man/systemd-quotacheck.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-quotacheck.8
+
+man/systemd-quotacheck.8: man/systemd-quotacheck.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2383,6 +2565,17 @@ randomseed-install-data-hook:
 
 INSTALL_DATA_HOOKS += \
        randomseed-install-data-hook
+
+MANPAGES += \
+       man/systemd-random-seed-load.service.8
+
+MANPAGES_ALIAS +=  \
+       man/systemd-random-seed-save.service.8 \
+       man/systemd-random-seed.8
+
+man/systemd-random-seed-save.service.8: man/systemd-random-seed-load.service.8
+man/systemd-random-seed.8: man/systemd-random-seed-load.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2425,6 +2618,17 @@ cryptsetup-install-data-hook:
 
 INSTALL_DATA_HOOKS += \
        cryptsetup-install-data-hook
+
+MANPAGES += \
+       man/systemd-cryptsetup@.service.8 \
+       man/systemd-cryptsetup-generator.8 \
+       man/crypttab.5
+
+MANPAGES_ALIAS += \
+       man/systemd-cryptsetup.8
+
+man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2472,6 +2676,14 @@ hostnamed-install-data-hook:
 INSTALL_DATA_HOOKS += \
        hostnamed-install-data-hook
 
+MANPAGES += \
+       man/systemd-hostnamed.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-hostnamed.8
+
+man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+
 EXTRA_DIST += \
        units/systemd-hostnamed.service.in
 endif
@@ -2522,10 +2734,18 @@ localed-install-data-hook:
 INSTALL_DATA_HOOKS += \
        localed-install-data-hook
 
+MANPAGES += \
+       man/systemd-localed.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-localed.8
+
+man/systemd-localed.8: man/systemd-localed.service.8
+
 EXTRA_DIST += \
        units/systemd-localed.service.in
 
-dist_pkgdata_DATA = \
+dist_pkgdata_DATA += \
        src/locale/kbd-model-map
 
 dist_noinst_SCRIPT = \
@@ -2581,6 +2801,14 @@ timedated-install-data-hook:
 INSTALL_DATA_HOOKS += \
        timedated-install-data-hook
 
+MANPAGES += \
+       man/systemd-timedated.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-timedated.8
+
+man/systemd-timedated.8: man/systemd-timedated.service.8
+
 EXTRA_DIST += \
        units/systemd-timedated.service.in
 endif
@@ -2593,6 +2821,8 @@ systemd_logind_SOURCES = \
        src/login/logind-dbus.c \
        src/login/logind-device.c \
        src/login/logind-device.h \
+       src/login/logind-button.c \
+       src/login/logind-button.h \
        src/login/logind-seat.c \
        src/login/logind-seat.h \
        src/login/logind-session.c \
@@ -2655,6 +2885,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
 
@@ -2794,12 +3038,14 @@ rootlibexec_PROGRAMS += \
 
 dist_udevrules_DATA += \
        src/login/70-uaccess.rules \
-       src/login/71-seat.rules
+       src/login/70-power-switch.rules
 
 nodist_udevrules_DATA += \
+       src/login/71-seat.rules \
        src/login/73-seat-late.rules
 
 MANPAGES += \
+       man/systemd-logind.service.8 \
        man/logind.conf.5 \
        man/sd-login.7 \
        man/loginctl.1 \
@@ -2808,9 +3054,11 @@ MANPAGES += \
        man/sd_uid_get_state.3 \
        man/sd_session_is_active.3 \
        man/sd_seat_get_active.3 \
-       man/sd_get_seats.3
+       man/sd_get_seats.3 \
+       man/systemd-user-sessions.service.8
 
 MANPAGES_ALIAS += \
+       man/systemd-logind.8 \
        man/sd_login_monitor_unref.3 \
        man/sd_login_monitor_flush.3 \
        man/sd_login_monitor_get_fd.3 \
@@ -2828,8 +3076,10 @@ MANPAGES_ALIAS += \
        man/sd_seat_get_sessions.3 \
        man/sd_seat_can_multi_session.3 \
        man/sd_get_sessions.3 \
-       man/sd_get_uids.3
+       man/sd_get_uids.3 \
+       man/systemd-user-sessions.8
 
+man/systemd-logind.8: man/systemd-logind.service.8
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
@@ -2848,17 +3098,20 @@ man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
 man/sd_get_sessions.3: man/sd_get_seats.3
 man/sd_get_uids.3: man/sd_get_seats.3
+man/systemd-user-sessions.8: man/systemd-user-sessions.service.8
 
 EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        src/login/libsystemd-login.pc.in \
        src/login/libsystemd-login.sym \
+       src/login/71-seat.rules.in \
        src/login/73-seat-late.rules.in \
        units/systemd-logind.service.in \
        units/systemd-user-sessions.service.in
 
 CLEANFILES += \
        src/login/logind-gperf.c \
+       src/login/71-seat.rules \
        src/login/73-seat-late.rules
 endif
 # ------------------------------------------------------------------------------
@@ -2872,19 +3125,20 @@ SED_PROCESS = \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
-               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                -e 's,@systemunitdir\@,$(systemunitdir),g' \
                -e 's,@userunitdir\@,$(userunitdir),g' \
                -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' \
                -e 's,@includedir\@,$(includedir),g' \
                -e 's,@VERSION\@,$(VERSION),g' \
                -e 's,@rootprefix\@,$(rootprefix),g' \
-               -e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \
+               -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
+               -e 's,@sushell\@,$(sushell),g' \
                < $< > $@ || rm $@
 
 units/%: units/%.in Makefile
@@ -2899,6 +3153,9 @@ sysctl.d/%: sysctl.d/%.in Makefile
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
+src/core/macros.%: src/core/macros.%.in Makefile
+       $(SED_PROCESS)
+
 src/%.policy.in: src/%.policy.in.in Makefile
        $(SED_PROCESS)
 
@@ -2998,6 +3255,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 \
@@ -3049,13 +3307,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 \
-                       fsck-root.service \
-                       remount-rootfs.service \
+               rm -f systemd-remount-fs.service \
+                       systemd-fsck-root.service \
                        tmp.mount && \
-               $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
-               $(LN_S) ../fsck-root.service fsck-root.service && \
-               $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
+               $(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
+               $(LN_S) ../systemd-fsck-root.service systemd-fsck-root.service && \
                $(LN_S) ../tmp.mount tmp.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
                rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
@@ -3113,34 +3369,6 @@ systemd-install-data-hook:
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
                $(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 \
-               $(DESTDIR)$(systemunitdir)/halt.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f plymouth-start.service plymouth-read-write.service && \
-               $(LN_S) ../plymouth-start.service plymouth-start.service && \
-               $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f plymouth-quit.service plymouth-quit-wait.service && \
-               $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
-               $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
-       ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
-               rm -f plymouth-reboot.service && \
-               $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
-       ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
-               rm -f plymouth-kexec.service && \
-               $(LN_S) ../plymouth-kexec.service plymouth-kexec.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 )
-endif
 if TARGET_MEEGO
        $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
@@ -3157,32 +3385,18 @@ 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 && \
                $(LN_S) rescue.service single.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 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 && \
                $(LN_S) prefdm.service dm.service && \
                $(LN_S) rescue.service single.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_DEBIAN_OR_UBUNTU
@@ -3192,27 +3406,16 @@ 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 && \
                $(LN_S) prefdm.service dm.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
@@ -3233,8 +3436,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/
@@ -3242,9 +3449,11 @@ 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 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)"
Unnamed repository; edit this file 'description' to name the repository.