chiark / gitweb /
build-sys: add 'make doc-sync' target
[elogind.git] / Makefile.am
index 72bbcc27cf8df7162c9dcb287a480b33b926790e..c87b4d7a1dbfe5eecdef20961f11d92a79b3ea57 100644 (file)
@@ -1,24 +1,35 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*- */
+#
 #  This file is part of systemd.
 #
-#  Copyright 2011 Lennart Poettering
-#  Copyright 2011 Kay Sievers
+#  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
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 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.
+#  Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
+#  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+AM_MAKEFLAGS = --no-print-directory
+
+SUBDIRS = . po
 
-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
@@ -41,7 +52,6 @@ dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
 dbusinterfacedir=@dbusinterfacedir@
-udevrulesdir=@udevrulesdir@
 pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
@@ -55,28 +65,46 @@ 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
-systemgeneratordir=$(rootlibexecdir)/system-generators
-systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemunitdir=$(rootprefix)/lib/systemd/system
 
 CLEANFILES =
 EXTRA_DIST =
+BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 INSTALL_DATA_HOOKS =
+DISTCLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
+noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
+include_HEADERS =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
 dist_udevrules_DATA =
+nodist_udevrules_DATA =
+dist_man_MANS =
+dist_pkgsysconf_DATA =
+dist_dbuspolicy_DATA =
+dbusinterface_DATA =
+dist_dbussystemservice_DATA =
+check_PROGRAMS =
+check_DATA =
+noinst_PROGRAMS =
+TESTS =
 
 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)\" \
@@ -99,16 +127,21 @@ AM_CPPFLAGS = \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-        -DX_SERVER=\"$(bindir)/X\" \
+       -DX_SERVER=\"$(bindir)/X\" \
+       -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
+       -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
        -I $(top_srcdir)/src \
-       -I $(top_srcdir)/src/readahead \
+       -I $(top_srcdir)/src/shared \
        -I $(top_srcdir)/src/login \
        -I $(top_srcdir)/src/journal \
-       -I $(top_srcdir)/src/systemd
+       -I $(top_srcdir)/src/systemd \
+       -I $(top_srcdir)/src/core \
+       -I $(top_srcdir)/src/libudev
 
 AM_CFLAGS = $(WARNINGFLAGS)
 AM_LDFLAGS = $(GCLDFLAGS)
 
+# ------------------------------------------------------------------------------
 if TARGET_GENTOO
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
@@ -163,6 +196,7 @@ endif
 endif
 endif
 
+# ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
        systemctl \
        systemd-notify \
@@ -175,10 +209,11 @@ bin_PROGRAMS = \
        systemd-cgls \
        systemd-cgtop \
        systemd-stdio-bridge \
-       systemd-nspawn
+       systemd-nspawn \
+       systemd-detect-virt
 
 dist_bin_SCRIPTS = \
-       src/systemd-analyze
+       src/analyze/systemd-analyze
 
 rootlibexec_PROGRAMS = \
        systemd \
@@ -193,54 +228,13 @@ rootlibexec_PROGRAMS = \
        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
-
-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
-
-nodist_udevrules_DATA = \
-       src/99-systemd.rules
-
-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
+       bash-completion/systemd-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
@@ -268,6 +262,7 @@ dist_systemunit_DATA = \
        units/remote-fs-pre.target \
        units/network.target \
        units/nss-lookup.target \
+       units/nss-user-lookup.target \
        units/mail-transfer-agent.target \
        units/http-daemon.target \
        units/poweroff.target \
@@ -289,6 +284,7 @@ dist_systemunit_DATA = \
        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 \
@@ -298,7 +294,9 @@ dist_systemunit_DATA = \
        units/quotaon.service \
        units/systemd-ask-password-wall.path \
        units/systemd-ask-password-console.path \
-       units/syslog.target
+       units/syslog.target \
+       units/udev-control.socket \
+       units/udev-kernel.socket
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -316,13 +314,17 @@ nodist_systemunit_DATA = \
        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/user@.service \
+       units/udev.service \
+       units/udev-trigger.service \
+       units/udev-settle.service
 
 dist_userunit_DATA = \
        units/user/default.target \
@@ -334,8 +336,8 @@ nodist_userunit_DATA = \
 EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
-       units/console-shell.service.m4 \
-       units/rescue.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 \
@@ -347,6 +349,7 @@ EXTRA_DIST += \
        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 \
@@ -355,9 +358,10 @@ EXTRA_DIST += \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/user@.service.in \
-       src/systemd.pc.in \
+       units/udev.service \
+       units/udev-trigger.service \
+       units/udev-settle.service \
        introspect.awk \
-       src/99-systemd.rules.in \
        man/custom-html.xsl
 
 if TARGET_FEDORA
@@ -421,230 +425,15 @@ endif
 
 dist_doc_DATA = \
        README \
-        NEWS \
-       LICENSE \
+       NEWS \
+       LICENSE.LGPL2.1 \
+       LICENSE.GPL2 \
+       LICENSE.MIT \
        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/virt.c \
-       src/label.c \
-       src/hashmap.c \
-       src/set.c \
-       src/strv.c \
-       src/conf-parser.c \
-       src/socket-util.c \
-       src/log.c \
-       src/ratelimit.c \
-       src/exit-status.c \
-        src/utf8.c
-
-libsystemd_basic_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(SELINUX_CFLAGS)
-
-libsystemd_basic_la_LIBADD = \
-       $(SELINUX_LIBS) \
-       $(CAP_LIBS)
-
-libsystemd_core_la_SOURCES = \
-       src/unit.c \
-       src/job.c \
-       src/manager.c \
-       src/path-lookup.c \
-       src/load-fragment.c \
-       src/service.c \
-       src/automount.c \
-       src/mount.c \
-       src/swap.c \
-       src/device.c \
-       src/target.c \
-       src/snapshot.c \
-       src/socket.c \
-       src/timer.c \
-       src/path.c \
-       src/load-dropin.c \
-       src/execute.c \
-       src/utmp-wtmp.c \
-       src/dbus.c \
-       src/dbus-manager.c \
-       src/dbus-unit.c \
-       src/dbus-job.c \
-       src/dbus-service.c \
-       src/dbus-socket.c \
-       src/dbus-timer.c \
-       src/dbus-target.c \
-       src/dbus-mount.c \
-       src/dbus-automount.c \
-       src/dbus-swap.c \
-       src/dbus-snapshot.c \
-       src/dbus-device.c \
-       src/dbus-execute.c \
-       src/dbus-path.c \
-       src/cgroup.c \
-       src/mount-setup.c \
-       src/hostname-setup.c \
-       src/selinux-setup.c \
-       src/ima-setup.c \
-       src/loopback-setup.c \
-       src/kmod-setup.c \
-       src/locale-setup.c \
-       src/machine-id-setup.c \
-       src/specifier.c \
-       src/unit-name.c \
-       src/fdset.c \
-       src/namespace.c \
-       src/tcpwrap.c \
-       src/cgroup-util.c \
-       src/condition.c \
-       src/dbus-common.c \
-       src/sd-daemon.c \
-       src/install.c \
-       src/cgroup-attr.c \
-       src/sd-id128.c
-
-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) \
-       $(UDEV_CFLAGS) \
-       $(LIBWRAP_CFLAGS) \
-       $(PAM_CFLAGS) \
-       $(AUDIT_CFLAGS) \
-       $(KMOD_CFLAGS)
-
-libsystemd_core_la_LIBADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS) \
-       $(UDEV_LIBS) \
-       $(LIBWRAP_LIBS) \
-       $(PAM_LIBS) \
-       $(AUDIT_LIBS) \
-       $(CAP_LIBS) \
-       $(KMOD_LIBS)
-
-# This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs. We therefore can't
-# list the .h files as dependencies if we want make dist to work.
-
-EXTRA_DIST += \
-       src/util.h \
-       src/virt.h \
-       src/label.h \
-       src/hashmap.h \
-       src/set.h \
-       src/strv.h \
-       src/conf-parser.h \
-       src/socket-util.h \
-       src/log.h \
-       src/ratelimit.h \
-       src/exit-status.h \
-       src/unit.h \
-       src/job.h \
-       src/manager.h \
-       src/path-lookup.h \
-       src/load-fragment.h \
-       src/service.h \
-       src/automount.h \
-       src/mount.h \
-       src/swap.h \
-       src/device.h \
-       src/target.h \
-       src/snapshot.h \
-       src/socket.h \
-       src/timer.h \
-       src/path.h \
-       src/load-dropin.h \
-       src/execute.h \
-       src/utmp-wtmp.h \
-       src/dbus.h \
-       src/dbus-manager.h \
-       src/dbus-unit.h \
-       src/dbus-job.h \
-       src/dbus-service.h \
-       src/dbus-socket.h \
-       src/dbus-timer.h \
-       src/dbus-target.h \
-       src/dbus-mount.h \
-       src/dbus-automount.h \
-       src/dbus-swap.h \
-       src/dbus-snapshot.h \
-       src/dbus-device.h \
-       src/dbus-execute.h \
-       src/dbus-path.h \
-       src/cgroup.h \
-       src/mount-setup.h \
-       src/hostname-setup.h \
-       src/selinux-setup.h \
-       src/loopback-setup.h \
-       src/kmod-setup.h \
-       src/locale-setup.h \
-       src/machine-id-setup.h \
-       src/specifier.h \
-       src/unit-name.h \
-       src/fdset.h \
-       src/namespace.h \
-       src/tcpwrap.h \
-       src/cgroup-util.h \
-       src/condition.h \
-       src/dbus-common.h \
-       src/install.h \
-       src/cgroup-attr.h \
-       src/macro.h \
-       src/def.h \
-       src/ioprio.h \
-       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 \
-        src/utf8.h \
-        src/journal/sparse-endian.h \
-        src/ima-setup.h
-
+# ------------------------------------------------------------------------------
 MANPAGES = \
        man/systemd.1 \
        man/systemctl.1 \
@@ -666,6 +455,7 @@ MANPAGES = \
        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 \
@@ -684,24 +474,19 @@ MANPAGES = \
        man/sysctl.d.5 \
        man/systemd-ask-password.1 \
        man/systemd-cat.1 \
-        man/systemd-machine-id-setup.1 \
-        man/systemd-journald.conf.5 \
-        man/journalctl.1
+       man/systemd-machine-id-setup.1 \
+       man/systemd-detect-virt.1 \
+       man/journald.conf.5 \
+       man/journalctl.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
        man/poweroff.8 \
-       man/init.1 \
-        man/systemd-systemctl.1 \
-        man/systemd-loginctl.1 \
-        man/systemd-journalctl.1
+       man/init.1
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
-man/systemd-systemctl.1: man/systemctl.1
-man/systemd-loginctl.1: man/loginctl.1
-man/systemd-journalctl.1: man/journalctl.1
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -721,106 +506,476 @@ EXTRA_DIST += \
        $(MANPAGES) \
        $(MANPAGES_ALIAS)
 
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-shared.la
+
+libsystemd_shared_la_SOURCES = \
+       src/shared/linux/auto_dev-ioctl.h \
+       src/shared/linux/fanotify.h \
+       src/shared/missing.h \
+       src/shared/list.h \
+       src/shared/macro.h \
+       src/shared/def.h \
+       src/shared/util.c \
+       src/shared/util.h \
+       src/shared/virt.c \
+       src/shared/virt.h \
+       src/shared/hashmap.c \
+       src/shared/hashmap.h \
+       src/shared/set.c \
+       src/shared/set.h \
+       src/shared/strv.c \
+       src/shared/strv.h \
+       src/shared/conf-parser.c \
+       src/shared/conf-parser.h \
+       src/shared/log.c \
+       src/shared/log.h \
+       src/shared/ratelimit.h \
+       src/shared/ratelimit.c \
+       src/shared/exit-status.c \
+       src/shared/exit-status.h \
+       src/shared/utf8.c \
+       src/shared/utf8.h \
+       src/shared/pager.c \
+       src/shared/pager.h \
+       src/shared/ioprio.h \
+       src/shared/socket-util.c \
+       src/shared/socket-util.h \
+       src/shared/cgroup-util.c \
+       src/shared/cgroup-util.h \
+       src/shared/cgroup-show.c \
+       src/shared/cgroup-show.h \
+       src/shared/unit-name.c \
+       src/shared/unit-name.h \
+       src/shared/utmp-wtmp.c \
+       src/shared/utmp-wtmp.h \
+       src/shared/watchdog.c \
+       src/shared/watchdog.h \
+       src/shared/spawn-ask-password-agent.c \
+       src/shared/spawn-ask-password-agent.h \
+       src/shared/specifier.c \
+       src/shared/specifier.h \
+       src/shared/spawn-polkit-agent.c \
+       src/shared/spawn-polkit-agent.h
+
+libsystemd_shared_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+#-------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-dbus.la
+
+libsystemd_dbus_la_SOURCES = \
+       src/shared/dbus-common.c \
+       src/shared/dbus-common.h \
+       src/shared/dbus-loop.c \
+       src/shared/dbus-loop.h \
+       src/shared/polkit.c \
+       src/shared/polkit.h
+
+libsystemd_dbus_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+libsystemd_dbus_la_LIBADD = \
+       $(DBUS_LIBS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-label.la
+
+libsystemd_label_la_SOURCES = \
+       src/shared/install.c \
+       src/shared/install.h \
+       src/shared/path-lookup.c \
+       src/shared/path-lookup.h \
+       src/shared/cgroup-label.c \
+       src/shared/socket-label.c \
+       src/shared/label.c \
+       src/shared/label.h \
+       src/shared/mkdir.c \
+       src/shared/mkdir.h \
+       src/shared/ask-password-api.c \
+       src/shared/ask-password-api.h
+
+libsystemd_label_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(SELINUX_CFLAGS)
+
+libsystemd_label_la_LIBADD = \
+       $(SELINUX_LIBS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-logs.la
+
+libsystemd_logs_la_SOURCES = \
+       src/shared/logs-show.c \
+       src/shared/logs-show.h
+
+libsystemd_logs_la_CFLAGS = \
+       $(AM_CFLAGS)
+
+libsystemd_logs_la_LIBADD = \
+       libsystemd-journal.la \
+       libsystemd-id128.la
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-capability.la
+
+libsystemd_capability_la_SOURCES = \
+       src/shared/capability.c \
+       src/shared/capability.h
+
+libsystemd_capability_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(CAP_CFLAGS)
+
+libsystemd_capability_la_LIBADD = \
+       $(CAP_LIBS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-audit.la
+
+libsystemd_audit_la_SOURCES = \
+       src/shared/audit.c \
+       src/shared/audit.h
+
+libsystemd_audit_la_LIBADD = \
+       libsystemd-capability.la
+
+# ------------------------------------------------------------------------------
+if HAVE_ACL
+noinst_LTLIBRARIES += \
+       libsystemd-acl.la
+
+libsystemd_acl_la_SOURCES = \
+       src/shared/acl-util.c \
+       src/shared/acl-util.h
+
+libsystemd_acl_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ACL_CFLAGS)
+
+libsystemd_acl_la_LIBADD = \
+       $(ACL_LIBS)
+endif
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-core.la
+
+libsystemd_core_la_SOURCES = \
+       src/core/unit.c \
+       src/core/unit.h \
+       src/core/job.c \
+       src/core/job.h \
+       src/core/manager.c \
+       src/core/manager.h \
+       src/core/load-fragment.c \
+       src/core/load-fragment.h \
+       src/core/service.c \
+       src/core/service.h \
+       src/core/automount.c \
+       src/core/automount.h \
+       src/core/mount.c \
+       src/core/mount.h \
+       src/core/swap.c \
+       src/core/swap.h \
+       src/core/device.c \
+       src/core/device.h \
+       src/core/target.c \
+       src/core/target.h \
+       src/core/snapshot.c \
+       src/core/snapshot.h \
+       src/core/socket.c \
+       src/core/socket.h \
+       src/core/timer.c \
+       src/core/timer.h \
+       src/core/path.c \
+       src/core/path.h \
+       src/core/load-dropin.c \
+       src/core/load-dropin.h \
+       src/core/execute.c \
+       src/core/execute.h \
+       src/core/dbus.c \
+       src/core/dbus.h \
+       src/core/dbus-manager.c \
+       src/core/dbus-manager.h \
+       src/core/dbus-unit.c \
+       src/core/dbus-unit.h \
+       src/core/dbus-job.c \
+       src/core/dbus-job.h \
+       src/core/dbus-service.c \
+       src/core/dbus-service.h \
+       src/core/dbus-socket.c \
+       src/core/dbus-socket.h \
+       src/core/dbus-timer.c \
+       src/core/dbus-timer.h \
+       src/core/dbus-target.c \
+       src/core/dbus-target.h \
+       src/core/dbus-mount.c \
+       src/core/dbus-mount.h \
+       src/core/dbus-automount.c \
+       src/core/dbus-automount.h \
+       src/core/dbus-swap.c \
+       src/core/dbus-swap.h \
+       src/core/dbus-snapshot.c \
+       src/core/dbus-snapshot.h \
+       src/core/dbus-device.c \
+       src/core/dbus-device.h \
+       src/core/dbus-execute.c \
+       src/core/dbus-execute.h \
+       src/core/dbus-path.c \
+       src/core/dbus-path.h \
+       src/core/cgroup.c \
+       src/core/cgroup.h \
+       src/core/selinux-setup.c \
+       src/core/selinux-setup.h \
+       src/core/ima-setup.c \
+       src/core/ima-setup.h \
+       src/core/kmod-setup.c \
+       src/core/kmod-setup.h \
+       src/core/locale-setup.h \
+       src/core/locale-setup.c \
+       src/core/hostname-setup.c \
+       src/core/hostname-setup.h \
+       src/core/machine-id-setup.c \
+       src/core/machine-id-setup.h \
+       src/core/mount-setup.c \
+       src/core/mount-setup.h \
+       src/core/loopback-setup.h \
+       src/core/loopback-setup.c \
+       src/core/fdset.c \
+       src/core/fdset.h \
+       src/core/condition.c \
+       src/core/condition.h \
+       src/core/namespace.c \
+       src/core/namespace.h \
+       src/core/tcpwrap.c \
+       src/core/tcpwrap.h \
+       src/core/cgroup-attr.c \
+       src/core/cgroup-attr.h \
+       src/core/securebits.h \
+       src/core/initreq.h \
+       src/core/special.h \
+       src/core/bus-errors.h \
+       src/core/build.h \
+       src/core/sysfs-show.h
+
+nodist_libsystemd_core_la_SOURCES = \
+       src/core/load-fragment-gperf.c \
+       src/core/load-fragment-gperf-nulstr.c
+
+libsystemd_core_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(LIBWRAP_CFLAGS) \
+       $(PAM_CFLAGS) \
+       $(AUDIT_CFLAGS) \
+       $(KMOD_CFLAGS)
+
+libsystemd_core_la_LIBADD = \
+       libsystemd-capability.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libsystemd-dbus.la \
+       libudev.la \
+       $(LIBWRAP_LIBS) \
+       $(PAM_LIBS) \
+       $(AUDIT_LIBS) \
+       $(CAP_LIBS) \
+       $(KMOD_LIBS)
+
+src/core/load-fragment-gperf-nulstr.c: src/core/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 $@
+
+EXTRA_DIST += \
+       src/core/load-fragment-gperf.gperf.m4
+
+CLEANFILES += \
+       src/core/load-fragment-gperf.gperf \
+       src/core/load-fragment-gperf.c \
+       src/core/load-fragment-gperf-nulstr.c
+
+# ------------------------------------------------------------------------------
 systemd_SOURCES = \
-       src/main.c
+       src/core/main.c
 
 systemd_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS)
+       $(DBUS_CFLAGS)
 
 systemd_LDADD = \
-       libsystemd-core.la
+       libsystemd-core.la \
+       libsystemd-daemon.la \
+       libsystemd-id128.la \
+       libsystemd-dbus.la
+
+dist_pkgsysconf_DATA += \
+       src/core/system.conf \
+       src/core/user.conf
+
+dist_dbuspolicy_DATA += \
+       src/core/org.freedesktop.systemd1.conf
+
+dist_dbussystemservice_DATA += \
+       src/core/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
+
+polkitpolicy_in_in_files = \
+       src/core/org.freedesktop.systemd1.policy.in.in
+
+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
+
+pkgconfigdata_DATA = \
+       src/core/systemd.pc
+
+EXTRA_DIST += \
+       src/core/systemd.pc.in
+
+# ------------------------------------------------------------------------------
+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
+
+TESTS += \
+       test-job-type \
+       test-env-replace \
+       test-strv
 
 test_engine_SOURCES = \
-       src/test-engine.c
+       src/test/test-engine.c
 
-test_engine_CFLAGS = $(systemd_CFLAGS)
-test_engine_LDADD = $(systemd_LDADD)
+test_engine_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+test_engine_LDADD = \
+       libsystemd-core.la \
+       libsystemd-daemon.la \
+       libsystemd-dbus.la
 
 test_job_type_SOURCES = \
-       src/test-job-type.c
+       src/test/test-job-type.c
 
-test_job_type_CFLAGS = $(systemd_CFLAGS)
-test_job_type_LDADD = $(systemd_LDADD)
+test_job_type_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+test_job_type_LDADD = \
+       libsystemd-core.la
 
 test_ns_SOURCES = \
-       src/test-ns.c
+       src/test/test-ns.c
 
-test_ns_CFLAGS = $(systemd_CFLAGS)
-test_ns_LDADD = $(systemd_LDADD)
+test_ns_LDADD = \
+       libsystemd-core.la
 
 test_loopback_SOURCES = \
-       src/test-loopback.c \
-       src/loopback-setup.c
+       src/test/test-loopback.c
 
 test_loopback_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la \
+       libsystemd-core.la
 
 test_hostname_SOURCES = \
-       src/test-hostname.c \
-       src/hostname-setup.c
+       src/test/test-hostname.c
 
 test_hostname_LDADD = \
-       libsystemd-basic.la
+       libsystemd-core.la
 
 test_daemon_SOURCES = \
-       src/test-daemon.c
+       src/test/test-daemon.c
 
 test_daemon_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
-       src/test-cgroup.c \
-       src/cgroup-util.c
+       src/test/test-cgroup.c
 
 test_cgroup_LDADD = \
-       libsystemd-basic.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 test_env_replace_SOURCES = \
-       src/test-env-replace.c
+       src/test/test-env-replace.c
 
 test_env_replace_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 test_strv_SOURCES = \
-       src/test-strv.c \
-       src/specifier.c
+       src/test/test-strv.c
 
 test_strv_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 test_install_SOURCES = \
-       src/test-install.c \
-       src/install.c \
-       src/path-lookup.c \
-       src/unit-name.c
+       src/test/test-install.c
 
 test_install_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
 test_install_LDADD = \
-       libsystemd-basic.la
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+test_watchdog_SOURCES = \
+       src/test/test-watchdog.c
 
+test_watchdog_LDADD = \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
-       src/initctl.c \
-       src/dbus-common.c
+       src/initctl/initctl.c
 
 systemd_initctl_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
 systemd_initctl_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
-       $(DBUS_LIBS)
+       libsystemd-dbus.la
 
+# ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
-       src/update-utmp.c \
-       src/dbus-common.c \
-       src/utmp-wtmp.c
+       src/update-utmp/update-utmp.c
 
 systemd_update_utmp_CFLAGS = \
        $(AM_CFLAGS) \
@@ -828,319 +983,961 @@ systemd_update_utmp_CFLAGS = \
        $(AUDIT_CFLAGS)
 
 systemd_update_utmp_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS) \
+       libsystemd-shared.la \
+       libsystemd-dbus.la \
        $(AUDIT_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_shutdownd_SOURCES = \
-       src/utmp-wtmp.c \
-       src/shutdownd.c
-
-systemd_shutdownd_CFLAGS = \
-       $(AM_CFLAGS)
+       src/shutdownd/shutdownd.c
 
 systemd_shutdownd_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la
 
-systemd_shutdown_SOURCES = \
-       src/mount-setup.c \
-       src/umount.c \
-       src/shutdown.c
+pkginclude_HEADERS += \
+       src/systemd/sd-shutdown.h
 
-systemd_shutdown_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
+# ------------------------------------------------------------------------------
+systemd_shutdown_SOURCES = \
+       src/core/umount.c \
+       src/core/umount.h \
+       src/core/shutdown.c \
+       src/core/mount-setup.c \
+       src/core/mount-setup.h
 
 systemd_shutdown_LDADD = \
-       libsystemd-basic.la \
-       $(UDEV_LIBS)
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libudev.la
 
+# ------------------------------------------------------------------------------
 systemd_modules_load_SOURCES = \
-       src/modules-load.c
+       src/modules-load/modules-load.c
 
 systemd_modules_load_CFLAGS = \
+       $(AM_CFLAGS) \
        $(KMOD_CFLAGS)
 
 systemd_modules_load_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        $(KMOD_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_tmpfiles_SOURCES = \
-       src/tmpfiles.c
+       src/tmpfiles/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
-       libsystemd-basic.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
-       src/machine-id-setup.c \
-       src/machine-id-main.c \
-       src/sd-id128.c
+       src/machine-id-setup/machine-id-setup-main.c \
+       src/core/machine-id-setup.c \
+       src/core/machine-id-setup.h
 
 systemd_machine_id_setup_LDADD = \
-       libsystemd-basic.la
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libsystemd-id128.la
 
+# ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
-       src/sysctl.c
+       src/sysctl/sysctl.c
 
 systemd_sysctl_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
 systemd_fsck_SOURCES = \
-       src/fsck.c \
-       src/dbus-common.c
+       src/fsck/fsck.c
 
 systemd_fsck_CFLAGS = \
        $(AM_CFLAGS) \
-       $(UDEV_CFLAGS) \
        $(DBUS_CFLAGS)
 
-systemd_fsck_LDADD = \
-       libsystemd-basic.la \
-       $(UDEV_LIBS) \
-       $(DBUS_LIBS)
+systemd_fsck_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-dbus.la \
+       libudev.la
+
+# ------------------------------------------------------------------------------
+systemd_timestamp_SOURCES = \
+       src/timestamp/timestamp.c
+
+systemd_timestamp_LDADD = \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_ac_power_SOURCES = \
+       src/ac-power/ac-power.c
+
+systemd_ac_power_LDADD = \
+       libsystemd-shared.la \
+       libudev.la
+
+# ------------------------------------------------------------------------------
+systemd_detect_virt_SOURCES = \
+       src/detect-virt/detect-virt.c
+
+systemd_detect_virt_LDADD = \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_getty_generator_SOURCES = \
+       src/getty-generator/getty-generator.c
+
+systemd_getty_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_rc_local_generator_SOURCES = \
+       src/rc-local-generator/rc-local-generator.c
+
+systemd_rc_local_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_remount_api_vfs_SOURCES = \
+       src/remount-api-vfs/remount-api-vfs.c \
+       src/core/mount-setup.c \
+       src/core/mount-setup.h
+
+systemd_remount_api_vfs_LDADD = \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_cgroups_agent_SOURCES = \
+       src/cgroups-agent/cgroups-agent.c
+
+systemd_cgroups_agent_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_cgroups_agent_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-dbus.la
+
+# ------------------------------------------------------------------------------
+systemctl_SOURCES = \
+       src/systemctl/systemctl.c
+
+systemctl_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemctl_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libsystemd-daemon.la \
+       libsystemd-journal.la \
+       libsystemd-id128.la \
+       libsystemd-dbus.la \
+       libsystemd-logs.la
+
+# ------------------------------------------------------------------------------
+systemd_notify_SOURCES = \
+       src/notify/notify.c \
+       src/readahead/sd-readahead.c
+
+systemd_notify_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-daemon.la
+
+# ------------------------------------------------------------------------------
+systemd_ask_password_SOURCES = \
+       src/ask-password/ask-password.c
+
+systemd_ask_password_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_reply_password_SOURCES = \
+       src/reply-password/reply-password.c
+
+systemd_reply_password_LDADD = \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_cgls_SOURCES = \
+       src/cgls/cgls.c
+
+systemd_cgls_LDADD = \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_cgtop_SOURCES = \
+       src/cgtop/cgtop.c
+
+systemd_cgtop_LDADD = \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_nspawn_SOURCES = \
+       src/nspawn/nspawn.c \
+       src/core/mount-setup.c \
+       src/core/mount-setup.h \
+       src/core/loopback-setup.c \
+       src/core/loopback-setup.h
+
+systemd_nspawn_LDADD = \
+       libsystemd-label.la \
+       libsystemd-capability.la \
+       libsystemd-shared.la \
+       libsystemd-daemon.la
+
+# ------------------------------------------------------------------------------
+systemd_stdio_bridge_SOURCES = \
+       src/stdio-bridge/stdio-bridge.c
+
+systemd_stdio_bridge_LDADD = \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_tty_ask_password_agent_SOURCES = \
+       src/tty-ask-password-agent/tty-ask-password-agent.c
+
+systemd_tty_ask_password_agent_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+libsystemd_daemon_la_SOURCES = \
+       src/libsystemd-daemon/sd-daemon.c
+
+libsystemd_daemon_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=hidden \
+       -DSD_EXPORT_SYMBOLS
+
+libsystemd_daemon_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -shared \
+       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/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/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/libsystemd-daemon.pc.in \
+       src/libsystemd-daemon/libsystemd-daemon.sym
+
+# ------------------------------------------------------------------------------
+SUBDIRS += \
+       docs/libudev
+
+include_HEADERS += \
+       src/libudev/libudev.h
+
+lib_LTLIBRARIES += \
+       libudev.la
+
+libudev_la_SOURCES =\
+       src/libudev/libudev-private.h \
+       src/libudev/libudev.c \
+       src/libudev/libudev-list.c \
+       src/libudev/libudev-util.c \
+       src/libudev/libudev-device.c \
+       src/libudev/libudev-enumerate.c \
+       src/libudev/libudev-monitor.c \
+       src/libudev/libudev-queue.c
+
+libudev_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=hidden
+
+libudev_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
+
+pkgconfiglib_DATA += \
+       src/libudev/libudev.pc
+
+EXTRA_DIST += \
+       src/libudev/libudev.pc.in
+
+CLEANFILES += \
+       src/libudev/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
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libudev-private.la
+
+libudev_private_la_SOURCES =\
+       $(libudev_la_SOURCES) \
+       src/libudev/libudev-util-private.c \
+       src/libudev/libudev-device-private.c \
+       src/libudev/libudev-queue-private.c
+
+if HAVE_SELINUX
+libudev_private_la_SOURCES +=\
+       src/libudev/libudev-selinux-private.c
+endif
+
+libudev_private_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SELINUX_CFLAGS)
+       -fvisibility=default
+
+libudev_private_la_LIBADD = \
+       $(SELINUX_LIBS)
+
+# ------------------------------------------------------------------------------
+MANPAGES += \
+       man/udev.7 \
+       man/udevadm.8 \
+       man/udevd.8
+
+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
+
+noinst_LTLIBRARIES += \
+       libudev-core.la
+
+libudev_core_la_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/libsystemd-daemon/sd-daemon.c
+
+libudev_core_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(BLKID_CFLAGS) \
+       $(KMOD_CFLAGS)
+
+libudev_core_la_LIBADD = \
+       libudev-private.la \
+       libsystemd-shared.la \
+       $(BLKID_LIBS) \
+       $(KMOD_LIBS)
+
+libudev_core_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
+       -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
+
+if HAVE_ACL
+libudev_core_la_SOURCES += \
+       src/udev/udev-builtin-uaccess.c \
+       src/login/logind-acl.c \
+       src/login/sd-login.c
+
+libudev_core_la_LIBADD += \
+       libsystemd-acl.la
+endif
+
+udevd_SOURCES = \
+       src/udev/udevd.c
+
+udevd_LDADD = \
+       libudev-core.la
+
+udevadm_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_LDADD = \
+       libudev-core.la \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+TESTS += \
+       src/udev/test/udev-test.pl \
+       src/udev/test/rules-test.sh
+
+noinst_PROGRAMS += \
+       test-libudev \
+       test-udev
+
+test_libudev_SOURCES = \
+       src/udev/test-libudev.c
+
+test_libudev_LDADD = \
+       libudev.la
+
+test_udev_SOURCES = \
+       src/udev/test-udev.c
+
+test_udev_LDADD = \
+       libudev-core.la \
+       libudev-private.la \
+       libsystemd-shared.la
+
+check_DATA += \
+       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 \
+       src/udev/test/udev-test.pl \
+       src/udev/test/rules-test.sh \
+       src/udev/test/rule-syntax-check.py
+
+# ------------------------------------------------------------------------------
+ata_id_SOURCES = \
+       src/udev/ata_id/ata_id.c
+
+ata_id_LDADD = \
+       libudev-private.la \
+       libsystemd-shared.la
+
+udevlibexec_PROGRAMS += \
+       ata_id
+
+# ------------------------------------------------------------------------------
+cdrom_id_SOURCES = \
+       src/udev/cdrom_id/cdrom_id.c
+
+cdrom_id_LDADD = \
+       libudev.la \
+       libsystemd-shared.la
+
+udevlibexec_PROGRAMS += \
+       cdrom_id
+
+dist_udevrules_DATA += \
+       src/udev/cdrom_id/60-cdrom_id.rules
 
-systemd_timestamp_SOURCES = \
-       src/timestamp.c
+# ------------------------------------------------------------------------------
+collect_SOURCES = \
+       src/udev/collect/collect.c
 
-systemd_timestamp_LDADD = \
-       libsystemd-basic.la
+collect_LDADD = \
+       libudev-private.la
 
-systemd_ac_power_SOURCES = \
-       src/ac-power.c
+udevlibexec_PROGRAMS += \
+       collect
 
-systemd_ac_power_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
+# ------------------------------------------------------------------------------
+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
 
-systemd_ac_power_LDADD = \
-       libsystemd-basic.la \
-       $(UDEV_LIBS)
+scsi_id_LDADD = \
+       libudev-private.la \
+       libsystemd-shared.la
 
-systemd_detect_virt_SOURCES = \
-       src/detect-virt.c
+udevlibexec_PROGRAMS += \
+       scsi_id
 
-systemd_detect_virt_LDADD = \
-       libsystemd-basic.la
+EXTRA_DIST += \
+       src/udev/scsi_id/README
 
-systemd_getty_generator_SOURCES = \
-       src/getty-generator.c \
-       src/unit-name.c
+# ------------------------------------------------------------------------------
+v4l_id_SOURCES = \
+       src/udev/v4l_id/v4l_id.c
 
-systemd_getty_generator_LDADD = \
-       libsystemd-basic.la
+v4l_id_LDADD = \
+       libudev.la
 
-systemd_rc_local_generator_SOURCES = \
-       src/rc-local-generator.c
+udevlibexec_PROGRAMS += \
+       v4l_id
 
-systemd_rc_local_generator_LDADD = \
-       libsystemd-basic.la
+dist_udevrules_DATA += \
+       src/udev/v4l_id/60-persistent-v4l.rules
 
-systemd_remount_api_vfs_SOURCES = \
-       src/remount-api-vfs.c \
-       src/mount-setup.c \
-       src/exit-status.c
+# ------------------------------------------------------------------------------
+accelerometer_SOURCES = \
+       src/udev/accelerometer/accelerometer.c
 
-systemd_remount_api_vfs_LDADD = \
-       libsystemd-basic.la
+accelerometer_LDADD = \
+       libudev.la -lm \
+       libsystemd-shared.la
 
-systemd_cgroups_agent_SOURCES = \
-       src/cgroups-agent.c \
-       src/dbus-common.c
+udevlibexec_PROGRAMS += \
+       accelerometer
 
-systemd_cgroups_agent_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+dist_udevrules_DATA += \
+       src/udev/accelerometer/61-accelerometer.rules
 
-systemd_cgroups_agent_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS)
+# ------------------------------------------------------------------------------
+if ENABLE_GUDEV
+SUBDIRS += \
+       docs/gudev
 
-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
+libgudev_includedir = \
+       $(includedir)/gudev-1.0/gudev
 
-systemctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+libgudev_include_HEADERS = \
+       src/gudev/gudev.h \
+       src/gudev/gudevenums.h \
+       src/gudev/gudevenumtypes.h \
+       src/gudev/gudevtypes.h \
+       src/gudev/gudevclient.h \
+       src/gudev/gudevdevice.h \
+       src/gudev/gudevenumerator.h
 
-systemctl_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       libsystemd-journal.la \
-       libsystemd-id128.la \
-       $(DBUS_LIBS)
+lib_LTLIBRARIES += libgudev-1.0.la
 
-systemctl-install-hook:
-       cd $(DESTDIR)$(rootbindir) && \
-               rm -f systemd-systemctl && \
-               $(LN_S) systemctl systemd-systemctl
+pkgconfiglib_DATA += \
+       src/gudev/gudev-1.0.pc
 
-INSTALL_EXEC_HOOKS += \
-        systemctl-install-hook
+EXTRA_DIST += \
+       src/gudev/gudev-1.0.pc.in
 
-systemd_notify_SOURCES = \
-       src/notify.c \
-       src/readahead/sd-readahead.c
+CLEANFILES += \
+       src/gudev/gudev-1.0.pc
+
+libgudev_1_0_la_SOURCES = \
+       src/gudev/gudevenums.h \
+       src/gudev/gudevenumtypes.h \
+       src/gudev/gudevenumtypes.h\
+       src/gudev/gudevtypes.h \
+       src/gudev/gudevclient.h \
+       src/gudev/gudevclient.c \
+       src/gudev/gudevdevice.h \
+       src/gudev/gudevdevice.c \
+       src/gudev/gudevenumerator.h \
+       src/gudev/gudevenumerator.c \
+       src/gudev/gudevprivate.h
+
+nodist_libgudev_1_0_la_SOURCES = \
+       src/gudev/gudevmarshal.h \
+       src/gudev/gudevmarshal.c \
+       src/gudev/gudevenumtypes.h \
+       src/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/gudev \
+       -I$(top_srcdir)/src/gudev \
+       -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
+       -D_GUDEV_COMPILATION \
+       -DG_LOG_DOMAIN=\"GUdev\"
+
+libgudev_1_0_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=default \
+       $(GLIB_CFLAGS)
 
-systemd_notify_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la
+libgudev_1_0_la_LIBADD = \
+       libudev.la \
+       $(GLIB_LIBS)
 
-systemd_ask_password_SOURCES = \
-       src/ask-password.c \
-       src/ask-password-api.c
+libgudev_1_0_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
+       -export-dynamic -no-undefined \
+       -export-symbols-regex '^g_udev_.*'
 
-systemd_ask_password_LDADD = \
-       libsystemd-basic.la
+EXTRA_DIST += \
+       src/gudev/gudevmarshal.list \
+       src/gudev/gudevenumtypes.h.template \
+       src/gudev/gudevenumtypes.c.template \
+       src/gudev/gjs-example.js \
+       src/gudev/seed-example-enum.js \
+       src/gudev/seed-example.js
 
-systemd_reply_password_SOURCES = \
-       src/reply-password.c
+CLEANFILES += \
+       $(nodist_libgudev_1_0_la_SOURCES)
 
-systemd_reply_password_LDADD = \
-       libsystemd-basic.la
+src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
+       $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
-systemd_cgls_SOURCES = \
-       src/cgls.c \
-       src/cgroup-show.c \
-       src/cgroup-util.c \
-       src/pager.c
+src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list
+       $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
+       glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
 
-systemd_cgls_LDADD = \
-       libsystemd-basic.la
+src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/gudev/gudevenums.h
+       $(AM_V_GEN)glib-mkenums --template $^ > \
+           $@.tmp && mv $@.tmp $@
 
-systemd_cgtop_SOURCES = \
-       src/cgtop.c \
-        src/cgroup-util.c
+src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/gudev/gudevenums.h
+       $(AM_V_GEN)glib-mkenums --template $^ > \
+           $@.tmp && mv $@.tmp $@
 
-systemd_cgtop_LDADD = \
-       libsystemd-basic.la
+if HAVE_INTROSPECTION
+-include $(INTROSPECTION_MAKEFILE)
 
-systemd_nspawn_SOURCES = \
-       src/nspawn.c \
-       src/cgroup-util.c \
-       src/loopback-setup.c
+src/gudev/GUdev-1.0.gir: libgudev-1.0.la
 
-systemd_nspawn_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la
+src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
 
-systemd_stdio_bridge_SOURCES = \
-       src/bridge.c
+src_gudev_GUdev_1_0_gir_CFLAGS = \
+       $(INCLUDES) \
+       -D_GUDEV_COMPILATION \
+       -D_GUDEV_WORK_AROUND_DEV_T_BUG \
+       -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
+       -I$(top_srcdir)/src/gdev \
+       -I$(top_builddir)/src/gdev
 
-systemd_stdio_bridge_LDADD = \
-       libsystemd-basic.la
+src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
 
-systemd_tty_ask_password_agent_SOURCES = \
-       src/tty-ask-password-agent.c \
-       src/ask-password-api.c \
-       src/utmp-wtmp.c
+src_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
+       --pkg-export=gudev-1.0 \
+       --warn-all
 
-systemd_tty_ask_password_agent_LDADD = \
-       libsystemd-basic.la
+src_gudev_GUdev_1_0_gir_FILES = \
+       $(top_srcdir)/src/gudev/gudev.h \
+       $(top_srcdir)/src/gudev/gudevtypes.h \
+       $(top_srcdir)/src/gudev/gudevenums.h \
+       $(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \
+       $(top_srcdir)/src/gudev/gudevclient.h \
+       $(top_srcdir)/src/gudev/gudevdevice.h \
+       $(top_srcdir)/src/gudev/gudevenumerator.h \
+       $(top_srcdir)/src/gudev/gudevclient.c \
+       $(top_srcdir)/src/gudev/gudevdevice.c \
+       $(top_srcdir)/src/gudev/gudevenumerator.c
 
-# ------------------------------------------------------------------------------
-libsystemd_daemon_la_SOURCES = \
-       src/sd-daemon.c
+INTROSPECTION_GIRS = src/gudev/GUdev-1.0.gir
+INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
 
-libsystemd_daemon_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden \
-       -DSD_EXPORT_SYMBOLS
+girdir = $(datadir)/gir-1.0
+gir_DATA = \
+       src/gudev/GUdev-1.0.gir
 
-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
+typelibsdir = $(libdir)/girepository-1.0
+typelibs_DATA = \
+       src/gudev/GUdev-1.0.typelib
 
-pkginclude_HEADERS += \
-       src/systemd/sd-daemon.h
+CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+endif # HAVE_INTROSPECTION
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-daemon-install-hook:
+libgudev-install-move-hook:
        if test "$(libdir)" != "$(rootlibdir)"; then \
                mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/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)/libsystemd-daemon.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
+               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
 
-INSTALL_EXEC_HOOKS += \
-       libsystemd-daemon-install-hook
+libgudev-uninstall-move-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
 
-libsystemd-daemon-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
+INSTALL_EXEC_HOOKS += libgudev-install-move-hook
+UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
+endif
 
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-daemon-uninstall-hook
+# ------------------------------------------------------------------------------
+if ENABLE_KEYMAP
+keymap_SOURCES = \
+       src/udev/keymap/keymap.c
 
-lib_LTLIBRARIES += \
-       libsystemd-daemon.la
+keymap_CPPFLAGS = \
+       $(AM_CPPFLAGS) -I src/udev/keymap
 
-pkgconfiglib_DATA += \
-       src/libsystemd-daemon.pc
+nodist_keymap_SOURCES = \
+       src/udev/keymap/keys-from-name.h \
+       src/udev/keymap/keys-to-name.h
 
-MANPAGES += \
-       man/sd-daemon.7 \
-       man/sd_notify.3 \
-       man/sd_listen_fds.3 \
-       man/sd_is_fifo.3 \
-       man/sd_booted.3
+BUILT_SOURCES += \
+       $(nodist_keymap_SOURCES)
 
-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
+udevlibexec_PROGRAMS += \
+       keymap
 
-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
+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
+
+TESTS += \
+       src/udev/keymap/check-keymaps.sh
 
 EXTRA_DIST += \
-       src/libsystemd-daemon.pc.in \
-       src/libsystemd-daemon.sym
+       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 = \
+       keymaps/acer \
+       keymaps/acer-aspire_5720 \
+       keymaps/acer-aspire_8930 \
+       keymaps/acer-aspire_5920g \
+       keymaps/acer-aspire_6920 \
+       keymaps/acer-travelmate_c300 \
+       keymaps/asus \
+       keymaps/compaq-e_evo \
+       keymaps/dell \
+       keymaps/dell-latitude-xt2 \
+       keymaps/everex-xt5000 \
+       keymaps/fujitsu-amilo_li_2732 \
+       keymaps/fujitsu-amilo_pa_2548 \
+       keymaps/fujitsu-amilo_pro_edition_v3505 \
+       keymaps/fujitsu-amilo_pro_v3205 \
+       keymaps/fujitsu-amilo_si_1520 \
+       keymaps/fujitsu-esprimo_mobile_v5 \
+       keymaps/fujitsu-esprimo_mobile_v6 \
+       keymaps/genius-slimstar-320 \
+       keymaps/hewlett-packard \
+       keymaps/hewlett-packard-2510p_2530p \
+       keymaps/hewlett-packard-compaq_elitebook \
+       keymaps/hewlett-packard-pavilion \
+       keymaps/hewlett-packard-presario-2100 \
+       keymaps/hewlett-packard-tablet \
+       keymaps/hewlett-packard-tx2 \
+       keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+       keymaps/inventec-symphony_6.0_7.0 \
+       keymaps/lenovo-3000 \
+       keymaps/lenovo-ideapad \
+       keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+       keymaps/lenovo-thinkpad_x6_tablet \
+       keymaps/lenovo-thinkpad_x200_tablet \
+       keymaps/lg-x110 \
+       keymaps/logitech-wave \
+       keymaps/logitech-wave-cordless \
+       keymaps/logitech-wave-pro-cordless \
+       keymaps/maxdata-pro_7000 \
+       keymaps/medion-fid2060 \
+       keymaps/medionnb-a555 \
+       keymaps/micro-star \
+       keymaps/module-asus-w3j \
+       keymaps/module-ibm \
+       keymaps/module-lenovo \
+       keymaps/module-sony \
+       keymaps/module-sony-old \
+       keymaps/module-sony-vgn \
+       keymaps/olpc-xo \
+       keymaps/onkyo \
+       keymaps/oqo-model2 \
+       keymaps/samsung-other \
+       keymaps/samsung-90x3a \
+       keymaps/samsung-sq1us \
+       keymaps/samsung-sx20s \
+       keymaps/toshiba-satellite_a100 \
+       keymaps/toshiba-satellite_a110 \
+       keymaps/toshiba-satellite_m30x \
+       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/dell-xps \
+       src/udev/keymap/force-release-maps/hp-other \
+       src/udev/keymap/force-release-maps/samsung-other \
+       src/udev/keymap/force-release-maps/samsung-90x3a \
+       src/udev/keymap/force-release-maps/common-volume-keys
+
+src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+       $(AM_V_at)mkdir -p src/udev/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 "};"}' < $< > $@
+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
+       src/libsystemd-id128/sd-id128.c
 
 libsystemd_id128_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=hidden
 
 libsystemd_id128_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -shared \
        -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 test_id128_SOURCES = \
-       src/test-id128.c \
-       src/sd-id128.c
+       src/test/test-id128.c
 
 test_id128_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la \
+       libsystemd-id128.la
 
 noinst_PROGRAMS += \
        test-id128
 
+TESTS += \
+       test-id128
+
 pkginclude_HEADERS += \
        src/systemd/sd-id128.h
 
@@ -1148,7 +1945,7 @@ lib_LTLIBRARIES += \
        libsystemd-id128.la
 
 pkgconfiglib_DATA += \
-       src/libsystemd-id128.pc
+       src/libsystemd-id128/libsystemd-id128.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-id128-install-hook:
@@ -1170,42 +1967,51 @@ UNINSTALL_EXEC_HOOKS += \
        libsystemd-id128-uninstall-hook
 
 EXTRA_DIST += \
-       src/libsystemd-id128.pc.in \
-       src/libsystemd-id128.sym
+       src/libsystemd-id128/libsystemd-id128.pc.in \
+       src/libsystemd-id128/libsystemd-id128.sym
 
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
        src/journal/journald.c \
+       src/journal/journald.h \
        src/journal/sd-journal.c \
        src/journal/journal-file.c \
+       src/journal/journal-file.h \
        src/journal/lookup3.c \
+       src/journal/lookup3.h \
        src/journal/journal-rate-limit.c \
-       src/sd-id128.c \
-       src/cgroup-util.c
-
-if HAVE_ACL
-systemd_journald_SOURCES += \
-       src/acl-util.c
-endif
+       src/journal/journal-rate-limit.h \
+       src/journal/sparse-endian.h \
+       src/journal/journal-def.h \
+       src/journal/journal-internal.h \
+       src/journal/compress.h
 
 nodist_systemd_journald_SOURCES = \
        src/journal/journald-gperf.c
 
-systemd_journald_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(ACL_CFLAGS)
+systemd_journald_CFLAGS =
 
 systemd_journald_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libsystemd-audit.la \
        libsystemd-daemon.la \
        libsystemd-login.la \
-       $(ACL_LIBS)
+       libsystemd-id128.la
+
+if HAVE_ACL
+systemd_journald_LDADD += \
+       libsystemd-acl.la
+endif
 
 if HAVE_XZ
 systemd_journald_SOURCES += \
        src/journal/compress.c
+
 systemd_journald_CFLAGS += \
+       $(AM_CFLAGS) \
        $(XZ_CFLAGS)
+
 systemd_journald_LDADD += \
        $(XZ_LIBS)
 endif
@@ -1214,47 +2020,29 @@ systemd_cat_SOURCES = \
        src/journal/cat.c
 
 systemd_cat_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-journal.la
 
 journalctl_SOURCES = \
-       src/journal/journalctl.c \
-       src/pager.c \
-       src/logs-show.c
+       src/journal/journalctl.c
 
 journalctl_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.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
-
-journalctl-install-hook:
-       cd $(DESTDIR)$(rootbindir) && \
-               rm -f systemd-journalctl && \
-               $(LN_S) journalctl systemd-journalctl
-
-INSTALL_EXEC_HOOKS += \
-        journalctl-install-hook
+       libsystemd-id128.la \
+       libsystemd-logs.la
 
 test_journal_SOURCES = \
        src/journal/test-journal.c \
        src/journal/sd-journal.c \
        src/journal/journal-file.c \
        src/journal/lookup3.c \
-       src/journal/journal-send.c \
-       src/sd-id128.c
+       src/journal/journal-send.c
 
 test_journal_LDADD = \
-       libsystemd-basic.la
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libsystemd-id128.la
 
 if HAVE_XZ
 test_journal_SOURCES += \
@@ -1268,6 +2056,13 @@ test_journal_LDADD += \
        $(XZ_LIBS)
 endif
 
+test_journal_send_SOURCES = \
+       src/journal/test-journal-send.c
+
+test_journal_send_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal.la
+
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
        src/journal/journal-file.c \
@@ -1279,12 +2074,13 @@ libsystemd_journal_la_CFLAGS = \
        -fvisibility=hidden
 
 libsystemd_journal_la_LDFLAGS = \
+       $(AM_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-shared.la \
        libsystemd-id128.la
 
 if HAVE_XZ
@@ -1292,6 +2088,7 @@ libsystemd_journal_la_SOURCES += \
        src/journal/compress.c
 
 libsystemd_journal_la_CFLAGS += \
+       $(AM_CFLAGS) \
        $(XZ_CFLAGS)
 
 libsystemd_journal_la_LIBADD += \
@@ -1318,7 +2115,8 @@ UNINSTALL_EXEC_HOOKS += \
        libsystemd-journal-uninstall-hook
 
 noinst_PROGRAMS += \
-       test-journal
+       test-journal \
+       test-journal-send
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
@@ -1343,7 +2141,7 @@ nodist_systemunit_DATA += \
        units/systemd-journald.service
 
 dist_pkgsysconf_DATA += \
-       src/journal/systemd-journald.conf
+       src/journal/journald.conf
 
 pkgconfiglib_DATA += \
        src/journal/libsystemd-journal.pc
@@ -1363,13 +2161,6 @@ 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 \
@@ -1384,9 +2175,10 @@ systemd_coredump_SOURCES = \
        src/journal/coredump.c
 
 systemd_coredump_LDADD = \
-       libsystemd-basic.la \
        libsystemd-journal.la \
-       libsystemd-login.la
+       libsystemd-login.la \
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-coredump
@@ -1407,7 +2199,7 @@ systemd_binfmt_SOURCES = \
        src/binfmt/binfmt.c
 
 systemd_binfmt_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-binfmt
@@ -1446,7 +2238,7 @@ systemd_vconsole_setup_SOURCES = \
        src/vconsole/vconsole-setup.c
 
 systemd_vconsole_setup_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-vconsole-setup
@@ -1475,29 +2267,25 @@ endif
 if ENABLE_READAHEAD
 systemd_readahead_collect_SOURCES = \
        src/readahead/readahead-collect.c \
-       src/readahead/readahead-common.c
+       src/readahead/readahead-common.c \
+       src/readahead/readahead-common.h
 
 systemd_readahead_collect_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
-       $(UDEV_LIBS)
-
-systemd_readahead_collect_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
+       libudev.la
 
 systemd_readahead_replay_SOURCES = \
        src/readahead/readahead-replay.c \
        src/readahead/readahead-common.c
 
-systemd_readahead_replay_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
-
 systemd_readahead_replay_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
-       $(UDEV_LIBS)
+       libudev.la
+
+pkginclude_HEADERS += \
+       src/systemd/sd-readahead.h
 
 rootlibexec_PROGRAMS += \
        systemd-readahead-collect \
@@ -1512,8 +2300,6 @@ nodist_systemunit_DATA += \
        units/systemd-readahead-done.service
 
 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
@@ -1535,10 +2321,10 @@ EXTRA_DIST += \
        units/quotacheck.service.in
 
 systemd_quotacheck_SOURCES = \
-       src/quotacheck.c
+       src/quotacheck/quotacheck.c
 
 systemd_quotacheck_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 endif
 
 # ------------------------------------------------------------------------------
@@ -1555,10 +2341,11 @@ EXTRA_DIST += \
        units/systemd-random-seed-load.service.in
 
 systemd_random_seed_SOURCES = \
-       src/random-seed.c
+       src/random-seed/random-seed.c
 
 systemd_random_seed_LDADD = \
-       libsystemd-basic.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 randomseed-install-data-hook:
        $(MKDIR_P) -m 0755 \
@@ -1587,25 +2374,24 @@ dist_systemunit_DATA += \
        units/cryptsetup.target
 
 systemd_cryptsetup_SOURCES = \
-       src/cryptsetup/cryptsetup.c \
-       src/ask-password-api.c
+       src/cryptsetup/cryptsetup.c
 
 systemd_cryptsetup_CFLAGS = \
        $(AM_CFLAGS) \
-       $(LIBCRYPTSETUP_CFLAGS) \
-       $(UDEV_CFLAGS)
+       $(LIBCRYPTSETUP_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
-       $(LIBCRYPTSETUP_LIBS) \
-       $(UDEV_LIBS) \
-       libsystemd-basic.la
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libudev.la \
+       $(LIBCRYPTSETUP_LIBS)
 
 systemd_cryptsetup_generator_SOURCES = \
-       src/cryptsetup/cryptsetup-generator.c \
-       src/unit-name.c
+       src/cryptsetup/cryptsetup-generator.c
 
 systemd_cryptsetup_generator_LDADD = \
-       libsystemd-basic.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 cryptsetup-install-data-hook:
        $(MKDIR_P) -m 0755 \
@@ -1621,18 +2407,16 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
-       src/hostname/hostnamed.c \
-       src/dbus-common.c \
-       src/polkit.c
+       src/hostname/hostnamed.c
 
 systemd_hostnamed_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
 systemd_hostnamed_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
-       $(DBUS_LIBS)
+       libsystemd-dbus.la
 
 rootlibexec_PROGRAMS += \
        systemd-hostnamed
@@ -1672,18 +2456,17 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
-       src/locale/localed.c \
-       src/dbus-common.c \
-       src/polkit.c
+       src/locale/localed.c
 
 systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
 systemd_localed_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
-       $(DBUS_LIBS)
+       libsystemd-dbus.la
 
 nodist_systemunit_DATA += \
        units/systemd-localed.service
@@ -1733,18 +2516,16 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
-       src/timedate/timedated.c \
-       src/dbus-common.c \
-       src/polkit.c
+       src/timedate/timedated.c
 
 systemd_timedated_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
 systemd_timedated_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
-       $(DBUS_LIBS)
+       libsystemd-dbus.la
 
 rootlibexec_PROGRAMS += \
        systemd-timedated
@@ -1785,47 +2566,49 @@ endif
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
        src/login/logind.c \
+       src/login/logind.h \
        src/login/logind-dbus.c \
        src/login/logind-device.c \
+       src/login/logind-device.h \
        src/login/logind-seat.c \
-       src/login/logind-seat-dbus.c \
+       src/login/logind-seat.h \
        src/login/logind-session.c \
-       src/login/logind-session-dbus.c \
+       src/login/logind-session.h \
        src/login/logind-user.c \
+       src/login/logind-user.h \
+       src/login/logind-session-dbus.c \
+       src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
-       src/dbus-common.c \
-       src/dbus-loop.c \
-       src/cgroup-util.c \
-       src/polkit.c
+       src/login/logind-acl.h
 
 nodist_systemd_logind_SOURCES = \
        src/login/logind-gperf.c
 
-if HAVE_ACL
-systemd_logind_SOURCES += \
-       src/login/logind-acl.c \
-       src/acl-util.c
-endif
-
 systemd_logind_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(ACL_CFLAGS)
+       $(DBUS_CFLAGS)
 
 systemd_logind_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libsystemd-audit.la \
        libsystemd-daemon.la \
-       $(DBUS_LIBS) \
-       $(UDEV_LIBS) \
-       $(ACL_LIBS)
+       libsystemd-dbus.la \
+       libudev.la
+
+if HAVE_ACL
+systemd_logind_SOURCES += \
+       src/login/logind-acl.c
+
+systemd_logind_LDADD += \
+       libsystemd-acl.la
+endif
 
 systemd_user_sessions_SOURCES = \
-       src/login/user-sessions.c \
-       src/cgroup-util.c
+       src/login/user-sessions.c
 
 systemd_user_sessions_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-logind \
@@ -1833,63 +2616,49 @@ rootlibexec_PROGRAMS += \
 
 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
+       src/login/sysfs-show.c
 
 loginctl_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS)
+       $(DBUS_CFLAGS)
 
 loginctl_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS) \
-       $(UDEV_LIBS)
+       libsystemd-shared.la \
+       libsystemd-dbus.la \
+       libudev.la
 
 rootbin_PROGRAMS += \
        loginctl
 
-loginctl-install-hook:
-       cd $(DESTDIR)$(rootbindir) && \
-               rm -f systemd-loginctl && \
-               $(LN_S) loginctl systemd-loginctl
-
-INSTALL_EXEC_HOOKS += \
-        loginctl-install-hook
-
 test_login_SOURCES = \
        src/login/test-login.c
 
 test_login_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-login.la
+       libsystemd-login.la \
+       libsystemd-shared.la
 
 noinst_PROGRAMS += \
        test-login
 
 libsystemd_login_la_SOURCES = \
-       src/login/sd-login.c \
-       src/cgroup-util.c
+       src/login/sd-login.c
 
 libsystemd_login_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=hidden
 
 libsystemd_login_la_LDFLAGS = \
+       $(AM_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
+       libsystemd-shared.la
 
 if HAVE_PAM
 pam_systemd_la_SOURCES = \
-       src/login/pam-module.c \
-       src/dbus-common.c
+       src/login/pam-module.c
 
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1898,6 +2667,7 @@ pam_systemd_la_CFLAGS = \
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -module \
        -export-dynamic \
        -avoid-version \
@@ -1905,10 +2675,11 @@ pam_systemd_la_LDFLAGS = \
        -export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
-       libsystemd-basic.la \
        libsystemd-daemon.la \
-       $(PAM_LIBS) \
-       $(DBUS_LIBS)
+       libsystemd-audit.la \
+       libsystemd-dbus.la \
+       libsystemd-shared.la \
+       $(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
        pam_systemd.la
@@ -1944,7 +2715,7 @@ dist_dbuspolicy_DATA += \
        src/login/org.freedesktop.login1.conf
 
 dist_pkgsysconf_DATA += \
-       src/login/systemd-logind.conf
+       src/login/logind.conf
 
 pkginclude_HEADERS += \
        src/systemd/sd-login.h
@@ -1961,7 +2732,7 @@ polkitpolicy_in_files += \
 logind-install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
-                $(DESTDIR)$(localstatedir)/lib/systemd
+               $(DESTDIR)$(localstatedir)/lib/systemd
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.login1.service && \
                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@@ -1976,52 +2747,23 @@ INSTALL_DATA_HOOKS += \
 systemd_multi_seat_x_SOURCES = \
        src/login/multi-seat-x.c
 
-systemd_multi_seat_x_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
-
 systemd_multi_seat_x_LDADD = \
-       libsystemd-basic.la \
-       $(UDEV_LIBS)
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libudev.la
 
 rootlibexec_PROGRAMS += \
        systemd-multi-seat-x
 
-systemd_uaccess_SOURCES = \
-       src/login/uaccess.c
-
-if HAVE_ACL
-systemd_uaccess_SOURCES += \
-       src/login/logind-acl.c \
-       src/acl-util.c
-endif
-
-systemd_uaccess_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(ACL_CFLAGS)
-
-systemd_uaccess_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       libsystemd-login.la \
-       $(UDEV_LIBS) \
-       $(ACL_LIBS)
-
-rootlibexec_PROGRAMS += \
-       systemd-uaccess
-
-dist_udevrules_DATA += \
-       src/login/70-uaccess.rules
-
 dist_udevrules_DATA += \
+       src/login/70-uaccess.rules \
        src/login/71-seat.rules
 
 nodist_udevrules_DATA += \
        src/login/73-seat-late.rules
 
 MANPAGES += \
-       man/systemd-logind.conf.5 \
+       man/logind.conf.5 \
        man/sd-login.7 \
        man/loginctl.1 \
        man/sd_login_monitor_new.3 \
@@ -2074,12 +2816,6 @@ EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        src/login/libsystemd-login.pc.in \
        src/login/libsystemd-login.sym \
-       src/login/logind.h \
-       src/login/logind-device.h \
-       src/login/logind-seat.h \
-       src/login/logind-session.h \
-       src/login/logind-user.h \
-       src/login/logind-acl.h \
        src/login/73-seat-late.rules.in \
        units/systemd-logind.service.in \
        units/systemd-user-sessions.service.in
@@ -2109,6 +2845,9 @@ SED_PROCESS = \
                -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
@@ -2126,9 +2865,13 @@ sysctl.d/%: sysctl.d/%.in Makefile
 src/%.policy.in: src/%.policy.in.in Makefile
        $(SED_PROCESS)
 
-src/%.rules: src/%.rules.in Makefile
+%.rules: %.rules.in Makefile
        $(SED_PROCESS)
 
+%.sh: %.sh.in Makefile
+       $(SED_PROCESS)
+       $(AM_V_GEN)chmod +x $@
+
 src/%.c: src/%.gperf
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(GPERF) < $< > $@
@@ -2137,10 +2880,6 @@ src/%: src/%.m4
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
 
-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 $@
-
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
@@ -2155,17 +2894,21 @@ units/%: units/%.m4 Makefile
 units/user/%: units/%.m4 Makefile
        $(M4_PROCESS_USER)
 
+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)
+
 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 \
-       src/99-systemd.rules
+       $(nodist_polkitpolicy_DATA)
 
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
@@ -2205,11 +2948,6 @@ endif
 
 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)
 
@@ -2275,10 +3013,12 @@ systemd-install-data-hook:
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f systemd-remount-api-vfs.service \
                        fsck-root.service \
-                       remount-rootfs.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) ../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 && \
@@ -2443,21 +3183,27 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
 install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
 
+distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
+
 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-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-        --with-rootprefix=$$dc_install_base \
-        --disable-split-usr
+       --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/
 
+doc-sync: all
+       rsync -av --delete docs/libudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
+       rsync -av --delete docs/gudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
+       rsync -av --delete man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
+
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"