X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=8f56d2549605e6af6771cb25a13edf0a55161a05;hp=83e5fa31d5fb9a82e06b2ac11efcf7eabc718268;hb=304b9f30781b8625c1f84fd27205f2707d4843b1;hpb=ccf4fd45f62645bbb7e94b7428bc5d9c78846e97

diff --git a/Makefile.am b/Makefile.am
index 83e5fa31d..8f56d2549 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,774 +1,3075 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 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
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+AM_MAKEFLAGS = --no-print-directory
+
+SUBDIRS = . po
+
+LIBUDEV_CURRENT=13
+LIBUDEV_REVISION=3
+LIBUDEV_AGE=13
+
+LIBGUDEV_CURRENT=1
+LIBGUDEV_REVISION=1
+LIBGUDEV_AGE=1
+
+LIBSYSTEMD_LOGIN_CURRENT=2
+LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_AGE=2
+
+LIBSYSTEMD_DAEMON_CURRENT=0
+LIBSYSTEMD_DAEMON_REVISION=1
+LIBSYSTEMD_DAEMON_AGE=0
+
+LIBSYSTEMD_ID128_CURRENT=0
+LIBSYSTEMD_ID128_REVISION=3
+LIBSYSTEMD_ID128_AGE=0
+
+LIBSYSTEMD_JOURNAL_CURRENT=0
+LIBSYSTEMD_JOURNAL_REVISION=3
+LIBSYSTEMD_JOURNAL_AGE=0
+
+# Dirs of external packages
+dbuspolicydir=@dbuspolicydir@
+dbussessionservicedir=@dbussessionservicedir@
+dbussystemservicedir=@dbussystemservicedir@
+dbusinterfacedir=@dbusinterfacedir@
+pamlibdir=@pamlibdir@
+pkgconfigdatadir=$(datadir)/pkgconfig
+pkgconfiglibdir=$(libdir)/pkgconfig
+polkitpolicydir=$(datadir)/polkit-1/actions
+bashcompletiondir=$(sysconfdir)/bash_completion.d
+
+# Our own, non-special dirs
+pkgsysconfdir=$(sysconfdir)/systemd
+userunitdir=$(prefix)/lib/systemd/user
+tmpfilesdir=$(prefix)/lib/tmpfiles.d
+sysctldir=$(prefix)/lib/sysctl.d
+usergeneratordir=$(pkglibexecdir)/user-generators
+pkgincludedir=$(includedir)/systemd
+systemgeneratordir=$(rootlibexecdir)/system-generators
+systemshutdowndir=$(rootlibexecdir)/system-shutdown
+systemunitdir=$(rootprefix)/lib/systemd/system
+udevlibexecdir=$(rootprefix)/lib/udev
+udevhomedir = $(libexecdir)/udev
+udevrulesdir = $(libexecdir)/udev/rules.d
+
+# And these are the special ones for /
+rootprefix=@rootprefix@
+rootbindir=$(rootprefix)/bin
+rootlibexecdir=$(rootprefix)/lib/systemd
+
+CLEANFILES =
+EXTRA_DIST =
+BUILT_SOURCES =
+INSTALL_EXEC_HOOKS =
+UNINSTALL_EXEC_HOOKS =
+INSTALL_DATA_HOOKS =
+DISTCHECK_HOOKS =
+DISTCLEAN_LOCAL_HOOKS =
+pkginclude_HEADERS =
+lib_LTLIBRARIES =
+include_HEADERS =
+pkgconfiglib_DATA =
+polkitpolicy_in_files =
+dist_udevrules_DATA =
+nodist_udevrules_DATA =
+dist_man_MANS =
+
+AM_CPPFLAGS = \
+	-include $(top_builddir)/config.h \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
+	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
+	-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
+	-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
+	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
+	-DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
+	-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
+	-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
+	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
+	-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\" \
+	-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
+	-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
+	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+	-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
+	-DX_SERVER=\"$(bindir)/X\" \
+	-DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
+	-I $(top_srcdir)/src \
+	-I $(top_srcdir)/src/readahead \
+	-I $(top_srcdir)/src/login \
+	-I $(top_srcdir)/src/journal \
+	-I $(top_srcdir)/src/systemd \
+	-I $(top_srcdir)/src/udev
+
+AM_CFLAGS = $(WARNINGFLAGS)
+AM_LDFLAGS = $(GCLDFLAGS)
+
+if TARGET_GENTOO
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/usr/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+if TARGET_ARCH
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/usr/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+if TARGET_FRUGALWARE
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/usr/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+if TARGET_MANDRIVA
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+if TARGET_MEEGO
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+if TARGET_ANGSTROM
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-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-16\"
+else
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/bin/setfont\" \
+	-DDEFAULT_FONT=\"latarcyrheb-sun16\"
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+
+rootbin_PROGRAMS = \
+	systemctl \
+	systemd-notify \
+	systemd-ask-password \
+	systemd-tty-ask-password-agent \
+	systemd-tmpfiles \
+	systemd-machine-id-setup
+
+bin_PROGRAMS = \
+	systemd-cgls \
+	systemd-cgtop \
+	systemd-stdio-bridge \
+	systemd-nspawn
+
+dist_bin_SCRIPTS = \
+	src/systemd-analyze
+
+rootlibexec_PROGRAMS = \
+	systemd \
+	systemd-cgroups-agent \
+	systemd-initctl \
+	systemd-update-utmp \
+	systemd-shutdownd \
+	systemd-shutdown \
+	systemd-modules-load \
+	systemd-remount-api-vfs \
+	systemd-reply-password \
+	systemd-fsck \
+	systemd-timestamp \
+	systemd-ac-power \
+	systemd-detect-virt \
+	systemd-sysctl
+
+systemgenerator_PROGRAMS = \
+	systemd-getty-generator
+
+noinst_PROGRAMS = \
+	test-engine \
+	test-job-type \
+	test-ns \
+	test-loopback \
+	test-hostname \
+	test-daemon \
+	test-cgroup \
+	test-env-replace \
+	test-strv \
+	test-install \
+        test-watchdog
+
+dist_pkgsysconf_DATA = \
+	src/system.conf \
+	src/user.conf
+
+dist_dbuspolicy_DATA = \
+	src/org.freedesktop.systemd1.conf
+
+dist_dbussystemservice_DATA = \
+	src/org.freedesktop.systemd1.service
+
+dbusinterface_DATA = \
+	org.freedesktop.systemd1.Manager.xml \
+	org.freedesktop.systemd1.Job.xml \
+	org.freedesktop.systemd1.Unit.xml \
+	org.freedesktop.systemd1.Service.xml \
+	org.freedesktop.systemd1.Socket.xml \
+	org.freedesktop.systemd1.Timer.xml \
+	org.freedesktop.systemd1.Target.xml \
+	org.freedesktop.systemd1.Device.xml \
+	org.freedesktop.systemd1.Mount.xml \
+	org.freedesktop.systemd1.Automount.xml \
+	org.freedesktop.systemd1.Snapshot.xml \
+	org.freedesktop.systemd1.Swap.xml \
+	org.freedesktop.systemd1.Path.xml
+
+dist_bashcompletion_DATA = \
+	src/systemd-bash-completion.sh
+
+dist_tmpfiles_DATA = \
+	tmpfiles.d/systemd.conf \
+	tmpfiles.d/tmp.conf \
+	tmpfiles.d/x11.conf
+
+if HAVE_SYSV_COMPAT
+dist_tmpfiles_DATA += \
+	tmpfiles.d/legacy.conf
+endif
+
+dist_systemunit_DATA = \
+	units/graphical.target \
+	units/multi-user.target \
+	units/emergency.service \
+	units/emergency.target \
+	units/sysinit.target \
+	units/basic.target \
+	units/getty.target \
+	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/network.target \
+	units/nss-lookup.target \
+	units/mail-transfer-agent.target \
+	units/http-daemon.target \
+	units/poweroff.target \
+	units/reboot.target \
+	units/rescue.target \
+	units/rpcbind.target \
+	units/time-sync.target \
+	units/shutdown.target \
+	units/final.target \
+	units/umount.target \
+	units/sigpwr.target \
+	units/sockets.target \
+	units/swap.target \
+	units/systemd-initctl.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-fs-fuse-connections.mount \
+	units/tmp.mount \
+	units/remount-rootfs.service \
+	units/printer.target \
+	units/sound.target \
+	units/bluetooth.target \
+	units/smartcard.target \
+	units/systemd-tmpfiles-clean.timer \
+	units/quotaon.service \
+	units/systemd-ask-password-wall.path \
+	units/systemd-ask-password-console.path \
+	units/syslog.target \
+	units/udev-control.socket \
+	units/udev-kernel.socket
+
+nodist_systemunit_DATA = \
+	units/getty@.service \
+	units/serial-getty@.service \
+	units/console-shell.service \
+	units/systemd-initctl.service \
+	units/systemd-shutdownd.service \
+	units/systemd-modules-load.service \
+	units/systemd-remount-api-vfs.service \
+	units/systemd-update-utmp-runlevel.service \
+	units/systemd-update-utmp-shutdown.service \
+	units/systemd-tmpfiles-setup.service \
+	units/systemd-tmpfiles-clean.service \
+	units/systemd-ask-password-wall.service \
+	units/systemd-ask-password-console.service \
+	units/systemd-sysctl.service \
+	units/halt.service \
+	units/emergency.service \
+	units/poweroff.service \
+	units/reboot.service \
+	units/kexec.service \
+	units/fsck@.service \
+	units/fsck-root.service \
+	units/rescue.service \
+	units/user@.service \
+	units/udev.service \
+	units/udev-trigger.service \
+	units/udev-settle.service
+
+dist_userunit_DATA = \
+	units/user/default.target \
+	units/user/exit.target
+
+nodist_userunit_DATA = \
+	units/user/exit.service
+
+EXTRA_DIST += \
+	units/getty@.service.m4 \
+	units/serial-getty@.service.m4 \
+	units/console-shell.service.m4.in \
+	units/rescue.service.m4.in \
+	units/systemd-initctl.service.in \
+	units/systemd-shutdownd.service.in \
+	units/systemd-modules-load.service.in \
+	units/systemd-remount-api-vfs.service.in \
+	units/systemd-update-utmp-runlevel.service.in \
+	units/systemd-update-utmp-shutdown.service.in \
+	units/systemd-tmpfiles-setup.service.in \
+	units/systemd-tmpfiles-clean.service.in \
+	units/systemd-ask-password-wall.service.in \
+	units/systemd-ask-password-console.service.in \
+	units/systemd-sysctl.service.in \
+	units/emergency.service.in \
+	units/halt.service.in \
+	units/poweroff.service.in \
+	units/reboot.service.in \
+	units/kexec.service.in \
+	units/user/exit.service.in \
+	units/fsck@.service.in \
+	units/fsck-root.service.in \
+	units/user@.service.in \
+	units/udev.service \
+	units/udev-trigger.service \
+	units/udev-settle.service \
+	src/systemd.pc.in \
+	introspect.awk \
+	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
+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
+dist_systemunit_DATA += \
+	units/frugalware/display-manager.service
+endif
+
+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
+dist_systemunit_DATA += \
+	units/plymouth-start.service \
+	units/plymouth-read-write.service \
+	units/plymouth-quit.service \
+	units/plymouth-quit-wait.service \
+	units/plymouth-reboot.service \
+	units/plymouth-kexec.service \
+	units/plymouth-poweroff.service \
+	units/plymouth-halt.service \
+	units/systemd-ask-password-plymouth.path
+
+nodist_systemunit_DATA += \
+	units/systemd-ask-password-plymouth.service
+
+EXTRA_DIST += \
+	units/systemd-ask-password-plymouth.service.in
+endif
+
+dist_doc_DATA = \
+	README \
+	NEWS \
+	LICENSE \
+	DISTRO_PORTING
+
+pkgconfigdata_DATA = \
+	src/systemd.pc
+
+# 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)
+
+EXTRA_DIST += \
+	$(polkitpolicy_in_files) \
+	$(polkitpolicy_in_in_files)
+
+@INTLTOOL_POLICY_RULE@
+
+noinst_LTLIBRARIES = \
+	libsystemd-basic.la \
+	libsystemd-core.la
+
+libsystemd_basic_la_SOURCES = \
+	src/util.c \
+	src/util.h \
+	src/virt.c \
+	src/virt.h \
+	src/label.c \
+	src/label.h \
+	src/hashmap.c \
+	src/hashmap.h \
+	src/set.c \
+	src/set.h \
+	src/strv.c \
+	src/strv.h \
+	src/conf-parser.c \
+	src/conf-parser.h \
+	src/socket-util.c \
+	src/socket-util.h \
+	src/log.c \
+	src/log.h \
+	src/ratelimit.h \
+	src/ratelimit.c \
+	src/exit-status.c \
+	src/exit-status.h \
+	src/utf8.c \
+	src/utf8.h
+
+libsystemd_basic_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(SELINUX_CFLAGS)
+
+libsystemd_basic_la_LIBADD = \
+	$(SELINUX_LIBS) \
+	$(CAP_LIBS)
+
+libsystemd_core_la_SOURCES = \
+	src/unit.c \
+	src/unit.h \
+	src/job.c \
+	src/job.h \
+	src/manager.c \
+	src/manager.h \
+	src/path-lookup.c \
+	src/path-lookup.h \
+	src/load-fragment.c \
+	src/load-fragment.h \
+	src/service.c \
+	src/service.h \
+	src/automount.c \
+	src/automount.h \
+	src/mount.c \
+	src/mount.h \
+	src/swap.c \
+	src/swap.h \
+	src/device.c \
+	src/device.h \
+	src/target.c \
+	src/target.h \
+	src/snapshot.c \
+	src/snapshot.h \
+	src/socket.c \
+	src/socket.h \
+	src/timer.c \
+	src/timer.h \
+	src/path.c \
+	src/path.h \
+	src/load-dropin.c \
+	src/load-dropin.h \
+	src/execute.c \
+	src/execute.h \
+	src/utmp-wtmp.c \
+	src/utmp-wtmp.h \
+	src/dbus.c \
+	src/dbus.h \
+	src/dbus-manager.c \
+	src/dbus-manager.h \
+	src/dbus-unit.c \
+	src/dbus-unit.h \
+	src/dbus-job.c \
+	src/dbus-job.h \
+	src/dbus-service.c \
+	src/dbus-service.h \
+	src/dbus-socket.c \
+	src/dbus-socket.h \
+	src/dbus-timer.c \
+	src/dbus-timer.h \
+	src/dbus-target.c \
+	src/dbus-target.h \
+	src/dbus-mount.c \
+	src/dbus-mount.h \
+	src/dbus-automount.c \
+	src/dbus-automount.h \
+	src/dbus-swap.c \
+	src/dbus-swap.h \
+	src/dbus-snapshot.c \
+	src/dbus-snapshot.h \
+	src/dbus-device.c \
+	src/dbus-device.h \
+	src/dbus-execute.c \
+	src/dbus-execute.h \
+	src/dbus-path.c \
+	src/dbus-path.h \
+	src/cgroup.c \
+	src/cgroup.h \
+	src/mount-setup.c \
+	src/mount-setup.h \
+	src/hostname-setup.c \
+	src/hostname-setup.h \
+	src/selinux-setup.c \
+	src/selinux-setup.h \
+	src/ima-setup.c \
+	src/ima-setup.h \
+	src/loopback-setup.h \
+	src/loopback-setup.c \
+	src/kmod-setup.c \
+	src/kmod-setup.h \
+	src/locale-setup.h \
+	src/locale-setup.c \
+	src/machine-id-setup.c \
+	src/machine-id-setup.h \
+	src/fdset.c \
+	src/fdset.h \
+	src/cgroup-util.c \
+	src/cgroup-util.h \
+	src/condition.c \
+	src/condition.h \
+	src/dbus-common.c \
+	src/dbus-common.h \
+	src/install.c \
+	src/install.h \
+	src/specifier.c \
+	src/specifier.h \
+	src/namespace.c \
+	src/namespace.h \
+	src/unit-name.c \
+	src/unit-name.h \
+	src/tcpwrap.c \
+	src/tcpwrap.h \
+	src/cgroup-attr.c \
+	src/cgroup-attr.h \
+        src/watchdog.c \
+        src/watchdog.h \
+	src/sd-daemon.c \
+	src/sd-id128.c \
+	src/macro.h \
+	src/def.h \
+	src/ioprio.h \
+	src/missing.h \
+	src/list.h \
+	src/securebits.h \
+	src/linux/auto_dev-ioctl.h \
+	src/linux/fanotify.h \
+	src/initreq.h \
+	src/special.h \
+	src/dbus-common.h \
+	src/bus-errors.h \
+	src/cgroup-show.h \
+	src/build.h \
+	src/shutdownd.h \
+	src/umount.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/acl-util.h \
+	src/logs-show.h
+
+nodist_libsystemd_core_la_SOURCES = \
+	src/load-fragment-gperf.c \
+	src/load-fragment-gperf-nulstr.c
+
+EXTRA_DIST += \
+	src/load-fragment-gperf.gperf.m4
+
+libsystemd_core_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(LIBWRAP_CFLAGS) \
+	$(PAM_CFLAGS) \
+	$(AUDIT_CFLAGS) \
+	$(KMOD_CFLAGS)
+
+libsystemd_core_la_LIBADD = \
+	libsystemd-basic.la \
+	libudev.la \
+	$(DBUS_LIBS) \
+	$(LIBWRAP_LIBS) \
+	$(PAM_LIBS) \
+	$(AUDIT_LIBS) \
+	$(CAP_LIBS) \
+	$(KMOD_LIBS)
+
+MANPAGES = \
+	man/systemd.1 \
+	man/systemctl.1 \
+	man/systemd-cgls.1 \
+	man/systemd-cgtop.1 \
+	man/systemd-nspawn.1 \
+	man/systemd-tmpfiles.8 \
+	man/systemd-notify.1 \
+	man/systemd.unit.5 \
+	man/systemd.service.5 \
+	man/systemd.socket.5 \
+	man/systemd.mount.5 \
+	man/systemd.automount.5 \
+	man/systemd.swap.5 \
+	man/systemd.timer.5 \
+	man/systemd.path.5 \
+	man/systemd.target.5 \
+	man/systemd.device.5 \
+	man/systemd.snapshot.5 \
+	man/systemd.exec.5 \
+	man/systemd.special.7 \
+        man/systemd.journal-fields.7 \
+	man/daemon.7 \
+	man/runlevel.8 \
+	man/telinit.8 \
+	man/halt.8 \
+	man/shutdown.8 \
+	man/pam_systemd.8 \
+	man/systemd.conf.5 \
+	man/tmpfiles.d.5 \
+	man/hostname.5 \
+	man/timezone.5 \
+	man/machine-id.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/systemd-cat.1 \
+	man/systemd-machine-id-setup.1 \
+	man/journald.conf.5 \
+	man/journalctl.1 \
+	man/udev.7 \
+	man/udevadm.8 \
+	man/udevd.8
+
+MANPAGES_ALIAS = \
+	man/reboot.8 \
+	man/poweroff.8 \
+	man/init.1
+
+man/reboot.8: man/halt.8
+man/poweroff.8: man/halt.8
+man/init.1: man/systemd.1
+
+XML_FILES = \
+	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
+
+if ENABLE_MANPAGES
+man_MANS = \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
+
+noinst_DATA = \
+	${XML_FILES:.xml=.html}
+endif
+
+EXTRA_DIST += \
+	$(XML_FILES) \
+	${XML_FILES:.xml=.html} \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
+
+systemd_SOURCES = \
+	src/main.c
+
+systemd_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+systemd_LDADD = \
+	libsystemd-core.la
+
+test_engine_SOURCES = \
+	src/test-engine.c
+
+test_engine_CFLAGS = $(systemd_CFLAGS)
+test_engine_LDADD = $(systemd_LDADD)
+
+test_job_type_SOURCES = \
+	src/test-job-type.c
+
+test_job_type_CFLAGS = $(systemd_CFLAGS)
+test_job_type_LDADD = $(systemd_LDADD)
+
+test_ns_SOURCES = \
+	src/test-ns.c
+
+test_ns_CFLAGS = $(systemd_CFLAGS)
+test_ns_LDADD = $(systemd_LDADD)
+
+test_loopback_SOURCES = \
+	src/test-loopback.c \
+	src/loopback-setup.c
+
+test_loopback_LDADD = \
+	libsystemd-basic.la
+
+test_hostname_SOURCES = \
+	src/test-hostname.c \
+	src/hostname-setup.c
+
+test_hostname_LDADD = \
+	libsystemd-basic.la
+
+test_daemon_SOURCES = \
+	src/test-daemon.c
+
+test_daemon_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la
+
+test_cgroup_SOURCES = \
+	src/test-cgroup.c \
+	src/cgroup-util.c
+
+test_cgroup_LDADD = \
+	libsystemd-basic.la
+
+test_env_replace_SOURCES = \
+	src/test-env-replace.c
+
+test_env_replace_LDADD = \
+	libsystemd-basic.la
+
+test_strv_SOURCES = \
+	src/test-strv.c \
+	src/specifier.c
+
+test_strv_LDADD = \
+	libsystemd-basic.la
+
+test_install_SOURCES = \
+	src/test-install.c \
+	src/install.c \
+	src/path-lookup.c \
+	src/unit-name.c
+
+test_install_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+test_install_LDADD = \
+	libsystemd-basic.la
+
+test_watchdog_SOURCES = \
+        src/test-watchdog.c \
+	src/watchdog.c \
+        src/watchdog.h
+
+test_watchdog_LDADD = \
+	libsystemd-basic.la
+
+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_update_utmp_SOURCES = \
+	src/update-utmp.c \
+	src/dbus-common.c \
+	src/utmp-wtmp.c
+
+systemd_update_utmp_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(AUDIT_CFLAGS)
+
+systemd_update_utmp_LDADD = \
+	libsystemd-basic.la \
+	$(DBUS_LIBS) \
+	$(AUDIT_LIBS)
+
+systemd_shutdownd_SOURCES = \
+	src/utmp-wtmp.c \
+	src/shutdownd.c
+
+systemd_shutdownd_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_shutdownd_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la
+
+systemd_shutdown_SOURCES = \
+	src/mount-setup.c \
+	src/umount.c \
+	src/shutdown.c \
+        src/watchdog.c \
+        src/watchdog.h
+
+systemd_shutdown_LDADD = \
+	libsystemd-basic.la \
+	libudev.la
+
+systemd_modules_load_SOURCES = \
+	src/modules-load.c
+
+systemd_modules_load_CFLAGS = \
+	$(KMOD_CFLAGS)
+
+systemd_modules_load_LDADD = \
+	libsystemd-basic.la \
+	$(KMOD_LIBS)
+
+systemd_tmpfiles_SOURCES = \
+	src/tmpfiles.c
+
+systemd_tmpfiles_LDADD = \
+	libsystemd-basic.la
+
+systemd_machine_id_setup_SOURCES = \
+	src/machine-id-setup.c \
+	src/machine-id-main.c \
+	src/sd-id128.c
+
+systemd_machine_id_setup_LDADD = \
+	libsystemd-basic.la
+
+systemd_sysctl_SOURCES = \
+	src/sysctl.c
+
+systemd_sysctl_LDADD = \
+	libsystemd-basic.la
+
+systemd_fsck_SOURCES = \
+	src/fsck.c \
+	src/dbus-common.c
+
+systemd_fsck_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+systemd_fsck_LDADD = \
+	libsystemd-basic.la \
+	libudev.la \
+	$(DBUS_LIBS)
+
+systemd_timestamp_SOURCES = \
+	src/timestamp.c
+
+systemd_timestamp_LDADD = \
+	libsystemd-basic.la
+
+systemd_ac_power_SOURCES = \
+	src/ac-power.c
+
+systemd_ac_power_LDADD = \
+	libsystemd-basic.la \
+	libudev.la
+
+systemd_detect_virt_SOURCES = \
+	src/detect-virt.c
+
+systemd_detect_virt_LDADD = \
+	libsystemd-basic.la
+
+systemd_getty_generator_SOURCES = \
+	src/getty-generator.c \
+	src/unit-name.c
+
+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_remount_api_vfs_SOURCES = \
+	src/remount-api-vfs.c \
+	src/mount-setup.c \
+	src/exit-status.c
+
+systemd_remount_api_vfs_LDADD = \
+	libsystemd-basic.la
+
+systemd_cgroups_agent_SOURCES = \
+	src/cgroups-agent.c \
+	src/dbus-common.c
+
+systemd_cgroups_agent_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+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-daemon-uninstall-hook
+
+lib_LTLIBRARIES += \
+	libsystemd-daemon.la
+
+pkgconfiglib_DATA += \
+	src/libsystemd-daemon.pc
+
+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 += \
+	src/libsystemd-daemon.pc.in \
+	src/libsystemd-daemon.sym
+
+# ------------------------------------------------------------------------------
+SUBDIRS += \
+	src/udev/docs
+
+include_HEADERS += \
+	src/udev/libudev.h
+
+lib_LTLIBRARIES += \
+	libudev.la
+
+noinst_LTLIBRARIES += \
+	libudev-private.la
+
+libudev_la_SOURCES =\
+	src/udev/libudev-private.h \
+	src/udev/libudev.c \
+	src/udev/libudev-list.c \
+	src/udev/libudev-util.c \
+	src/udev/libudev-device.c \
+	src/udev/libudev-enumerate.c \
+	src/udev/libudev-monitor.c \
+	src/udev/libudev-queue.c
+
+libudev_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
+
+libudev_private_la_SOURCES =\
+	$(libudev_la_SOURCES) \
+	src/udev/libudev-util-private.c \
+	src/udev/libudev-device-private.c \
+	src/udev/libudev-queue-private.c
+
+if HAVE_SELINUX
+libudev_private_la_SOURCES +=\
+	src/udev/libudev-selinux-private.c
+endif
+
+libudev_private_la_LIBADD = \
+	$(SELINUX_LIBS)
+
+pkgconfiglib_DATA += \
+	src/udev/libudev.pc
+
+EXTRA_DIST += \
+	src/udev/libudev.pc.in
+
+CLEANFILES += \
+	src/udev/libudev.pc
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libudev-install-move-hook:
+	if test "$(libdir)" != "$(rootlibdir)"; then \
+		mkdir -p $(DESTDIR)$(rootlibdir) && \
+		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
+		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
+		mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlibdir); \
+	fi
+
+libudev-uninstall-move-hook:
+	rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
+
+INSTALL_EXEC_HOOKS += libudev-install-move-hook
+UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
+
+# ------------------------------------------------------------------------------
+udev-confdirs:
+	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+	-mkdir -p $(DESTDIR)$(libexecdir)/udev/devices
+
+INSTALL_DATA_HOOKS += udev-confdirs
+
+dist_udevrules_DATA += \
+	rules/99-systemd.rules \
+	rules/42-usb-hid-pm.rules \
+	rules/50-udev-default.rules \
+	rules/60-persistent-storage-tape.rules \
+	rules/60-persistent-serial.rules \
+	rules/60-persistent-input.rules \
+	rules/60-persistent-alsa.rules \
+	rules/60-persistent-storage.rules \
+	rules/75-net-description.rules \
+	rules/75-tty-description.rules \
+	rules/78-sound-card.rules \
+	rules/80-drivers.rules \
+	rules/95-udev-late.rules
+
+udevconfdir = $(sysconfdir)/udev
+dist_udevconf_DATA = \
+	src/udev/udev.conf
+
+sharepkgconfigdir = $(datadir)/pkgconfig
+sharepkgconfig_DATA = \
+	src/udev/udev.pc
+
+EXTRA_DIST += \
+	rules/99-systemd.rules.in \
+	src/udev/udev.pc.in
+
+CLEANFILES += \
+	rules/99-systemd.rules \
+	src/udev/udev.pc
+
+EXTRA_DIST += \
+	units/udev.service.in \
+	units/udev-trigger.service.in \
+	units/udev-settle.service.in
+
+CLEANFILES += \
+	units/udev.service \
+	units/udev-trigger.service \
+	units/udev-settle.service
+
+systemd-install-hook:
+	mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
+	ln -sf ../udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-control.socket
+	ln -sf ../udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-kernel.socket
+	mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants
+	ln -sf ../udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev.service
+	ln -sf ../udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev-trigger.service
+
+INSTALL_DATA_HOOKS += systemd-install-hook
+
+bin_PROGRAMS += \
+	udevadm
+
+udevlibexec_PROGRAMS = \
+	udevd
+
+udev_common_sources = \
+	src/udev/udev.h \
+	src/udev/udev-event.c \
+	src/udev/udev-watch.c \
+	src/udev/udev-node.c \
+	src/udev/udev-rules.c \
+	src/udev/udev-ctrl.c \
+	src/udev/udev-builtin.c \
+	src/udev/udev-builtin-blkid.c \
+	src/udev/udev-builtin-firmware.c \
+	src/udev/udev-builtin-hwdb.c \
+	src/udev/udev-builtin-input_id.c \
+	src/udev/udev-builtin-kmod.c \
+	src/udev/udev-builtin-path_id.c \
+	src/udev/udev-builtin-usb_id.c \
+	src/systemd/sd-daemon.h \
+	src/sd-daemon.c
+
+udev_common_CFLAGS = \
+	$(BLKID_CFLAGS) \
+	$(KMOD_CFLAGS)
+
+udev_common_LDADD = \
+	libudev-private.la \
+	$(BLKID_LIBS) \
+	$(KMOD_LIBS)
+
+udev_common_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
+	-DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
+
+if HAVE_ACL
+udev_common_sources += \
+	src/udev/udev-builtin-uaccess.c \
+	src/login/logind-acl.c \
+	src/acl-util.c
+
+udev_common_CFLAGS += \
+	$(ACL_CFLAGS)
+
+udev_common_LDADD += \
+	libsystemd-login.la \
+	$(ACL_LIBS)
+endif
+
+udevd_SOURCES = \
+	$(udev_common_sources) \
+	src/udev/udevd.c
+
+udevd_CFLAGS = \
+	$(udev_common_CFLAGS)
+
+udevd_LDADD = \
+	$(udev_common_LDADD) \
+	libsystemd-basic.la
+
+udevd_CPPFLAGS = \
+	$(udev_common_CPPFLAGS)
+
+udevadm_SOURCES = \
+	$(udev_common_sources) \
+	src/udev/udevadm.c \
+	src/udev/udevadm-info.c \
+	src/udev/udevadm-control.c \
+	src/udev/udevadm-monitor.c \
+	src/udev/udevadm-settle.c \
+	src/udev/udevadm-trigger.c \
+	src/udev/udevadm-test.c \
+	src/udev/udevadm-test-builtin.c
+
+udevadm_CFLAGS = \
+	$(udev_common_CFLAGS)
+
+udevadm_LDADD = \
+	$(udev_common_LDADD) \
+	libsystemd-basic.la
+
+udevadm_CPPFLAGS = \
+	$(udev_common_CPPFLAGS)
+
+# ------------------------------------------------------------------------------
+TESTS = \
+	src/udev/test/udev-test.pl \
+	src/udev/test/rules-test.sh
+
+check_PROGRAMS = \
+	test-libudev \
+	test-udev
+
+test_libudev_SOURCES = \
+	src/udev/test-libudev.c
+
+test_libudev_LDADD = \
+	libudev.la
+
+test_udev_SOURCES = \
+	$(udev_common_sources) \
+	src/udev/test-udev.c
+
+test_udev_CFLAGS = \
+	$(udev_common_CFLAGS)
+
+test_udev_LDADD = \
+	$(udev_common_LDADD) \
+	libsystemd-basic.la
+
+test_udev_CPPFLAGS = \
+	$(udev_common_CPPFLAGS)
+
+test_udev_DEPENDENCIES = \
+	src/udev/test/sys
+
+# packed sysfs test tree
+src/udev/test/sys:
+	$(AM_V_GEN)mkdir -p src/udev/test && tar -C src/udev/test/ -xJf $(top_srcdir)/src/udev/test/sys.tar.xz
+
+test-sys-distclean:
+	-rm -rf src/udev/test/sys
+DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
+
+EXTRA_DIST += \
+	src/udev/test/sys.tar.xz \
+	$(TESTS) \
+	src/udev/test/rule-syntax-check.py
+
+# ------------------------------------------------------------------------------
+ata_id_SOURCES = \
+	src/udev/ata_id/ata_id.c
+
+ata_id_LDADD = \
+	libudev-private.la \
+	libsystemd-basic.la
+
+udevlibexec_PROGRAMS += \
+	ata_id
+
+# ------------------------------------------------------------------------------
+cdrom_id_SOURCES = \
+	src/udev/cdrom_id/cdrom_id.c
+
+cdrom_id_LDADD = \
+	libudev-private.la \
+	libsystemd-basic.la
+
+udevlibexec_PROGRAMS += \
+	cdrom_id
+
+dist_udevrules_DATA += \
+	src/udev/cdrom_id/60-cdrom_id.rules
+
+# ------------------------------------------------------------------------------
+collect_SOURCES = \
+	src/udev/collect/collect.c
+
+collect_LDADD = \
+	libudev-private.la
+
+udevlibexec_PROGRAMS += \
+	collect
+
+# ------------------------------------------------------------------------------
+scsi_id_SOURCES =\
+	src/udev/scsi_id/scsi_id.c \
+	src/udev/scsi_id/scsi_serial.c \
+	src/udev/scsi_id/scsi.h \
+	src/udev/scsi_id/scsi_id.h
+
+scsi_id_LDADD = \
+	libudev-private.la \
+	libsystemd-basic.la
+
+udevlibexec_PROGRAMS += \
+	scsi_id
+
+EXTRA_DIST += \
+	src/udev/scsi_id/README
+
+# ------------------------------------------------------------------------------
+v4l_id_SOURCES = \
+	src/udev/v4l_id/v4l_id.c
+
+v4l_id_LDADD = \
+	libudev-private.la
+
+udevlibexec_PROGRAMS += \
+	v4l_id
+
+dist_udevrules_DATA += \
+	src/udev/v4l_id/60-persistent-v4l.rules
+
+# ------------------------------------------------------------------------------
+accelerometer_SOURCES = \
+	src/udev/accelerometer/accelerometer.c
+
+accelerometer_LDADD = \
+	libudev-private.la -lm \
+	libsystemd-basic.la
+
+udevlibexec_PROGRAMS += \
+	accelerometer
+
+dist_udevrules_DATA += \
+	src/udev/accelerometer/61-accelerometer.rules
+
+# ------------------------------------------------------------------------------
+if ENABLE_GUDEV
+SUBDIRS += \
+	src/udev/gudev/docs
+
+libgudev_includedir = \
+	$(includedir)/gudev-1.0/gudev
+
+libgudev_include_HEADERS = \
+	src/udev/gudev/gudev.h \
+	src/udev/gudev/gudevenums.h \
+	src/udev/gudev/gudevenumtypes.h \
+	src/udev/gudev/gudevtypes.h \
+	src/udev/gudev/gudevclient.h \
+	src/udev/gudev/gudevdevice.h \
+	src/udev/gudev/gudevenumerator.h
+
+lib_LTLIBRARIES += libgudev-1.0.la
+
+pkgconfiglib_DATA += \
+	src/udev/gudev/gudev-1.0.pc
+
+EXTRA_DIST += \
+	src/udev/gudev/gudev-1.0.pc.in
+
+CLEANFILES += \
+	src/udev/gudev/gudev-1.0.pc
+
+libgudev_1_0_la_SOURCES = \
+	src/udev/gudev/gudevenums.h \
+	src/udev/gudev/gudevenumtypes.h \
+	src/udev/gudev/gudevenumtypes.h\
+	src/udev/gudev/gudevtypes.h \
+	src/udev/gudev/gudevclient.h \
+	src/udev/gudev/gudevclient.c \
+	src/udev/gudev/gudevdevice.h \
+	src/udev/gudev/gudevdevice.c \
+	src/udev/gudev/gudevenumerator.h \
+	src/udev/gudev/gudevenumerator.c \
+	src/udev/gudev/gudevprivate.h
+
+nodist_libgudev_1_0_la_SOURCES = \
+	src/udev/gudev/gudevmarshal.h \
+	src/udev/gudev/gudevmarshal.c \
+	src/udev/gudev/gudevenumtypes.h \
+	src/udev/gudev/gudevenumtypes.c
+
+BUILT_SOURCES += \
+	$(nodist_libgudev_1_0_la_SOURCES)
+
+libgudev_1_0_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_builddir)/src\
+	-I$(top_srcdir)/src\
+	-I$(top_builddir)/src/udev/gudev \
+	-I$(top_srcdir)/src/udev/gudev \
+	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
+	-D_GUDEV_COMPILATION \
+	-DG_LOG_DOMAIN=\"GUdev\"
+
+libgudev_1_0_la_CFLAGS = \
+	-fvisibility=default \
+	$(GLIB_CFLAGS)
+
+libgudev_1_0_la_LIBADD = \
+	libudev.la \
+	$(GLIB_LIBS)
+
+libgudev_1_0_la_LDFLAGS = \
+	-version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
+	-export-dynamic -no-undefined \
+	-export-symbols-regex '^g_udev_.*'
+
+EXTRA_DIST += \
+	src/udev/gudev/gudevmarshal.list \
+	src/udev/gudev/gudevenumtypes.h.template \
+	src/udev/gudev/gudevenumtypes.c.template \
+	src/udev/gudev/gjs-example.js \
+	src/udev/gudev/seed-example-enum.js \
+	src/udev/gudev/seed-example.js
+
+CLEANFILES += \
+	$(nodist_libgudev_1_0_la_SOURCES)
+
+src/udev/gudev/gudevmarshal.h: src/udev/gudev/gudevmarshal.list
+	$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
+
+src/udev/gudev/gudevmarshal.c: src/udev/gudev/gudevmarshal.list
+	$(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
+	glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
+
+src/udev/gudev/gudevenumtypes.h: src/udev/gudev/gudevenumtypes.h.template src/udev/gudev/gudevenums.h
+	$(AM_V_GEN)glib-mkenums --template $^ > \
+	    $@.tmp && mv $@.tmp $@
+
+src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/udev/gudev/gudevenums.h
+	$(AM_V_GEN)glib-mkenums --template $^ > \
+	    $@.tmp && mv $@.tmp $@
+
+if ENABLE_INTROSPECTION
+src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la $(G_IR_SCANNER)
+	$(AM_V_GEN)$(G_IR_SCANNER) -v \
+		--warn-all \
+		--namespace GUdev \
+		--nsversion=1.0 \
+		--include=GObject-2.0 \
+		--library=gudev-1.0 \
+		--library-path=$(top_builddir)/src/udev \
+		--library-path=$(top_builddir)/src/udev/gudev \
+		--output $@ \
+		--pkg=glib-2.0 \
+		--pkg=gobject-2.0 \
+		--pkg-export=gudev-1.0 \
+		--c-include=gudev/gudev.h \
+		-I$(top_srcdir)/src/udev \
+		-I$(top_builddir)/src/udev \
+		-D_GUDEV_COMPILATION \
+		-D_GUDEV_WORK_AROUND_DEV_T_BUG \
+		$(top_srcdir)/src/udev/gudev/gudev.h \
+		$(top_srcdir)/src/udev/gudev/gudevtypes.h \
+		$(top_srcdir)/src/udev/gudev/gudevenums.h \
+		$(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \
+		$(top_srcdir)/src/udev/gudev/gudevclient.h \
+		$(top_srcdir)/src/udev/gudev/gudevdevice.h \
+		$(top_srcdir)/src/udev/gudev/gudevenumerator.h \
+		$(top_srcdir)/src/udev/gudev/gudevclient.c \
+		$(top_srcdir)/src/udev/gudev/gudevdevice.c \
+		$(top_srcdir)/src/udev/gudev/gudevenumerator.c
+
+src/udev/gudev/GUdev-1.0.typelib: src/udev/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
+	$(AM_V_GEN)g-ir-compiler $< -o $@
+
+girdir = $(GIRDIR)
+gir_DATA = \
+	src/udev/gudev/GUdev-1.0.gir
+
+typelibsdir = $(GIRTYPELIBDIR)
+typelibs_DATA = \
+	src/udev/gudev/GUdev-1.0.typelib
+
+CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+endif # ENABLE_INTROSPECTION
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libgudev-install-move-hook:
+	if test "$(libdir)" != "$(rootlibdir)"; then \
+		mkdir -p $(DESTDIR)$(rootlibdir) && \
+		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libgudev-1.0.so) && \
+		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libgudev-1.0.so && \
+		mv $(DESTDIR)$(libdir)/libgudev-1.0.so.* $(DESTDIR)$(rootlibdir); \
+	fi
+
+libgudev-uninstall-move-hook:
+	rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
+
+INSTALL_EXEC_HOOKS += libgudev-install-move-hook
+UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_KEYMAP
+keymap_SOURCES = \
+	src/udev/keymap/keymap.c
+
+keymap_CPPFLAGS = \
+	$(AM_CPPFLAGS) -I src/udev/keymap
+
+nodist_keymap_SOURCES = \
+	src/udev/keymap/keys-from-name.h \
+	src/udev/keymap/keys-to-name.h
+
+BUILT_SOURCES += \
+	$(nodist_keymap_SOURCES)
+
+udevlibexec_PROGRAMS += \
+	keymap
+
+dist_doc_DATA += \
+	src/udev/keymap/README.keymap.txt
+
+dist_udevrules_DATA += \
+	src/udev/keymap/95-keymap.rules \
+	src/udev/keymap/95-keyboard-force-release.rules
+
+dist_udevhome_SCRIPTS = \
+	src/udev/keymap/findkeyboards \
+	src/udev/keymap/keyboard-force-release.sh
+
+EXTRA_DIST += \
+	src/udev/keymap/check-keymaps.sh
+
+CLEANFILES += \
+	$(nodist_keymap_SOURCES) \
+	src/udev/keymap/keys.txt \
+	src/udev/keymap/keys-from-name.gperf
+
+udevkeymapdir = $(libexecdir)/udev/keymaps
+dist_udevkeymap_DATA = \
+	src/udev/keymap/keymaps/acer \
+	src/udev/keymap/keymaps/acer-aspire_5720 \
+	src/udev/keymap/keymaps/acer-aspire_8930 \
+	src/udev/keymap/keymaps/acer-aspire_5920g \
+	src/udev/keymap/keymaps/acer-aspire_6920 \
+	src/udev/keymap/keymaps/acer-travelmate_c300 \
+	src/udev/keymap/keymaps/asus \
+	src/udev/keymap/keymaps/compaq-e_evo \
+	src/udev/keymap/keymaps/dell \
+	src/udev/keymap/keymaps/dell-latitude-xt2 \
+	src/udev/keymap/keymaps/everex-xt5000 \
+	src/udev/keymap/keymaps/fujitsu-amilo_li_2732 \
+	src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 \
+	src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
+	src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 \
+	src/udev/keymap/keymaps/fujitsu-amilo_si_1520 \
+	src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
+	src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
+	src/udev/keymap/keymaps/genius-slimstar-320 \
+	src/udev/keymap/keymaps/hewlett-packard \
+	src/udev/keymap/keymaps/hewlett-packard-2510p_2530p \
+	src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook \
+	src/udev/keymap/keymaps/hewlett-packard-pavilion \
+	src/udev/keymap/keymaps/hewlett-packard-presario-2100 \
+	src/udev/keymap/keymaps/hewlett-packard-tablet \
+	src/udev/keymap/keymaps/hewlett-packard-tx2 \
+	src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+	src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 \
+	src/udev/keymap/keymaps/lenovo-3000 \
+	src/udev/keymap/keymaps/lenovo-ideapad \
+	src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+	src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet \
+	src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet \
+	src/udev/keymap/keymaps/lg-x110 \
+	src/udev/keymap/keymaps/logitech-wave \
+	src/udev/keymap/keymaps/logitech-wave-cordless \
+	src/udev/keymap/keymaps/logitech-wave-pro-cordless \
+	src/udev/keymap/keymaps/maxdata-pro_7000 \
+	src/udev/keymap/keymaps/medion-fid2060 \
+	src/udev/keymap/keymaps/medionnb-a555 \
+	src/udev/keymap/keymaps/micro-star \
+	src/udev/keymap/keymaps/module-asus-w3j \
+	src/udev/keymap/keymaps/module-ibm \
+	src/udev/keymap/keymaps/module-lenovo \
+	src/udev/keymap/keymaps/module-sony \
+	src/udev/keymap/keymaps/module-sony-old \
+	src/udev/keymap/keymaps/module-sony-vgn \
+	src/udev/keymap/keymaps/olpc-xo \
+	src/udev/keymap/keymaps/onkyo \
+	src/udev/keymap/keymaps/oqo-model2 \
+	src/udev/keymap/keymaps/samsung-other \
+	src/udev/keymap/keymaps/samsung-90x3a \
+	src/udev/keymap/keymaps/samsung-sq1us \
+	src/udev/keymap/keymaps/samsung-sx20s \
+	src/udev/keymap/keymaps/toshiba-satellite_a100 \
+	src/udev/keymap/keymaps/toshiba-satellite_a110 \
+	src/udev/keymap/keymaps/toshiba-satellite_m30x \
+	src/udev/keymap/keymaps/zepto-znote
+
+udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
+dist_udevkeymapforcerel_DATA = \
+	src/udev/keymap/force-release-maps/dell-touchpad \
+	src/udev/keymap/force-release-maps/hp-other \
+	src/udev/keymap/force-release-maps/samsung-other \
+	src/udev/keymap/force-release-maps/samsung-90x3a \
+	src/udev/keymap/force-release-maps/common-volume-keys
+
+src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+	$(AM_V_at)mkdir -p src/keymap
+	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+
+src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
+
+src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile
+	$(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
+
+src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
+
+keymaps-distcheck-hook: src/udev/keymap/keys.txt
+	$(top_srcdir)/src/udev/keymap/check-keymaps.sh $(top_srcdir) $^
+DISTCHECK_HOOKS += keymaps-distcheck-hook
+endif
+
+# ------------------------------------------------------------------------------
+mtd_probe_SOURCES =  \
+	src/udev/mtd_probe/mtd_probe.c \
+	src/udev/mtd_probe/mtd_probe.h \
+	src/udev/mtd_probe/probe_smartmedia.c
+
+mtd_probe_CPPFLAGS = \
+	$(AM_CPPFLAGS)
+
+dist_udevrules_DATA += \
+	src/udev/mtd_probe/75-probe_mtd.rules
+
+udevlibexec_PROGRAMS += \
+	mtd_probe
+
+# ------------------------------------------------------------------------------
+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/systemd/sd-id128.h
+
+lib_LTLIBRARIES += \
+	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
+
 # ------------------------------------------------------------------------------
-# Copyright (C) 2008-2012 Kay Sievers <kay.sievers@vrfy.org>
-# Copyright (C) 2009 Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
+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/journal/sparse-endian.h \
+	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
+
+journalctl_SOURCES = \
+	src/journal/journalctl.c \
+	src/pager.c \
+	src/logs-show.c
+
+journalctl_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-journal.la \
+	libsystemd-id128.la
+
+if HAVE_XZ
+journalctl_SOURCES += \
+	src/journal/compress.c
+journalctl_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(XZ_CFLAGS)
+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
+
+test_journal_send_SOURCES = \
+	src/journal/test-journal-send.c
+
+test_journal_send_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-journal.la
+
+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 \
+        test-journal-send
+
+pkginclude_HEADERS += \
+	src/systemd/sd-journal.h \
+	src/systemd/sd-messages.h
+
+lib_LTLIBRARIES += \
+	libsystemd-journal.la
+
+rootlibexec_PROGRAMS += \
+	systemd-journald
+
+rootbin_PROGRAMS += \
+	journalctl
+
+bin_PROGRAMS += \
+	systemd-cat
+
+dist_systemunit_DATA += \
+	units/systemd-journald.socket
+
+nodist_systemunit_DATA += \
+	units/systemd-journald.service
+
+dist_pkgsysconf_DATA += \
+	src/journal/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
+
+# ------------------------------------------------------------------------------
+if ENABLE_COREDUMP
+systemd_coredump_SOURCES = \
+	src/journal/coredump.c
+
+systemd_coredump_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-journal.la \
+	libsystemd-login.la
+
+rootlibexec_PROGRAMS += \
+	systemd-coredump
+
+sysctl_DATA = \
+	sysctl.d/coredump.conf
+
+EXTRA_DIST += \
+	sysctl.d/coredump.conf.in
+
+CLEANFILES += \
+	sysctl.d/coredump.conf
+endif
+
 # ------------------------------------------------------------------------------
+if ENABLE_BINFMT
+systemd_binfmt_SOURCES = \
+	src/binfmt/binfmt.c
 
-SUBDIRS = .
+systemd_binfmt_LDADD = \
+	libsystemd-basic.la
 
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+rootlibexec_PROGRAMS += \
+	systemd-binfmt
 
-AM_MAKEFLAGS = --no-print-directory
+dist_systemunit_DATA += \
+	units/proc-sys-fs-binfmt_misc.automount \
+	units/proc-sys-fs-binfmt_misc.mount
 
-AM_CPPFLAGS = \
-	-include $(top_builddir)/config.h \
-	-I$(top_srcdir)/src \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DPKGLIBEXECDIR=\""$(libexecdir)/udev"\"
+nodist_systemunit_DATA += \
+	units/systemd-binfmt.service
 
-AM_CFLAGS = \
-	${my_CFLAGS} \
-	-fvisibility=hidden \
-	-ffunction-sections \
-	-fdata-sections
+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 )
 
-AM_LDFLAGS = \
-	-Wl,--gc-sections \
-	-Wl,--as-needed
+INSTALL_DATA_HOOKS += \
+	binfmt-install-data-hook
 
-DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-gtk-doc \
-	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+MANPAGES += \
+	man/binfmt.d.5
 
-BUILT_SOURCES =
-EXTRA_DIST =
-CLEANFILES =
-INSTALL_EXEC_HOOKS =
-INSTALL_DATA_HOOKS =
-UNINSTALL_EXEC_HOOKS =
-DISTCHECK_HOOKS =
-DISTCLEAN_LOCAL_HOOKS =
+EXTRA_DIST += \
+	units/systemd-binfmt.service.in
+endif
 
-udevhomedir = $(libexecdir)/udev
-udevhome_SCRIPTS =
-dist_udevhome_SCRIPTS =
-dist_udevhome_DATA =
-dist_man_MANS =
+# ------------------------------------------------------------------------------
+if ENABLE_VCONSOLE
+systemd_vconsole_setup_SOURCES = \
+	src/vconsole/vconsole-setup.c
 
-SED_PROCESS = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
-	-e 's,@VERSION\@,$(VERSION),g' \
-	-e 's,@prefix\@,$(prefix),g' \
-	-e 's,@rootprefix\@,$(rootprefix),g' \
-	-e 's,@exec_prefix\@,$(exec_prefix),g' \
-	-e 's,@libdir\@,$(libdir),g' \
-	-e 's,@includedir\@,$(includedir),g' \
-	-e 's,@bindir\@,$(bindir),g' \
-	-e 's,@pkglibexecdir\@,$(libexecdir)/udev,g' \
-	< $< > $@ || rm $@
+systemd_vconsole_setup_LDADD = \
+	libsystemd-basic.la
 
-%.pc: %.pc.in Makefile
-	$(SED_PROCESS)
+rootlibexec_PROGRAMS += \
+	systemd-vconsole-setup
 
-%.rules: %.rules.in Makefile
-	$(SED_PROCESS)
+nodist_systemunit_DATA += \
+	units/systemd-vconsole-setup.service
 
-%.service: %.service.in Makefile
-	$(SED_PROCESS)
+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 )
 
-%.sh: %.sh.in Makefile
-	$(SED_PROCESS)
-	$(AM_V_GEN)chmod +x $@
+INSTALL_DATA_HOOKS += \
+	vconsole-install-data-hook
 
-%.pl: %.pl.in Makefile
-	$(SED_PROCESS)
-	$(AM_V_GEN)chmod +x $@
+MANPAGES += \
+	man/vconsole.conf.5
+
+EXTRA_DIST += \
+	units/systemd-vconsole-setup.service.in
+endif
 
 # ------------------------------------------------------------------------------
-# libudev
-# ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=0
-LIBUDEV_AGE=13
+if ENABLE_READAHEAD
+systemd_readahead_collect_SOURCES = \
+	src/readahead/readahead-collect.c \
+	src/readahead/readahead-common.c
 
-SUBDIRS += src/docs
+systemd_readahead_collect_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	libudev.la
 
-include_HEADERS = src/libudev.h
-lib_LTLIBRARIES = src/libudev.la
+systemd_readahead_replay_SOURCES = \
+	src/readahead/readahead-replay.c \
+	src/readahead/readahead-common.c
 
-src_libudev_la_SOURCES =\
-	src/libudev-private.h \
-	src/libudev.c \
-	src/libudev-list.c \
-	src/libudev-util.c \
-	src/libudev-device.c \
-	src/libudev-enumerate.c \
-	src/libudev-monitor.c \
-	src/libudev-queue.c
+systemd_readahead_replay_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	libudev.la
 
-src_libudev_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
-	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
+rootlibexec_PROGRAMS += \
+	systemd-readahead-collect \
+	systemd-readahead-replay
 
-noinst_LTLIBRARIES = \
-	src/libudev-private.la
+dist_systemunit_DATA += \
+	units/systemd-readahead-done.timer
 
-src_libudev_private_la_SOURCES =\
-	$(src_libudev_la_SOURCES) \
-	src/libudev-util-private.c \
-	src/libudev-device-private.c \
-	src/libudev-queue-private.c
+nodist_systemunit_DATA += \
+	units/systemd-readahead-collect.service \
+	units/systemd-readahead-replay.service \
+	units/systemd-readahead-done.service
 
-if WITH_SELINUX
-src_libudev_private_la_SOURCES += src/libudev-selinux-private.c
-src_libudev_private_la_LIBADD = $(SELINUX_LIBS)
+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
+
+MANPAGES += \
+	man/sd_readahead.3 \
+	man/sd-readahead.7
 endif
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = src/libudev.pc
-EXTRA_DIST += src/libudev.pc.in
-CLEANFILES += src/libudev.pc
+# ------------------------------------------------------------------------------
+if ENABLE_QUOTACHECK
+rootlibexec_PROGRAMS += \
+	systemd-quotacheck
+
+nodist_systemunit_DATA += \
+	units/quotacheck.service
 
-EXTRA_DIST += src/COPYING
-# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
-libudev-install-move-hook:
-	if test "$(libdir)" != "$(rootlib_execdir)"; then \
-		mkdir -p $(DESTDIR)$(rootlib_execdir) && \
-		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
-		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-		ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
-		mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \
-	fi
+EXTRA_DIST += \
+	units/quotacheck.service.in
 
-libudev-uninstall-move-hook:
-	rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so*
+systemd_quotacheck_SOURCES = \
+	src/quotacheck.c
 
-INSTALL_EXEC_HOOKS += libudev-install-move-hook
-UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
+systemd_quotacheck_LDADD = \
+	libsystemd-basic.la
+endif
 
 # ------------------------------------------------------------------------------
-# main udev
-# ------------------------------------------------------------------------------
-udev-confdirs:
-	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
-	-mkdir -p $(DESTDIR)$(libexecdir)/udev/devices
+if ENABLE_RANDOMSEED
+rootlibexec_PROGRAMS += \
+	systemd-random-seed
 
-INSTALL_DATA_HOOKS += udev-confdirs
+nodist_systemunit_DATA += \
+	units/systemd-random-seed-save.service \
+	units/systemd-random-seed-load.service
 
 EXTRA_DIST += \
-	rules/arch \
-	rules/misc
+	units/systemd-random-seed-save.service.in \
+	units/systemd-random-seed-load.service.in
+
+systemd_random_seed_SOURCES = \
+	src/random-seed.c
+
+systemd_random_seed_LDADD = \
+	libsystemd-basic.la
+
+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 )
+
+INSTALL_DATA_HOOKS += \
+	randomseed-install-data-hook
+endif
 
-udevrulesdir = $(libexecdir)/udev/rules.d
-dist_udevrules_DATA = \
-	rules/rules.d/50-udev-default.rules \
-	rules/rules.d/60-persistent-storage-tape.rules \
-	rules/rules.d/60-persistent-serial.rules \
-	rules/rules.d/60-persistent-input.rules \
-	rules/rules.d/60-persistent-alsa.rules \
-	rules/rules.d/60-persistent-storage.rules \
-	rules/rules.d/75-net-description.rules \
-	rules/rules.d/75-tty-description.rules \
-	rules/rules.d/78-sound-card.rules \
-	rules/rules.d/80-drivers.rules \
-	rules/rules.d/95-udev-late.rules
+# ------------------------------------------------------------------------------
+if HAVE_LIBCRYPTSETUP
+rootlibexec_PROGRAMS += \
+	systemd-cryptsetup
 
-udevconfdir = $(sysconfdir)/udev
-dist_udevconf_DATA = src/udev.conf
+systemgenerator_PROGRAMS += \
+	systemd-cryptsetup-generator
 
-sharepkgconfigdir = $(datadir)/pkgconfig
-sharepkgconfig_DATA = src/udev.pc
-EXTRA_DIST += src/udev.pc.in
-CLEANFILES += src/udev.pc
+dist_systemunit_DATA += \
+	units/cryptsetup.target
 
-if WITH_SYSTEMD
-dist_systemdsystemunit_DATA = \
-	src/udev-control.socket \
-	src/udev-kernel.socket
+systemd_cryptsetup_SOURCES = \
+	src/cryptsetup/cryptsetup.c \
+	src/ask-password-api.c
 
-systemdsystemunit_DATA = \
-	src/udev.service \
-	src/udev-trigger.service \
-	src/udev-settle.service
+systemd_cryptsetup_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(LIBCRYPTSETUP_CFLAGS)
 
-EXTRA_DIST += \
-	src/udev.service.in \
-	src/udev-trigger.service.in \
-	src/udev-settle.service.in
+systemd_cryptsetup_LDADD = \
+	$(LIBCRYPTSETUP_LIBS) \
+	libudev.la \
+	libsystemd-basic.la
 
-CLEANFILES += \
-	src/udev.service \
-	src/udev-trigger.service \
-	src/udev-settle.service
+systemd_cryptsetup_generator_SOURCES = \
+	src/cryptsetup/cryptsetup-generator.c \
+	src/unit-name.c
 
-systemd-install-hook:
-	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
-	ln -sf ../udev-control.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-control.socket
-	ln -sf ../udev-kernel.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-kernel.socket
-	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
-	ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev.service
-	ln -sf ../udev-trigger.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-trigger.service
+systemd_cryptsetup_generator_LDADD = \
+	libsystemd-basic.la
 
-INSTALL_DATA_HOOKS += systemd-install-hook
+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
 
-bin_PROGRAMS = \
-	src/udevadm
+# ------------------------------------------------------------------------------
+if ENABLE_HOSTNAMED
+systemd_hostnamed_SOURCES = \
+	src/hostname/hostnamed.c \
+	src/dbus-common.c \
+	src/polkit.c
 
-pkglibexec_PROGRAMS = \
-	src/udevd
+systemd_hostnamed_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
 
-udev_common_sources = \
-	src/udev.h \
-	src/udev-event.c \
-	src/udev-watch.c \
-	src/udev-node.c \
-	src/udev-rules.c \
-	src/udev-ctrl.c \
-	src/udev-builtin.c \
-	src/udev-builtin-blkid.c \
-	src/udev-builtin-firmware.c \
-	src/udev-builtin-hwdb.c \
-	src/udev-builtin-input_id.c \
-	src/udev-builtin-kmod.c \
-	src/udev-builtin-path_id.c \
-	src/udev-builtin-usb_id.c
+systemd_hostnamed_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(DBUS_LIBS)
 
-udev_common_CFLAGS = \
-	$(BLKID_CFLAGS) \
-	$(KMOD_CFLAGS)
+rootlibexec_PROGRAMS += \
+	systemd-hostnamed
 
-udev_common_LDADD = \
-	src/libudev-private.la \
-	$(BLKID_LIBS) \
-	$(KMOD_LIBS)
+nodist_systemunit_DATA += \
+	units/systemd-hostnamed.service
 
-udev_common_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
-	-DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
+dist_dbuspolicy_DATA += \
+	src/hostname/org.freedesktop.hostname1.conf
 
-src_udevd_SOURCES = \
-	$(udev_common_sources) \
-	src/udevd.c \
-	src/sd-daemon.h \
-	src/sd-daemon.c
-src_udevd_CFLAGS = $(udev_common_CFLAGS)
-src_udevd_LDADD = $(udev_common_LDADD)
-src_udevd_CPPFLAGS = $(udev_common_CPPFLAGS)
+dist_dbussystemservice_DATA += \
+	src/hostname/org.freedesktop.hostname1.service
 
-src_udevadm_SOURCES = \
-	$(udev_common_sources) \
-	src/udevadm.c \
-	src/udevadm-info.c \
-	src/udevadm-control.c \
-	src/udevadm-monitor.c \
-	src/udevadm-settle.c \
-	src/udevadm-trigger.c \
-	src/udevadm-test.c \
-	src/udevadm-test-builtin.c
-src_udevadm_CFLAGS = $(udev_common_CFLAGS)
-src_udevadm_LDADD = $(udev_common_LDADD)
-src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS)
+polkitpolicy_in_files += \
+	src/hostname/org.freedesktop.hostname1.policy.in
 
-if HAVE_XSLTPROC
-# ------------------------------------------------------------------------------
-# udev man pages
-# ------------------------------------------------------------------------------
-dist_man_MANS += \
-	src/udev.7 \
-	src/udevadm.8 \
-	src/udevd.8
+dbusinterface_DATA += \
+	org.freedesktop.hostname1.xml
 
-dist_noinst_DATA = \
-	src/udev.html \
-	src/udevadm.html \
-	src/udevd.html
+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
 
-EXTRA_DIST += \
-	src/udev.xml \
-	src/udevadm.xml \
-	src/udevd.xml
+hostnamed-install-data-hook:
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f dbus-org.freedesktop.hostname1.service && \
+		$(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
 
-src/%.7 src/%.8 : src/%.xml
-	$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+INSTALL_DATA_HOOKS += \
+	hostnamed-install-data-hook
 
-src/%.html : src/%.xml
-	$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+EXTRA_DIST += \
+	units/systemd-hostnamed.service.in
 endif
 
 # ------------------------------------------------------------------------------
-# udev tests
-# ------------------------------------------------------------------------------
-TESTS = \
-	test/udev-test.pl \
-	test/rules-test.sh
+if ENABLE_LOCALED
+systemd_localed_SOURCES = \
+	src/locale/localed.c \
+	src/dbus-common.c \
+	src/polkit.c
 
-check_PROGRAMS = \
-	src/test-libudev \
-	src/test-udev
+systemd_localed_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
 
-src_test_libudev_SOURCES = src/test-libudev.c
-src_test_libudev_LDADD = src/libudev.la
+systemd_localed_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(DBUS_LIBS)
 
-src_test_udev_SOURCES = \
-	$(udev_common_sources) \
-	src/test-udev.c
-src_test_udev_CFLAGS = $(udev_common_CFLAGS)
-src_test_udev_LDADD = $(udev_common_LDADD)
-src_test_udev_CPPFLAGS = $(udev_common_CPPFLAGS)
+nodist_systemunit_DATA += \
+	units/systemd-localed.service
 
-# packed sysfs test tree
-test/sys/kernel/uevent_seqnum:
-	$(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
+rootlibexec_PROGRAMS += \
+	systemd-localed
 
-BUILT_SOURCES += test/sys/kernel/uevent_seqnum
+dist_dbuspolicy_DATA += \
+	src/locale/org.freedesktop.locale1.conf
 
-test-sys-distclean:
-	-rm -rf test/sys
-DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
+dist_dbussystemservice_DATA += \
+	src/locale/org.freedesktop.locale1.service
 
-EXTRA_DIST += test/sys.tar.xz
+polkitpolicy_in_files += \
+	src/locale/org.freedesktop.locale1.policy.in
 
-# ------------------------------------------------------------------------------
-# ata_id - ATA identify
-# ------------------------------------------------------------------------------
-src_extras_ata_id_ata_id_SOURCES = src/extras/ata_id/ata_id.c
-src_extras_ata_id_ata_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/extras/ata_id/ata_id
+dbusinterface_DATA += \
+	org.freedesktop.locale1.xml
 
-# ------------------------------------------------------------------------------
-# cdrom_id - optical drive/media capability
-# ------------------------------------------------------------------------------
-src_extras_cdrom_id_cdrom_id_SOURCES = src/extras/cdrom_id/cdrom_id.c
-src_extras_cdrom_id_cdrom_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/extras/cdrom_id/cdrom_id
-dist_udevrules_DATA += src/extras/cdrom_id/60-cdrom_id.rules
+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
 
-# ------------------------------------------------------------------------------
-# collect - trigger action when a collection of devices appeared
-# ------------------------------------------------------------------------------
-src_extras_collect_collect_SOURCES = src/extras/collect/collect.c
-src_extras_collect_collect_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/extras/collect/collect
+localed-install-data-hook:
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f dbus-org.freedesktop.locale1.service && \
+		$(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
 
-# ------------------------------------------------------------------------------
-# scsi_id - SCSI inquiry to get various serial numbers
-# ------------------------------------------------------------------------------
-src_extras_scsi_id_scsi_id_SOURCES =\
-	src/extras/scsi_id/scsi_id.c \
-	src/extras/scsi_id/scsi_serial.c \
-	src/extras/scsi_id/scsi.h \
-	src/extras/scsi_id/scsi_id.h
-src_extras_scsi_id_scsi_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/extras/scsi_id/scsi_id
-dist_man_MANS += src/extras/scsi_id/scsi_id.8
-EXTRA_DIST += src/extras/scsi_id/README
+INSTALL_DATA_HOOKS += \
+	localed-install-data-hook
 
-# ------------------------------------------------------------------------------
-# v4l_id - video4linux capabilities
-# ------------------------------------------------------------------------------
-src_extras_v4l_id_v4l_id_SOURCES = src/extras/v4l_id/v4l_id.c
-src_extras_v4l_id_v4l_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/extras/v4l_id/v4l_id
-dist_udevrules_DATA += src/extras/v4l_id/60-persistent-v4l.rules
+EXTRA_DIST += \
+	units/systemd-localed.service.in
 
-# ------------------------------------------------------------------------------
-# accelerometer - updates device orientation
-# ------------------------------------------------------------------------------
-src_extras_accelerometer_accelerometer_SOURCES = src/extras/accelerometer/accelerometer.c
-src_extras_accelerometer_accelerometer_LDADD = src/libudev-private.la -lm
-pkglibexec_PROGRAMS += src/extras/accelerometer/accelerometer
-dist_udevrules_DATA += src/extras/accelerometer/61-accelerometer.rules
+dist_pkgdata_DATA = \
+	src/locale/kbd-model-map
 
-# ------------------------------------------------------------------------------
-# qemu -- qemu/kvm guest tweaks
-# ------------------------------------------------------------------------------
-dist_udevrules_DATA += src/extras/qemu/42-qemu-usb.rules
+dist_noinst_SCRIPT = \
+	src/locale/generate-kbd-model-map
+
+update-kbd-model-map:
+	src/locale/generate-kbd-model-map > src/locale/kbd-model-map
+
+endif
 
-if ENABLE_GUDEV
-# ------------------------------------------------------------------------------
-# GUdev - libudev gobject interface
 # ------------------------------------------------------------------------------
-LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=1
-LIBGUDEV_AGE=1
+if ENABLE_TIMEDATED
+systemd_timedated_SOURCES = \
+	src/timedate/timedated.c \
+	src/dbus-common.c \
+	src/polkit.c
 
-SUBDIRS += src/extras/gudev/docs
-
-src_extras_gudev_libgudev_includedir=$(includedir)/gudev-1.0/gudev
-src_extras_gudev_libgudev_include_HEADERS = \
-	src/extras/gudev/gudev.h \
-	src/extras/gudev/gudevenums.h \
-	src/extras/gudev/gudevenumtypes.h \
-	src/extras/gudev/gudevtypes.h \
-	src/extras/gudev/gudevclient.h \
-	src/extras/gudev/gudevdevice.h \
-	src/extras/gudev/gudevenumerator.h
-
-lib_LTLIBRARIES += src/extras/gudev/libgudev-1.0.la
-
-pkgconfig_DATA += src/extras/gudev/gudev-1.0.pc
-EXTRA_DIST += src/extras/gudev/gudev-1.0.pc.in
-CLEANFILES += src/extras/gudev/gudev-1.0.pc
-
-src_extras_gudev_libgudev_1_0_la_SOURCES = \
-	src/extras/gudev/gudevenums.h \
-	src/extras/gudev/gudevenumtypes.h \
-	src/extras/gudev/gudevenumtypes.h\
-	src/extras/gudev/gudevtypes.h \
-	src/extras/gudev/gudevclient.h \
-	src/extras/gudev/gudevclient.c \
-	src/extras/gudev/gudevdevice.h \
-	src/extras/gudev/gudevdevice.c \
-	src/extras/gudev/gudevenumerator.h \
-	src/extras/gudev/gudevenumerator.c \
-	src/extras/gudev/gudevprivate.h
-
-nodist_src_extras_gudev_libgudev_1_0_la_SOURCES = \
-	src/extras/gudev/gudevmarshal.h \
-	src/extras/gudev/gudevmarshal.c \
-	src/extras/gudev/gudevenumtypes.h \
-	src/extras/gudev/gudevenumtypes.c
-BUILT_SOURCES += $(nodist_src_extras_gudev_libgudev_1_0_la_SOURCES)
-
-src_extras_gudev_libgudev_1_0_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-I$(top_builddir)/src/extras \
-	-I$(top_srcdir)/src/extras \
-	-I$(top_builddir)/src/extras/gudev \
-	-I$(top_srcdir)/src/extras/gudev \
-	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
-	-D_GUDEV_COMPILATION \
-	-DG_LOG_DOMAIN=\"GUdev\"
+systemd_timedated_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
 
-src_extras_gudev_libgudev_1_0_la_CFLAGS = \
-	-fvisibility=default \
-	$(GLIB_CFLAGS)
+systemd_timedated_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(DBUS_LIBS)
 
-src_extras_gudev_libgudev_1_0_la_LIBADD = src/libudev.la $(GLIB_LIBS)
+rootlibexec_PROGRAMS += \
+	systemd-timedated
 
-src_extras_gudev_libgudev_1_0_la_LDFLAGS = \
-	-version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
-	-export-dynamic -no-undefined \
-	-export-symbols-regex '^g_udev_.*'
+dist_dbussystemservice_DATA += \
+	src/timedate/org.freedesktop.timedate1.service
 
-EXTRA_DIST += \
-	src/extras/gudev/COPYING \
-	src/extras/gudev/gudevmarshal.list \
-	src/extras/gudev/gudevenumtypes.h.template \
-	src/extras/gudev/gudevenumtypes.c.template \
-	src/extras/gudev/gjs-example.js \
-	src/extras/gudev/seed-example-enum.js \
-	src/extras/gudev/seed-example.js
-
-src/extras/gudev/gudevmarshal.h: src/extras/gudev/gudevmarshal.list
-	$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
+dist_dbuspolicy_DATA += \
+	src/timedate/org.freedesktop.timedate1.conf
 
-src/extras/gudev/gudevmarshal.c: src/extras/gudev/gudevmarshal.list
-	$(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
-	glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
+nodist_systemunit_DATA += \
+	units/systemd-timedated.service
 
-src/extras/gudev/gudevenumtypes.h: src/extras/gudev/gudevenumtypes.h.template src/extras/gudev/gudevenums.h
-	$(AM_V_GEN)glib-mkenums --template $^ > \
-	    $@.tmp && mv $@.tmp $@
+polkitpolicy_in_files += \
+	src/timedate/org.freedesktop.timedate1.policy.in
 
-src/extras/gudev/gudevenumtypes.c: src/extras/gudev/gudevenumtypes.c.template src/extras/gudev/gudevenums.h
-	$(AM_V_GEN)glib-mkenums --template $^ > \
-	    $@.tmp && mv $@.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
 
-if ENABLE_INTROSPECTION
-src/extras/gudev/GUdev-1.0.gir: src/extras/gudev/libgudev-1.0.la $(G_IR_SCANNER)
-	$(AM_V_GEN)$(G_IR_SCANNER) -v \
-		--warn-all \
-		--namespace GUdev \
-		--nsversion=1.0 \
-		--include=GObject-2.0 \
-		--library=gudev-1.0 \
-		--library-path=$(top_builddir)/src \
-		--library-path=$(top_builddir)/src/extras/gudev \
-		--output $@ \
-		--pkg=glib-2.0 \
-		--pkg=gobject-2.0 \
-		-I$(top_srcdir)/src/extras \
-		-I$(top_builddir)/src/extras \
-		-D_GUDEV_COMPILATION \
-		-D_GUDEV_WORK_AROUND_DEV_T_BUG \
-		$(top_srcdir)/src/extras/gudev/gudev.h \
-		$(top_srcdir)/src/extras/gudev/gudevtypes.h \
-		$(top_srcdir)/src/extras/gudev/gudevenums.h \
-		$(or $(wildcard $(top_builddir)/src/extras/gudev/gudevenumtypes.h),$(top_srcdir)/src/extras/gudev/gudevenumtypes.h) \
-		$(top_srcdir)/src/extras/gudev/gudevclient.h \
-		$(top_srcdir)/src/extras/gudev/gudevdevice.h \
-		$(top_srcdir)/src/extras/gudev/gudevenumerator.h \
-		$(top_srcdir)/src/extras/gudev/gudevclient.c \
-		$(top_srcdir)/src/extras/gudev/gudevdevice.c \
-		$(top_srcdir)/src/extras/gudev/gudevenumerator.c
-
-src/extras/gudev/GUdev-1.0.typelib: src/extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
-	$(AM_V_GEN)g-ir-compiler $< -o $@
+dbusinterface_DATA += \
+	org.freedesktop.timedate1.xml
 
-girdir = $(GIRDIR)
-gir_DATA = src/extras/gudev/GUdev-1.0.gir
+timedated-install-data-hook:
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f dbus-org.freedesktop.timedate1.service  && \
+		$(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
 
-typelibsdir = $(GIRTYPELIBDIR)
-typelibs_DATA = src/extras/gudev/GUdev-1.0.typelib
+INSTALL_DATA_HOOKS += \
+	timedated-install-data-hook
 
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif # ENABLE_INTROSPECTION
+EXTRA_DIST += \
+	units/systemd-timedated.service.in
+endif
 
-# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
-libgudev-install-move-hook:
-	if test "$(libdir)" != "$(rootlib_execdir)"; then \
-		mkdir -p $(DESTDIR)$(rootlib_execdir) && \
-		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libgudev-1.0.so) && \
+# ------------------------------------------------------------------------------
+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
+
+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) \
+	$(ACL_CFLAGS)
+
+systemd_logind_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	libudev.la \
+	$(DBUS_LIBS) \
+	$(ACL_LIBS)
+
+systemd_user_sessions_SOURCES = \
+	src/login/user-sessions.c \
+	src/cgroup-util.c
+
+systemd_user_sessions_LDADD = \
+	libsystemd-basic.la
+
+rootlibexec_PROGRAMS += \
+	systemd-logind \
+	systemd-user-sessions
+
+loginctl_SOURCES = \
+	src/login/loginctl.c \
+	src/login/sysfs-show.c \
+	src/dbus-common.c \
+	src/cgroup-show.c \
+	src/cgroup-util.c \
+	src/pager.c
+
+loginctl_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+loginctl_LDADD = \
+	libsystemd-basic.la \
+	libudev.la \
+	$(DBUS_LIBS)
+
+rootbin_PROGRAMS += \
+	loginctl
+
+test_login_SOURCES = \
+	src/login/test-login.c
+
+test_login_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-login.la
+
+noinst_PROGRAMS += \
+	test-login
+
+libsystemd_login_la_SOURCES = \
+	src/login/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/login/libsystemd-login.sym
+
+libsystemd_login_la_LIBADD = \
+	libsystemd-basic.la
+
+if HAVE_PAM
+pam_systemd_la_SOURCES = \
+	src/login/pam-module.c \
+	src/dbus-common.c
+
+pam_systemd_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(PAM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-fvisibility=hidden
+
+pam_systemd_la_LDFLAGS = \
+	-module \
+	-export-dynamic \
+	-avoid-version \
+	-shared \
+	-export-symbols-regex '^pam_sm_.*'
+
+pam_systemd_la_LIBADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(PAM_LIBS) \
+	$(DBUS_LIBS)
+
+pamlib_LTLIBRARIES = \
+	pam_systemd.la
+endif
+
+# 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$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libgudev-1.0.so && \
-		mv $(DESTDIR)$(libdir)/libgudev-1.0.so.* $(DESTDIR)$(rootlib_execdir); \
+		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
 
-libgudev-uninstall-move-hook:
-	rm -f $(DESTDIR)$(rootlib_execdir)/libgudev-1.0.so*
+INSTALL_EXEC_HOOKS += \
+	libsystemd-login-install-hook
 
-INSTALL_EXEC_HOOKS += libgudev-install-move-hook
-UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
-endif
+libsystemd-login-uninstall-hook:
+	rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
 
-if ENABLE_KEYMAP
-# ------------------------------------------------------------------------------
-# keymap - map custom hardware's multimedia keys
-# ------------------------------------------------------------------------------
-src_extras_keymap_keymap_SOURCES = src/extras/keymap/keymap.c
-src_extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I src/extras/keymap
-nodist_src_extras_keymap_keymap_SOURCES = \
-	src/extras/keymap/keys-from-name.h \
-	src/extras/keymap/keys-to-name.h
-BUILT_SOURCES += $(nodist_src_extras_keymap_keymap_SOURCES)
+UNINSTALL_EXEC_HOOKS += \
+	libsystemd-login-uninstall-hook
+
+nodist_systemunit_DATA += \
+	units/systemd-logind.service \
+	units/systemd-user-sessions.service
+
+dist_dbussystemservice_DATA += \
+	src/login/org.freedesktop.login1.service
 
-pkglibexec_PROGRAMS += src/extras/keymap/keymap
-dist_doc_DATA = src/extras/keymap/README.keymap.txt
+dist_dbuspolicy_DATA += \
+	src/login/org.freedesktop.login1.conf
+
+dist_pkgsysconf_DATA += \
+	src/login/logind.conf
+
+pkginclude_HEADERS += \
+	src/systemd/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:
+	$(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_LDADD = \
+	libsystemd-basic.la \
+	libudev.la
+
+rootlibexec_PROGRAMS += \
+	systemd-multi-seat-x
 
 dist_udevrules_DATA += \
-	src/extras/keymap/95-keymap.rules \
-	src/extras/keymap/95-keyboard-force-release.rules
+	src/login/70-uaccess.rules
 
-dist_udevhome_SCRIPTS += src/extras/keymap/findkeyboards
-udevhome_SCRIPTS += src/extras/keymap/keyboard-force-release.sh
+dist_udevrules_DATA += \
+	src/login/71-seat.rules
+
+nodist_udevrules_DATA += \
+	src/login/73-seat-late.rules
+
+MANPAGES += \
+	man/logind.conf.5 \
+	man/sd-login.7 \
+	man/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/extras/keymap/check-keymaps.sh \
-	src/extras/keymap/keyboard-force-release.sh.in
+	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/extras/keymap/keys.txt \
-	src/extras/keymap/keys-from-name.gperf \
-	src/extras/keymap/keyboard-force-release.sh
+	src/login/logind-gperf.c \
+	src/login/73-seat-late.rules
+endif
+# ------------------------------------------------------------------------------
 
-udevkeymapdir = $(libexecdir)/udev/keymaps
-dist_udevkeymap_DATA = \
-	src/extras/keymap/keymaps/acer \
-	src/extras/keymap/keymaps/acer-aspire_5720 \
-	src/extras/keymap/keymaps/acer-aspire_8930 \
-	src/extras/keymap/keymaps/acer-aspire_5920g \
-	src/extras/keymap/keymaps/acer-aspire_6920 \
-	src/extras/keymap/keymaps/acer-travelmate_c300 \
-	src/extras/keymap/keymaps/asus \
-	src/extras/keymap/keymaps/compaq-e_evo \
-	src/extras/keymap/keymaps/dell \
-	src/extras/keymap/keymaps/dell-latitude-xt2 \
-	src/extras/keymap/keymaps/everex-xt5000 \
-	src/extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
-	src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
-	src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \
-	src/extras/keymap/keymaps/fujitsu-amilo_si_1520 \
-	src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
-	src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
-	src/extras/keymap/keymaps/genius-slimstar-320 \
-	src/extras/keymap/keymaps/hewlett-packard \
-	src/extras/keymap/keymaps/hewlett-packard-2510p_2530p \
-	src/extras/keymap/keymaps/hewlett-packard-compaq_elitebook \
-	src/extras/keymap/keymaps/hewlett-packard-pavilion \
-	src/extras/keymap/keymaps/hewlett-packard-presario-2100 \
-	src/extras/keymap/keymaps/hewlett-packard-tablet \
-	src/extras/keymap/keymaps/hewlett-packard-tx2 \
-	src/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
-	src/extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
-	src/extras/keymap/keymaps/lenovo-3000 \
-	src/extras/keymap/keymaps/lenovo-ideapad \
-	src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
-	src/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
-	src/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
-	src/extras/keymap/keymaps/lg-x110 \
-	src/extras/keymap/keymaps/logitech-wave \
-	src/extras/keymap/keymaps/logitech-wave-cordless \
-	src/extras/keymap/keymaps/logitech-wave-pro-cordless \
-	src/extras/keymap/keymaps/maxdata-pro_7000 \
-	src/extras/keymap/keymaps/medion-fid2060 \
-	src/extras/keymap/keymaps/medionnb-a555 \
-	src/extras/keymap/keymaps/micro-star \
-	src/extras/keymap/keymaps/module-asus-w3j \
-	src/extras/keymap/keymaps/module-ibm \
-	src/extras/keymap/keymaps/module-lenovo \
-	src/extras/keymap/keymaps/module-sony \
-	src/extras/keymap/keymaps/module-sony-old \
-	src/extras/keymap/keymaps/module-sony-vgn \
-	src/extras/keymap/keymaps/olpc-xo \
-	src/extras/keymap/keymaps/onkyo \
-	src/extras/keymap/keymaps/oqo-model2 \
-	src/extras/keymap/keymaps/samsung-other \
-	src/extras/keymap/keymaps/samsung-sq1us \
-	src/extras/keymap/keymaps/samsung-sx20s \
-	src/extras/keymap/keymaps/toshiba-satellite_a100 \
-	src/extras/keymap/keymaps/toshiba-satellite_a110 \
-	src/extras/keymap/keymaps/toshiba-satellite_m30x \
-	src/extras/keymap/keymaps/zepto-znote
+SED_PROCESS = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(SED)	-e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
+		-e 's,@rootbindir\@,$(rootbindir),g' \
+		-e 's,@bindir\@,$(bindir),g' \
+		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
+		-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
+		-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+		-e 's,@systemunitdir\@,$(systemunitdir),g' \
+		-e 's,@userunitdir\@,$(userunitdir),g' \
+		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
+		-e 's,@prefix\@,$(prefix),g' \
+		-e 's,@exec_prefix\@,$(exec_prefix),g' \
+		-e 's,@libdir\@,$(libdir),g' \
+		-e 's,@includedir\@,$(includedir),g' \
+		-e 's,@VERSION\@,$(VERSION),g' \
+		-e 's,@rootprefix\@,$(rootprefix),g' \
+		-e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \
+		< $< > $@ || rm $@
+
+units/%: units/%.in Makefile
+	$(SED_PROCESS)
 
-udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
-dist_udevkeymapforcerel_DATA = \
-	src/extras/keymap/force-release-maps/dell-touchpad \
-	src/extras/keymap/force-release-maps/hp-other \
-	src/extras/keymap/force-release-maps/samsung-other \
-	src/extras/keymap/force-release-maps/common-volume-keys
+man/%: man/%.in Makefile
+	$(SED_PROCESS)
 
-src/extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
-	$(AM_V_at)mkdir -p src/extras/keymap
-	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+sysctl.d/%: sysctl.d/%.in Makefile
+	$(SED_PROCESS)
 
-src/extras/keymap/keys-from-name.gperf: src/extras/keymap/keys.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
+%.pc: %.pc.in Makefile
+	$(SED_PROCESS)
 
-src/extras/keymap/keys-from-name.h: src/extras/keymap/keys-from-name.gperf Makefile
-	$(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
+src/%.policy.in: src/%.policy.in.in Makefile
+	$(SED_PROCESS)
 
-src/extras/keymap/keys-to-name.h: src/extras/keymap/keys.txt Makefile
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
+%.rules: %.rules.in Makefile
+	$(SED_PROCESS)
 
-keymaps-distcheck-hook: src/extras/keymap/keys.txt
-	$(top_srcdir)/src/extras/keymap/check-keymaps.sh $(top_srcdir) $^
-DISTCHECK_HOOKS += keymaps-distcheck-hook
-endif
+%.sh: %.sh.in Makefile
+	$(SED_PROCESS)
+	$(AM_V_GEN)chmod +x $@
 
-if ENABLE_MTD_PROBE
-# ------------------------------------------------------------------------------
-# mtd_probe - autoloads FTL module for mtd devices
-# ------------------------------------------------------------------------------
-src_extras_mtd_probe_mtd_probe_SOURCES =  \
-	src/extras/mtd_probe/mtd_probe.c \
-	src/extras/mtd_probe/mtd_probe.h \
-	src/extras/mtd_probe/probe_smartmedia.c
-src_extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
-dist_udevrules_DATA += src/extras/mtd_probe/75-probe_mtd.rules
-pkglibexec_PROGRAMS += src/extras/mtd_probe/mtd_probe
-endif
+src/%.c: src/%.gperf
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(GPERF) < $< > $@
 
-if ENABLE_RULE_GENERATOR
-# ------------------------------------------------------------------------------
-# rule_generator - persistent network and optical device rule generator
-# ------------------------------------------------------------------------------
-dist_udevhome_SCRIPTS += \
-	src/extras/rule_generator/write_cd_rules \
-	src/extras/rule_generator/write_net_rules
+src/%: src/%.m4
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
 
-dist_udevhome_DATA += \
-	src/extras/rule_generator/rule_generator.functions
+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 $@
 
-dist_udevrules_DATA += \
-	src/extras/rule_generator/75-cd-aliases-generator.rules \
-	src/extras/rule_generator/75-persistent-net-generator.rules
-endif
+M4_PROCESS_SYSTEM = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
 
-if ENABLE_UDEV_ACL
-# ------------------------------------------------------------------------------
-# udev_acl - apply ACLs for users with local forground sessions
-# ------------------------------------------------------------------------------
-src_udev_acl_SOURCES = src/extras/udev-acl/udev-acl.c
-src_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
-src_udev_acl_LDADD = src/libudev-private.la -lacl $(GLIB_LIBS)
-dist_udevrules_DATA += src/extras/udev-acl/70-udev-acl.rules
-pkglibexec_PROGRAMS += src/udev-acl
+M4_PROCESS_USER = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@
+
+units/%: units/%.m4 Makefile
+	$(M4_PROCESS_SYSTEM)
+
+units/user/%: units/%.m4 Makefile
+	$(M4_PROCESS_USER)
+
+CLEANFILES += \
+	$(nodist_systemunit_DATA) \
+	$(nodist_userunit_DATA) \
+	$(nodist_man_MANS) \
+	$(pkgconfigdata_DATA) \
+	$(pkgconfiglib_DATA) \
+	$(nodist_polkitpolicy_DATA) \
+	src/load-fragment-gperf.gperf \
+	src/load-fragment-gperf.c \
+	src/load-fragment-gperf-nulstr.c
 
-udevacl-install-hook:
-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
-	ln -sf $(libexecdir)/udev/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
+if HAVE_XSLTPROC
+XSLTPROC_FLAGS = \
+	--nonet \
+	--stringparam funcsynopsis.style ansi
+
+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_HTML = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
+
+man/%.1: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.3: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.5: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.7: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.8: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
 
-INSTALL_EXEC_HOOKS += udevacl-install-hook
+man/%.html: man/%.xml
+	$(XSLTPROC_PROCESS_HTML)
+
+CLEANFILES += \
+	$(dist_man_MANS) \
+	${XML_FILES:.xml=.html}
 endif
 
-if ENABLE_FLOPPY
-# ------------------------------------------------------------------------------
-# create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)
-# ------------------------------------------------------------------------------
-src_create_floppy_devices_SOURCES = src/extras/floppy/create_floppy_devices.c
-src_create_floppy_devices_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/create_floppy_devices
-dist_udevrules_DATA += src/extras/floppy/60-floppy.rules
+DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+
+org.freedesktop.systemd1.%.xml: systemd
+	$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
+		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+CLEANFILES += \
+	$(dbusinterface_DATA)
+
+systemd-install-data-hook:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(tmpfilesdir) \
+		$(DESTDIR)$(sysconfdir)/tmpfiles.d \
+		$(DESTDIR)$(prefix)/lib/modules-load.d \
+		$(DESTDIR)$(sysconfdir)/modules-load.d \
+		$(DESTDIR)$(prefix)/lib/sysctl.d \
+		$(DESTDIR)$(sysconfdir)/sysctl.d \
+		$(DESTDIR)$(systemshutdowndir) \
+		$(DESTDIR)$(systemgeneratordir) \
+		$(DESTDIR)$(usergeneratordir)
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(systemunitdir) \
+		$(DESTDIR)$(userunitdir) \
+		$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
+		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
+		$(DESTDIR)$(systemunitdir)/basic.target.wants \
+		$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+		$(DESTDIR)$(systemunitdir)/local-fs.target.wants \
+		$(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
+		$(DESTDIR)$(systemunitdir)/runlevel2.target.wants \
+		$(DESTDIR)$(systemunitdir)/runlevel3.target.wants \
+		$(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
+		$(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
+		$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+		$(DESTDIR)$(systemunitdir)/graphical.target.wants \
+		$(DESTDIR)$(pkgsysconfdir)/system \
+		$(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants \
+		$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
+		$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
+		$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
+		$(DESTDIR)$(pkgsysconfdir)/user \
+		$(DESTDIR)$(dbussessionservicedir) \
+		$(DESTDIR)$(sysconfdir)/xdg/systemd
+	( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
+		rm -f user && \
+		$(LN_S) $(pkgsysconfdir)/user user )
+	( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
+		rm -f systemd-initctl.socket systemd-shutdownd.socket && \
+		$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
+		$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
+	( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
+		rm -f systemd-update-utmp-runlevel.service && \
+		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
+	( cd $(DESTDIR)$(systemunitdir)/runlevel2.target.wants && \
+		rm -f systemd-update-utmp-runlevel.service && \
+		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
+	( cd $(DESTDIR)$(systemunitdir)/runlevel3.target.wants && \
+		rm -f systemd-update-utmp-runlevel.service && \
+		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
+	( cd $(DESTDIR)$(systemunitdir)/runlevel4.target.wants && \
+		rm -f systemd-update-utmp-runlevel.service && \
+		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
+	( cd $(DESTDIR)$(systemunitdir)/runlevel5.target.wants && \
+		rm -f systemd-update-utmp-runlevel.service && \
+		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
+	( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
+		rm -f systemd-update-utmp-shutdown.service && \
+		$(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
+	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
+		rm -f systemd-remount-api-vfs.service \
+			fsck-root.service \
+			remount-rootfs.service \
+			tmp.mount && \
+		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+		$(LN_S) ../fsck-root.service fsck-root.service && \
+		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
+		$(LN_S) ../tmp.mount tmp.mount )
+	( cd $(DESTDIR)$(userunitdir) && \
+		rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
+		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
+		$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
+		$(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
+		$(LN_S) $(systemunitdir)/printer.target printer.target && \
+		$(LN_S) $(systemunitdir)/sound.target sound.target )
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \
+		$(LN_S) poweroff.target runlevel0.target && \
+		$(LN_S) rescue.target runlevel1.target && \
+		$(LN_S) multi-user.target runlevel2.target && \
+		$(LN_S) multi-user.target runlevel3.target && \
+		$(LN_S) multi-user.target runlevel4.target && \
+		$(LN_S) graphical.target runlevel5.target && \
+		$(LN_S) reboot.target runlevel6.target )
+	( cd $(DESTDIR)$(systemunitdir) && \
+		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) getty@.service autovt@.service )
+	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+		rm -f getty.target systemd-ask-password-wall.path && \
+		$(LN_S) ../getty.target getty.target && \
+		$(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 )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
+		rm -f remote-fs.target && \
+		$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
+	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+		rm -f dev-hugepages.mount \
+			dev-mqueue.mount \
+			sys-kernel-config.mount \
+			sys-kernel-debug.mount \
+			sys-fs-fuse-connections.mount \
+			systemd-modules-load.service \
+			systemd-tmpfiles-setup.service \
+			systemd-sysctl.service \
+			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-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
+		$(LN_S) ../systemd-modules-load.service systemd-modules-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 )
+	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+		rm -f systemd-tmpfiles-clean.timer && \
+		$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
+	( cd $(DESTDIR)$(dbussessionservicedir) && \
+		rm -f org.freedesktop.systemd1.service && \
+		$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
+if HAVE_PLYMOUTH
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
+		$(DESTDIR)$(systemunitdir)/reboot.target.wants \
+		$(DESTDIR)$(systemunitdir)/kexec.target.wants \
+		$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
+		$(DESTDIR)$(systemunitdir)/halt.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+		rm -f plymouth-start.service plymouth-read-write.service && \
+		$(LN_S) ../plymouth-start.service plymouth-start.service && \
+		$(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
+	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+		rm -f plymouth-quit.service plymouth-quit-wait.service && \
+		$(LN_S) ../plymouth-quit.service plymouth-quit.service && \
+		$(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
+	( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
+		rm -f plymouth-reboot.service && \
+		$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
+	( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
+		rm -f plymouth-kexec.service && \
+		$(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
+	( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
+		rm -f plymouth-poweroff.service && \
+		$(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
+	( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
+		rm -f plymouth-halt.service && \
+		$(LN_S) ../plymouth-halt.service plymouth-halt.service )
+endif
+if TARGET_MEEGO
+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+		rm -f network.target && \
+		$(LN_S) $(systemunitdir)/network.target network.target )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
+		rm -f * )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
+		rm -f * )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
+		rm -f * )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
+		rm -f * )
 endif
 
-if ENABLE_EDD
-# ------------------------------------------------------------------------------
-# edd_id - create /dev/disk/by-id/edd-* links for BIOS EDD data
-# ------------------------------------------------------------------------------
-src_edd_id_SOURCES = src/extras/edd_id/edd_id.c
-src_edd_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/edd_id
-dist_udevrules_DATA += src/extras/edd_id/61-persistent-storage-edd.rules
+if TARGET_FEDORA
+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+		rm -f halt-local.service && \
+		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f display-manager.service single.service && \
+		$(LN_S) prefdm.service display-manager.service && \
+		$(LN_S) rescue.service single.service )
+	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
+		rm -f display-manager.service && \
+		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
-# ------------------------------------------------------------------------------
-# install, uninstall, clean hooks
-# ------------------------------------------------------------------------------
-clean-local:
-	rm -rf udev-test-install
+if TARGET_MANDRIVA
+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+		rm -f halt-local.service && \
+		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f display-manager.service dm.service single.service && \
+		$(LN_S) prefdm.service display-manager.service && \
+		$(LN_S) prefdm.service dm.service && \
+		$(LN_S) rescue.service single.service )
+	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
+		rm -f display-manager.service && \
+		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
+endif
 
-distclean-local:
-	rm -rf autom4te.cache
+if TARGET_DEBIAN_OR_UBUNTU
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f runlevel5.target && \
+		$(LN_S) multi-user.target runlevel5.target )
+endif
 
-EXTRA_DIST += \
-	$(TESTS) \
-	test/rule-syntax-check.py
+if TARGET_SUSE
+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f local.service && \
+		$(LN_S) rc-local.service local.service )
+	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+		rm -f halt-local.service && \
+		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+endif
 
-CLEANFILES += \
-	$(BUILT_SOURCES)
+if TARGET_MAGEIA
+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+		rm -f halt-local.service && \
+		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f display-manager.service && \
+		$(LN_S) prefdm.service display-manager.service && \
+		$(LN_S) prefdm.service dm.service )
+	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
+		rm -f display-manager.service && \
+		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
+endif
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
-install-data-hook: $(INSTALL_DATA_HOOKS)
-
 uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
+install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
+
 distcheck-hook: $(DISTCHECK_HOOKS)
 
 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
-# ------------------------------------------------------------------------------
-# custom release helpers
-# ------------------------------------------------------------------------------
-PREVIOUS_VERSION = `expr $(VERSION) - 1`
-changelog:
-	@ head -1 ChangeLog | grep -q "to v$(PREVIOUS_VERSION)"
-	@ mv ChangeLog ChangeLog.tmp
-	@ echo "Summary of changes from v$(PREVIOUS_VERSION) to v$(VERSION)" >> ChangeLog
-	@ echo "============================================" >> ChangeLog
-	@ echo >> ChangeLog
-	@ git log --pretty=short $(PREVIOUS_VERSION)..HEAD | git shortlog  >> ChangeLog
-	@ echo >> ChangeLog
-	@ cat ChangeLog
-	@ cat ChangeLog.tmp >> ChangeLog
-	@ rm ChangeLog.tmp
-
-test-install:
-	rm -rf $(PWD)/udev-test-install/
-	make DESTDIR=$(PWD)/udev-test-install install
-	tree $(PWD)/udev-test-install/
-
-git-release:
-	head -1 ChangeLog | grep -q "to v$(VERSION)"
-	head -1 NEWS | grep -q "udev $(VERSION)"
-	git commit -a -m "release $(VERSION)"
-	git tag -m "udev $(VERSION)" -s $(VERSION)
-	git gc --prune=0
-
-git-sync:
-	git push
-	git push --tags $(VERSION)
-
-tar:
-	make distcheck
-	xz -d -c udev-$(VERSION).tar.xz | gpg --armor --detach-sign --output udev-$(VERSION).tar.asc
-
-tar-sync:
-	kup put udev-$(VERSION).tar.xz  udev-$(VERSION).tar.asc /pub/linux/utils/kernel/hotplug/udev-$(VERSION).tar.gz
-
-doc-sync:
-	rsync -av src/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/
-	rsync -av --delete src/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/src/
-	rsync -av --delete src/extras/gudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/gudev/
+DISTCHECK_CONFIGURE_FLAGS = \
+	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
+	--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
+	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
+	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
+	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
+	--with-rootprefix=$$dc_install_base \
+	--disable-split-usr \
+	--enable-gtk-doc
+
+upload: all distcheck
+	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)"