X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=a52a8931f31c81670d795f3a602e3d4aed5f5911;hp=d83a5a1df310cb83c1f7ca23aa7870136e607809;hb=771f19c06a9dbe19e4c3e532d901734f4b3b3a2b;hpb=6df831f25ebc9f55cd939f04392dad9237706e45

diff --git a/Makefile.am b/Makefile.am
index d83a5a1df..a52a8931f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ AM_MAKEFLAGS = --no-print-directory
 SUBDIRS = . po
 
 LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=2
+LIBUDEV_REVISION=3
 LIBUDEV_AGE=13
 
 LIBGUDEV_CURRENT=1
@@ -63,15 +63,17 @@ 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 =
@@ -82,16 +84,13 @@ INSTALL_DATA_HOOKS =
 DISTCHECK_HOOKS =
 DISTCLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
+noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
 include_HEADERS =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
 dist_udevrules_DATA =
 nodist_udevrules_DATA =
-udevhomedir = $(libexecdir)/udev
-udevhome_SCRIPTS =
-dist_udevhome_SCRIPTS =
-dist_udevhome_DATA =
 dist_man_MANS =
 
 AM_CPPFLAGS = \
@@ -122,6 +121,7 @@ AM_CPPFLAGS = \
 	-DX_SERVER=\"$(bindir)/X\" \
 	-DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
 	-I $(top_srcdir)/src \
+	-I $(top_srcdir)/src/shared \
 	-I $(top_srcdir)/src/readahead \
 	-I $(top_srcdir)/src/login \
 	-I $(top_srcdir)/src/journal \
@@ -131,6 +131,7 @@ AM_CPPFLAGS = \
 AM_CFLAGS = $(WARNINGFLAGS)
 AM_LDFLAGS = $(GCLDFLAGS)
 
+# ------------------------------------------------------------------------------
 if TARGET_GENTOO
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
@@ -185,6 +186,7 @@ endif
 endif
 endif
 
+# ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
 	systemctl \
 	systemd-notify \
@@ -231,7 +233,8 @@ noinst_PROGRAMS = \
 	test-cgroup \
 	test-env-replace \
 	test-strv \
-	test-install
+	test-install \
+	test-watchdog
 
 dist_pkgsysconf_DATA = \
 	src/system.conf \
@@ -338,6 +341,7 @@ 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 \
@@ -359,8 +363,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 \
@@ -372,6 +376,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 \
@@ -469,185 +474,277 @@ EXTRA_DIST += \
 
 @INTLTOOL_POLICY_RULE@
 
-noinst_LTLIBRARIES = \
-	libsystemd-basic.la \
-	libsystemd-core.la
+# ------------------------------------------------------------------------------
+MANPAGES = \
+	man/systemd.1 \
+	man/systemctl.1 \
+	man/systemd-cgls.1 \
+	man/systemd-cgtop.1 \
+	man/systemd-nspawn.1 \
+	man/systemd-tmpfiles.8 \
+	man/systemd-notify.1 \
+	man/systemd.unit.5 \
+	man/systemd.service.5 \
+	man/systemd.socket.5 \
+	man/systemd.mount.5 \
+	man/systemd.automount.5 \
+	man/systemd.swap.5 \
+	man/systemd.timer.5 \
+	man/systemd.path.5 \
+	man/systemd.target.5 \
+	man/systemd.device.5 \
+	man/systemd.snapshot.5 \
+	man/systemd.exec.5 \
+	man/systemd.special.7 \
+	man/systemd.journal-fields.7 \
+	man/daemon.7 \
+	man/runlevel.8 \
+	man/telinit.8 \
+	man/halt.8 \
+	man/shutdown.8 \
+	man/pam_systemd.8 \
+	man/systemd.conf.5 \
+	man/tmpfiles.d.5 \
+	man/hostname.5 \
+	man/timezone.5 \
+	man/machine-id.5 \
+	man/locale.conf.5 \
+	man/os-release.5 \
+	man/machine-info.5 \
+	man/modules-load.d.5 \
+	man/sysctl.d.5 \
+	man/systemd-ask-password.1 \
+	man/systemd-cat.1 \
+	man/systemd-machine-id-setup.1 \
+	man/journald.conf.5 \
+	man/journalctl.1 \
+	man/udev.7 \
+	man/udevadm.8 \
+	man/udevd.8
+
+MANPAGES_ALIAS = \
+	man/reboot.8 \
+	man/poweroff.8 \
+	man/init.1
+
+man/reboot.8: man/halt.8
+man/poweroff.8: man/halt.8
+man/init.1: man/systemd.1
+
+XML_FILES = \
+	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
+
+if ENABLE_MANPAGES
+man_MANS = \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
+
+noinst_DATA = \
+	${XML_FILES:.xml=.html}
+endif
+
+EXTRA_DIST += \
+	$(XML_FILES) \
+	${XML_FILES:.xml=.html} \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-basic.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
+	src/shared/util.c \
+	src/shared/util.h \
+	src/shared/virt.c \
+	src/shared/virt.h \
+	src/shared/label.c \
+	src/shared/label.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/socket-util.c \
+	src/shared/socket-util.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/cgroup-util.c \
+	src/shared/cgroup-util.h \
+	src/shared/pager.c \
+	src/shared/pager.h \
+	src/shared/ioprio.h \
+	src/shared/list.h \
+	src/shared/macro.h
 
 libsystemd_basic_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(SELINUX_CFLAGS)
 
 libsystemd_basic_la_LIBADD = \
-	$(SELINUX_LIBS) \
+	$(SELINUX_LIBS)
+
+# ------------------------------------------------------------------------------
+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)
 
-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
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-audit.la
 
-nodist_libsystemd_core_la_SOURCES = \
-	src/load-fragment-gperf.c \
-	src/load-fragment-gperf-nulstr.c
+libsystemd_audit_la_SOURCES = \
+	src/shared/audit.c \
+	src/shared/audit.h
 
-EXTRA_DIST += \
-	src/load-fragment-gperf.gperf.m4
+libsystemd_audit_la_LIBADD = \
+	libsystemd-capability.la
 
-libsystemd_core_la_CFLAGS = \
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-acl.la
+
+libsystemd_acl_la_SOURCES = \
+	src/shared/acl.c \
+	src/shared/acl.h
+
+libsystemd_acl_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(LIBWRAP_CFLAGS) \
-	$(PAM_CFLAGS) \
-	$(AUDIT_CFLAGS) \
-	$(KMOD_CFLAGS)
+	$(ACL_CFLAGS)
 
-libsystemd_core_la_LIBADD = \
-	libsystemd-basic.la \
-	libudev.la \
-	$(DBUS_LIBS) \
-	$(LIBWRAP_LIBS) \
-	$(PAM_LIBS) \
-	$(AUDIT_LIBS) \
-	$(CAP_LIBS) \
-	$(KMOD_LIBS)
+libsystemd_acl_la_LIBADD = \
+	$(ACL_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.
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-core.la
 
-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 \
+libsystemd_core_la_SOURCES = \
+	src/unit.c \
 	src/unit.h \
+	src/job.c \
 	src/job.h \
+	src/manager.c \
 	src/manager.h \
+	src/path-lookup.c \
 	src/path-lookup.h \
+	src/load-fragment.c \
 	src/load-fragment.h \
+	src/service.c \
 	src/service.h \
+	src/automount.c \
 	src/automount.h \
+	src/mount.c \
 	src/mount.h \
+	src/swap.c \
 	src/swap.h \
+	src/device.c \
 	src/device.h \
+	src/target.c \
 	src/target.h \
+	src/snapshot.c \
 	src/snapshot.h \
+	src/socket.c \
 	src/socket.h \
+	src/timer.c \
 	src/timer.h \
+	src/path.c \
 	src/path.h \
+	src/load-dropin.c \
 	src/load-dropin.h \
+	src/execute.c \
 	src/execute.h \
+	src/utmp-wtmp.c \
 	src/utmp-wtmp.h \
+	src/dbus.c \
 	src/dbus.h \
+	src/dbus-manager.c \
 	src/dbus-manager.h \
+	src/dbus-unit.c \
 	src/dbus-unit.h \
+	src/dbus-job.c \
 	src/dbus-job.h \
+	src/dbus-service.c \
 	src/dbus-service.h \
+	src/dbus-socket.c \
 	src/dbus-socket.h \
+	src/dbus-timer.c \
 	src/dbus-timer.h \
+	src/dbus-target.c \
 	src/dbus-target.h \
+	src/dbus-mount.c \
 	src/dbus-mount.h \
+	src/dbus-automount.c \
 	src/dbus-automount.h \
+	src/dbus-swap.c \
 	src/dbus-swap.h \
+	src/dbus-snapshot.c \
 	src/dbus-snapshot.h \
+	src/dbus-device.c \
 	src/dbus-device.h \
+	src/dbus-execute.c \
 	src/dbus-execute.h \
+	src/dbus-path.c \
 	src/dbus-path.h \
+	src/cgroup.c \
 	src/cgroup.h \
+	src/mount-setup.c \
 	src/mount-setup.h \
+	src/hostname-setup.c \
 	src/hostname-setup.h \
+	src/selinux-setup.c \
 	src/selinux-setup.h \
+	src/ima-setup.c \
+	src/ima-setup.h \
 	src/loopback-setup.h \
+	src/loopback-setup.c \
+	src/kmod-setup.c \
 	src/kmod-setup.h \
 	src/locale-setup.h \
+	src/locale-setup.c \
+	src/machine-id-setup.c \
 	src/machine-id-setup.h \
-	src/specifier.h \
-	src/unit-name.h \
+	src/fdset.c \
 	src/fdset.h \
-	src/namespace.h \
-	src/tcpwrap.h \
-	src/cgroup-util.h \
+	src/condition.c \
 	src/condition.h \
+	src/dbus-common.c \
 	src/dbus-common.h \
+	src/install.c \
 	src/install.h \
+	src/specifier.c \
+	src/specifier.h \
+	src/namespace.c \
+	src/namespace.h \
+	src/unit-name.c \
+	src/unit-name.h \
+	src/tcpwrap.c \
+	src/tcpwrap.h \
+	src/cgroup-attr.c \
 	src/cgroup-attr.h \
-	src/macro.h \
+	src/watchdog.c \
+	src/watchdog.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 \
@@ -660,91 +757,39 @@ EXTRA_DIST += \
 	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 \
-	man/systemd-cgls.1 \
-	man/systemd-cgtop.1 \
-	man/systemd-nspawn.1 \
-	man/systemd-tmpfiles.8 \
-	man/systemd-notify.1 \
-	man/systemd.unit.5 \
-	man/systemd.service.5 \
-	man/systemd.socket.5 \
-	man/systemd.mount.5 \
-	man/systemd.automount.5 \
-	man/systemd.swap.5 \
-	man/systemd.timer.5 \
-	man/systemd.path.5 \
-	man/systemd.target.5 \
-	man/systemd.device.5 \
-	man/systemd.snapshot.5 \
-	man/systemd.exec.5 \
-	man/systemd.special.7 \
-        man/systemd.journal-fields.7 \
-	man/daemon.7 \
-	man/runlevel.8 \
-	man/telinit.8 \
-	man/halt.8 \
-	man/shutdown.8 \
-	man/pam_systemd.8 \
-	man/systemd.conf.5 \
-	man/tmpfiles.d.5 \
-	man/hostname.5 \
-	man/timezone.5 \
-	man/machine-id.5 \
-	man/locale.conf.5 \
-	man/os-release.5 \
-	man/machine-info.5 \
-	man/modules-load.d.5 \
-	man/sysctl.d.5 \
-	man/systemd-ask-password.1 \
-	man/systemd-cat.1 \
-	man/systemd-machine-id-setup.1 \
-	man/journald.conf.5 \
-	man/journalctl.1 \
-	man/udev.7 \
-	man/udevadm.8 \
-	man/udevd.8
-
-MANPAGES_ALIAS = \
-	man/reboot.8 \
-	man/poweroff.8 \
-	man/init.1
-
-man/reboot.8: man/halt.8
-man/poweroff.8: man/halt.8
-man/init.1: man/systemd.1
+	src/logs-show.h
 
-XML_FILES = \
-	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
+nodist_libsystemd_core_la_SOURCES = \
+	src/load-fragment-gperf.c \
+	src/load-fragment-gperf-nulstr.c
 
-if ENABLE_MANPAGES
-man_MANS = \
-	$(MANPAGES) \
-	$(MANPAGES_ALIAS)
+EXTRA_DIST += \
+	src/load-fragment-gperf.gperf.m4
 
-noinst_DATA = \
-	${XML_FILES:.xml=.html}
-endif
+libsystemd_core_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(LIBWRAP_CFLAGS) \
+	$(PAM_CFLAGS) \
+	$(AUDIT_CFLAGS) \
+	$(KMOD_CFLAGS)
 
-EXTRA_DIST += \
-	$(XML_FILES) \
-	${XML_FILES:.xml=.html} \
-	$(MANPAGES) \
-	$(MANPAGES_ALIAS)
+libsystemd_core_la_LIBADD = \
+	libsystemd-basic.la \
+	libsystemd-capability.la \
+	libudev.la \
+	$(DBUS_LIBS) \
+	$(LIBWRAP_LIBS) \
+	$(PAM_LIBS) \
+	$(AUDIT_LIBS) \
+	$(CAP_LIBS) \
+	$(KMOD_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_SOURCES = \
 	src/main.c
 
@@ -753,25 +798,37 @@ systemd_CFLAGS = \
 	$(DBUS_CFLAGS)
 
 systemd_LDADD = \
-	libsystemd-core.la
+	libsystemd-core.la \
+	libsystemd-daemon.la \
+	libsystemd-id128.la
 
+# ------------------------------------------------------------------------------
 test_engine_SOURCES = \
 	src/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
 
 test_job_type_SOURCES = \
 	src/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
 
-test_ns_CFLAGS = $(systemd_CFLAGS)
-test_ns_LDADD = $(systemd_LDADD)
+test_ns_LDADD = \
+	libsystemd-core.la
 
 test_loopback_SOURCES = \
 	src/test-loopback.c \
@@ -795,8 +852,7 @@ test_daemon_LDADD = \
 	libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
-	src/test-cgroup.c \
-	src/cgroup-util.c
+	src/test-cgroup.c
 
 test_cgroup_LDADD = \
 	libsystemd-basic.la
@@ -827,6 +883,15 @@ test_install_CFLAGS = \
 test_install_LDADD = \
 	libsystemd-basic.la
 
+test_watchdog_SOURCES = \
+	src/test-watchdog.c \
+	src/watchdog.c \
+	src/watchdog.h
+
+test_watchdog_LDADD = \
+	libsystemd-basic.la
+
+# ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
 	src/initctl.c \
 	src/dbus-common.c
@@ -840,6 +905,7 @@ systemd_initctl_LDADD = \
 	libsystemd-daemon.la \
 	$(DBUS_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
 	src/update-utmp.c \
 	src/dbus-common.c \
@@ -855,13 +921,11 @@ systemd_update_utmp_LDADD = \
 	$(DBUS_LIBS) \
 	$(AUDIT_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_shutdownd_SOURCES = \
 	src/utmp-wtmp.c \
 	src/shutdownd.c
 
-systemd_shutdownd_CFLAGS = \
-	$(AM_CFLAGS)
-
 systemd_shutdownd_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la
@@ -869,42 +933,50 @@ systemd_shutdownd_LDADD = \
 systemd_shutdown_SOURCES = \
 	src/mount-setup.c \
 	src/umount.c \
-	src/shutdown.c
+	src/shutdown.c \
+	src/watchdog.c \
+	src/watchdog.h
 
 systemd_shutdown_LDADD = \
 	libsystemd-basic.la \
 	libudev.la
 
+# ------------------------------------------------------------------------------
 systemd_modules_load_SOURCES = \
 	src/modules-load.c
 
 systemd_modules_load_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(KMOD_CFLAGS)
 
 systemd_modules_load_LDADD = \
 	libsystemd-basic.la \
 	$(KMOD_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_tmpfiles_SOURCES = \
 	src/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
 	src/machine-id-setup.c \
-	src/machine-id-main.c \
-	src/sd-id128.c
+	src/machine-id-main.c
 
 systemd_machine_id_setup_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	libsystemd-id128.la
 
+# ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
 	src/sysctl.c
 
 systemd_sysctl_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_fsck_SOURCES = \
 	src/fsck.c \
 	src/dbus-common.c
@@ -918,12 +990,14 @@ systemd_fsck_LDADD = \
 	libudev.la \
 	$(DBUS_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_timestamp_SOURCES = \
 	src/timestamp.c
 
 systemd_timestamp_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_ac_power_SOURCES = \
 	src/ac-power.c
 
@@ -931,12 +1005,14 @@ systemd_ac_power_LDADD = \
 	libsystemd-basic.la \
 	libudev.la
 
+# ------------------------------------------------------------------------------
 systemd_detect_virt_SOURCES = \
 	src/detect-virt.c
 
 systemd_detect_virt_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
 	src/getty-generator.c \
 	src/unit-name.c
@@ -944,20 +1020,22 @@ systemd_getty_generator_SOURCES = \
 systemd_getty_generator_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
 	src/rc-local-generator.c
 
 systemd_rc_local_generator_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_remount_api_vfs_SOURCES = \
 	src/remount-api-vfs.c \
-	src/mount-setup.c \
-	src/exit-status.c
+	src/mount-setup.c
 
 systemd_remount_api_vfs_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_cgroups_agent_SOURCES = \
 	src/cgroups-agent.c \
 	src/dbus-common.c
@@ -970,16 +1048,14 @@ systemd_cgroups_agent_LDADD = \
 	libsystemd-basic.la \
 	$(DBUS_LIBS)
 
+# ------------------------------------------------------------------------------
 systemctl_SOURCES = \
 	src/systemctl.c \
 	src/utmp-wtmp.c \
 	src/dbus-common.c \
 	src/path-lookup.c \
 	src/cgroup-show.c \
-	src/cgroup-util.c \
-	src/exit-status.c \
 	src/unit-name.c \
-	src/pager.c \
 	src/install.c \
 	src/spawn-agent.c \
 	src/logs-show.c
@@ -995,6 +1071,7 @@ systemctl_LDADD = \
 	libsystemd-id128.la \
 	$(DBUS_LIBS)
 
+# ------------------------------------------------------------------------------
 systemd_notify_SOURCES = \
 	src/notify.c \
 	src/readahead/sd-readahead.c
@@ -1003,6 +1080,7 @@ systemd_notify_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la
 
+# ------------------------------------------------------------------------------
 systemd_ask_password_SOURCES = \
 	src/ask-password.c \
 	src/ask-password-api.c
@@ -1010,43 +1088,46 @@ systemd_ask_password_SOURCES = \
 systemd_ask_password_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_reply_password_SOURCES = \
 	src/reply-password.c
 
 systemd_reply_password_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
 	src/cgls.c \
-	src/cgroup-show.c \
-	src/cgroup-util.c \
-	src/pager.c
+	src/cgroup-show.c
 
 systemd_cgls_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_cgtop_SOURCES = \
-	src/cgtop.c \
-        src/cgroup-util.c
+	src/cgtop.c
 
 systemd_cgtop_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_nspawn_SOURCES = \
 	src/nspawn.c \
-	src/cgroup-util.c \
 	src/loopback-setup.c
 
 systemd_nspawn_LDADD = \
 	libsystemd-basic.la \
+	libsystemd-capability.la \
 	libsystemd-daemon.la
 
+# ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
 	src/bridge.c
 
 systemd_stdio_bridge_LDADD = \
 	libsystemd-basic.la
 
+# ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
 	src/tty-ask-password-agent.c \
 	src/ask-password-api.c \
@@ -1131,9 +1212,6 @@ include_HEADERS += \
 lib_LTLIBRARIES += \
 	libudev.la
 
-noinst_LTLIBRARIES += \
-	libudev-private.la
-
 libudev_la_SOURCES =\
 	src/udev/libudev-private.h \
 	src/udev/libudev.c \
@@ -1144,20 +1222,14 @@ libudev_la_SOURCES =\
 	src/udev/libudev-monitor.c \
 	src/udev/libudev-queue.c
 
+libudev_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-fvisibility=hidden
+
 libudev_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
-libudev_private_la_SOURCES =\
-	$(libudev_la_SOURCES) \
-	src/udev/libudev-util-private.c \
-	src/udev/libudev-device-private.c \
-	src/udev/libudev-queue-private.c \
-	src/udev/libudev-selinux-private.c
-
-libudev_private_la_LIBADD = \
-	$(SELINUX_LIBS)
-
 pkgconfiglib_DATA += \
 	src/udev/libudev.pc
 
@@ -1183,6 +1255,28 @@ libudev-uninstall-move-hook:
 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/udev/libudev-util-private.c \
+	src/udev/libudev-device-private.c \
+	src/udev/libudev-queue-private.c
+
+libudev_private_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-fvisibility=default
+
+if HAVE_SELINUX
+libudev_private_la_SOURCES +=\
+	src/udev/libudev-selinux-private.c
+
+libudev_private_la_LIBADD = \
+	$(SELINUX_LIBS)
+endif
+
 # ------------------------------------------------------------------------------
 udev-confdirs:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
@@ -1190,7 +1284,6 @@ udev-confdirs:
 
 INSTALL_DATA_HOOKS += udev-confdirs
 
-udevrulesdir = $(libexecdir)/udev/rules.d
 dist_udevrules_DATA += \
 	rules/99-systemd.rules \
 	rules/42-usb-hid-pm.rules \
@@ -1248,7 +1341,10 @@ bin_PROGRAMS += \
 udevlibexec_PROGRAMS = \
 	udevd
 
-udev_common_sources = \
+noinst_LTLIBRARIES += \
+	libudev-core.la
+
+libudev_core_la_SOURCES = \
 	src/udev/udev.h \
 	src/udev/udev-event.c \
 	src/udev/udev-watch.c \
@@ -1264,37 +1360,40 @@ udev_common_sources = \
 	src/udev/udev-builtin-path_id.c \
 	src/udev/udev-builtin-usb_id.c
 
-udev_common_CFLAGS = \
+libudev_core_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(BLKID_CFLAGS) \
 	$(KMOD_CFLAGS)
 
-udev_common_LDADD = \
+libudev_core_la_LIBADD = \
 	libudev-private.la \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
-udev_common_CPPFLAGS = \
+libudev_core_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
 	-DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
 
-udevd_SOURCES = \
-	$(udev_common_sources) \
-	src/udev/udevd.c \
-	src/systemd/sd-daemon.h \
-	src/sd-daemon.c
+if HAVE_ACL
+libudev_core_la_SOURCES += \
+	src/udev/udev-builtin-uaccess.c \
+	src/login/logind-acl.c
 
-udevd_CFLAGS = \
-	$(udev_common_CFLAGS)
+libudev_core_la_LIBADD += \
+	libsystemd-login.la \
+	libsystemd-acl.la
+endif
 
-udevd_LDADD = \
-	$(udev_common_LDADD)
+udevd_SOURCES = \
+	src/udev/udevd.c
 
-udevd_CPPFLAGS = \
-	$(udev_common_CPPFLAGS)
+udevd_LDADD = \
+	libudev-core.la
 
 udevadm_SOURCES = \
-	$(udev_common_sources) \
 	src/udev/udevadm.c \
 	src/udev/udevadm-info.c \
 	src/udev/udevadm-control.c \
@@ -1304,14 +1403,8 @@ udevadm_SOURCES = \
 	src/udev/udevadm-test.c \
 	src/udev/udevadm-test-builtin.c
 
-udevadm_CFLAGS = \
-	$(udev_common_CFLAGS)
-
 udevadm_LDADD = \
-	$(udev_common_LDADD)
-
-udevadm_CPPFLAGS = \
-	$(udev_common_CPPFLAGS)
+	libudev-core.la
 
 # ------------------------------------------------------------------------------
 TESTS = \
@@ -1329,17 +1422,12 @@ test_libudev_LDADD = \
 	libudev.la
 
 test_udev_SOURCES = \
-	$(udev_common_sources) \
 	src/udev/test-udev.c
 
-test_udev_CFLAGS = \
-	$(udev_common_CFLAGS)
-
 test_udev_LDADD = \
-	$(udev_common_LDADD)
-
-test_udev_CPPFLAGS = \
-	$(udev_common_CPPFLAGS)
+	libudev-core.la \
+	libudev-private.la \
+	libsystemd-basic.la
 
 test_udev_DEPENDENCIES = \
 	src/udev/test/sys
@@ -1362,7 +1450,8 @@ ata_id_SOURCES = \
 	src/udev/ata_id/ata_id.c
 
 ata_id_LDADD = \
-	libudev-private.la
+	libudev-private.la \
+	libsystemd-basic.la
 
 udevlibexec_PROGRAMS += \
 	ata_id
@@ -1372,7 +1461,8 @@ cdrom_id_SOURCES = \
 	src/udev/cdrom_id/cdrom_id.c
 
 cdrom_id_LDADD = \
-	libudev-private.la
+	libudev.la \
+	libsystemd-basic.la
 
 udevlibexec_PROGRAMS += \
 	cdrom_id
@@ -1398,7 +1488,8 @@ scsi_id_SOURCES =\
 	src/udev/scsi_id/scsi_id.h
 
 scsi_id_LDADD = \
-	libudev-private.la
+	libudev-private.la \
+	libsystemd-basic.la
 
 udevlibexec_PROGRAMS += \
 	scsi_id
@@ -1411,7 +1502,7 @@ v4l_id_SOURCES = \
 	src/udev/v4l_id/v4l_id.c
 
 v4l_id_LDADD = \
-	libudev-private.la
+	libudev.la
 
 udevlibexec_PROGRAMS += \
 	v4l_id
@@ -1424,7 +1515,8 @@ accelerometer_SOURCES = \
 	src/udev/accelerometer/accelerometer.c
 
 accelerometer_LDADD = \
-	libudev-private.la -lm
+	libudev.la -lm \
+	libsystemd-basic.la
 
 udevlibexec_PROGRAMS += \
 	accelerometer
@@ -1493,6 +1585,7 @@ libgudev_1_0_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"GUdev\"
 
 libgudev_1_0_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	-fvisibility=default \
 	$(GLIB_CFLAGS)
 
@@ -1617,21 +1710,17 @@ dist_udevrules_DATA += \
 	src/udev/keymap/95-keymap.rules \
 	src/udev/keymap/95-keyboard-force-release.rules
 
-dist_udevhome_SCRIPTS += \
-	src/udev/keymap/findkeyboards
-
-udevhome_SCRIPTS += \
+dist_udevhome_SCRIPTS = \
+	src/udev/keymap/findkeyboards \
 	src/udev/keymap/keyboard-force-release.sh
 
 EXTRA_DIST += \
-	src/udev/keymap/check-keymaps.sh \
-	src/udev/keymap/keyboard-force-release.sh.in
+	src/udev/keymap/check-keymaps.sh
 
 CLEANFILES += \
 	$(nodist_keymap_SOURCES) \
 	src/udev/keymap/keys.txt \
-	src/udev/keymap/keys-from-name.gperf \
-	src/udev/keymap/keyboard-force-release.sh
+	src/udev/keymap/keys-from-name.gperf
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
@@ -1752,11 +1841,11 @@ libsystemd_id128_la_LIBADD = \
 	libsystemd-basic.la
 
 test_id128_SOURCES = \
-	src/test-id128.c \
-	src/sd-id128.c
+	src/test-id128.c
 
 test_id128_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	libsystemd-id128.la
 
 noinst_PROGRAMS += \
 	test-id128
@@ -1800,32 +1889,33 @@ systemd_journald_SOURCES = \
 	src/journal/journal-file.c \
 	src/journal/lookup3.c \
 	src/journal/journal-rate-limit.c \
-	src/sd-id128.c \
-	src/cgroup-util.c
-
-if HAVE_ACL
-systemd_journald_SOURCES += \
-	src/acl-util.c
-endif
+	src/journal/sparse-endian.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-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
@@ -1839,7 +1929,6 @@ systemd_cat_LDADD = \
 
 journalctl_SOURCES = \
 	src/journal/journalctl.c \
-	src/pager.c \
 	src/logs-show.c
 
 journalctl_LDADD = \
@@ -1862,11 +1951,11 @@ test_journal_SOURCES = \
 	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-basic.la \
+	libsystemd-id128.la
 
 if HAVE_XZ
 test_journal_SOURCES += \
@@ -1911,6 +2000,7 @@ libsystemd_journal_la_SOURCES += \
 	src/journal/compress.c
 
 libsystemd_journal_la_CFLAGS += \
+	$(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 
 libsystemd_journal_la_LIBADD += \
@@ -2406,33 +2496,32 @@ systemd_logind_SOURCES = \
 	src/login/logind-user-dbus.c \
 	src/dbus-common.c \
 	src/dbus-loop.c \
-	src/cgroup-util.c \
 	src/polkit.c
 
 nodist_systemd_logind_SOURCES = \
 	src/login/logind-gperf.c
 
-if HAVE_ACL
-systemd_logind_SOURCES += \
-	src/login/logind-acl.c \
-	src/acl-util.c
-endif
-
 systemd_logind_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(ACL_CFLAGS)
+	$(DBUS_CFLAGS)
 
 systemd_logind_LDADD = \
 	libsystemd-basic.la \
+	libsystemd-audit.la \
 	libsystemd-daemon.la \
 	libudev.la \
-	$(DBUS_LIBS) \
-	$(ACL_LIBS)
+	$(DBUS_LIBS)
+
+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
@@ -2445,9 +2534,7 @@ 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/cgroup-show.c
 
 loginctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2472,8 +2559,7 @@ 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) \
@@ -2584,29 +2670,6 @@ systemd_multi_seat_x_LDADD = \
 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) \
-	$(ACL_CFLAGS)
-
-systemd_uaccess_LDADD = \
-	libsystemd-basic.la \
-	libsystemd-daemon.la \
-	libsystemd-login.la \
-	libudev.la \
-	$(ACL_LIBS)
-
-rootlibexec_PROGRAMS += \
-	systemd-uaccess
-
 dist_udevrules_DATA += \
 	src/login/70-uaccess.rules