X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=6d0b51a0903389372e73be322c9870c75ad8f383;hp=4a338145f4eca4915d3c23bc0283009b7b0cc3b4;hb=816115863962548a9a0d9fbfe429c7f8e685beac;hpb=2a018e83ded29c9719b2478a65ee6245c829c0f5

diff --git a/Makefile.am b/Makefile.am
index 4a338145f..6d0b51a09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,20 +20,20 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = po
 
-LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=6
-LIBSYSTEMD_LOGIN_AGE=0
+LIBSYSTEMD_LOGIN_CURRENT=2
+LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=0
+LIBSYSTEMD_DAEMON_REVISION=1
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=0
+LIBSYSTEMD_ID128_REVISION=3
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=3
 LIBSYSTEMD_JOURNAL_AGE=0
 
 # Dirs of external packages
@@ -52,23 +52,28 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
+sysctldir=$(prefix)/lib/sysctl.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 pkgincludedir=$(includedir)/systemd
 
 # And these are the special ones for /
-rootdir=@rootdir@
-rootbindir=$(rootdir)/bin
-rootlibexecdir=$(rootdir)/lib/systemd
+rootprefix=@rootprefix@
+rootbindir=$(rootprefix)/bin
+rootlibexecdir=$(rootprefix)/lib/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemunitdir=$(rootdir)/lib/systemd/system
+systemunitdir=$(rootprefix)/lib/systemd/system
 
 CLEANFILES =
 EXTRA_DIST =
 INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 INSTALL_DATA_HOOKS =
+pkginclude_HEADERS =
+lib_LTLIBRARIES =
+pkgconfiglib_DATA =
 polkitpolicy_in_files =
+dist_udevrules_DATA =
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
@@ -81,11 +86,12 @@ AM_CPPFLAGS = \
 	-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
 	-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
 	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+	-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
 	-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
 	-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\" \
+	-DROOTPREFIX=\"$(rootprefix)\" \
 	-DRUNTIME_DIR=\"/run\" \
 	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
 	-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
@@ -93,7 +99,12 @@ AM_CPPFLAGS = \
 	-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
 	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
 	-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-	-I $(top_srcdir)/src
+        -DX_SERVER=\"$(bindir)/X\" \
+	-I $(top_srcdir)/src \
+	-I $(top_srcdir)/src/readahead \
+	-I $(top_srcdir)/src/login \
+	-I $(top_srcdir)/src/journal \
+	-I $(top_srcdir)/src/systemd
 
 if TARGET_GENTOO
 AM_CPPFLAGS += \
@@ -131,16 +142,16 @@ AM_CPPFLAGS += \
 	-DKBD_SETFONT=\"/usr/bin/setfont\" \
 	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_MAGEIA
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
 	-DKBD_SETFONT=\"/bin/setfont\" \
-	-DDEFAULT_FONT=\"latarcyrheb-sun16\"
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
-if TARGET_MAGEIA
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
 	-DKBD_SETFONT=\"/bin/setfont\" \
-	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+	-DDEFAULT_FONT=\"latarcyrheb-sun16\"
 endif
 endif
 endif
@@ -150,94 +161,41 @@ endif
 endif
 
 rootbin_PROGRAMS = \
-	systemd \
 	systemctl \
 	systemd-notify \
 	systemd-ask-password \
 	systemd-tty-ask-password-agent \
 	systemd-tmpfiles \
-	systemd-machine-id-setup \
-	systemd-journalctl
+	systemd-machine-id-setup
 
 bin_PROGRAMS = \
 	systemd-cgls \
+	systemd-cgtop \
 	systemd-stdio-bridge \
 	systemd-nspawn
 
 dist_bin_SCRIPTS = \
 	src/systemd-analyze
 
-if HAVE_GTK
-bin_PROGRAMS += \
-	systemadm \
-	systemd-gnome-ask-password-agent
-endif
-
 rootlibexec_PROGRAMS = \
-	systemd-stdout-syslog-bridge \
+	systemd \
 	systemd-cgroups-agent \
 	systemd-initctl \
 	systemd-update-utmp \
-	systemd-random-seed \
 	systemd-shutdownd \
 	systemd-shutdown \
 	systemd-modules-load \
 	systemd-remount-api-vfs \
-	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-journald
-
-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
 
-if HAVE_LIBCRYPTSETUP
-rootlibexec_PROGRAMS += \
-	systemd-cryptsetup
-
-systemgenerator_PROGRAMS += \
-	systemd-cryptsetup-generator
-endif
-
-lib_LTLIBRARIES = \
-	libsystemd-daemon.la \
-	libsystemd-id128.la \
-	libsystemd-journal.la
-
-pkginclude_HEADERS = \
-	src/sd-daemon.h \
-	src/sd-id128.h \
-	src/journal/sd-journal.h
-
 noinst_PROGRAMS = \
 	test-engine \
 	test-job-type \
@@ -248,14 +206,7 @@ noinst_PROGRAMS = \
 	test-cgroup \
 	test-env-replace \
 	test-strv \
-	test-install \
-	test-id128 \
-	test-journal
-
-if HAVE_PAM
-pamlib_LTLIBRARIES = \
-	pam_systemd.la
-endif
+	test-install
 
 dist_pkgsysconf_DATA = \
 	src/system.conf \
@@ -264,44 +215,10 @@ dist_pkgsysconf_DATA = \
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.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
-
 dist_dbussystemservice_DATA = \
 	src/org.freedesktop.systemd1.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
-
-dist_udevrules_DATA = \
-	src/71-seat.rules
-
 nodist_udevrules_DATA = \
-	src/73-seat-late.rules \
 	src/99-systemd.rules
 
 dbusinterface_DATA = \
@@ -319,21 +236,6 @@ 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/systemd-bash-completion.sh
 
@@ -361,7 +263,6 @@ dist_systemunit_DATA = \
 	units/local-fs-pre.target \
 	units/remote-fs.target \
 	units/remote-fs-pre.target \
-	units/cryptsetup.target \
 	units/network.target \
 	units/nss-lookup.target \
 	units/mail-transfer-agent.target \
@@ -378,14 +279,12 @@ dist_systemunit_DATA = \
 	units/sockets.target \
 	units/swap.target \
 	units/systemd-initctl.socket \
-	units/systemd-stdout-syslog-bridge.socket \
 	units/systemd-shutdownd.socket \
 	units/syslog.socket \
 	units/dev-hugepages.mount \
 	units/dev-mqueue.mount \
 	units/sys-kernel-config.mount \
 	units/sys-kernel-debug.mount \
-	units/sys-kernel-security.mount \
 	units/sys-fs-fuse-connections.mount \
 	units/var-run.mount \
 	units/media.mount \
@@ -394,47 +293,29 @@ 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 \
 	units/systemd-ask-password-console.path \
-	units/syslog.target \
-	units/systemd-journald.socket
+	units/syslog.target
 
 if HAVE_SYSV_COMPAT
 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-stdout-syslog-bridge.service \
 	units/systemd-shutdownd.service \
-	units/systemd-journald.service \
-	units/systemd-kmsg-syslogd.service \
 	units/systemd-modules-load.service \
-	units/systemd-vconsole-setup.service \
 	units/systemd-remount-api-vfs.service \
 	units/systemd-update-utmp-runlevel.service \
 	units/systemd-update-utmp-shutdown.service \
-	units/systemd-random-seed-save.service \
-	units/systemd-random-seed-load.service \
-	units/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 \
 	units/systemd-ask-password-wall.service \
 	units/systemd-ask-password-console.service \
 	units/systemd-sysctl.service \
@@ -444,30 +325,9 @@ nodist_systemunit_DATA = \
 	units/kexec.service \
 	units/fsck@.service \
 	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
-
 dist_userunit_DATA = \
 	units/user/default.target \
 	units/user/exit.target
@@ -481,23 +341,13 @@ EXTRA_DIST += \
 	units/console-shell.service.m4 \
 	units/rescue.service.m4 \
 	units/systemd-initctl.service.in \
-	units/systemd-stdout-syslog-bridge.service.in \
 	units/systemd-shutdownd.service.in \
-	units/systemd-journald.service.in \
-	units/systemd-kmsg-syslogd.service.in \
 	units/systemd-modules-load.service.in \
-	units/systemd-vconsole-setup.service.in \
 	units/systemd-remount-api-vfs.service.in \
 	units/systemd-update-utmp-runlevel.service.in \
 	units/systemd-update-utmp-shutdown.service.in \
-	units/systemd-random-seed-save.service.in \
-	units/systemd-random-seed-load.service.in \
-	units/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 \
 	units/systemd-ask-password-wall.service.in \
 	units/systemd-ask-password-console.service.in \
 	units/systemd-sysctl.service.in \
@@ -508,40 +358,12 @@ EXTRA_DIST += \
 	units/user/exit.service.in \
 	units/fsck@.service.in \
 	units/fsck-root.service.in \
-	units/quotacheck.service.in \
 	units/user@.service.in \
-	systemd.pc.in \
-	libsystemd-daemon.pc.in \
-	libsystemd-id128.pc.in \
-	libsystemd-journal.pc.in \
-	src/libsystemd-daemon.sym \
-	src/libsystemd-id128.sym \
-	src/journal/libsystemd-journal.sym \
+	src/systemd.pc.in \
 	introspect.awk \
-	src/73-seat-late.rules.in \
 	src/99-systemd.rules.in \
 	man/custom-html.xsl
 
-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
-
 if TARGET_FEDORA
 dist_systemunit_DATA += \
 	units/fedora/prefdm.service \
@@ -603,35 +425,12 @@ endif
 
 dist_doc_DATA = \
 	README \
+        NEWS \
 	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-id128.pc \
-	libsystemd-journal.pc
-
-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
+	src/systemd.pc
 
 # First passed through sed, followed by intltool
 polkitpolicy_in_in_files = \
@@ -662,7 +461,8 @@ libsystemd_basic_la_SOURCES = \
 	src/socket-util.c \
 	src/log.c \
 	src/ratelimit.c \
-	src/exit-status.c
+	src/exit-status.c \
+        src/utf8.c
 
 libsystemd_basic_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -710,6 +510,7 @@ libsystemd_core_la_SOURCES = \
 	src/mount-setup.c \
 	src/hostname-setup.c \
 	src/selinux-setup.c \
+	src/ima-setup.c \
 	src/loopback-setup.c \
 	src/kmod-setup.c \
 	src/locale-setup.c \
@@ -740,7 +541,8 @@ libsystemd_core_la_CFLAGS = \
 	$(UDEV_CFLAGS) \
 	$(LIBWRAP_CFLAGS) \
 	$(PAM_CFLAGS) \
-	$(AUDIT_CFLAGS)
+	$(AUDIT_CFLAGS) \
+	$(KMOD_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
 	libsystemd-basic.la \
@@ -749,16 +551,76 @@ libsystemd_core_la_LIBADD = \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS) \
 	$(AUDIT_LIBS) \
-	$(CAP_LIBS)
+	$(CAP_LIBS) \
+	$(KMOD_LIBS)
 
 # This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs.  We therefore can't
+# rules for C programs, but not Vala programs.	We therefore can't
 # list the .h files as dependencies if we want make dist to work.
 
 EXTRA_DIST += \
-	${libsystemd_basic_la_SOURCES:.c=.h} \
-	${libsystemd_core_la_SOURCES:.c=.h} \
-	${libsystemd_daemon_la_SOURCES:.c=.h} \
+	src/util.h \
+	src/virt.h \
+	src/label.h \
+	src/hashmap.h \
+	src/set.h \
+	src/strv.h \
+	src/conf-parser.h \
+	src/socket-util.h \
+	src/log.h \
+	src/ratelimit.h \
+	src/exit-status.h \
+	src/unit.h \
+	src/job.h \
+	src/manager.h \
+	src/path-lookup.h \
+	src/load-fragment.h \
+	src/service.h \
+	src/automount.h \
+	src/mount.h \
+	src/swap.h \
+	src/device.h \
+	src/target.h \
+	src/snapshot.h \
+	src/socket.h \
+	src/timer.h \
+	src/path.h \
+	src/load-dropin.h \
+	src/execute.h \
+	src/utmp-wtmp.h \
+	src/dbus.h \
+	src/dbus-manager.h \
+	src/dbus-unit.h \
+	src/dbus-job.h \
+	src/dbus-service.h \
+	src/dbus-socket.h \
+	src/dbus-timer.h \
+	src/dbus-target.h \
+	src/dbus-mount.h \
+	src/dbus-automount.h \
+	src/dbus-swap.h \
+	src/dbus-snapshot.h \
+	src/dbus-device.h \
+	src/dbus-execute.h \
+	src/dbus-path.h \
+	src/cgroup.h \
+	src/mount-setup.h \
+	src/hostname-setup.h \
+	src/selinux-setup.h \
+	src/loopback-setup.h \
+	src/kmod-setup.h \
+	src/locale-setup.h \
+	src/machine-id-setup.h \
+	src/specifier.h \
+	src/unit-name.h \
+	src/fdset.h \
+	src/namespace.h \
+	src/tcpwrap.h \
+	src/cgroup-util.h \
+	src/condition.h \
+	src/dbus-common.h \
+	src/install.h \
+	src/cgroup-attr.h \
 	src/macro.h \
 	src/def.h \
 	src/ioprio.h \
@@ -768,7 +630,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 \
@@ -776,34 +637,24 @@ 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/dbus-loop.h \
 	src/spawn-agent.h \
-	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/acl-util.h
+	src/acl-util.h \
+	src/logs-show.h \
+        src/utf8.h
 
 MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
-	man/systemadm.1 \
 	man/systemd-cgls.1 \
+	man/systemd-cgtop.1 \
 	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 \
@@ -816,9 +667,8 @@ MANPAGES = \
 	man/systemd.device.5 \
 	man/systemd.snapshot.5 \
 	man/systemd.exec.5 \
+	man/systemd.special.7 \
 	man/daemon.7 \
-	man/sd-daemon.7 \
-	man/sd-readahead.7 \
 	man/runlevel.8 \
 	man/telinit.8 \
 	man/halt.8 \
@@ -829,87 +679,43 @@ MANPAGES = \
 	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/modules-load.d.5 \
 	man/sysctl.d.5 \
 	man/systemd-ask-password.1 \
-	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
-
-if ENABLE_BINFMT
-MANPAGES += \
-	man/binfmt.d.5
-endif
+	man/systemd-cat.1 \
+        man/systemd-machine-id-setup.1 \
+        man/systemd-journald.conf.5 \
+        man/systemd-journalctl.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_is_mq.3 \
-	man/sd_notifyf.3 \
-	man/init.1 \
-	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/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_is_mq.3: man/sd_is_fifo.3
-man/sd_notifyf.3: man/sd_notify.3
 man/init.1: man/systemd.1
-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
-
-dist_man_MANS = \
-	$(MANPAGES) \
-	$(MANPAGES_ALIAS)
-
-nodist_man_MANS = \
-	man/systemd.special.7
 
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
 
-XML_IN_FILES = \
-	${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}}
+if ENABLE_MANPAGES
+man_MANS = \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
 
-dist_noinst_DATA = \
+noinst_DATA = \
 	${XML_FILES:.xml=.html}
-
-nodist_noinst_DATA = \
-	${XML_IN_FILES:.xml.in=.html}
+endif
 
 EXTRA_DIST += \
 	$(XML_FILES) \
-	$(XML_IN_FILES) \
-	${nodist_man_MANS:=.in} \
-	${XML_IN_FILES:.xml.in=.html.in}
+	${XML_FILES:.xml=.html} \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
 
 systemd_SOURCES = \
 	src/main.c
@@ -965,18 +771,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
 
@@ -984,9 +784,6 @@ test_strv_SOURCES = \
 	src/test-strv.c \
 	src/specifier.c
 
-test_strv_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_strv_LDADD = \
 	libsystemd-basic.la
 
@@ -1003,111 +800,18 @@ test_install_CFLAGS = \
 test_install_LDADD = \
 	libsystemd-basic.la
 
-test_id128_SOURCES = \
-	src/test-id128.c \
-	src/sd-id128.c
+systemd_initctl_SOURCES = \
+	src/initctl.c \
+	src/dbus-common.c
 
-test_id128_CFLAGS = \
-	$(AM_CFLAGS)
+systemd_initctl_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
 
-test_id128_LDADD = \
-	libsystemd-basic.la
-
-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_CFLAGS = \
-	$(AM_CFLAGS)
-
-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
-
-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_CFLAGS = \
-	$(AM_CFLAGS)
-
-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
-
-systemd_stdout_syslog_bridge_SOURCES = \
-	src/stdout-syslog-bridge.c \
-	src/tcpwrap.c
-
-systemd_stdout_syslog_bridge_LDADD = \
-	libsystemd-basic.la \
-	libsystemd-daemon.la \
-	$(LIBWRAP_LIBS)
-
-systemd_initctl_SOURCES = \
-	src/initctl.c \
-	src/dbus-common.c
-
-systemd_initctl_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-systemd_initctl_LDADD = \
-	libsystemd-basic.la \
-	libsystemd-daemon.la \
-	$(DBUS_LIBS)
+systemd_initctl_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(DBUS_LIBS)
 
 systemd_update_utmp_SOURCES = \
 	src/update-utmp.c \
@@ -1124,15 +828,6 @@ systemd_update_utmp_LDADD = \
 	$(DBUS_LIBS) \
 	$(AUDIT_LIBS)
 
-systemd_random_seed_SOURCES = \
-	src/random-seed.c
-
-systemd_random_seed_CFLAGS = \
-	$(AM_CFLAGS)
-
-systemd_random_seed_LDADD = \
-	libsystemd-basic.la
-
 systemd_shutdownd_SOURCES = \
 	src/utmp-wtmp.c \
 	src/shutdownd.c
@@ -1144,626 +839,1028 @@ systemd_shutdownd_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la
 
-systemd_hostnamed_SOURCES = \
-	src/hostnamed.c \
-	src/dbus-common.c \
-	src/polkit.c
+systemd_shutdown_SOURCES = \
+	src/mount-setup.c \
+	src/umount.c \
+	src/shutdown.c
 
-systemd_hostnamed_CFLAGS = \
+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_CFLAGS = \
+	$(KMOD_CFLAGS)
 
-systemd_localed_LDADD = \
+systemd_modules_load_LDADD = \
 	libsystemd-basic.la \
-	libsystemd-daemon.la \
-	$(DBUS_LIBS)
-
-dist_pkgdata_DATA = \
-	src/kbd-model-map
-
-dist_noinst_SCRIPT = \
-	src/generate-kbd-model-map
+	$(KMOD_LIBS)
 
-systemd_timedated_SOURCES = \
-	src/timedated.c \
-	src/dbus-common.c \
-	src/polkit.c
+systemd_tmpfiles_SOURCES = \
+	src/tmpfiles.c
 
-systemd_timedated_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
+systemd_tmpfiles_LDADD = \
+	libsystemd-basic.la
 
-systemd_timedated_LDADD = \
-	libsystemd-basic.la \
-	libsystemd-daemon.la \
-	$(DBUS_LIBS)
+systemd_machine_id_setup_SOURCES = \
+	src/machine-id-setup.c \
+	src/machine-id-main.c \
+	src/sd-id128.c
 
-# ------------------------------------------------------------------------------
-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/polkit.c
+systemd_machine_id_setup_LDADD = \
+	libsystemd-basic.la
 
-nodist_systemd_logind_SOURCES = \
-	src/login/logind-gperf.c
+systemd_sysctl_SOURCES = \
+	src/sysctl.c
 
-if HAVE_ACL
-systemd_logind_SOURCES += \
-	src/login/logind-acl.c \
-	src/acl-util.c
-endif
+systemd_sysctl_LDADD = \
+	libsystemd-basic.la
 
-systemd_logind_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-I $(top_srcdir)/src/login
+systemd_fsck_SOURCES = \
+	src/fsck.c \
+	src/dbus-common.c
 
-systemd_logind_CFLAGS = \
+systemd_fsck_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(UDEV_CFLAGS) \
-	$(ACL_CFLAGS)
+	$(DBUS_CFLAGS)
 
-systemd_logind_LDADD = \
+systemd_fsck_LDADD = \
 	libsystemd-basic.la \
-	libsystemd-daemon.la \
-	$(DBUS_LIBS) \
 	$(UDEV_LIBS) \
-	$(ACL_LIBS)
+	$(DBUS_LIBS)
 
-rootlibexec_PROGRAMS += \
-	systemd-logind
+systemd_timestamp_SOURCES = \
+	src/timestamp.c
 
-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
+systemd_timestamp_LDADD = \
+	libsystemd-basic.la
 
-systemd_loginctl_CFLAGS = \
+systemd_ac_power_SOURCES = \
+	src/ac-power.c
+
+systemd_ac_power_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(UDEV_CFLAGS)
 
-systemd_loginctl_LDADD = \
+systemd_ac_power_LDADD = \
 	libsystemd-basic.la \
-	$(DBUS_LIBS) \
 	$(UDEV_LIBS)
 
-rootbin_PROGRAMS += \
-	systemd-loginctl
+systemd_detect_virt_SOURCES = \
+	src/detect-virt.c
 
-test_login_SOURCES = \
-	src/login/test-login.c
+systemd_detect_virt_LDADD = \
+	libsystemd-basic.la
 
-test_login_LDADD = \
-	libsystemd-basic.la \
-	libsystemd-login.la
+systemd_getty_generator_SOURCES = \
+	src/getty-generator.c \
+	src/unit-name.c
 
-noinst_PROGRAMS += \
-	test-login
+systemd_getty_generator_LDADD = \
+	libsystemd-basic.la
 
-libsystemd_login_la_SOURCES = \
-	src/login/sd-login.c \
-	src/cgroup-util.c
+systemd_rc_local_generator_SOURCES = \
+	src/rc-local-generator.c
 
-libsystemd_login_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-fvisibility=hidden
+systemd_rc_local_generator_LDADD = \
+	libsystemd-basic.la
 
-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
+systemd_remount_api_vfs_SOURCES = \
+	src/remount-api-vfs.c \
+	src/mount-setup.c \
+	src/exit-status.c
 
-libsystemd_login_la_LIBADD = \
+systemd_remount_api_vfs_LDADD = \
 	libsystemd-basic.la
 
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-login-install-hook:
-	if test "$(libdir)" != "$(rootlibdir)"; then \
-		mkdir -p $(DESTDIR)$(rootlibdir) && \
-		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.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-login.so && \
-		mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
-	fi
+systemd_cgroups_agent_SOURCES = \
+	src/cgroups-agent.c \
+	src/dbus-common.c
 
-INSTALL_EXEC_HOOKS += \
-	libsystemd-login-install-hook
+systemd_cgroups_agent_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
 
-libsystemd-login-uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
+systemd_cgroups_agent_LDADD = \
+	libsystemd-basic.la \
+	$(DBUS_LIBS)
+
+systemctl_SOURCES = \
+	src/systemctl.c \
+	src/utmp-wtmp.c \
+	src/dbus-common.c \
+	src/path-lookup.c \
+	src/cgroup-show.c \
+	src/cgroup-util.c \
+	src/exit-status.c \
+	src/unit-name.c \
+	src/pager.c \
+	src/install.c \
+	src/spawn-agent.c \
+	src/logs-show.c
+
+systemctl_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+systemctl_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	libsystemd-journal.la \
+	libsystemd-id128.la \
+	$(DBUS_LIBS)
+
+systemd_notify_SOURCES = \
+	src/notify.c \
+	src/readahead/sd-readahead.c
+
+systemd_notify_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la
+
+systemd_ask_password_SOURCES = \
+	src/ask-password.c \
+	src/ask-password-api.c
+
+systemd_ask_password_LDADD = \
+	libsystemd-basic.la
+
+systemd_reply_password_SOURCES = \
+	src/reply-password.c
+
+systemd_reply_password_LDADD = \
+	libsystemd-basic.la
+
+systemd_cgls_SOURCES = \
+	src/cgls.c \
+	src/cgroup-show.c \
+	src/cgroup-util.c \
+	src/pager.c
+
+systemd_cgls_LDADD = \
+	libsystemd-basic.la
+
+systemd_cgtop_SOURCES = \
+	src/cgtop.c \
+        src/cgroup-util.c
+
+systemd_cgtop_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
+
+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
+
+# ------------------------------------------------------------------------------
+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/systemd/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-login-uninstall-hook
+	libsystemd-daemon-uninstall-hook
 
-nodist_systemunit_DATA += \
-	units/systemd-logind.service
+lib_LTLIBRARIES += \
+	libsystemd-daemon.la
 
-dist_dbussystemservice_DATA += \
-	src/login/org.freedesktop.login1.service
+pkgconfiglib_DATA += \
+	src/libsystemd-daemon.pc
 
-dist_dbuspolicy_DATA += \
-	src/login/org.freedesktop.login1.conf
+MANPAGES += \
+	man/sd-daemon.7 \
+	man/sd_notify.3 \
+	man/sd_listen_fds.3 \
+	man/sd_is_fifo.3 \
+	man/sd_booted.3
 
-dist_pkgsysconf_DATA += \
-	src/login/systemd-logind.conf
+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 += \
+	src/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/login/sd-login.h
+	src/systemd/sd-id128.h
 
 lib_LTLIBRARIES += \
-	libsystemd-login.la
+	libsystemd-id128.la
+
+pkgconfiglib_DATA += \
+	src/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 += \
+	src/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/cgroup-util.c
+
+if HAVE_ACL
+systemd_journald_SOURCES += \
+	src/acl-util.c
+endif
+
+nodist_systemd_journald_SOURCES = \
+	src/journal/journald-gperf.c
+
+systemd_journald_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(ACL_CFLAGS)
+
+systemd_journald_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	libsystemd-login.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_cat_SOURCES = \
+	src/journal/cat.c
+
+systemd_cat_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-journal.la
+
+systemd_journalctl_SOURCES = \
+	src/journal/journalctl.c \
+	src/pager.c \
+	src/logs-show.c
+
+systemd_journalctl_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-journal.la \
+	libsystemd-id128.la
+
+if HAVE_XZ
+systemd_journalctl_SOURCES += \
+	src/journal/compress.c
+systemd_journalctl_CFLAGS = \
+	$(AM_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 = \
+	$(AM_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/lookup3.c \
+	src/journal/journal-send.c
+
+libsystemd_journal_la_CFLAGS = \
+	$(AM_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
+
+if HAVE_XZ
+libsystemd_journal_la_SOURCES += \
+	src/journal/compress.c
+
+libsystemd_journal_la_CFLAGS += \
+	$(XZ_CFLAGS)
+
+libsystemd_journal_la_LIBADD += \
+	$(XZ_LIBS)
+endif
+
+# 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/systemd/sd-journal.h \
+	src/systemd/sd-messages.h
+
+lib_LTLIBRARIES += \
+	libsystemd-journal.la
+
+rootlibexec_PROGRAMS += \
+	systemd-journald
+
+rootbin_PROGRAMS += \
+	systemd-journalctl
+
+bin_PROGRAMS += \
+	systemd-cat
+
+dist_systemunit_DATA += \
+	units/systemd-journald.socket
+
+nodist_systemunit_DATA += \
+	units/systemd-journald.service
+
+dist_pkgsysconf_DATA += \
+	src/journal/systemd-journald.conf
+
+pkgconfiglib_DATA += \
+	src/journal/libsystemd-journal.pc
+
+journal-install-data-hook:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
+		$(DESTDIR)$(systemunitdir)/sysinit.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
+		rm -f systemd-journald.socket && \
+		$(LN_S) ../systemd-journald.socket )
+	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+		rm -f systemd-journald.service && \
+		$(LN_S) ../systemd-journald.service )
+
+INSTALL_DATA_HOOKS += \
+	journal-install-data-hook
+
+EXTRA_DIST += \
+	src/journal/journald.h \
+	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 \
+	src/journal/journald-gperf.gperf
+
+CLEANFILES += \
+	src/journal/journald-gperf.c
 
-pkgconfiglib_DATA += \
-	libsystemd-login.pc
+# ------------------------------------------------------------------------------
+if ENABLE_COREDUMP
+systemd_coredump_SOURCES = \
+	src/journal/coredump.c
 
-polkitpolicy_in_files += \
-	src/login/org.freedesktop.login1.policy.in
+systemd_coredump_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-journal.la \
+	libsystemd-login.la
 
-logind-install-data:
-	( 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 )
+rootlibexec_PROGRAMS += \
+	systemd-coredump
 
-INSTALL_DATA_HOOKS += \
-	logind-install-data
+sysctl_DATA = \
+	sysctl.d/coredump.conf
 
-systemd_uaccess_SOURCES = \
-	src/login/uaccess.c
+EXTRA_DIST += \
+	sysctl.d/coredump.conf.in
 
-if HAVE_ACL
-systemd_uaccess_SOURCES += \
-	src/login/logind-acl.c \
-	src/acl-util.c
+CLEANFILES += \
+	sysctl.d/coredump.conf
 endif
 
-systemd_uaccess_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(UDEV_CFLAGS) \
-	$(ACL_CFLAGS)
+# ------------------------------------------------------------------------------
+if ENABLE_BINFMT
+systemd_binfmt_SOURCES = \
+	src/binfmt/binfmt.c
 
-systemd_uaccess_LDADD = \
-	libsystemd-basic.la \
-	libsystemd-daemon.la \
-	libsystemd-login.la \
-	$(UDEV_LIBS) \
-	$(ACL_LIBS)
+systemd_binfmt_LDADD = \
+	libsystemd-basic.la
 
 rootlibexec_PROGRAMS += \
-	systemd-uaccess
+	systemd-binfmt
 
-dist_udevrules_DATA += \
-	src/70-uaccess.rules
+dist_systemunit_DATA += \
+	units/proc-sys-fs-binfmt_misc.automount \
+	units/proc-sys-fs-binfmt_misc.mount
 
-MANPAGES += \
-	man/systemd-logind.conf.5 \
-	man/sd-login.7 \
-	man/systemd-loginctl.1 \
-	man/sd_login_monitor_new.3
+nodist_systemunit_DATA += \
+	units/systemd-binfmt.service
 
-MANPAGES_ALIAS += \
-	man/sd_login_monitor_unref.3 \
-	man/sd_login_monitor_flush.3 \
-	man/sd_login_monitor_get_fd.3
+binfmt-install-data-hook:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(prefix)/lib/binfmt.d \
+		$(DESTDIR)$(sysconfdir)/binfmt.d \
+		$(DESTDIR)$(systemunitdir)/sysinit.target.wants
+	( 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 )
 
-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
+INSTALL_DATA_HOOKS += \
+	binfmt-install-data-hook
 
-EXTRA_DIST += \
-	src/login/logind-gperf.gperf \
-	units/systemd-logind.service.in \
-	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
+MANPAGES += \
+	man/binfmt.d.5
 
-CLEANFILES += \
-	src/login/logind-gperf.c
+EXTRA_DIST += \
+	units/systemd-binfmt.service.in
 endif
+
 # ------------------------------------------------------------------------------
+if ENABLE_VCONSOLE
+systemd_vconsole_setup_SOURCES = \
+	src/vconsole/vconsole-setup.c
 
-systemd_shutdown_SOURCES = \
-	src/mount-setup.c \
-	src/umount.c \
-	src/shutdown.c
+systemd_vconsole_setup_LDADD = \
+	libsystemd-basic.la
 
-systemd_shutdown_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(UDEV_CFLAGS)
+rootlibexec_PROGRAMS += \
+	systemd-vconsole-setup
 
-systemd_shutdown_LDADD = \
-	libsystemd-basic.la \
-	$(UDEV_LIBS)
+nodist_systemunit_DATA += \
+	units/systemd-vconsole-setup.service
 
-systemd_modules_load_SOURCES = \
-	src/modules-load.c
+vconsole-install-data-hook:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(systemunitdir)/sysinit.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+		rm -f systemd-vconsole-setup.service && \
+		$(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service )
 
-systemd_modules_load_CFLAGS = \
-	$(AM_CFLAGS)
+INSTALL_DATA_HOOKS += \
+	vconsole-install-data-hook
 
-systemd_modules_load_LDADD = \
-	libsystemd-basic.la
+MANPAGES += \
+	man/vconsole.conf.5
 
-systemd_tmpfiles_SOURCES = \
-	src/tmpfiles.c
+EXTRA_DIST += \
+	units/systemd-vconsole-setup.service.in
+endif
 
-systemd_tmpfiles_CFLAGS = \
-	$(AM_CFLAGS)
+# ------------------------------------------------------------------------------
+if ENABLE_READAHEAD
+systemd_readahead_collect_SOURCES = \
+	src/readahead/readahead-collect.c \
+	src/readahead/readahead-common.c
 
-systemd_tmpfiles_LDADD = \
-	libsystemd-basic.la
+systemd_readahead_collect_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(UDEV_LIBS)
 
-systemd_machine_id_setup_SOURCES = \
-	src/machine-id-setup.c \
-	src/machine-id-main.c \
-	src/sd-id128.c
+systemd_readahead_collect_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(UDEV_CFLAGS)
 
-systemd_machine_id_setup_CFLAGS = \
-	$(AM_CFLAGS)
+systemd_readahead_replay_SOURCES = \
+	src/readahead/readahead-replay.c \
+	src/readahead/readahead-common.c
 
-systemd_machine_id_setup_LDADD = \
-	libsystemd-basic.la
+systemd_readahead_replay_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(UDEV_CFLAGS)
 
-systemd_sysctl_SOURCES = \
-	src/sysctl.c
+systemd_readahead_replay_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(UDEV_LIBS)
 
-systemd_sysctl_CFLAGS = \
-	$(AM_CFLAGS)
+rootlibexec_PROGRAMS += \
+	systemd-readahead-collect \
+	systemd-readahead-replay
 
-systemd_sysctl_LDADD = \
-	libsystemd-basic.la
+dist_systemunit_DATA += \
+	units/systemd-readahead-done.timer
 
-systemd_binfmt_SOURCES = \
-	src/binfmt.c
+nodist_systemunit_DATA += \
+	units/systemd-readahead-collect.service \
+	units/systemd-readahead-replay.service \
+	units/systemd-readahead-done.service
 
-systemd_binfmt_CFLAGS = \
-	$(AM_CFLAGS)
+EXTRA_DIST += \
+	src/systemd/sd-readahead.h \
+	src/readahead/readahead-common.h \
+	units/systemd-readahead-collect.service.in \
+	units/systemd-readahead-replay.service.in \
+	units/systemd-readahead-done.service.in
 
-systemd_binfmt_LDADD = \
-	libsystemd-basic.la
+MANPAGES += \
+	man/sd_readahead.3 \
+	man/sd-readahead.7
+endif
 
-systemd_fsck_SOURCES = \
-	src/fsck.c \
-	src/dbus-common.c
+# ------------------------------------------------------------------------------
+if ENABLE_QUOTACHECK
+rootlibexec_PROGRAMS += \
+	systemd-quotacheck
 
-systemd_fsck_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(UDEV_CFLAGS) \
-	$(DBUS_CFLAGS)
+nodist_systemunit_DATA += \
+	units/quotacheck.service
 
-systemd_fsck_LDADD = \
-	libsystemd-basic.la \
-	$(UDEV_LIBS) \
-	$(DBUS_LIBS)
+EXTRA_DIST += \
+	units/quotacheck.service.in
 
 systemd_quotacheck_SOURCES = \
 	src/quotacheck.c
 
-systemd_quotacheck_CFLAGS = \
-	$(AM_CFLAGS)
-
 systemd_quotacheck_LDADD = \
 	libsystemd-basic.la
+endif
 
-systemd_timestamp_SOURCES = \
-	src/timestamp.c
+# ------------------------------------------------------------------------------
+if ENABLE_RANDOMSEED
+rootlibexec_PROGRAMS += \
+	systemd-random-seed
 
-systemd_timestamp_CFLAGS = \
-	$(AM_CFLAGS)
+nodist_systemunit_DATA += \
+	units/systemd-random-seed-save.service \
+	units/systemd-random-seed-load.service
 
-systemd_timestamp_LDADD = \
-	libsystemd-basic.la
+EXTRA_DIST += \
+	units/systemd-random-seed-save.service.in \
+	units/systemd-random-seed-load.service.in
 
-systemd_ac_power_SOURCES = \
-	src/ac-power.c
+systemd_random_seed_SOURCES = \
+	src/random-seed.c
 
-systemd_ac_power_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(UDEV_CFLAGS)
+systemd_random_seed_LDADD = \
+	libsystemd-basic.la
 
-systemd_ac_power_LDADD = \
-	libsystemd-basic.la \
-	$(UDEV_LIBS)
+randomseed-install-data-hook:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+		$(DESTDIR)$(systemunitdir)/sysinit.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
+		rm -f systemd-random-seed-save.service && \
+		$(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
+	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+		rm -f systemd-random-seed-load.service && \
+		$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service )
 
-systemd_detect_virt_SOURCES = \
-	src/detect-virt.c
+INSTALL_DATA_HOOKS += \
+	randomseed-install-data-hook
+endif
 
-systemd_detect_virt_CFLAGS = \
-	$(AM_CFLAGS)
+# ------------------------------------------------------------------------------
+if HAVE_LIBCRYPTSETUP
+rootlibexec_PROGRAMS += \
+	systemd-cryptsetup
 
-systemd_detect_virt_LDADD = \
-	libsystemd-basic.la
+systemgenerator_PROGRAMS += \
+	systemd-cryptsetup-generator
+
+dist_systemunit_DATA += \
+	units/cryptsetup.target
 
 systemd_cryptsetup_SOURCES = \
-	src/cryptsetup.c \
+	src/cryptsetup/cryptsetup.c \
 	src/ask-password-api.c
 
 systemd_cryptsetup_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(LIBCRYPTSETUP_CFLAGS) \
-	$(UDEV_CFLAGS) \
-	$(AM_CFLAGS)
+	$(UDEV_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
 	$(LIBCRYPTSETUP_LIBS) \
 	$(UDEV_LIBS) \
 	libsystemd-basic.la
 
-systemd_cryptsetup_generator_SOURCES = \
-	src/cryptsetup-generator.c \
-	src/unit-name.c
+systemd_cryptsetup_generator_SOURCES = \
+	src/cryptsetup/cryptsetup-generator.c \
+	src/unit-name.c
+
+systemd_cryptsetup_generator_LDADD = \
+	libsystemd-basic.la
+
+cryptsetup-install-data-hook:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(systemunitdir)/sysinit.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+		rm -f cryptsetup.target && \
+		$(LN_S) ../cryptsetup.target cryptsetup.target )
+
+INSTALL_DATA_HOOKS += \
+	cryptsetup-install-data-hook
+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
 
-systemd_cryptsetup_generator_CFLAGS = \
-	$(AM_CFLAGS)
+polkitpolicy_in_files += \
+	src/hostname/org.freedesktop.hostname1.policy.in
 
-systemd_cryptsetup_generator_LDADD = \
-	libsystemd-basic.la
+dbusinterface_DATA += \
+	org.freedesktop.hostname1.xml
 
-systemd_getty_generator_SOURCES = \
-	src/getty-generator.c \
-	src/unit-name.c
+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
 
-systemd_getty_generator_CFLAGS = \
-	$(AM_CFLAGS)
+hostnamed-install-data-hook:
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f dbus-org.freedesktop.hostname1.service && \
+		$(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
 
-systemd_getty_generator_LDADD = \
-	libsystemd-basic.la
+INSTALL_DATA_HOOKS += \
+	hostnamed-install-data-hook
 
-systemd_rc_local_generator_SOURCES = \
-	src/rc-local-generator.c
+EXTRA_DIST += \
+	units/systemd-hostnamed.service.in
+endif
 
-systemd_rc_local_generator_CFLAGS = \
-	$(AM_CFLAGS)
+# ------------------------------------------------------------------------------
+if ENABLE_LOCALED
+systemd_localed_SOURCES = \
+	src/locale/localed.c \
+	src/dbus-common.c \
+	src/polkit.c
 
-systemd_rc_local_generator_LDADD = \
-	libsystemd-basic.la
+systemd_localed_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
 
-systemd_user_sessions_SOURCES = \
-	src/user-sessions.c \
-	src/cgroup-util.c
+systemd_localed_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(DBUS_LIBS)
 
-systemd_user_sessions_CFLAGS = \
-	$(AM_CFLAGS)
+nodist_systemunit_DATA += \
+	units/systemd-localed.service
 
-systemd_user_sessions_LDADD = \
-	libsystemd-basic.la
+rootlibexec_PROGRAMS += \
+	systemd-localed
 
-systemd_vconsole_setup_SOURCES = \
-	src/vconsole-setup.c
+dist_dbuspolicy_DATA += \
+	src/locale/org.freedesktop.locale1.conf
 
-systemd_vconsole_setup_CFLAGS = \
-	$(AM_CFLAGS)
+dist_dbussystemservice_DATA += \
+	src/locale/org.freedesktop.locale1.service
 
-systemd_vconsole_setup_LDADD = \
-	libsystemd-basic.la
+polkitpolicy_in_files += \
+	src/locale/org.freedesktop.locale1.policy.in
 
-systemd_remount_api_vfs_SOURCES = \
-	src/remount-api-vfs.c \
-	src/mount-setup.c \
-	src/exit-status.c
+dbusinterface_DATA += \
+	org.freedesktop.locale1.xml
 
-systemd_remount_api_vfs_CFLAGS = \
-	$(AM_CFLAGS)
+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
 
-systemd_remount_api_vfs_LDADD = \
-	libsystemd-basic.la
+localed-install-data-hook:
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f dbus-org.freedesktop.locale1.service && \
+		$(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
 
-systemd_cgroups_agent_SOURCES = \
-	src/cgroups-agent.c \
-	src/dbus-common.c
+INSTALL_DATA_HOOKS += \
+	localed-install-data-hook
 
-systemd_cgroups_agent_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
+EXTRA_DIST += \
+	units/systemd-localed.service.in
 
-systemd_cgroups_agent_LDADD = \
-	libsystemd-basic.la \
-	$(DBUS_LIBS)
+dist_pkgdata_DATA = \
+	src/locale/kbd-model-map
 
-systemd_kmsg_syslogd_SOURCES = \
-	src/kmsg-syslogd.c \
-	src/fdset.c
+dist_noinst_SCRIPT = \
+	src/locale/generate-kbd-model-map
 
-systemd_kmsg_syslogd_CFLAGS = \
-	$(AM_CFLAGS)
+update-kbd-model-map:
+	src/locale/generate-kbd-model-map > src/locale/kbd-model-map
 
-systemd_kmsg_syslogd_LDADD = \
-	libsystemd-basic.la \
-	libsystemd-daemon.la
+endif
 
-systemctl_SOURCES = \
-	src/systemctl.c \
-	src/utmp-wtmp.c \
+# ------------------------------------------------------------------------------
+if ENABLE_TIMEDATED
+systemd_timedated_SOURCES = \
+	src/timedate/timedated.c \
 	src/dbus-common.c \
-	src/path-lookup.c \
-	src/cgroup-show.c \
-	src/cgroup-util.c \
-	src/exit-status.c \
-	src/unit-name.c \
-	src/pager.c \
-	src/install.c \
-	src/spawn-agent.c
+	src/polkit.c
 
-systemctl_CFLAGS = \
+systemd_timedated_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
-systemctl_LDADD = \
+systemd_timedated_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la \
 	$(DBUS_LIBS)
 
-systemd_notify_SOURCES = \
-	src/notify.c \
-	src/sd-readahead.c
+rootlibexec_PROGRAMS += \
+	systemd-timedated
 
-systemd_notify_LDADD = \
-	libsystemd-basic.la \
-	libsystemd-daemon.la
+dist_dbussystemservice_DATA += \
+	src/timedate/org.freedesktop.timedate1.service
 
-systemd_ask_password_SOURCES = \
-	src/ask-password.c \
-	src/ask-password-api.c
+dist_dbuspolicy_DATA += \
+	src/timedate/org.freedesktop.timedate1.conf
 
-systemd_ask_password_LDADD = \
-	libsystemd-basic.la
+nodist_systemunit_DATA += \
+	units/systemd-timedated.service
 
-systemd_reply_password_SOURCES = \
-	src/reply-password.c
+polkitpolicy_in_files += \
+	src/timedate/org.freedesktop.timedate1.policy.in
 
-systemd_reply_password_LDADD = \
-	libsystemd-basic.la
+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
 
-systemd_readahead_collect_SOURCES = \
-	src/readahead-collect.c \
-	src/readahead-common.c
+dbusinterface_DATA += \
+	org.freedesktop.timedate1.xml
 
-systemd_readahead_collect_CFLAGS = \
-	$(UDEV_CFLAGS)
+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_collect_LDADD = \
-	libsystemd-basic.la \
-	libsystemd-daemon.la \
-	$(UDEV_LIBS)
+INSTALL_DATA_HOOKS += \
+	timedated-install-data-hook
 
-systemd_readahead_replay_SOURCES = \
-	src/readahead-replay.c \
-	src/readahead-common.c
+EXTRA_DIST += \
+	units/systemd-timedated.service.in
+endif
 
-systemd_readahead_replay_CFLAGS = \
-	$(UDEV_CFLAGS)
+# ------------------------------------------------------------------------------
+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/polkit.c
 
-systemd_readahead_replay_LDADD = \
+nodist_systemd_logind_SOURCES = \
+	src/login/logind-gperf.c
+
+if HAVE_ACL
+systemd_logind_SOURCES += \
+	src/login/logind-acl.c \
+	src/acl-util.c
+endif
+
+systemd_logind_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(UDEV_CFLAGS) \
+	$(ACL_CFLAGS)
+
+systemd_logind_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la \
-	$(UDEV_LIBS)
-
-systemd_cgls_SOURCES = \
-	src/cgls.c \
-	src/cgroup-show.c \
-	src/cgroup-util.c \
-	src/pager.c
+	$(DBUS_LIBS) \
+	$(UDEV_LIBS) \
+	$(ACL_LIBS)
 
-systemd_cgls_CFLAGS = \
-	$(AM_CFLAGS)
+systemd_user_sessions_SOURCES = \
+	src/login/user-sessions.c \
+	src/cgroup-util.c
 
-systemd_cgls_LDADD = \
+systemd_user_sessions_LDADD = \
 	libsystemd-basic.la
 
-systemd_nspawn_SOURCES = \
-	src/nspawn.c \
+rootlibexec_PROGRAMS += \
+	systemd-logind \
+	systemd-user-sessions
+
+systemd_loginctl_SOURCES = \
+	src/login/loginctl.c \
+	src/login/sysfs-show.c \
+	src/dbus-common.c \
+	src/cgroup-show.c \
 	src/cgroup-util.c \
-	src/loopback-setup.c
+	src/pager.c
 
-systemd_nspawn_CFLAGS = \
-	$(AM_CFLAGS)
+systemd_loginctl_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(UDEV_CFLAGS)
 
-systemd_nspawn_LDADD = \
+systemd_loginctl_LDADD = \
 	libsystemd-basic.la \
-	libsystemd-daemon.la
-
-systemd_stdio_bridge_SOURCES = \
-	src/bridge.c
-
-systemd_stdio_bridge_LDADD = \
-	libsystemd-basic.la
+	$(DBUS_LIBS) \
+	$(UDEV_LIBS)
 
-systemadm_SOURCES = \
-	src/systemadm.vala \
-	src/systemd-interfaces.vala \
-	src/wraplabel.vala
+rootbin_PROGRAMS += \
+	systemd-loginctl
 
-systemadm_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GTK_CFLAGS) \
-	-Wno-unused-variable \
-	-Wno-unused-function \
-	-Wno-shadow \
-	-Wno-format-nonliteral
+test_login_SOURCES = \
+	src/login/test-login.c
 
-systemadm_VALAFLAGS = \
-	--pkg=posix \
-	--pkg=gtk+-2.0 \
-	--pkg=gee-1.0 \
-	-g
+test_login_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-login.la
 
-systemadm_LDADD = \
-	$(GTK_LIBS)
+noinst_PROGRAMS += \
+	test-login
 
-systemd_gnome_ask_password_agent_SOURCES = \
-	src/gnome-ask-password-agent.vala
+libsystemd_login_la_SOURCES = \
+	src/login/sd-login.c \
+	src/cgroup-util.c
 
-systemd_gnome_ask_password_agent_CFLAGS = \
+libsystemd_login_la_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)
+	-fvisibility=hidden
 
-systemd_tty_ask_password_agent_SOURCES = \
-	src/tty-ask-password-agent.c \
-	src/ask-password-api.c \
-	src/utmp-wtmp.c
+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
 
-systemd_tty_ask_password_agent_LDADD = \
+libsystemd_login_la_LIBADD = \
 	libsystemd-basic.la
 
+if HAVE_PAM
 pam_systemd_la_SOURCES = \
-	src/pam-module.c \
+	src/login/pam-module.c \
 	src/dbus-common.c
 
 pam_systemd_la_CFLAGS = \
@@ -1785,98 +1882,189 @@ pam_systemd_la_LIBADD = \
 	$(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
+pamlib_LTLIBRARIES = \
+	pam_systemd.la
+endif
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-daemon-install-hook:
+libsystemd-login-install-hook:
 	if test "$(libdir)" != "$(rootlibdir)"; then \
 		mkdir -p $(DESTDIR)$(rootlibdir) && \
-		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
+		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.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); \
+		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
+		mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
 	fi
 
-libsystemd-daemon-uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
+INSTALL_EXEC_HOOKS += \
+	libsystemd-login-install-hook
 
-libsystemd_id128_la_SOURCES = \
-	src/sd-id128.c
+libsystemd-login-uninstall-hook:
+	rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
 
-libsystemd_id128_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-fvisibility=hidden
+UNINSTALL_EXEC_HOOKS += \
+	libsystemd-login-uninstall-hook
 
-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
+nodist_systemunit_DATA += \
+	units/systemd-logind.service \
+	units/systemd-user-sessions.service
 
-libsystemd_id128_la_LIBADD = \
-	libsystemd-basic.la
+dist_dbussystemservice_DATA += \
+	src/login/org.freedesktop.login1.service
 
-# 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
+dist_dbuspolicy_DATA += \
+	src/login/org.freedesktop.login1.conf
 
-libsystemd-id128-uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
+dist_pkgsysconf_DATA += \
+	src/login/systemd-logind.conf
 
-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
+pkginclude_HEADERS += \
+	src/systemd/sd-login.h
 
-libsystemd_journal_la_CFLAGS = \
+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:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+                $(DESTDIR)$(localstatedir)/lib/systemd
+	( 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 systemd-user-sessions.service && \
+		$(LN_S) ../systemd-logind.service systemd-logind.service && \
+		$(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
+
+INSTALL_DATA_HOOKS += \
+	logind-install-data-hook
+
+systemd_multi_seat_x_SOURCES = \
+	src/login/multi-seat-x.c
+
+systemd_multi_seat_x_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(XZ_CFLAGS) \
-	-fvisibility=hidden
+	$(UDEV_CFLAGS)
 
-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
+systemd_multi_seat_x_LDADD = \
+	libsystemd-basic.la \
+	$(UDEV_LIBS)
 
-libsystemd_journal_la_LIBADD = \
+rootlibexec_PROGRAMS += \
+	systemd-multi-seat-x
+
+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-id128.la \
-	$(XZ_LIBS)
+	libsystemd-daemon.la \
+	libsystemd-login.la \
+	$(UDEV_LIBS) \
+	$(ACL_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
+rootlibexec_PROGRAMS += \
+	systemd-uaccess
 
-libsystemd-journal-uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
+dist_udevrules_DATA += \
+	src/login/70-uaccess.rules
+
+dist_udevrules_DATA += \
+	src/login/71-seat.rules
+
+nodist_udevrules_DATA += \
+	src/login/73-seat-late.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_session_get_service.3 \
+	man/sd_session_get_type.3 \
+	man/sd_session_get_class.3 \
+	man/sd_session_get_display.3 \
+	man/sd_pid_get_owner_uid.3 \
+	man/sd_pid_get_unit.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_session_get_service.3: man/sd_session_is_active.3
+man/sd_session_get_type.3: man/sd_session_is_active.3
+man/sd_session_get_class.3: man/sd_session_is_active.3
+man/sd_session_get_display.3: man/sd_session_is_active.3
+man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
+man/sd_pid_get_unit.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 \
+	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 \
+	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/73-seat-late.rules
+endif
+# ------------------------------------------------------------------------------
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
+	$(SED)	-e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
 		-e 's,@rootbindir\@,$(rootbindir),g' \
 		-e 's,@bindir\@,$(bindir),g' \
 		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
@@ -1901,6 +2089,9 @@ units/%: units/%.in Makefile
 man/%: man/%.in Makefile
 	$(SED_PROCESS)
 
+sysctl.d/%: sysctl.d/%.in Makefile
+	$(SED_PROCESS)
+
 %.pc: %.pc.in Makefile
 	$(SED_PROCESS)
 
@@ -1940,20 +2131,13 @@ CLEANFILES += \
 	$(nodist_systemunit_DATA) \
 	$(nodist_userunit_DATA) \
 	$(nodist_man_MANS) \
-	${XML_IN_FILES:.xml.in=.html} \
 	$(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
-
-if HAVE_VALAC
-CLEANFILES += \
-	${systemadm_SOURCES:.vala=.c}
-endif
+	src/load-fragment-gperf-nulstr.c \
+	src/99-systemd.rules
 
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
@@ -1964,61 +2148,31 @@ XSLTPROC_PROCESS_MAN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-XSLTPROC_PROCESS_MAN_IN = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
-	mv ${@:.in=} $@
-
 XSLTPROC_PROCESS_HTML = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) man/custom-html.xsl $<
-
-XSLTPROC_PROCESS_HTML_IN = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) man/custom-html.xsl $< && \
-	mv ${@:.in=} $@
+	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
 
 man/%.1: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.1.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN)
-
 man/%.3: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.3.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN)
-
 man/%.5: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.5.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN)
-
 man/%.7: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.7.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN_IN)
-
 man/%.8: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.8.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN_IN)
-
 man/%.html: man/%.xml
 	$(XSLTPROC_PROCESS_HTML)
 
-man/%.html.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_HTML_IN)
-
 CLEANFILES += \
 	$(dist_man_MANS) \
-	${nodist_man_MANS:=.in} \
-	${XML_FILES:.xml=.html} \
-	${XML_IN_FILES:.xml.in=.html.in}
+	${XML_FILES:.xml=.html}
 endif
 
 DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
@@ -2028,21 +2182,6 @@ 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)
 
@@ -2057,11 +2196,6 @@ systemd-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) \
@@ -2089,12 +2223,9 @@ endif
 		rm -f user && \
 		$(LN_S) $(pkgsysconfdir)/user user )
 	( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-		rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket systemd-journald.socket && \
-		$(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \
+		rm -f systemd-initctl.socket systemd-shutdownd.socket && \
 		$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
-		$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
-		$(LN_S) ../syslog.socket syslog.socket && \
-		$(LN_S) ../systemd-journald.socket )
+		$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
 	( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
 		rm -f systemd-update-utmp-runlevel.service && \
 		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
@@ -2111,10 +2242,8 @@ endif
 		rm -f systemd-update-utmp-runlevel.service && \
 		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
 	( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
-		rm -f systemd-update-utmp-shutdown.service \
-			systemd-random-seed-save.service && \
-		$(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service && \
-		$(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
+		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 \
@@ -2148,9 +2277,8 @@ endif
 		$(LN_S) reboot.target ctrl-alt-del.target && \
 		$(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 && \
+		rm -f getty.target 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)
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
 		rm -f getty@tty1.service && \
@@ -2163,52 +2291,20 @@ endif
 			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 \
 			systemd-tmpfiles-setup.service \
 			systemd-sysctl.service \
-			systemd-ask-password-console.path \
-			systemd-kmsg-syslogd.service \
-			cryptsetup.target && \
+			systemd-ask-password-console.path && \
 		$(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 && \
 		$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
 		$(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
-		$(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
+		$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
 	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
 		rm -f systemd-tmpfiles-clean.timer && \
 		$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
@@ -2323,9 +2419,9 @@ if HAVE_SYSV_COMPAT
 		$(LN_S) ../var-lock.mount var-lock.mount )
 endif
 
-install-exec-hook: libsystemd-daemon-install-hook $(INSTALL_EXEC_HOOKS)
+install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
-uninstall-hook: libsystemd-daemon-uninstall-hook $(UNINSTALL_EXEC_HOOKS)
+uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
 install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
 
@@ -2336,15 +2432,14 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-	--with-rootdir=$$dc_install_base/$(rootdir)
+        --with-rootprefix=$$dc_install_base \
+        --disable-split-usr
 
 upload: all distcheck
-	cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
-	scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
+	cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
+	scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
+	scp man/*.html fdo:/srv/www.freedesktop.org/www/software/systemd/man/
 	scp man/*.html tango:public/systemd-man/
 
 git-tag:
 	git tag "v$(VERSION)" -m "systemd $(VERSION)"
-
-update-kbd-model-map:
-	src/generate-kbd-model-map > src/kbd-model-map