chiark / gitweb /
build-sys: more remaining parts of sd-deamon to their own section in Makefile.am
[elogind.git] / Makefile.am
index 56446b0..694335f 100644 (file)
@@ -1,6 +1,7 @@
 #  This file is part of systemd.
 #
-#  Copyright 2010 Lennart Poettering
+#  Copyright 2011 Lennart Poettering
+#  Copyright 2011 Kay Sievers
 #
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by
@@ -20,13 +21,21 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=3
+LIBSYSTEMD_LOGIN_REVISION=6
 LIBSYSTEMD_LOGIN_AGE=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=0
 LIBSYSTEMD_DAEMON_AGE=0
 
+LIBSYSTEMD_ID128_CURRENT=0
+LIBSYSTEMD_ID128_REVISION=0
+LIBSYSTEMD_ID128_AGE=0
+
+LIBSYSTEMD_JOURNAL_CURRENT=0
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=0
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -54,6 +63,16 @@ systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemunitdir=$(rootdir)/lib/systemd/system
 
+CLEANFILES =
+EXTRA_DIST =
+INSTALL_EXEC_HOOKS =
+UNINSTALL_EXEC_HOOKS =
+INSTALL_DATA_HOOKS =
+pkginclude_HEADERS =
+lib_LTLIBRARIES =
+pkgconfiglib_DATA =
+polkitpolicy_in_files =
+
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
@@ -76,6 +95,7 @@ AM_CPPFLAGS = \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+       -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -118,6 +138,13 @@ AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+else
+if TARGET_MAGEIA
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+endif
 endif
 endif
 endif
@@ -128,7 +155,6 @@ endif
 rootbin_PROGRAMS = \
        systemd \
        systemctl \
-        systemd-loginctl \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
@@ -150,7 +176,7 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
-       systemd-logger \
+       systemd-stdout-syslog-bridge \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
@@ -162,37 +188,13 @@ rootlibexec_PROGRAMS = \
        systemd-kmsg-syslogd \
        systemd-vconsole-setup \
        systemd-reply-password \
-       systemd-readahead-collect \
-       systemd-readahead-replay \
        systemd-user-sessions \
        systemd-fsck \
        systemd-quotacheck \
        systemd-timestamp \
        systemd-ac-power \
        systemd-detect-virt \
-       systemd-sysctl \
-        systemd-logind \
-        systemd-uaccess
-
-if ENABLE_BINFMT
-rootlibexec_PROGRAMS += \
-       systemd-binfmt
-endif
-
-if ENABLE_HOSTNAMED
-rootlibexec_PROGRAMS += \
-       systemd-hostnamed
-endif
-
-if ENABLE_TIMEDATED
-rootlibexec_PROGRAMS += \
-       systemd-timedated
-endif
-
-if ENABLE_LOCALED
-rootlibexec_PROGRAMS += \
-       systemd-localed
-endif
+       systemd-sysctl
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
@@ -205,14 +207,6 @@ systemgenerator_PROGRAMS += \
        systemd-cryptsetup-generator
 endif
 
-lib_LTLIBRARIES = \
-       libsystemd-daemon.la \
-       libsystemd-login.la
-
-pkginclude_HEADERS = \
-       src/sd-daemon.h \
-       src/sd-login.h
-
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
@@ -223,64 +217,24 @@ noinst_PROGRAMS = \
        test-cgroup \
        test-env-replace \
        test-strv \
-        test-login \
-        test-install
-
-if HAVE_PAM
-pamlib_LTLIBRARIES = \
-       pam_systemd.la
-endif
+       test-install
 
 dist_pkgsysconf_DATA = \
        src/system.conf \
-        src/user.conf \
-        src/systemd-logind.conf
+       src/user.conf
 
 dist_dbuspolicy_DATA = \
-       src/org.freedesktop.systemd1.conf \
-        src/org.freedesktop.login1.conf
-
-if ENABLE_HOSTNAMED
-dist_dbuspolicy_DATA += \
-       src/org.freedesktop.hostname1.conf
-endif
-
-if ENABLE_TIMEDATED
-dist_dbuspolicy_DATA += \
-       src/org.freedesktop.timedate1.conf
-endif
-
-if ENABLE_LOCALED
-dist_dbuspolicy_DATA += \
-       src/org.freedesktop.locale1.conf
-endif
+       src/org.freedesktop.systemd1.conf
 
 dist_dbussystemservice_DATA = \
-       src/org.freedesktop.systemd1.service \
-        src/org.freedesktop.login1.service
-
-if ENABLE_HOSTNAMED
-dist_dbussystemservice_DATA += \
-       src/org.freedesktop.hostname1.service
-endif
-
-if ENABLE_TIMEDATED
-dist_dbussystemservice_DATA += \
-       src/org.freedesktop.timedate1.service
-endif
-
-if ENABLE_LOCALED
-dist_dbussystemservice_DATA += \
-        src/org.freedesktop.locale1.service
-endif
+       src/org.freedesktop.systemd1.service
 
 dist_udevrules_DATA = \
-        src/70-uaccess.rules \
-        src/71-seat.rules
+       src/71-seat.rules
 
 nodist_udevrules_DATA = \
-        src/73-seat-late.rules \
-        src/99-systemd.rules
+       src/73-seat-late.rules \
+       src/99-systemd.rules
 
 dbusinterface_DATA = \
        org.freedesktop.systemd1.Manager.xml \
@@ -297,23 +251,8 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Swap.xml \
        org.freedesktop.systemd1.Path.xml
 
-if ENABLE_HOSTNAMED
-dbusinterface_DATA += \
-       org.freedesktop.hostname1.xml
-endif
-
-if ENABLE_TIMEDATED
-dbusinterface_DATA += \
-       org.freedesktop.timedate1.xml
-endif
-
-if ENABLE_LOCALED
-dbusinterface_DATA += \
-       org.freedesktop.locale1.xml
-endif
-
 dist_bashcompletion_DATA = \
-       src/systemctl-bash-completion.sh
+       src/systemd-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
@@ -336,7 +275,9 @@ dist_systemunit_DATA = \
        units/halt.target \
        units/kexec.target \
        units/local-fs.target \
+       units/local-fs-pre.target \
        units/remote-fs.target \
+       units/remote-fs-pre.target \
        units/cryptsetup.target \
        units/network.target \
        units/nss-lookup.target \
@@ -354,17 +295,15 @@ dist_systemunit_DATA = \
        units/sockets.target \
        units/swap.target \
        units/systemd-initctl.socket \
-       units/systemd-logger.socket \
+       units/systemd-stdout-syslog-bridge.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \
-       units/dev-hugepages.automount \
        units/dev-hugepages.mount \
-       units/dev-mqueue.automount \
        units/dev-mqueue.mount \
-       units/sys-kernel-debug.automount \
+       units/sys-kernel-config.mount \
        units/sys-kernel-debug.mount \
-       units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
+       units/sys-fs-fuse-connections.mount \
        units/var-run.mount \
        units/media.mount \
        units/remount-rootfs.service \
@@ -372,7 +311,6 @@ dist_systemunit_DATA = \
        units/sound.target \
        units/bluetooth.target \
        units/smartcard.target \
-       units/systemd-readahead-done.timer \
        units/systemd-tmpfiles-clean.timer \
        units/quotaon.service \
        units/systemd-ask-password-wall.path \
@@ -384,20 +322,13 @@ dist_systemunit_DATA += \
        units/var-lock.mount
 endif
 
-if ENABLE_BINFMT
-dist_systemunit_DATA += \
-       units/proc-sys-fs-binfmt_misc.automount \
-       units/proc-sys-fs-binfmt_misc.mount
-endif
-
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
        units/console-shell.service \
        units/systemd-initctl.service \
-       units/systemd-logger.service \
+       units/systemd-stdout-syslog-bridge.service \
        units/systemd-shutdownd.service \
-       units/systemd-logind.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
        units/systemd-vconsole-setup.service \
@@ -406,9 +337,6 @@ nodist_systemunit_DATA = \
        units/systemd-update-utmp-shutdown.service \
        units/systemd-random-seed-save.service \
        units/systemd-random-seed-load.service \
-       units/systemd-readahead-collect.service \
-       units/systemd-readahead-replay.service \
-       units/systemd-readahead-done.service \
        units/systemd-tmpfiles-setup.service \
        units/systemd-tmpfiles-clean.service \
        units/systemd-user-sessions.service \
@@ -423,27 +351,7 @@ nodist_systemunit_DATA = \
        units/fsck-root.service \
        units/quotacheck.service \
        units/rescue.service \
-        units/user@.service
-
-if ENABLE_BINFMT
-nodist_systemunit_DATA += \
-       units/systemd-binfmt.service
-endif
-
-if ENABLE_HOSTNAMED
-nodist_systemunit_DATA += \
-       units/systemd-hostnamed.service
-endif
-
-if ENABLE_TIMEDATED
-nodist_systemunit_DATA += \
-       units/systemd-timedated.service
-endif
-
-if ENABLE_LOCALED
-nodist_systemunit_DATA += \
-       units/systemd-localed.service
-endif
+       units/user@.service
 
 dist_userunit_DATA = \
        units/user/default.target \
@@ -452,15 +360,14 @@ dist_userunit_DATA = \
 nodist_userunit_DATA = \
        units/user/exit.service
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
        units/console-shell.service.m4 \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
-       units/systemd-logger.service.in \
+       units/systemd-stdout-syslog-bridge.service.in \
        units/systemd-shutdownd.service.in \
-       units/systemd-logind.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
        units/systemd-vconsole-setup.service.in \
@@ -469,9 +376,6 @@ EXTRA_DIST = \
        units/systemd-update-utmp-shutdown.service.in \
        units/systemd-random-seed-save.service.in \
        units/systemd-random-seed-load.service.in \
-       units/systemd-readahead-collect.service.in \
-       units/systemd-readahead-replay.service.in \
-       units/systemd-readahead-done.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in \
        units/systemd-user-sessions.service.in \
@@ -488,39 +392,18 @@ EXTRA_DIST = \
        units/quotacheck.service.in \
        units/user@.service.in \
        systemd.pc.in \
-       libsystemd-daemon.pc.in \
-       libsystemd-login.pc.in \
-       src/libsystemd-daemon.sym \
-       src/libsystemd-login.sym \
        introspect.awk \
        src/73-seat-late.rules.in \
-        src/99-systemd.rules.in
-
-if ENABLE_BINFMT
-EXTRA_DIST += \
-       units/systemd-binfmt.service.in
-endif
-
-if ENABLE_HOSTNAMED
-EXTRA_DIST += \
-       units/systemd-hostnamed.service.in
-endif
-
-if ENABLE_TIMEDATED
-EXTRA_DIST += \
-       units/systemd-timedated.service.in
-endif
-
-if ENABLE_LOCALED
-EXTRA_DIST += \
-       units/systemd-localed.service.in
-endif
+       src/99-systemd.rules.in \
+       man/custom-html.xsl
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
+systemgenerator_PROGRAMS += \
+       systemd-rc-local-generator
 endif
 
 if TARGET_MANDRIVA
@@ -528,6 +411,8 @@ dist_systemunit_DATA += \
        units/mandriva/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
+systemgenerator_PROGRAMS += \
+       systemd-rc-local-generator
 endif
 
 if TARGET_FRUGALWARE
@@ -539,6 +424,17 @@ if TARGET_SUSE
 dist_systemunit_DATA += \
        units/suse/rc-local.service \
        units/suse/halt-local.service
+systemgenerator_PROGRAMS += \
+       systemd-rc-local-generator
+endif
+
+if TARGET_MAGEIA
+dist_systemunit_DATA += \
+       units/mageia/prefdm.service \
+       units/fedora/rc-local.service \
+       units/fedora/halt-local.service
+systemgenerator_PROGRAMS += \
+       systemd-rc-local-generator
 endif
 
 if HAVE_PLYMOUTH
@@ -563,49 +459,22 @@ endif
 dist_doc_DATA = \
        README \
        LICENSE \
-       DISTRO_PORTING \
-       src/sd-daemon.h \
-       src/sd-daemon.c \
-       src/sd-readahead.h \
-       src/sd-readahead.c
+       DISTRO_PORTING
 
 pkgconfigdata_DATA = \
        systemd.pc
 
-pkgconfiglib_DATA = \
-        libsystemd-daemon.pc \
-        libsystemd-login.pc
-
-# Passed through intltool only
-polkitpolicy_in_files = \
-        src/org.freedesktop.login1.policy.in
-
-if ENABLE_HOSTNAMED
-polkitpolicy_in_files += \
-       src/org.freedesktop.hostname1.policy.in
-endif
-
-if ENABLE_TIMEDATED
-polkitpolicy_in_files += \
-       src/org.freedesktop.timedate1.policy.in
-endif
-
-if ENABLE_LOCALED
-polkitpolicy_in_files += \
-        src/org.freedesktop.locale1.policy.in
-endif
-
 # First passed through sed, followed by intltool
 polkitpolicy_in_in_files = \
        src/org.freedesktop.systemd1.policy.in.in
 
 nodist_polkitpolicy_DATA = \
-        $(polkitpolicy_in_files:.policy.in=.policy) \
-        $(polkitpolicy_in_in_files:.policy.in.in=.policy)
+       $(polkitpolicy_in_files:.policy.in=.policy) \
+       $(polkitpolicy_in_in_files:.policy.in.in=.policy)
 
 EXTRA_DIST += \
-        $(polkitpolicy_in_files) \
-        $(polkitpolicy_in_in_files)
+       $(polkitpolicy_in_files) \
+       $(polkitpolicy_in_in_files)
 
 @INTLTOOL_POLICY_RULE@
 
@@ -615,6 +484,7 @@ noinst_LTLIBRARIES = \
 
 libsystemd_basic_la_SOURCES = \
        src/util.c \
+       src/virt.c \
        src/label.c \
        src/hashmap.c \
        src/set.c \
@@ -682,17 +552,18 @@ libsystemd_core_la_SOURCES = \
        src/tcpwrap.c \
        src/cgroup-util.c \
        src/condition.c \
-        src/dbus-common.c \
-        src/sd-daemon.c \
-        src/install.c \
-        src/cgroup-attr.c
+       src/dbus-common.c \
+       src/sd-daemon.c \
+       src/install.c \
+       src/cgroup-attr.c \
+       src/sd-id128.c
 
 nodist_libsystemd_core_la_SOURCES = \
-        src/load-fragment-gperf.c \
-        src/load-fragment-gperf-nulstr.c
+       src/load-fragment-gperf.c \
+       src/load-fragment-gperf-nulstr.c
 
 EXTRA_DIST += \
-        src/load-fragment-gperf.gperf.m4
+       src/load-fragment-gperf.gperf.m4
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -718,7 +589,6 @@ libsystemd_core_la_LIBADD = \
 EXTRA_DIST += \
        ${libsystemd_basic_la_SOURCES:.c=.h} \
        ${libsystemd_core_la_SOURCES:.c=.h} \
-       ${libsystemd_daemon_la_SOURCES:.c=.h} \
        src/macro.h \
        src/def.h \
        src/ioprio.h \
@@ -728,7 +598,6 @@ EXTRA_DIST += \
        src/linux/auto_dev-ioctl.h \
        src/linux/fanotify.h \
        src/initreq.h \
-       src/sd-readahead.h \
        src/special.h \
        src/dbus-common.h \
        src/bus-errors.h \
@@ -736,19 +605,13 @@ EXTRA_DIST += \
        src/build.h \
        src/shutdownd.h \
        src/umount.h \
-       src/readahead-common.h \
        src/ask-password-api.h \
-        src/pager.h \
-        src/sysfs-show.h \
-        src/polkit.h \
-        src/logind.h \
-        src/logind-device.h \
-        src/logind-seat.h \
-        src/logind-session.h \
-        src/logind-user.h \
-        src/logind-acl.h \
-        src/dbus-loop.h \
-        src/spawn-agent.h
+       src/pager.h \
+       src/sysfs-show.h \
+       src/polkit.h \
+       src/dbus-loop.h \
+       src/spawn-agent.h \
+       src/acl-util.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -758,11 +621,6 @@ MANPAGES = \
        man/systemd-nspawn.1 \
        man/systemd-tmpfiles.8 \
        man/systemd-notify.1 \
-       man/sd_notify.3 \
-       man/sd_readahead.3 \
-       man/sd_booted.3 \
-       man/sd_listen_fds.3 \
-       man/sd_is_fifo.3 \
        man/systemd.unit.5 \
        man/systemd.service.5 \
        man/systemd.socket.5 \
@@ -776,47 +634,31 @@ MANPAGES = \
        man/systemd.snapshot.5 \
        man/systemd.exec.5 \
        man/daemon.7 \
-       man/sd-daemon.7 \
-       man/sd-readahead.7 \
        man/runlevel.8 \
        man/telinit.8 \
        man/halt.8 \
        man/shutdown.8 \
        man/pam_systemd.8 \
        man/systemd.conf.5 \
-       man/systemd-logind.conf.5 \
        man/tmpfiles.d.5 \
        man/hostname.5 \
+       man/timezone.5 \
        man/machine-id.5 \
        man/vconsole.conf.5 \
        man/locale.conf.5 \
        man/os-release.5 \
-        man/machine-info.5 \
+       man/machine-info.5 \
        man/modules-load.d.5 \
        man/sysctl.d.5 \
-        man/systemd-ask-password.1 \
-        man/systemd-loginctl.1
-
-if ENABLE_BINFMT
-MANPAGES += \
-       man/binfmt.d.5
-endif
+       man/systemd-ask-password.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
        man/poweroff.8 \
-       man/sd_is_socket.3 \
-       man/sd_is_socket_unix.3 \
-       man/sd_is_socket_inet.3 \
-       man/sd_notifyf.3 \
        man/init.1
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
-man/sd_is_socket.3: man/sd_is_fifo.3
-man/sd_is_socket_unix.3: man/sd_is_fifo.3
-man/sd_is_socket_inet.3: man/sd_is_fifo.3
-man/sd_notifyf.3: man/sd_notify.3
 man/init.1: man/systemd.1
 
 dist_man_MANS = \
@@ -898,18 +740,12 @@ test_cgroup_SOURCES = \
        src/test-cgroup.c \
        src/cgroup-util.c
 
-test_cgroup_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_cgroup_LDADD = \
        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
 
@@ -917,40 +753,27 @@ test_strv_SOURCES = \
        src/test-strv.c \
        src/specifier.c
 
-test_strv_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_strv_LDADD = \
        libsystemd-basic.la
 
-test_login_SOURCES = \
-       src/test-login.c
-
-test_login_CFLAGS = \
-       $(AM_CFLAGS)
-
-test_login_LDADD = \
-       libsystemd-basic.la \
-        libsystemd-login.la
-
 test_install_SOURCES = \
        src/test-install.c \
-        src/install.c \
-        src/path-lookup.c \
-        src/unit-name.c
+       src/install.c \
+       src/path-lookup.c \
+       src/unit-name.c
 
 test_install_CFLAGS = \
        $(AM_CFLAGS) \
-        $(DBUS_CFLAGS)
+       $(DBUS_CFLAGS)
 
 test_install_LDADD = \
        libsystemd-basic.la
 
-systemd_logger_SOURCES = \
-       src/logger.c \
+systemd_stdout_syslog_bridge_SOURCES = \
+       src/stdout-syslog-bridge.c \
        src/tcpwrap.c
 
-systemd_logger_LDADD = \
+systemd_stdout_syslog_bridge_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
        $(LIBWRAP_LIBS)
@@ -986,9 +809,6 @@ systemd_update_utmp_LDADD = \
 systemd_random_seed_SOURCES = \
        src/random-seed.c
 
-systemd_random_seed_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_random_seed_LDADD = \
        libsystemd-basic.la
 
@@ -1003,169 +823,56 @@ systemd_shutdownd_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
 
-systemd_hostnamed_SOURCES = \
-       src/hostnamed.c \
-        src/dbus-common.c \
-        src/polkit.c
+dist_pkgdata_DATA = \
+       src/kbd-model-map
 
-systemd_hostnamed_CFLAGS = \
+dist_noinst_SCRIPT = \
+       src/generate-kbd-model-map
+
+systemd_shutdown_SOURCES = \
+       src/mount-setup.c \
+       src/umount.c \
+       src/shutdown.c
+
+systemd_shutdown_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+       $(UDEV_CFLAGS)
 
-systemd_hostnamed_LDADD = \
+systemd_shutdown_LDADD = \
        libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS)
+       $(UDEV_LIBS)
 
-systemd_localed_SOURCES = \
-       src/localed.c \
-        src/dbus-common.c \
-        src/polkit.c
+systemd_modules_load_SOURCES = \
+       src/modules-load.c
 
-systemd_localed_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+systemd_modules_load_LDADD = \
+       libsystemd-basic.la
 
-systemd_localed_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS)
+systemd_tmpfiles_SOURCES = \
+       src/tmpfiles.c
 
-systemd_timedated_SOURCES = \
-       src/timedated.c \
-        src/dbus-common.c \
-        src/polkit.c
+systemd_tmpfiles_LDADD = \
+       libsystemd-basic.la
 
-systemd_timedated_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+systemd_machine_id_setup_SOURCES = \
+       src/machine-id-setup.c \
+       src/machine-id-main.c \
+       src/sd-id128.c
 
-systemd_timedated_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS)
+systemd_machine_id_setup_LDADD = \
+       libsystemd-basic.la
 
-systemd_logind_SOURCES = \
-       src/logind.c \
-       src/logind-dbus.c \
-        src/logind-device.c \
-        src/logind-seat.c \
-        src/logind-seat-dbus.c \
-        src/logind-session.c \
-        src/logind-session-dbus.c \
-        src/logind-user.c \
-        src/logind-user-dbus.c \
-        src/dbus-common.c \
-        src/dbus-loop.c \
-        src/cgroup-util.c \
-        src/polkit.c
+systemd_sysctl_SOURCES = \
+       src/sysctl.c
 
-nodist_systemd_logind_SOURCES = \
-        src/logind-gperf.c
+systemd_sysctl_LDADD = \
+       libsystemd-basic.la
 
-EXTRA_DIST += \
-        src/logind-gperf.gperf
+systemd_fsck_SOURCES = \
+       src/fsck.c \
+       src/dbus-common.c
 
-systemd_logind_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-        $(UDEV_CFLAGS) \
-        $(ACL_CFLAGS)
-
-systemd_logind_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS) \
-        $(UDEV_LIBS) \
-        $(ACL_LIBS)
-
-systemd_uaccess_SOURCES = \
-       src/uaccess.c
-
-if HAVE_ACL
-systemd_logind_SOURCES += \
-       src/logind-acl.c
-
-systemd_uaccess_SOURCES += \
-       src/logind-acl.c
-endif
-
-systemd_uaccess_CFLAGS = \
-       $(AM_CFLAGS) \
-        $(UDEV_CFLAGS) \
-        $(ACL_CFLAGS)
-
-systemd_uaccess_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       libsystemd-login.la \
-        $(UDEV_LIBS) \
-        $(ACL_LIBS)
-
-systemd_shutdown_SOURCES = \
-       src/mount-setup.c \
-       src/umount.c \
-       src/shutdown.c
-
-systemd_shutdown_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
-
-systemd_shutdown_LDADD = \
-       libsystemd-basic.la \
-       $(UDEV_LIBS)
-
-systemd_modules_load_SOURCES = \
-       src/modules-load.c
-
-systemd_modules_load_CFLAGS = \
-       $(AM_CFLAGS)
-
-systemd_modules_load_LDADD = \
-       libsystemd-basic.la
-
-systemd_tmpfiles_SOURCES = \
-       src/tmpfiles.c
-
-systemd_tmpfiles_CFLAGS = \
-       $(AM_CFLAGS)
-
-systemd_tmpfiles_LDADD = \
-       libsystemd-basic.la
-
-systemd_machine_id_setup_SOURCES = \
-       src/machine-id-setup.c \
-       src/machine-id-main.c
-
-systemd_machine_id_setup_CFLAGS = \
-       $(AM_CFLAGS)
-
-systemd_machine_id_setup_LDADD = \
-       libsystemd-basic.la
-
-systemd_sysctl_SOURCES = \
-       src/sysctl.c
-
-systemd_sysctl_CFLAGS = \
-       $(AM_CFLAGS)
-
-systemd_sysctl_LDADD = \
-       libsystemd-basic.la
-
-systemd_binfmt_SOURCES = \
-       src/binfmt.c
-
-systemd_binfmt_CFLAGS = \
-       $(AM_CFLAGS)
-
-systemd_binfmt_LDADD = \
-       libsystemd-basic.la
-
-systemd_fsck_SOURCES = \
-       src/fsck.c \
-       src/dbus-common.c
-
-systemd_fsck_CFLAGS = \
+systemd_fsck_CFLAGS = \
        $(AM_CFLAGS) \
        $(UDEV_CFLAGS) \
        $(DBUS_CFLAGS)
@@ -1178,18 +885,12 @@ systemd_fsck_LDADD = \
 systemd_quotacheck_SOURCES = \
        src/quotacheck.c
 
-systemd_quotacheck_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_quotacheck_LDADD = \
        libsystemd-basic.la
 
 systemd_timestamp_SOURCES = \
        src/timestamp.c
 
-systemd_timestamp_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_timestamp_LDADD = \
        libsystemd-basic.la
 
@@ -1207,9 +908,6 @@ systemd_ac_power_LDADD = \
 systemd_detect_virt_SOURCES = \
        src/detect-virt.c
 
-systemd_detect_virt_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_detect_virt_LDADD = \
        libsystemd-basic.la
 
@@ -1218,9 +916,9 @@ systemd_cryptsetup_SOURCES = \
        src/ask-password-api.c
 
 systemd_cryptsetup_CFLAGS = \
+       $(AM_CFLAGS) \
        $(LIBCRYPTSETUP_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(AM_CFLAGS)
+       $(UDEV_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
        $(LIBCRYPTSETUP_LIBS) \
@@ -1231,9 +929,6 @@ systemd_cryptsetup_generator_SOURCES = \
        src/cryptsetup-generator.c \
        src/unit-name.c
 
-systemd_cryptsetup_generator_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_cryptsetup_generator_LDADD = \
        libsystemd-basic.la
 
@@ -1241,28 +936,25 @@ systemd_getty_generator_SOURCES = \
        src/getty-generator.c \
        src/unit-name.c
 
-systemd_getty_generator_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_getty_generator_LDADD = \
        libsystemd-basic.la
 
+systemd_rc_local_generator_SOURCES = \
+       src/rc-local-generator.c
+
+systemd_rc_local_generator_LDADD = \
+       libsystemd-basic.la
+
 systemd_user_sessions_SOURCES = \
        src/user-sessions.c \
        src/cgroup-util.c
 
-systemd_user_sessions_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_user_sessions_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
 
@@ -1271,9 +963,6 @@ systemd_remount_api_vfs_SOURCES = \
        src/mount-setup.c \
        src/exit-status.c
 
-systemd_remount_api_vfs_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_remount_api_vfs_LDADD = \
        libsystemd-basic.la
 
@@ -1293,9 +982,6 @@ systemd_kmsg_syslogd_SOURCES = \
        src/kmsg-syslogd.c \
        src/fdset.c
 
-systemd_kmsg_syslogd_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_kmsg_syslogd_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
@@ -1309,9 +995,9 @@ systemctl_SOURCES = \
        src/cgroup-util.c \
        src/exit-status.c \
        src/unit-name.c \
-        src/pager.c \
-        src/install.c \
-        src/spawn-agent.c
+       src/pager.c \
+       src/install.c \
+       src/spawn-agent.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1322,24 +1008,6 @@ systemctl_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
-systemd_loginctl_SOURCES = \
-       src/loginctl.c \
-       src/dbus-common.c \
-       src/cgroup-show.c \
-       src/cgroup-util.c \
-        src/pager.c \
-        src/sysfs-show.c
-
-systemd_loginctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-        $(UDEV_CFLAGS)
-
-systemd_loginctl_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS) \
-        $(UDEV_LIBS)
-
 systemd_notify_SOURCES = \
        src/notify.c \
        src/sd-readahead.c
@@ -1361,13 +1029,94 @@ systemd_reply_password_SOURCES = \
 systemd_reply_password_LDADD = \
        libsystemd-basic.la
 
+systemd_cgls_SOURCES = \
+       src/cgls.c \
+       src/cgroup-show.c \
+       src/cgroup-util.c \
+       src/pager.c
+
+systemd_cgls_LDADD = \
+       libsystemd-basic.la
+
+systemd_nspawn_SOURCES = \
+       src/nspawn.c \
+       src/cgroup-util.c \
+       src/loopback-setup.c
+
+systemd_nspawn_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la
+
+systemd_stdio_bridge_SOURCES = \
+       src/bridge.c
+
+systemd_stdio_bridge_LDADD = \
+       libsystemd-basic.la
+
+systemadm_SOURCES = \
+       src/systemadm.vala \
+       src/systemd-interfaces.vala \
+       src/wraplabel.vala
+
+systemadm_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(GTK_CFLAGS) \
+       -Wno-unused-variable \
+       -Wno-unused-function \
+       -Wno-shadow \
+       -Wno-format-nonliteral
+
+systemadm_VALAFLAGS = \
+       --pkg=posix \
+       --pkg=gtk+-2.0 \
+       --pkg=gee-1.0 \
+       -g
+
+systemadm_LDADD = \
+       $(GTK_LIBS)
+
+systemd_gnome_ask_password_agent_SOURCES = \
+       src/gnome-ask-password-agent.vala
+
+systemd_gnome_ask_password_agent_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(LIBNOTIFY_CFLAGS) \
+       $(GTK_CFLAGS) \
+       -Wno-unused-variable \
+       -Wno-unused-function \
+       -Wno-shadow \
+       -Wno-format-nonliteral
+
+systemd_gnome_ask_password_agent_VALAFLAGS = \
+       --pkg=posix \
+       --pkg=gtk+-2.0 \
+       --pkg=linux \
+       --pkg=gio-unix-2.0 \
+       --pkg=libnotify
+if LIBNOTIFY07
+systemd_gnome_ask_password_agent_VALAFLAGS += \
+       -D LIBNOTIFY07
+endif
+systemd_gnome_ask_password_agent_VALAFLAGS += \
+       -g
+
+systemd_gnome_ask_password_agent_LDADD = \
+       $(LIBNOTIFY_LIBS) \
+       $(GTK_LIBS)
+
+systemd_tty_ask_password_agent_SOURCES = \
+       src/tty-ask-password-agent.c \
+       src/ask-password-api.c \
+       src/utmp-wtmp.c
+
+systemd_tty_ask_password_agent_LDADD = \
+       libsystemd-basic.la
+
+# ------------------------------------------------------------------------------
 systemd_readahead_collect_SOURCES = \
        src/readahead-collect.c \
        src/readahead-common.c
 
-systemd_readahead_collect_CFLAGS = \
-       $(UDEV_CFLAGS)
-
 systemd_readahead_collect_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
@@ -1377,109 +1126,619 @@ systemd_readahead_replay_SOURCES = \
        src/readahead-replay.c \
        src/readahead-common.c
 
-systemd_readahead_replay_CFLAGS = \
-       $(UDEV_CFLAGS)
+systemd_readahead_replay_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS)
+
+systemd_readahead_replay_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(UDEV_LIBS)
+
+rootlibexec_PROGRAMS += \
+       systemd-readahead-collect \
+       systemd-readahead-replay
+
+dist_systemunit_DATA += \
+       units/systemd-readahead-done.timer
+
+nodist_systemunit_DATA += \
+       units/systemd-readahead-collect.service \
+       units/systemd-readahead-replay.service \
+       units/systemd-readahead-done.service
+
+EXTRA_DIST += \
+       src/sd-readahead.h \
+       src/readahead-common.h \
+       units/systemd-readahead-collect.service.in \
+       units/systemd-readahead-replay.service.in \
+       units/systemd-readahead-done.service.in
+
+dist_doc_DATA += \
+       src/sd-readahead.h \
+       src/sd-readahead.c
+
+MANPAGES += \
+       man/sd_readahead.3 \
+       man/sd-readahead.7
+
+# ------------------------------------------------------------------------------
+libsystemd_daemon_la_SOURCES = \
+       src/sd-daemon.c
+
+libsystemd_daemon_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=hidden \
+       -DSD_EXPORT_SYMBOLS
+
+libsystemd_daemon_la_LDFLAGS = \
+       -shared \
+       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
+
+pkginclude_HEADERS += \
+       src/sd-daemon.h
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-daemon-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
+       fi
+
+INSTALL_EXEC_HOOKS += \
+       libsystemd-daemon-install-hook
+
+libsystemd-daemon-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
+
+UNINSTALL_EXEC_HOOKS += \
+       libsystemd-daemon-uninstall-hook
+
+lib_LTLIBRARIES += \
+       libsystemd-daemon.la
+
+pkgconfiglib_DATA += \
+       libsystemd-daemon.pc
+
+dist_doc_DATA += \
+       src/sd-daemon.h \
+       src/sd-daemon.c
+
+MANPAGES += \
+       man/sd-daemon.7 \
+       man/sd_notify.3 \
+       man/sd_listen_fds.3 \
+       man/sd_is_fifo.3 \
+       man/sd_booted.3
+
+MANPAGES_ALIAS += \
+       man/sd_is_socket.3 \
+       man/sd_is_socket_unix.3 \
+       man/sd_is_socket_inet.3 \
+       man/sd_is_mq.3 \
+       man/sd_notifyf.3
+
+man/sd_is_socket.3: man/sd_is_fifo.3
+man/sd_is_socket_unix.3: man/sd_is_fifo.3
+man/sd_is_socket_inet.3: man/sd_is_fifo.3
+man/sd_is_mq.3: man/sd_is_fifo.3
+man/sd_notifyf.3: man/sd_notify.3
+
+EXTRA_DIST += \
+       ${libsystemd_daemon_la_SOURCES:.c=.h} \
+       libsystemd-daemon.pc.in \
+       src/libsystemd-daemon.sym
+
+# ------------------------------------------------------------------------------
+libsystemd_id128_la_SOURCES = \
+       src/sd-id128.c
+
+libsystemd_id128_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=hidden
+
+libsystemd_id128_la_LDFLAGS = \
+       -shared \
+       -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
+
+libsystemd_id128_la_LIBADD = \
+       libsystemd-basic.la
+
+test_id128_SOURCES = \
+       src/test-id128.c \
+       src/sd-id128.c
+
+test_id128_LDADD = \
+       libsystemd-basic.la
+
+noinst_PROGRAMS += \
+       test-id128
+
+pkginclude_HEADERS += \
+       src/sd-id128.h
+
+lib_LTLIBRARIES += \
+       libsystemd-id128.la
+
+pkgconfiglib_DATA += \
+       libsystemd-id128.pc
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-id128-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
+       fi
+
+INSTALL_EXEC_HOOKS += \
+       libsystemd-id128-install-hook
+
+libsystemd-id128-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
+
+UNINSTALL_EXEC_HOOKS += \
+       libsystemd-id128-uninstall-hook
+
+EXTRA_DIST += \
+       libsystemd-id128.pc.in \
+       src/libsystemd-id128.sym
+
+# ------------------------------------------------------------------------------
+systemd_journald_SOURCES = \
+       src/journal/journald.c \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/lookup3.c \
+       src/journal/journal-rate-limit.c \
+       src/sd-id128.c \
+       src/acl-util.c \
+       src/cgroup-util.c
+
+systemd_journald_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ACL_CFLAGS)
+
+systemd_journald_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(ACL_LIBS)
+
+if HAVE_XZ
+systemd_journald_SOURCES += \
+       src/journal/compress.c
+systemd_journald_CFLAGS += \
+       $(XZ_CFLAGS)
+systemd_journald_LDADD += \
+       $(XZ_LIBS)
+endif
+
+systemd_journalctl_SOURCES = \
+       src/journal/journalctl.c \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/lookup3.c \
+       src/sd-id128.c \
+       src/pager.c
+
+systemd_journalctl_LDADD = \
+       libsystemd-basic.la
+
+if HAVE_XZ
+systemd_journalctl_SOURCES += \
+       src/journal/compress.c
+systemd_journalctl_CFLAGS = \
+       $(XZ_CFLAGS)
+systemd_journalctl_LDADD += \
+       $(XZ_LIBS)
+endif
+
+test_journal_SOURCES = \
+       src/journal/test-journal.c \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/lookup3.c \
+       src/journal/journal-send.c \
+       src/sd-id128.c
+
+test_journal_LDADD = \
+       libsystemd-basic.la
+
+if HAVE_XZ
+test_journal_SOURCES += \
+       src/journal/compress.c
+
+test_journal_CFLAGS = \
+       $(XZ_CFLAGS)
+
+test_journal_LDADD += \
+       $(XZ_LIBS)
+endif
+
+libsystemd_journal_la_SOURCES = \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/compress.c \
+       src/journal/lookup3.c \
+       src/journal/journal-send.c
+
+libsystemd_journal_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(XZ_CFLAGS) \
+       -fvisibility=hidden
+
+libsystemd_journal_la_LDFLAGS = \
+       -shared \
+       -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
+
+libsystemd_journal_la_LIBADD = \
+       libsystemd-basic.la \
+       libsystemd-id128.la \
+       $(XZ_LIBS)
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-journal-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
+       fi
+
+INSTALL_EXEC_HOOKS += \
+       libsystemd-journal-install-hook
+
+libsystemd-journal-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
+
+UNINSTALL_EXEC_HOOKS += \
+       libsystemd-journal-uninstall-hook
+
+noinst_PROGRAMS += \
+       test-journal
+
+pkginclude_HEADERS += \
+       src/journal/sd-journal.h
+
+lib_LTLIBRARIES += \
+       libsystemd-journal.la
+
+rootlibexec_PROGRAMS += \
+       systemd-journald
+
+rootbin_PROGRAMS += \
+       systemd-journalctl
+
+dist_systemunit_DATA += \
+       units/systemd-journald.socket
+
+nodist_systemunit_DATA += \
+       units/systemd-journald.service
+
+pkgconfiglib_DATA += \
+       src/journal/libsystemd-journal.pc
+
+journal-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
+               rm -f systemd-journald.socket && \
+               $(LN_S) ../systemd-journald.socket )
+
+INSTALL_DATA_HOOKS += \
+       journal-install-data-hook
+
+EXTRA_DIST += \
+       src/journal/journal-def.h \
+       src/journal/journal-internal.h \
+       src/journal/journal-file.h \
+       src/journal/lookup3.h \
+       src/journal/compress.h \
+       src/journal/journal-rate-limit.h \
+       src/journal/libsystemd-journal.pc.in \
+       src/journal/libsystemd-journal.sym \
+       units/systemd-journald.service.in
+
+# ------------------------------------------------------------------------------
+if ENABLE_BINFMT
+systemd_binfmt_SOURCES = \
+       src/binfmt/binfmt.c
+
+systemd_binfmt_LDADD = \
+       libsystemd-basic.la
+
+rootlibexec_PROGRAMS += \
+       systemd-binfmt
+
+dist_systemunit_DATA += \
+       units/proc-sys-fs-binfmt_misc.automount \
+       units/proc-sys-fs-binfmt_misc.mount
+
+nodist_systemunit_DATA += \
+       units/systemd-binfmt.service
+
+binfmt-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(prefix)/lib/binfmt.d \
+               $(DESTDIR)$(sysconfdir)/binfmt.d
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f systemd-binfmt.service \
+                       proc-sys-fs-binfmt_misc.automount && \
+               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
+               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
+
+INSTALL_DATA_HOOKS += \
+       binfmt-install-data-hook
+
+MANPAGES += \
+       man/binfmt.d.5
+
+EXTRA_DIST += \
+       units/systemd-binfmt.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_HOSTNAMED
+systemd_hostnamed_SOURCES = \
+       src/hostname/hostnamed.c \
+       src/dbus-common.c \
+       src/polkit.c
+
+systemd_hostnamed_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_hostnamed_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
+
+rootlibexec_PROGRAMS += \
+       systemd-hostnamed
+
+nodist_systemunit_DATA += \
+       units/systemd-hostnamed.service
+
+dist_dbuspolicy_DATA += \
+       src/hostname/org.freedesktop.hostname1.conf
+
+dist_dbussystemservice_DATA += \
+       src/hostname/org.freedesktop.hostname1.service
+
+polkitpolicy_in_files += \
+       src/hostname/org.freedesktop.hostname1.policy.in
+
+dbusinterface_DATA += \
+       org.freedesktop.hostname1.xml
+
+org.freedesktop.hostname1.xml: systemd-hostnamed
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+hostnamed-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.hostname1.service && \
+               $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
+
+INSTALL_DATA_HOOKS += \
+       hostnamed-install-data-hook
+
+EXTRA_DIST += \
+       units/systemd-hostnamed.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_LOCALED
+systemd_localed_SOURCES = \
+       src/locale/localed.c \
+       src/dbus-common.c \
+       src/polkit.c
+
+systemd_localed_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_localed_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
+
+nodist_systemunit_DATA += \
+       units/systemd-localed.service
+
+rootlibexec_PROGRAMS += \
+       systemd-localed
+
+dist_dbuspolicy_DATA += \
+       src/locale/org.freedesktop.locale1.conf
+
+dist_dbussystemservice_DATA += \
+       src/locale/org.freedesktop.locale1.service
+
+polkitpolicy_in_files += \
+       src/locale/org.freedesktop.locale1.policy.in
+
+dbusinterface_DATA += \
+       org.freedesktop.locale1.xml
+
+org.freedesktop.locale1.xml: systemd-localed
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+localed-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.locale1.service && \
+               $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
+
+INSTALL_DATA_HOOKS += \
+       localed-install-data-hook
+
+EXTRA_DIST += \
+       units/systemd-localed.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_TIMEDATED
+systemd_timedated_SOURCES = \
+       src/timedate/timedated.c \
+       src/dbus-common.c \
+       src/polkit.c
+
+systemd_timedated_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_timedated_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
+
+rootlibexec_PROGRAMS += \
+       systemd-timedated
+
+dist_dbussystemservice_DATA += \
+       src/timedate/org.freedesktop.timedate1.service
+
+dist_dbuspolicy_DATA += \
+       src/timedate/org.freedesktop.timedate1.conf
+
+nodist_systemunit_DATA += \
+       units/systemd-timedated.service
+
+polkitpolicy_in_files += \
+       src/timedate/org.freedesktop.timedate1.policy.in
+
+org.freedesktop.timedate1.xml: systemd-timedated
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+dbusinterface_DATA += \
+       org.freedesktop.timedate1.xml
+
+timedated-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.timedate1.service  && \
+               $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
 
-systemd_readahead_replay_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(UDEV_LIBS)
+INSTALL_DATA_HOOKS += \
+       timedated-install-data-hook
 
-systemd_cgls_SOURCES = \
-       src/cgls.c \
-       src/cgroup-show.c \
+EXTRA_DIST += \
+       units/systemd-timedated.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_LOGIND
+systemd_logind_SOURCES = \
+       src/login/logind.c \
+       src/login/logind-dbus.c \
+       src/login/logind-device.c \
+       src/login/logind-seat.c \
+       src/login/logind-seat-dbus.c \
+       src/login/logind-session.c \
+       src/login/logind-session-dbus.c \
+       src/login/logind-user.c \
+       src/login/logind-user-dbus.c \
+       src/dbus-common.c \
+       src/dbus-loop.c \
        src/cgroup-util.c \
-        src/pager.c
+       src/polkit.c
 
-systemd_cgls_CFLAGS = \
-       $(AM_CFLAGS)
+nodist_systemd_logind_SOURCES = \
+       src/login/logind-gperf.c
 
-systemd_cgls_LDADD = \
-       libsystemd-basic.la
+if HAVE_ACL
+systemd_logind_SOURCES += \
+       src/login/logind-acl.c \
+       src/acl-util.c
+endif
 
-systemd_nspawn_SOURCES = \
-       src/nspawn.c \
-       src/cgroup-util.c \
-        src/loopback-setup.c
+systemd_logind_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I $(top_srcdir)/src/login
 
-systemd_nspawn_CFLAGS = \
-       $(AM_CFLAGS)
+systemd_logind_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(UDEV_CFLAGS) \
+       $(ACL_CFLAGS)
 
-systemd_nspawn_LDADD = \
+systemd_logind_LDADD = \
        libsystemd-basic.la \
-       libsystemd-daemon.la
-
-systemd_stdio_bridge_SOURCES = \
-       src/bridge.c
+       libsystemd-daemon.la \
+       $(DBUS_LIBS) \
+       $(UDEV_LIBS) \
+       $(ACL_LIBS)
 
-systemd_stdio_bridge_LDADD = \
-       libsystemd-basic.la
+rootlibexec_PROGRAMS += \
+       systemd-logind
 
-systemadm_SOURCES = \
-       src/systemadm.vala \
-       src/systemd-interfaces.vala
+systemd_loginctl_SOURCES = \
+       src/login/loginctl.c \
+       src/dbus-common.c \
+       src/cgroup-show.c \
+       src/cgroup-util.c \
+       src/pager.c \
+       src/sysfs-show.c
 
-systemadm_CFLAGS = \
+systemd_loginctl_CFLAGS = \
        $(AM_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -Wno-unused-variable \
-       -Wno-unused-function \
-       -Wno-shadow \
-       -Wno-format-nonliteral
+       $(DBUS_CFLAGS) \
+       $(UDEV_CFLAGS)
 
-systemadm_VALAFLAGS = \
-       --pkg=posix \
-       --pkg=gtk+-2.0 \
-       -g
+systemd_loginctl_LDADD = \
+       libsystemd-basic.la \
+       $(DBUS_LIBS) \
+       $(UDEV_LIBS)
 
-systemadm_LDADD = \
-       $(GTK_LIBS)
+rootbin_PROGRAMS += \
+       systemd-loginctl
 
-systemd_gnome_ask_password_agent_SOURCES = \
-       src/gnome-ask-password-agent.vala
+test_login_SOURCES = \
+       src/login/test-login.c
 
-systemd_gnome_ask_password_agent_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(LIBNOTIFY_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -Wno-unused-variable \
-       -Wno-unused-function \
-       -Wno-shadow \
-       -Wno-format-nonliteral
+test_login_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-login.la
 
-systemd_gnome_ask_password_agent_VALAFLAGS = \
-       --pkg=posix \
-       --pkg=gtk+-2.0 \
-       --pkg=linux \
-       --pkg=gio-unix-2.0 \
-       --pkg=libnotify
-if LIBNOTIFY07
-systemd_gnome_ask_password_agent_VALAFLAGS += \
-       -D LIBNOTIFY07
-endif
-systemd_gnome_ask_password_agent_VALAFLAGS += \
-       -g
+noinst_PROGRAMS += \
+       test-login
 
-systemd_gnome_ask_password_agent_LDADD = \
-       $(LIBNOTIFY_LIBS) \
-       $(GTK_LIBS)
+libsystemd_login_la_SOURCES = \
+       src/login/sd-login.c \
+       src/cgroup-util.c
 
-systemd_tty_ask_password_agent_SOURCES = \
-       src/tty-ask-password-agent.c \
-       src/ask-password-api.c \
-       src/utmp-wtmp.c
+libsystemd_login_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=hidden
 
-systemd_tty_ask_password_agent_LDADD = \
+libsystemd_login_la_LDFLAGS = \
+       -shared \
+       -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
+
+libsystemd_login_la_LIBADD = \
        libsystemd-basic.la
 
+if HAVE_PAM
 pam_systemd_la_SOURCES = \
        src/pam-module.c \
-        src/dbus-common.c
+       src/dbus-common.c
 
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS) \
-        $(PAM_CFLAGS) \
-        $(DBUS_CFLAGS) \
+       $(PAM_CFLAGS) \
+       $(DBUS_CFLAGS) \
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -1493,49 +1752,11 @@ pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
        $(PAM_LIBS) \
-        $(DBUS_LIBS)
-
-libsystemd_daemon_la_SOURCES = \
-       src/sd-daemon.c
-
-libsystemd_daemon_la_CFLAGS = \
-        $(AM_CFLAGS) \
-       -fvisibility=hidden \
-        -DSD_EXPORT_SYMBOLS
-
-libsystemd_daemon_la_LDFLAGS = \
-        -shared \
-        -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-        -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-daemon-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
-       fi
-
-libsystemd-daemon-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
-
-libsystemd_login_la_SOURCES = \
-        src/sd-login.c \
-        src/cgroup-util.c
-
-libsystemd_login_la_CFLAGS = \
-        $(AM_CFLAGS) \
-       -fvisibility=hidden
-
-libsystemd_login_la_LDFLAGS = \
-        -shared \
-        -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-        -Wl,--version-script=$(top_srcdir)/src/libsystemd-login.sym
+       $(DBUS_LIBS)
 
-libsystemd_login_la_LIBADD = \
-       libsystemd-basic.la
+pamlib_LTLIBRARIES = \
+       pam_systemd.la
+endif
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-login-install-hook:
@@ -1547,9 +1768,134 @@ libsystemd-login-install-hook:
                mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
        fi
 
+INSTALL_EXEC_HOOKS += \
+       libsystemd-login-install-hook
+
 libsystemd-login-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
 
+UNINSTALL_EXEC_HOOKS += \
+       libsystemd-login-uninstall-hook
+
+nodist_systemunit_DATA += \
+       units/systemd-logind.service
+
+dist_dbussystemservice_DATA += \
+       src/login/org.freedesktop.login1.service
+
+dist_dbuspolicy_DATA += \
+       src/login/org.freedesktop.login1.conf
+
+dist_pkgsysconf_DATA += \
+       src/login/systemd-logind.conf
+
+pkginclude_HEADERS += \
+       src/login/sd-login.h
+
+lib_LTLIBRARIES += \
+       libsystemd-login.la
+
+pkgconfiglib_DATA += \
+       src/login/libsystemd-login.pc
+
+polkitpolicy_in_files += \
+       src/login/org.freedesktop.login1.policy.in
+
+logind-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.login1.service && \
+               $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f systemd-logind.service && \
+               $(LN_S) ../systemd-logind.service systemd-logind.service )
+
+INSTALL_DATA_HOOKS += \
+       logind-install-data-hook
+
+systemd_uaccess_SOURCES = \
+       src/login/uaccess.c
+
+if HAVE_ACL
+systemd_uaccess_SOURCES += \
+       src/login/logind-acl.c \
+       src/acl-util.c
+endif
+
+systemd_uaccess_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS) \
+       $(ACL_CFLAGS)
+
+systemd_uaccess_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       libsystemd-login.la \
+       $(UDEV_LIBS) \
+       $(ACL_LIBS)
+
+rootlibexec_PROGRAMS += \
+       systemd-uaccess
+
+dist_udevrules_DATA += \
+       src/70-uaccess.rules
+
+MANPAGES += \
+       man/systemd-logind.conf.5 \
+       man/sd-login.7 \
+       man/systemd-loginctl.1 \
+       man/sd_login_monitor_new.3 \
+       man/sd_pid_get_session.3 \
+       man/sd_uid_get_state.3 \
+       man/sd_session_is_active.3 \
+       man/sd_seat_get_active.3 \
+       man/sd_get_seats.3
+
+MANPAGES_ALIAS += \
+       man/sd_login_monitor_unref.3 \
+       man/sd_login_monitor_flush.3 \
+       man/sd_login_monitor_get_fd.3 \
+       man/sd_session_get_uid.3 \
+       man/sd_session_get_seat.3 \
+       man/sd_pid_get_owner_uid.3 \
+       man/sd_uid_is_on_seat.3 \
+       man/sd_uid_get_sessions.3 \
+       man/sd_uid_get_seats.3 \
+       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_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
+man/sd_session_get_uid.3: man/sd_session_is_active.3
+man/sd_session_get_seat.3: man/sd_session_is_active.3
+man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
+man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
+man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
+man/sd_uid_get_seats.3: man/sd_uid_get_state.3
+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
+
+EXTRA_DIST += \
+       src/login/logind-gperf.gperf \
+       units/systemd-logind.service.in \
+       src/login/libsystemd-login.pc.in \
+       src/login/libsystemd-login.sym \
+       src/login/logind.h \
+       src/login/logind-device.h \
+       src/login/logind-seat.h \
+       src/login/logind-session.h \
+       src/login/logind-user.h \
+       src/login/logind-acl.h
+
+CLEANFILES += \
+       src/login/logind-gperf.c
+endif
+# ------------------------------------------------------------------------------
+
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
@@ -1596,7 +1942,7 @@ src/%: src/%.m4
 
 src/load-fragment-gperf-nulstr.c: src/load-fragment-gperf.gperf
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-        $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
+       $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
 
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -1612,7 +1958,7 @@ units/%: units/%.m4 Makefile
 units/user/%: units/%.m4 Makefile
        $(M4_PROCESS_USER)
 
-CLEANFILES = \
+CLEANFILES += \
        $(nodist_systemunit_DATA) \
        $(nodist_userunit_DATA) \
        $(nodist_man_MANS) \
@@ -1620,12 +1966,11 @@ CLEANFILES = \
        $(pkgconfigdata_DATA) \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA) \
-        src/73-seat-late.rules \
-        src/99-systemd.rules \
-        src/load-fragment-gperf.gperf \
-        src/load-fragment-gperf.c \
-        src/load-fragment-gperf-nulstr.c \
-        src/logind-gperf.c
+       src/73-seat-late.rules \
+       src/99-systemd.rules \
+       src/load-fragment-gperf.gperf \
+       src/load-fragment-gperf.c \
+       src/load-fragment-gperf-nulstr.c
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1635,7 +1980,7 @@ endif
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
        --nonet \
-       --param funcsynopsis.style "'ansi'"
+       --stringparam funcsynopsis.style ansi
 
 XSLTPROC_PROCESS_MAN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -1648,11 +1993,11 @@ XSLTPROC_PROCESS_MAN_IN = \
 
 XSLTPROC_PROCESS_HTML = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) man/custom-html.xsl $<
 
 XSLTPROC_PROCESS_HTML_IN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
+       $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) man/custom-html.xsl $< && \
        mv ${@:.in=} $@
 
 man/%.1: man/%.xml
@@ -1705,25 +2050,10 @@ org.freedesktop.systemd1.%.xml: systemd
                $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
                $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
-org.freedesktop.hostname1.xml: systemd-hostnamed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-org.freedesktop.locale1.xml: systemd-localed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-org.freedesktop.timedate1.xml: systemd-timedated
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 CLEANFILES += \
        $(dbusinterface_DATA)
 
-install-data-hook:
+systemd-install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(tmpfilesdir) \
                $(DESTDIR)$(sysconfdir)/tmpfiles.d \
@@ -1734,11 +2064,6 @@ install-data-hook:
                $(DESTDIR)$(systemshutdowndir) \
                $(DESTDIR)$(systemgeneratordir) \
                $(DESTDIR)$(usergeneratordir)
-if ENABLE_BINFMT
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(prefix)/lib/binfmt.d \
-               $(DESTDIR)$(sysconfdir)/binfmt.d
-endif
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(userunitdir) \
@@ -1766,8 +2091,8 @@ endif
                rm -f user && \
                $(LN_S) $(pkgsysconfdir)/user user )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
-               $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
+               rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket && \
+               $(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
                $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
                $(LN_S) ../syslog.socket syslog.socket )
@@ -1819,17 +2144,15 @@ endif
                $(LN_S) graphical.target runlevel5.target && \
                $(LN_S) reboot.target runlevel6.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.login1.service autovt@.service && \
+               rm -f default.target ctrl-alt-del.target autovt@.service && \
                $(LN_S) graphical.target default.target && \
                $(LN_S) reboot.target ctrl-alt-del.target && \
-                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
-                $(LN_S) getty@.service autovt@.service )
+               $(LN_S) getty@.service autovt@.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path systemd-logind.service && \
+               rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
                $(LN_S) ../getty.target getty.target && \
                $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
-               $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path && \
-                $(LN_S) ../systemd-logind.service systemd-logind.service )
+               $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path)
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
                rm -f getty@tty1.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service )
@@ -1837,10 +2160,12 @@ endif
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f dev-hugepages.automount \
-                       dev-mqueue.automount \
-                       sys-kernel-debug.automount \
-                       sys-kernel-security.automount \
+               rm -f dev-hugepages.mount \
+                       dev-mqueue.mount \
+                       sys-kernel-config.mount \
+                       sys-kernel-debug.mount \
+                       sys-kernel-security.mount \
+                       sys-fs-fuse-connections.mount \
                        systemd-vconsole-setup.service \
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
@@ -1849,10 +2174,12 @@ endif
                        systemd-ask-password-console.path \
                        systemd-kmsg-syslogd.service \
                        cryptsetup.target && \
-               $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
-               $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
-               $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
-               $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
+               $(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
+               $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
+               $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
+               $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
+               $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \
+               $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
                $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
                $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
@@ -1861,28 +2188,6 @@ endif
                $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
                $(LN_S) ../systemd-kmsg-syslogd.service && \
                $(LN_S) ../cryptsetup.target cryptsetup.target )
-if ENABLE_BINFMT
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f systemd-binfmt.service \
-                       proc-sys-fs-binfmt_misc.automount && \
-               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
-               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
-endif
-if ENABLE_HOSTNAMED
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.hostname1.service && \
-               $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
-endif
-if ENABLE_TIMEDATED
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.timedate1.service  && \
-                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
-endif
-if ENABLE_LOCALED
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.locale1.service && \
-                $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
-endif
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
                $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
@@ -1934,9 +2239,6 @@ endif
 
 if TARGET_FEDORA
        $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f rc-local.service && \
-               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
        ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
@@ -1951,9 +2253,6 @@ endif
 
 if TARGET_MANDRIVA
        $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f rc-local.service && \
-               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
        ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
@@ -1975,9 +2274,6 @@ endif
 
 if TARGET_SUSE
        $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f rc-local.service && \
-               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )
@@ -1986,15 +2282,31 @@ if TARGET_SUSE
                $(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
+
 if HAVE_SYSV_COMPAT
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f var-lock.mount && \
                $(LN_S) ../var-lock.mount var-lock.mount )
 endif
 
-install-exec-hook: libsystemd-daemon-install-hook libsystemd-login-install-hook
+install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
-uninstall-hook: libsystemd-daemon-uninstall-hook libsystemd-login-uninstall-hook
+uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
+
+install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@ -2012,3 +2324,6 @@ upload: all distcheck
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+update-kbd-model-map:
+       src/generate-kbd-model-map > src/kbd-model-map