X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=421d27c88659f7b73db180e7b3fafe80b1888459;hp=b38489b616d2693b5a1d38b17a46c173c35b2ea0;hb=33502ffe2eb7b56cdd018a4fb6830d7828519fad;hpb=90ccc3fca7e53a60a9e67b9d5812e1d4a27fc07d

diff --git a/Makefile.am b/Makefile.am
index b38489b61..421d27c88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,6 @@ BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 INSTALL_DATA_HOOKS =
-DISTCHECK_HOOKS =
 DISTCLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
 noinst_LTLIBRARIES =
@@ -98,6 +97,10 @@ 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 \
@@ -130,8 +133,10 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/shared \
 	-I $(top_srcdir)/src/login \
+	-I $(top_srcdir)/src/journal \
 	-I $(top_srcdir)/src/systemd \
 	-I $(top_srcdir)/src/core \
+	-I $(top_srcdir)/src/libudev \
 	-I $(top_srcdir)/src/udev
 
 AM_CFLAGS = $(WARNINGFLAGS)
@@ -205,10 +210,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 \
@@ -223,27 +229,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 \
-	test-watchdog
-
 dist_bashcompletion_DATA = \
-	src/systemd-bash-completion.sh
+	bash-completion/systemd-bash-completion.sh
 
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
@@ -484,6 +476,7 @@ MANPAGES = \
 	man/systemd-ask-password.1 \
 	man/systemd-cat.1 \
 	man/systemd-machine-id-setup.1 \
+	man/systemd-detect-virt.1 \
 	man/journald.conf.5 \
 	man/journalctl.1
 
@@ -519,9 +512,12 @@ noinst_LTLIBRARIES += \
 	libsystemd-shared.la
 
 libsystemd_shared_la_SOURCES = \
-	src/missing.h \
-	src/linux/auto_dev-ioctl.h \
-	src/linux/fanotify.h \
+	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 \
@@ -549,10 +545,6 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/socket-util.h \
 	src/shared/cgroup-util.c \
 	src/shared/cgroup-util.h \
-	src/shared/dbus-common.c \
-	src/shared/dbus-common.h \
-	src/shared/logs-show.c \
-	src/shared/logs-show.h \
 	src/shared/cgroup-show.c \
 	src/shared/cgroup-show.h \
 	src/shared/unit-name.c \
@@ -563,24 +555,34 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/watchdog.h \
 	src/shared/spawn-ask-password-agent.c \
 	src/shared/spawn-ask-password-agent.h \
-	src/shared/mount-setup.c \
-	src/shared/mount-setup.h \
-	src/shared/machine-id-util.c \
-	src/shared/machine-id-util.h \
-	src/shared/loopback-setup.h \
-	src/shared/loopback-setup.c \
 	src/shared/specifier.c \
 	src/shared/specifier.h \
 	src/shared/spawn-polkit-agent.c \
-	src/shared/spawn-polkit-agent.h \
-	src/shared/list.h \
-	src/shared/macro.h \
-	src/shared/ask-password-api.h
+	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
@@ -595,7 +597,9 @@ libsystemd_label_la_SOURCES = \
 	src/shared/label.c \
 	src/shared/label.h \
 	src/shared/mkdir.c \
-	src/shared/mkdir.h
+	src/shared/mkdir.h \
+	src/shared/ask-password-api.c \
+	src/shared/ask-password-api.h
 
 libsystemd_label_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -605,6 +609,21 @@ libsystemd_label_la_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
@@ -653,7 +672,6 @@ noinst_LTLIBRARIES += \
 	libsystemd-core.la
 
 libsystemd_core_la_SOURCES = \
-	src/def.h \
 	src/core/unit.c \
 	src/core/unit.h \
 	src/core/job.c \
@@ -728,6 +746,12 @@ libsystemd_core_la_SOURCES = \
 	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 \
@@ -761,8 +785,8 @@ libsystemd_core_la_LIBADD = \
 	libsystemd-capability.la \
 	libsystemd-label.la \
 	libsystemd-shared.la \
+	libsystemd-dbus.la \
 	libudev.la \
-	$(DBUS_LIBS) \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS) \
 	$(AUDIT_LIBS) \
@@ -792,7 +816,8 @@ systemd_CFLAGS = \
 systemd_LDADD = \
 	libsystemd-core.la \
 	libsystemd-daemon.la \
-	libsystemd-id128.la
+	libsystemd-id128.la \
+	libsystemd-dbus.la
 
 dist_pkgsysconf_DATA += \
 	src/core/system.conf \
@@ -834,6 +859,24 @@ 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/test-engine.c
 
@@ -843,7 +886,8 @@ test_engine_CFLAGS = \
 
 test_engine_LDADD = \
 	libsystemd-core.la \
-	libsystemd-daemon.la
+	libsystemd-daemon.la \
+	libsystemd-dbus.la
 
 test_job_type_SOURCES = \
 	src/test/test-job-type.c
@@ -865,7 +909,8 @@ test_loopback_SOURCES = \
 	src/test/test-loopback.c
 
 test_loopback_LDADD = \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-core.la
 
 test_hostname_SOURCES = \
 	src/test/test-hostname.c
@@ -918,7 +963,7 @@ test_watchdog_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
-	src/initctl.c
+	src/initctl/initctl.c
 
 systemd_initctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -927,11 +972,11 @@ systemd_initctl_CFLAGS = \
 systemd_initctl_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	$(DBUS_LIBS)
+	libsystemd-dbus.la
 
 # ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
-	src/update-utmp.c
+	src/update-utmp/update-utmp.c
 
 systemd_update_utmp_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -940,12 +985,12 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
 	libsystemd-shared.la \
-	$(DBUS_LIBS) \
+	libsystemd-dbus.la \
 	$(AUDIT_LIBS)
 
 # ------------------------------------------------------------------------------
 systemd_shutdownd_SOURCES = \
-	src/shutdownd.c
+	src/shutdownd/shutdownd.c
 
 systemd_shutdownd_LDADD = \
 	libsystemd-label.la \
@@ -959,7 +1004,9 @@ pkginclude_HEADERS += \
 systemd_shutdown_SOURCES = \
 	src/core/umount.c \
 	src/core/umount.h \
-	src/core/shutdown.c
+	src/core/shutdown.c \
+	src/core/mount-setup.c \
+	src/core/mount-setup.h
 
 systemd_shutdown_LDADD = \
 	libsystemd-label.la \
@@ -968,7 +1015,7 @@ systemd_shutdown_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_modules_load_SOURCES = \
-	src/modules-load.c
+	src/modules-load/modules-load.c
 
 systemd_modules_load_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -980,7 +1027,7 @@ systemd_modules_load_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_tmpfiles_SOURCES = \
-	src/tmpfiles.c
+	src/tmpfiles/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
 	libsystemd-label.la \
@@ -988,7 +1035,9 @@ systemd_tmpfiles_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
-	src/machine-id-setup.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-label.la \
@@ -997,14 +1046,14 @@ systemd_machine_id_setup_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
-	src/sysctl.c
+	src/sysctl/sysctl.c
 
 systemd_sysctl_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_fsck_SOURCES = \
-	src/fsck.c
+	src/fsck/fsck.c
 
 systemd_fsck_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1012,19 +1061,19 @@ systemd_fsck_CFLAGS = \
 
 systemd_fsck_LDADD = \
 	libsystemd-shared.la \
-	libudev.la \
-	$(DBUS_LIBS)
+	libsystemd-dbus.la \
+	libudev.la
 
 # ------------------------------------------------------------------------------
 systemd_timestamp_SOURCES = \
-	src/timestamp.c
+	src/timestamp/timestamp.c
 
 systemd_timestamp_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_ac_power_SOURCES = \
-	src/ac-power.c
+	src/ac-power/ac-power.c
 
 systemd_ac_power_LDADD = \
 	libsystemd-shared.la \
@@ -1032,14 +1081,14 @@ systemd_ac_power_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_detect_virt_SOURCES = \
-	src/detect-virt.c
+	src/detect-virt/detect-virt.c
 
 systemd_detect_virt_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
-	src/getty-generator.c
+	src/getty-generator/getty-generator.c
 
 systemd_getty_generator_LDADD = \
 	libsystemd-label.la \
@@ -1047,7 +1096,7 @@ systemd_getty_generator_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
-	src/rc-local-generator.c
+	src/rc-local-generator/rc-local-generator.c
 
 systemd_rc_local_generator_LDADD = \
 	libsystemd-label.la \
@@ -1055,14 +1104,16 @@ systemd_rc_local_generator_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_remount_api_vfs_SOURCES = \
-	src/remount-api-vfs.c
+	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.c
+	src/cgroups-agent/cgroups-agent.c
 
 systemd_cgroups_agent_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1070,11 +1121,11 @@ systemd_cgroups_agent_CFLAGS = \
 
 systemd_cgroups_agent_LDADD = \
 	libsystemd-shared.la \
-	$(DBUS_LIBS)
+	libsystemd-dbus.la
 
 # ------------------------------------------------------------------------------
 systemctl_SOURCES = \
-	src/systemctl.c
+	src/systemctl/systemctl.c
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1086,11 +1137,12 @@ systemctl_LDADD = \
 	libsystemd-daemon.la \
 	libsystemd-journal.la \
 	libsystemd-id128.la \
-	$(DBUS_LIBS)
+	libsystemd-dbus.la \
+	libsystemd-logs.la
 
 # ------------------------------------------------------------------------------
 systemd_notify_SOURCES = \
-	src/notify.c \
+	src/notify/notify.c \
 	src/readahead/sd-readahead.c
 
 systemd_notify_LDADD = \
@@ -1099,8 +1151,7 @@ systemd_notify_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_ask_password_SOURCES = \
-	src/ask-password.c \
-	src/ask-password-api.c
+	src/ask-password/ask-password.c
 
 systemd_ask_password_LDADD = \
 	libsystemd-label.la \
@@ -1108,28 +1159,32 @@ systemd_ask_password_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_reply_password_SOURCES = \
-	src/reply-password.c
+	src/reply-password/reply-password.c
 
 systemd_reply_password_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
-	src/cgls.c
+	src/cgls/cgls.c
 
 systemd_cgls_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_cgtop_SOURCES = \
-	src/cgtop.c
+	src/cgtop/cgtop.c
 
 systemd_cgtop_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_nspawn_SOURCES = \
-	src/nspawn.c
+	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 \
@@ -1139,15 +1194,14 @@ systemd_nspawn_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
-	src/bridge.c
+	src/stdio-bridge/stdio-bridge.c
 
 systemd_stdio_bridge_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
-	src/tty-ask-password-agent.c \
-	src/ask-password-api.c
+	src/tty-ask-password-agent/tty-ask-password-agent.c
 
 systemd_tty_ask_password_agent_LDADD = \
 	libsystemd-label.la \
@@ -1155,7 +1209,7 @@ systemd_tty_ask_password_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 libsystemd_daemon_la_SOURCES = \
-	src/sd-daemon.c
+	src/libsystemd-daemon/sd-daemon.c
 
 libsystemd_daemon_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1166,7 +1220,7 @@ 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.sym
+	-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
 
 pkginclude_HEADERS += \
 	src/systemd/sd-daemon.h
@@ -1194,7 +1248,7 @@ lib_LTLIBRARIES += \
 	libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
-	src/libsystemd-daemon.pc
+	src/libsystemd-daemon/libsystemd-daemon.pc
 
 MANPAGES += \
 	man/sd-daemon.7 \
@@ -1217,28 +1271,28 @@ 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
+	src/libsystemd-daemon/libsystemd-daemon.pc.in \
+	src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
 SUBDIRS += \
-	src/udev/docs
+	docs/libudev
 
 include_HEADERS += \
-	src/udev/libudev.h
+	src/libudev/libudev.h
 
 lib_LTLIBRARIES += \
 	libudev.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
+	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) \
@@ -1248,14 +1302,17 @@ libudev_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
+libudev_la_LIBADD = \
+	libsystemd-shared.la
+
 pkgconfiglib_DATA += \
-	src/udev/libudev.pc
+	src/libudev/libudev.pc
 
 EXTRA_DIST += \
-	src/udev/libudev.pc.in
+	src/libudev/libudev.pc.in
 
 CLEANFILES += \
-	src/udev/libudev.pc
+	src/libudev/libudev.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libudev-install-move-hook:
@@ -1279,13 +1336,13 @@ noinst_LTLIBRARIES += \
 
 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
+	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/udev/libudev-selinux-private.c
+	src/libudev/libudev-selinux-private.c
 endif
 
 libudev_private_la_CFLAGS = \
@@ -1294,6 +1351,7 @@ libudev_private_la_CFLAGS = \
 	-fvisibility=default
 
 libudev_private_la_LIBADD = \
+	libsystemd-shared.la \
 	$(SELINUX_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1382,7 +1440,8 @@ libudev_core_la_SOURCES = \
 	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/udev/udev-builtin-usb_id.c \
+	src/libsystemd-daemon/sd-daemon.c
 
 libudev_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1391,7 +1450,6 @@ libudev_core_la_CFLAGS = \
 
 libudev_core_la_LIBADD = \
 	libudev-private.la \
-	libsystemd-daemon.la \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
@@ -1404,10 +1462,10 @@ libudev_core_la_CPPFLAGS = \
 if HAVE_ACL
 libudev_core_la_SOURCES += \
 	src/udev/udev-builtin-uaccess.c \
-	src/login/logind-acl.c
+	src/login/logind-acl.c \
+	src/login/sd-login.c
 
 libudev_core_la_LIBADD += \
-	libsystemd-login.la \
 	libsystemd-acl.la
 endif
 
@@ -1432,43 +1490,63 @@ udevadm_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-TESTS = \
-	src/udev/test/udev-test.pl \
-	src/udev/test/rules-test.sh
+TESTS += \
+	test/udev-test.pl \
+	test/rules-test.sh
 
-check_PROGRAMS = \
+noinst_PROGRAMS += \
 	test-libudev \
 	test-udev
 
 test_libudev_SOURCES = \
-	src/udev/test-libudev.c
+	src/test/test-libudev.c
 
 test_libudev_LDADD = \
+	libsystemd-shared.la \
 	libudev.la
 
 test_udev_SOURCES = \
-	src/udev/test-udev.c
+	src/test/test-udev.c \
+	$(libudev_core_la_SOURCES) \
+	$(libudev_private_la_SOURCES)
+
+# The test-udev program needs everything compiled with relative path
+# names for /sys, /dev, /run prefixed, pointing to our test/ directory.
+test_udev_CFLAGS = \
+	-DTEST_PREFIX=\"test\" \
+	$(libudev_core_la_CFLAGS) \
+	$(libudev_private_la_CFLAGS)
+
+test_udev_CPPFLAGS =\
+	$(libudev_core_la_CPPFLAGS)
 
 test_udev_LDADD = \
-	libudev-core.la \
-	libudev-private.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	$(BLKID_LIBS) \
+	$(KMOD_LIBS) \
+	$(SELINUX_LIBS)
 
-test_udev_DEPENDENCIES = \
-	src/udev/test/sys
+if HAVE_ACL
+test_udev_LDADD += \
+	libsystemd-acl.la
+endif
+
+check_DATA += \
+	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:
+	$(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
 
 test-sys-distclean:
-	-rm -rf src/udev/test/sys
+	-rm -rf test/sys
 DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
 
 EXTRA_DIST += \
-	src/udev/test/sys.tar.xz \
-	$(TESTS) \
-	src/udev/test/rule-syntax-check.py
+	test/sys.tar.xz \
+	test/udev-test.pl \
+	test/rules-test.sh \
+	test/rule-syntax-check.py
 
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = \
@@ -1493,7 +1571,7 @@ udevlibexec_PROGRAMS += \
 	cdrom_id
 
 dist_udevrules_DATA += \
-	src/udev/cdrom_id/60-cdrom_id.rules
+	rules/60-cdrom_id.rules
 
 # ------------------------------------------------------------------------------
 collect_SOURCES = \
@@ -1533,7 +1611,7 @@ udevlibexec_PROGRAMS += \
 	v4l_id
 
 dist_udevrules_DATA += \
-	src/udev/v4l_id/60-persistent-v4l.rules
+	rules/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------
 accelerometer_SOURCES = \
@@ -1547,54 +1625,54 @@ udevlibexec_PROGRAMS += \
 	accelerometer
 
 dist_udevrules_DATA += \
-	src/udev/accelerometer/61-accelerometer.rules
+	rules/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
 SUBDIRS += \
-	src/udev/gudev/docs
+	docs/gudev
 
 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
+	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
 
 lib_LTLIBRARIES += libgudev-1.0.la
 
 pkgconfiglib_DATA += \
-	src/udev/gudev/gudev-1.0.pc
+	src/gudev/gudev-1.0.pc
 
 EXTRA_DIST += \
-	src/udev/gudev/gudev-1.0.pc.in
+	src/gudev/gudev-1.0.pc.in
 
 CLEANFILES += \
-	src/udev/gudev/gudev-1.0.pc
+	src/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
+	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/udev/gudev/gudevmarshal.h \
-	src/udev/gudev/gudevmarshal.c \
-	src/udev/gudev/gudevenumtypes.h \
-	src/udev/gudev/gudevenumtypes.c
+	src/gudev/gudevmarshal.h \
+	src/gudev/gudevmarshal.c \
+	src/gudev/gudevenumtypes.h \
+	src/gudev/gudevenumtypes.c
 
 BUILT_SOURCES += \
 	$(nodist_libgudev_1_0_la_SOURCES)
@@ -1603,10 +1681,8 @@ libgudev_1_0_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_builddir)/src\
 	-I$(top_srcdir)/src\
-	-I$(top_builddir)/src/udev \
-	-I$(top_srcdir)/src/udev \
-	-I$(top_builddir)/src/udev/gudev \
-	-I$(top_srcdir)/src/udev/gudev \
+	-I$(top_builddir)/src/gudev \
+	-I$(top_srcdir)/src/gudev \
 	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
 	-D_GUDEV_COMPILATION \
 	-DG_LOG_DOMAIN=\"GUdev\"
@@ -1627,76 +1703,78 @@ libgudev_1_0_la_LDFLAGS = \
 	-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
+	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
 
 CLEANFILES += \
 	$(nodist_libgudev_1_0_la_SOURCES)
 
-src/udev/gudev/gudevmarshal.h: src/udev/gudev/gudevmarshal.list
+src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
 	$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
-src/udev/gudev/gudevmarshal.c: src/udev/gudev/gudevmarshal.list
+src/gudev/gudevmarshal.c: src/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
+src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/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
+src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/gudev/gudevenums.h
 	$(AM_V_GEN)glib-mkenums --template $^ > \
 	    $@.tmp && mv $@.tmp $@
 
-if ENABLE_INTROSPECTION
+if HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
 
-src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la
+src/gudev/GUdev-1.0.gir: libgudev-1.0.la
 
-src_udev_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
+src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
 
-src_udev_gudev_GUdev_1_0_gir_CFLAGS = \
+src_gudev_GUdev_1_0_gir_CFLAGS = \
 	$(INCLUDES) \
 	-D_GUDEV_COMPILATION \
 	-D_GUDEV_WORK_AROUND_DEV_T_BUG \
-	-I$(top_srcdir)/src/udev \
-	-I$(top_builddir)/src/udev
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
+	-I$(top_srcdir)/src/gdev \
+	-I$(top_builddir)/src/gdev
 
-src_udev_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
+src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
 
-src_udev_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
+src_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
 	--pkg-export=gudev-1.0 \
 	--warn-all
 
-src_udev_gudev_GUdev_1_0_gir_FILES = \
-	$(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
-
-INTROSPECTION_GIRS = src/udev/gudev/GUdev-1.0.gir
+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
+
+INTROSPECTION_GIRS = src/gudev/GUdev-1.0.gir
 INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = \
-	src/udev/gudev/GUdev-1.0.gir
+	src/gudev/GUdev-1.0.gir
 
 typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = \
-	src/udev/gudev/GUdev-1.0.typelib
+	src/gudev/GUdev-1.0.typelib
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif # ENABLE_INTROSPECTION
+endif # HAVE_INTROSPECTION
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libgudev-install-move-hook:
@@ -1723,6 +1801,9 @@ keymap_SOURCES = \
 keymap_CPPFLAGS = \
 	$(AM_CPPFLAGS) -I src/udev/keymap
 
+keymap_LDADD = \
+	libsystemd-shared.la
+
 nodist_keymap_SOURCES = \
 	src/udev/keymap/keys-from-name.h \
 	src/udev/keymap/keys-to-name.h
@@ -1744,6 +1825,9 @@ dist_udevhome_SCRIPTS = \
 	src/udev/keymap/findkeyboards \
 	src/udev/keymap/keyboard-force-release.sh
 
+TESTS += \
+	src/udev/keymap/check-keymaps.sh
+
 EXTRA_DIST += \
 	src/udev/keymap/check-keymaps.sh
 
@@ -1754,72 +1838,73 @@ CLEANFILES += \
 
 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
+	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/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
+	keymaps-force-release/dell-touchpad \
+	keymaps-force-release/dell-xps \
+	keymaps-force-release/hp-other \
+	keymaps-force-release/samsung-other \
+	keymaps-force-release/samsung-90x3a \
+	keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
 	$(AM_V_at)mkdir -p src/udev/keymap
@@ -1833,10 +1918,6 @@ src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile
 
 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
 
 # ------------------------------------------------------------------------------
@@ -1849,14 +1930,14 @@ mtd_probe_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 dist_udevrules_DATA += \
-	src/udev/mtd_probe/75-probe_mtd.rules
+	rules/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) \
@@ -1866,7 +1947,7 @@ 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-shared.la
@@ -1881,6 +1962,9 @@ test_id128_LDADD = \
 noinst_PROGRAMS += \
 	test-id128
 
+TESTS += \
+	test-id128
+
 pkginclude_HEADERS += \
 	src/systemd/sd-id128.h
 
@@ -1888,7 +1972,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:
@@ -1910,8 +1994,8 @@ 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 = \
@@ -1972,17 +2056,8 @@ journalctl_SOURCES = \
 journalctl_LDADD = \
 	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
+	libsystemd-id128.la \
+	libsystemd-logs.la
 
 test_journal_SOURCES = \
 	src/journal/test-journal.c \
@@ -2273,7 +2348,7 @@ EXTRA_DIST += \
 	units/quotacheck.service.in
 
 systemd_quotacheck_SOURCES = \
-	src/quotacheck.c
+	src/quotacheck/quotacheck.c
 
 systemd_quotacheck_LDADD = \
 	libsystemd-shared.la
@@ -2293,7 +2368,7 @@ 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-label.la \
@@ -2326,8 +2401,7 @@ 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) \
@@ -2360,9 +2434,7 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
-	src/hostname/hostnamed.c \
-	src/polkit.c \
-	src/polkit.h
+	src/hostname/hostnamed.c
 
 systemd_hostnamed_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2371,7 +2443,7 @@ systemd_hostnamed_CFLAGS = \
 systemd_hostnamed_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	$(DBUS_LIBS)
+	libsystemd-dbus.la
 
 rootlibexec_PROGRAMS += \
 	systemd-hostnamed
@@ -2411,9 +2483,7 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
-	src/locale/localed.c \
-	src/polkit.c \
-	src/polkit.h
+	src/locale/localed.c
 
 systemd_localed_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2423,7 +2493,7 @@ systemd_localed_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	$(DBUS_LIBS)
+	libsystemd-dbus.la
 
 nodist_systemunit_DATA += \
 	units/systemd-localed.service
@@ -2473,9 +2543,7 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
-	src/timedate/timedated.c \
-	src/polkit.c \
-	src/polkit.h
+	src/timedate/timedated.c
 
 systemd_timedated_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2484,7 +2552,7 @@ systemd_timedated_CFLAGS = \
 systemd_timedated_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	$(DBUS_LIBS)
+	libsystemd-dbus.la
 
 rootlibexec_PROGRAMS += \
 	systemd-timedated
@@ -2535,13 +2603,11 @@ systemd_logind_SOURCES = \
 	src/login/logind-session.h \
 	src/login/logind-user.c \
 	src/login/logind-user.h \
+	src/login/logind-inhibit.c \
+	src/login/logind-inhibit.h \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
-	src/dbus-loop.c \
-	src/dbus-loop.h \
-	src/polkit.c \
-	src/polkit.h \
 	src/login/logind-acl.h
 
 nodist_systemd_logind_SOURCES = \
@@ -2556,8 +2622,8 @@ systemd_logind_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
-	libudev.la \
-	$(DBUS_LIBS)
+	libsystemd-dbus.la \
+	libudev.la
 
 if HAVE_ACL
 systemd_logind_SOURCES += \
@@ -2587,8 +2653,8 @@ loginctl_CFLAGS = \
 
 loginctl_LDADD = \
 	libsystemd-shared.la \
-	libudev.la \
-	$(DBUS_LIBS)
+	libsystemd-dbus.la \
+	libudev.la
 
 rootbin_PROGRAMS += \
 	loginctl
@@ -2600,8 +2666,20 @@ test_login_LDADD = \
 	libsystemd-login.la \
 	libsystemd-shared.la
 
+test_inhibit_SOURCES = \
+	src/login/test-inhibit.c
+
+test_inhibit_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-dbus.la
+
+test_inhibit_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
 noinst_PROGRAMS += \
-	test-login
+	test-login \
+	test-inhibit
 
 libsystemd_login_la_SOURCES = \
 	src/login/sd-login.c
@@ -2640,9 +2718,9 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
 	libsystemd-daemon.la \
 	libsystemd-audit.la \
+	libsystemd-dbus.la \
 	libsystemd-shared.la \
-	$(PAM_LIBS) \
-	$(DBUS_LIBS)
+	$(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
 	pam_systemd.la
@@ -2876,6 +2954,7 @@ CLEANFILES += \
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
 	--nonet \
+	--stringparam man.output.quietly 1 \
 	--stringparam funcsynopsis.style ansi
 
 XSLTPROC_PROCESS_MAN = \
@@ -3146,8 +3225,6 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
 install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
 
-distcheck-hook: $(DISTCHECK_HOOKS)
-
 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
 DISTCHECK_CONFIGURE_FLAGS = \
@@ -3163,8 +3240,12 @@ DISTCHECK_CONFIGURE_FLAGS = \
 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)"