Prep v221: Update and clean up build system to sync with upstream

This commit replays the moving around of source files that have been
done between systemd-219 and systemd-221.

Further the Makefile.am is synchronized with the upstream version and
then "re-cleaned".

A lot of functions, that are not used anywhere in elogind have been
coated into #if 0/#endif directives to further shorten the list of
dependencies.

All unneeded files have been removed.

1 files changed, 417 insertions, 446 deletions

diff --git a/Makefile.am b/Makefile.am
index e104c41d4..1cb1c2063 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,39 +38,36 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBELOGIND_CURRENT=7
+LIBELOGIND_CURRENT=8
 LIBELOGIND_REVISION=0
-LIBELOGIND_AGE=7
+LIBELOGIND_AGE=8
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
-dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
 pamlibdir=@pamlibdir@
 pamconfdir=@pamconfdir@
+pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
-varlogdir=$(localstatedir)/log
-elogindstatedir=$(localstatedir)/lib/elogind
-systemsleepdir=$(pkglibexecdir)/sleep.d
-systemshutdowndir=$(pkglibexecdir)/shutdown.d
-
-udevrulesdir=@udevrulesdir@
-udevbindir=@udevbindir@
-
-PKTTYAGENT=$(bindir)/pkttyagent
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/elogind
 pkgincludedir=$(includedir)/elogind
+udevrulesdir=@udevrulesdir@
+udevbindir=@udevbindir@
 udevlibexecdir=$(udevbindir)
 udevhomedir=$(udevlibexecdir)
 udevhwdbdir=$(udevlibexecdir)/hwdb.d
-factory_etcdir = $(datadir)/factory/etc
 factory_pamdir = $(datadir)/factory/etc/pam.d
 
+# And these are the special ones for /
+rootprefix=@rootprefix@
+rootbindir=$(rootprefix)/bin
+rootlibexecdir=$(rootprefix)/lib/elogind
+
 EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
@@ -82,23 +79,19 @@ CLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
 noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
-include_HEADERS =
 noinst_DATA =
 pkgconfiglib_DATA =
-polkitpolicy_in_in_files =
 polkitpolicy_in_files =
 polkitpolicy_files =
+dist_udevrules_DATA =
+nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
-nodist_pkgsysconf_DATA =
-dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
 tests=
 manual_tests =
-TEST_EXTENSIONS = .py
-PY_LOG_COMPILER = $(PYTHON)
 if ENABLE_TESTS
 noinst_PROGRAMS = $(manual_tests) $(tests)
 TESTS = $(tests)
@@ -123,114 +116,51 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-	-DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
-	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-	-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/logind-cgroups-agent\" \
-	-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
-	-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
+	-DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
+	-DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
 	-DROOTPREFIX=\"$(rootprefix)\" \
-	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-	-DHALT=\"$(HALT)\" \
-	-DREBOOT=\"$(REBOOT)\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
+	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
 	-DKEXEC=\"$(KEXEC)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DROOTLIBDIR=\"$(rootlibdir)\" \
+	-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
 	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
 	-I $(top_srcdir)/src \
-	-I $(top_builddir)/src/shared \
+	-I $(top_builddir)/src/basic \
+	-I $(top_srcdir)/src/basic \
 	-I $(top_srcdir)/src/shared \
+	-I $(top_builddir)/src/shared \
 	-I $(top_srcdir)/src/login \
 	-I $(top_srcdir)/src/systemd \
+	-I $(top_builddir)/src/core \
+	-I $(top_srcdir)/src/core \
 	-I $(top_srcdir)/src/libelogind/sd-bus \
 	-I $(top_srcdir)/src/libelogind/sd-event \
-	-I $(top_srcdir)/src/libelogind/sd-device \
-	$(UDEV_CFLAGS) \
+	-I $(top_srcdir)/src/libelogind/sd-login \
+	-I $(top_srcdir)/src/libelogind/sd-netlink \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
 
 # ------------------------------------------------------------------------------
-SHUTDOWN_TARGET_WANTS =
-LOCAL_FS_TARGET_WANTS =
-MULTI_USER_TARGET_WANTS =
-GRAPHICAL_TARGET_WANTS =
-RESCUE_TARGET_WANTS =
-SYSINIT_TARGET_WANTS =
-SOCKETS_TARGET_WANTS =
-BUSNAMES_TARGET_WANTS =
-TIMERS_TARGET_WANTS =
-USER_SOCKETS_TARGET_WANTS =
-USER_DEFAULT_TARGET_WANTS =
-USER_BUSNAMES_TARGET_WANTS =
-
-SYSTEM_UNIT_ALIASES =
-USER_UNIT_ALIASES =
-GENERAL_ALIASES =
-
-install-target-wants-hook:
-	what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(RESCUE_TARGET_WANTS)" && wants=rescue.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
-	what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
-
-install-busnames-target-wants-hook:
-	what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
-
-define add-wants
-	[ -z "$$what" ] || ( \
-	  dir=$(DESTDIR)$$dir/$$wants.wants && \
-	  $(MKDIR_P) -m 0755 $$dir && \
-	  cd $$dir && \
-	  rm -f $$what && \
-	  for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done )
-endef
-
-install-aliases-hook:
-	set -- $(GENERAL_ALIASES) && \
-		dir= && $(install-relative-aliases)
-
-define install-aliases
-	while [ -n "$$1" ]; do \
-		$(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
-		rm -f $(DESTDIR)$$dir/$$2 && \
-		$(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \
-		shift 2 || exit $$?; \
-	done
-endef
-
-define install-relative-aliases
-	while [ -n "$$1" ]; do \
-		$(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
-		rm -f $(DESTDIR)$$dir/$$2 && \
-		$(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
-		shift 2 || exit $$?; \
-	done
+define move-to-rootlibdir
+	if test "$(libdir)" != "$(rootlibdir)"; then \
+		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
+		so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
+		rm -f $(DESTDIR)$(libdir)/$$libname && \
+		$(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+		mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
+	fi
 endef
 
 install-touch-usr-hook:
 	touch -c $(DESTDIR)/$(prefix)
 
 INSTALL_EXEC_HOOKS += \
-	install-target-wants-hook \
-	install-aliases-hook \
 	install-touch-usr-hook
 
-if ENABLE_KDBUS
-INSTALL_EXEC_HOOKS += \
-	install-busnames-target-wants-hook
-endif
 
 # ------------------------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
@@ -254,8 +184,10 @@ AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY))
 AM_V_RM_0 = @echo "  RM      " $@;
 
 # ------------------------------------------------------------------------------
+rootbin_PROGRAMS =
 bin_PROGRAMS =
-pkglibexec_PROGRAMS =
+rootlibexec_PROGRAMS =
+
 dist_bashcompletion_DATA =
 dist_zshcompletion_DATA =
 
@@ -264,10 +196,7 @@ dist_doc_DATA = \
 	NEWS \
 	LICENSE.LGPL2.1 \
 	LICENSE.GPL2 \
-	LICENSE.MIT \
-	src/libelogind/sd-bus/PORTING-DBUS1 \
-	src/libelogind/sd-bus/DIFFERENCES \
-	src/libelogind/sd-bus/GVARIANT-SERIALIZATION
+	DISTRO_PORTING
 
 @INTLTOOL_POLICY_RULE@
 
@@ -315,235 +244,162 @@ CLEANFILES += \
 endif
 
 EXTRA_DIST += \
-	$(XML_FILES) \
+	$(filter-out man/systemd.directives.xml,$(XML_FILES)) \
 	$(HTML_FILES) \
 	$(HTML_ALIAS) \
 	$(man_MANS) \
-	tools/make-man-index.py \
-	tools/make-directive-index.py \
-	tools/xml_helper.py
+	$(NULL)
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-	libelogind-shared.la
-
-libelogind_shared_la_SOURCES = \
-	src/shared/capability.c \
-	src/shared/capability.h \
-	src/shared/linux/auto_dev-ioctl.h \
-	src/shared/ioprio.h \
-	src/shared/missing.h \
-	src/shared/initreq.h \
-	src/shared/securebits.h \
-	src/shared/special.h \
-	src/shared/list.h \
-	src/shared/unaligned.h \
-	src/shared/macro.h \
-	src/shared/def.h \
-	src/shared/sparse-endian.h \
-	src/shared/refcnt.h \
-	src/shared/udev-util.h \
-	src/shared/device-nodes.c \
-	src/shared/device-nodes.h \
-	src/shared/util.c \
-	src/shared/util.h \
-	src/shared/virt.c \
-	src/shared/virt.h \
-	src/shared/architecture.c \
-	src/shared/architecture.h \
-	src/shared/fstab-util.c \
-	src/shared/fstab-util.h \
-	src/shared/path-util.c \
-	src/shared/path-util.h \
-	src/shared/time-util.c \
-	src/shared/time-util.h \
-	src/shared/locale-util.c \
-	src/shared/locale-util.h \
-	src/shared/mempool.c \
-	src/shared/mempool.h \
-	src/shared/hashmap.c \
-	src/shared/hashmap.h \
-	src/shared/siphash24.c \
-	src/shared/siphash24.h \
-	src/shared/set.h \
-	src/shared/fdset.c \
-	src/shared/fdset.h \
-	src/shared/prioq.c \
-	src/shared/prioq.h \
+	libbasic.la
+
+libbasic_la_SOURCES = \
+	src/basic/missing.h \
+	src/basic/capability.c \
+	src/basic/capability.h \
+	src/basic/conf-files.c \
+	src/basic/conf-files.h \
+	src/basic/hostname-util.h \
+	src/basic/hostname-util.c \
+	src/basic/unit-name.c \
+	src/basic/unit-name.h \
+	src/basic/util.c \
+	src/basic/util.h \
+	src/basic/path-util.c \
+	src/basic/path-util.h \
+	src/basic/time-util.c \
+	src/basic/time-util.h \
+	src/basic/signal-util.c \
+	src/basic/signal-util.h \
+	src/basic/mempool.c \
+	src/basic/mempool.h \
+	src/basic/hashmap.c \
+	src/basic/hashmap.h \
+	src/basic/siphash24.c \
+	src/basic/siphash24.h \
+	src/basic/prioq.c \
+	src/basic/prioq.h \
+	src/basic/strv.c \
+	src/basic/strv.h \
+	src/basic/log.c \
+	src/basic/log.h \
+	src/basic/bus-label.c \
+	src/basic/bus-label.h \
+	src/basic/virt.c \
+	src/basic/virt.h \
+	src/basic/smack-util.c \
+	src/basic/smack-util.h \
+	src/basic/utf8.c \
+	src/basic/utf8.h \
+	src/basic/gunicode.c \
+	src/basic/gunicode.h \
+	src/basic/fileio.c \
+	src/basic/fileio.h \
+	src/basic/mkdir.c \
+	src/basic/mkdir.h \
+	src/basic/cgroup-util.c \
+	src/basic/cgroup-util.h \
+	src/basic/errno-list.c \
+	src/basic/errno-list.h \
+	src/basic/terminal-util.c \
+	src/basic/terminal-util.h \
+	src/basic/login-util.h \
+	src/basic/login-util.c \
+	src/basic/audit.c \
+	src/basic/audit.h \
+	src/basic/memfd-util.c \
+	src/basic/memfd-util.h \
+	src/basic/process-util.c \
+	src/basic/process-util.h \
+	src/basic/random-util.c \
+	src/basic/random-util.h \
+	src/basic/verbs.c \
+	src/basic/verbs.h \
+	src/basic/label.c \
+	src/basic/label.h \
+	src/basic/selinux-util.c \
+	src/basic/selinux-util.h \
+	src/basic/mkdir-label.c \
+	src/basic/fileio-label.c \
+	src/basic/fileio-label.h \
+	src/basic/rm-rf.c \
+	src/basic/rm-rf.h
+
+nodist_libbasic_la_SOURCES = \
+	src/basic/errno-from-name.h \
+	src/basic/errno-to-name.h \
+	src/basic/cap-from-name.h \
+	src/basic/cap-to-name.h
+
+libbasic_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(SELINUX_CFLAGS) \
+	$(CAP_CFLAGS) \
+	-pthread
+
+libbasic_la_LIBADD = \
+	$(SELINUX_LIBS) \
+	$(CAP_LIBS) \
+	-ldl \
+	-lrt \
+	-lm
+
+# -----------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libshared.la
+
+libshared_la_SOURCES = \
 	src/shared/sleep-config.c \
 	src/shared/sleep-config.h \
-	src/shared/strv.c \
-	src/shared/strv.h \
-	src/shared/env-util.c \
-	src/shared/env-util.h \
-	src/shared/strbuf.c \
-	src/shared/strbuf.h \
-	src/shared/strxcpyx.c \
-	src/shared/strxcpyx.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/gunicode.c \
-	src/shared/gunicode.h \
 	src/shared/pager.c \
 	src/shared/pager.h \
-	src/shared/socket-util.c \
-	src/shared/socket-util.h \
-	src/shared/in-addr-util.c \
-	src/shared/in-addr-util.h \
-	src/shared/ether-addr-util.h \
-	src/shared/conf-files.c \
-	src/shared/conf-files.h \
-	src/shared/cgroup-util.c \
-	src/shared/cgroup-util.h \
-	src/shared/cgroup-show.c \
-	src/shared/cgroup-show.h \
-	src/shared/logs-show.h \
-	src/shared/unit-name.c \
-	src/shared/unit-name.h \
-	src/shared/watchdog.c \
-	src/shared/watchdog.h \
-	src/shared/replace-var.c \
-	src/shared/replace-var.h \
 	src/shared/spawn-polkit-agent.c \
 	src/shared/spawn-polkit-agent.h \
-	src/shared/clock-util.c \
-	src/shared/clock-util.h \
-	src/shared/calendarspec.c \
-	src/shared/calendarspec.h \
-	src/shared/fileio.c \
-	src/shared/fileio.h \
-	src/shared/output-mode.h \
-	src/shared/MurmurHash2.c \
-	src/shared/MurmurHash2.h \
-	src/shared/acpi-fpdt.h \
-	src/shared/acpi-fpdt.c \
-	src/shared/mkdir.c \
-	src/shared/mkdir.h \
-	src/shared/smack-util.c \
-	src/shared/smack-util.h \
 	src/shared/apparmor-util.c \
 	src/shared/apparmor-util.h \
-	src/shared/ima-util.c \
-	src/shared/ima-util.h \
-	src/shared/ptyfwd.c \
-	src/shared/ptyfwd.h \
-	src/shared/errno-list.c \
-	src/shared/errno-list.h \
-	src/shared/af-list.c \
-	src/shared/af-list.h \
-	src/shared/arphrd-list.c \
-	src/shared/arphrd-list.h \
-	src/shared/cap-list.c \
-	src/shared/cap-list.h \
-	src/shared/audit.c \
-	src/shared/audit.h \
-	src/shared/xml.c \
-	src/shared/xml.h \
-	src/shared/json.c \
-	src/shared/json.h \
-	src/shared/selinux-util.c \
-	src/shared/selinux-util.h \
-	src/shared/label.c \
-	src/shared/label.h \
-	src/shared/socket-label.c \
-	src/shared/mkdir-label.c \
-	src/shared/fileio-label.h \
-	src/shared/fileio-label.c \
-	src/shared/bus-label.c \
-	src/shared/bus-label.h \
-	src/shared/gpt.h \
-	src/shared/clean-ipc.h \
 	src/shared/clean-ipc.c \
-	src/shared/login-shared.c \
-	src/shared/login-shared.h \
-	src/shared/ring.c \
-	src/shared/ring.h \
-	src/shared/barrier.c \
-	src/shared/barrier.h \
-	src/shared/pty.c \
-	src/shared/pty.h \
-	src/shared/async.c \
-	src/shared/async.h \
-	src/shared/base-filesystem.c \
-	src/shared/base-filesystem.h \
-	src/shared/memfd-util.c \
-	src/shared/memfd-util.h \
-	src/shared/process-util.c \
-	src/shared/process-util.h \
-	src/shared/random-util.c \
-	src/shared/random-util.h \
-	src/shared/terminal-util.c \
-	src/shared/terminal-util.h \
-	src/shared/uid-range.c \
-	src/shared/uid-range.h \
-	src/shared/nss-util.h \
-	src/shared/verbs.c \
-	src/shared/verbs.h \
-	src/shared/sigbus.c \
-	src/shared/sigbus.h \
-	src/shared/build.h \
-	src/shared/import-util.c \
-	src/shared/import-util.h \
-	src/shared/sysctl-util.c \
-	src/shared/sysctl-util.h \
-	src/shared/hostname-util.h \
-	src/shared/hostname-util.c
-
-nodist_libelogind_shared_la_SOURCES = \
-	src/shared/errno-from-name.h \
-	src/shared/errno-to-name.h \
-	src/shared/af-from-name.h \
-	src/shared/af-to-name.h \
-	src/shared/arphrd-from-name.h \
-	src/shared/arphrd-to-name.h \
-	src/shared/cap-from-name.h \
-	src/shared/cap-to-name.h
-
-libelogind_shared_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(CAP_CFLAGS) \
-	$(SECCOMP_CFLAGS) \
-	-pthread
-
-libelogind_shared_la_LIBADD = \
-	$(CAP_LIBS) \
-	-lm
+	src/shared/clean-ipc.h \
+	src/shared/cgroup-show.c \
+	src/shared/cgroup-show.h \
+	src/shared/bus-util.c \
+	src/shared/bus-util.h
 
-libelogind_shared_la_LDFLAGS = \
-	$(CAP_LDFLAGS)
+if HAVE_SECCOMP
+libshared_la_SOURCES += \
+	src/shared/seccomp-util.h \
+	src/shared/seccomp-util.c
+endif
 
-# ------------------------------------------------------------------------------
 if HAVE_ACL
-noinst_LTLIBRARIES += \
-	libelogind-acl.la
-
-libelogind_acl_la_SOURCES = \
+libshared_la_SOURCES += \
 	src/shared/acl-util.c \
 	src/shared/acl-util.h
+endif
 
-libelogind_acl_la_CFLAGS = \
+libshared_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(ACL_CFLAGS)
+	$(ACL_CFLAGS) \
+	$(LIBIDN_CFLAGS) \
+	$(SECCOMP_CFLAGS)
 
-libelogind_acl_la_LIBADD = \
-	$(ACL_LIBS)
-endif
+libshared_la_LIBADD = \
+	libelogind-internal.la \
+	$(UDEV_LIBS) \
+	$(ACL_LIBS) \
+	$(LIBIDN_LIBS) \
+	$(SECCOMP_LIBS)
 
 gperf_txt_sources = \
-	src/shared/errno-list.txt \
-	src/shared/af-list.txt \
-	src/shared/arphrd-list.txt \
-	src/shared/cap-list.txt
+	src/basic/errno-list.txt \
+	src/basic/af-list.txt \
+	src/basic/arphrd-list.txt \
+	src/basic/cap-list.txt
 
 BUILT_SOURCES += \
+	$(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf.c) \
 	$(gperf_gperf_sources:-gperf.gperf=-gperf.c) \
 	$(gperf_txt_sources:-list.txt=-from-name.h) \
 	$(gperf_txt_sources:-list.txt=-to-name.h)
@@ -555,61 +411,68 @@ DISTCLEANFILES = \
 
 EXTRA_DIST += \
 	$(gperf_gperf_m4_sources) \
-	$(gperf_gperf_sources) \
-	$(gperf_txt_sources:-list.txt=-from-name.gperf)
+	$(gperf_gperf_sources)
 
 CLEANFILES += \
 	$(gperf_txt_sources)
 
 %-from-name.gperf: %-list.txt
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
 
 %-from-name.h: %-from-name.gperf
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@
 
 
-src/shared/errno-list.txt:
+src/basic/errno-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
 
-src/shared/errno-to-name.h: src/shared/errno-list.txt
+src/basic/errno-to-name.h: src/basic/errno-list.txt
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
 
-src/shared/af-list.txt:
+src/basic/af-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
 
-src/shared/af-to-name.h: src/shared/af-list.txt
+src/basic/af-to-name.h: src/basic/af-list.txt
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
 
-src/shared/arphrd-list.txt:
+src/basic/arphrd-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
 
-src/shared/arphrd-to-name.h: src/shared/arphrd-list.txt
+src/basic/arphrd-to-name.h: src/basic/arphrd-list.txt
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
-src/shared/arphrd-from-name.gperf: src/shared/arphrd-list.txt
+src/basic/arphrd-from-name.gperf: src/basic/arphrd-list.txt
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
 
 
-src/shared/cap-list.txt:
+src/basic/cap-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
 
-src/shared/cap-to-name.h: src/shared/cap-list.txt
+src/basic/cap-to-name.h: src/basic/cap-list.txt
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
 
-src/shared/cap-from-name.gperf: src/shared/cap-list.txt
+src/basic/cap-from-name.gperf: src/basic/cap-list.txt
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
 
-src/shared/cap-from-name.h: src/shared/cap-from-name.gperf
+src/basic/cap-from-name.h: src/basic/cap-from-name.gperf
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
 # ------------------------------------------------------------------------------
-dist_factory_etc_DATA =
 
 if HAVE_PAM
 dist_factory_pam_DATA = \
@@ -618,24 +481,26 @@ dist_factory_pam_DATA = \
 endif
 
 # ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-	libelogind-internal.la
+rootlibexec_PROGRAMS += \
+	elogind-cgroups-agent
+
+elogind_cgroups_agent_SOURCES = \
+	src/cgroups-agent/cgroups-agent.c
+
+elogind_cgroups_agent_LDADD = \
+	libshared.la
 
+# ------------------------------------------------------------------------------
 libelogind_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
-	src/systemd/sd-utf8.h \
 	src/systemd/sd-event.h \
-	src/systemd/sd-rtnl.h \
-	src/systemd/sd-resolve.h \
 	src/systemd/sd-login.h \
 	src/systemd/sd-id128.h \
 	src/systemd/sd-daemon.h \
 	src/systemd/sd-path.h \
-	src/systemd/sd-network.h \
-	src/systemd/sd-hwdb.h \
-	src/systemd/sd-device.h \
+	src/libelogind/libelogind.sym \
 	src/libelogind/sd-bus/sd-bus.c \
 	src/libelogind/sd-bus/bus-control.c \
 	src/libelogind/sd-bus/bus-control.h \
@@ -649,8 +514,6 @@ libelogind_internal_la_SOURCES = \
 	src/libelogind/sd-bus/bus-socket.h \
 	src/libelogind/sd-bus/bus-kernel.c \
 	src/libelogind/sd-bus/bus-kernel.h \
-	src/libelogind/sd-bus/bus-container.c \
-	src/libelogind/sd-bus/bus-container.h \
 	src/libelogind/sd-bus/bus-message.c \
 	src/libelogind/sd-bus/bus-message.h \
 	src/libelogind/sd-bus/bus-creds.c \
@@ -672,88 +535,68 @@ libelogind_internal_la_SOURCES = \
 	src/libelogind/sd-bus/bus-convenience.c \
 	src/libelogind/sd-bus/bus-track.c \
 	src/libelogind/sd-bus/bus-track.h \
-	src/libelogind/sd-bus/bus-util.c \
-	src/libelogind/sd-bus/bus-util.h \
 	src/libelogind/sd-bus/bus-slot.c \
 	src/libelogind/sd-bus/bus-slot.h \
 	src/libelogind/sd-bus/bus-protocol.h \
-	src/libelogind/sd-bus/kdbus.h \
-	src/libelogind/sd-utf8/sd-utf8.c \
 	src/libelogind/sd-event/sd-event.c \
 	src/libelogind/sd-event/event-util.h \
-	src/libelogind/sd-rtnl/sd-rtnl.c \
-	src/libelogind/sd-rtnl/rtnl-internal.h \
-	src/libelogind/sd-rtnl/rtnl-message.c \
-	src/libelogind/sd-rtnl/rtnl-types.h \
-	src/libelogind/sd-rtnl/rtnl-types.c \
-	src/libelogind/sd-rtnl/rtnl-util.h \
-	src/libelogind/sd-rtnl/rtnl-util.c \
-	src/libelogind/sd-rtnl/local-addresses.h \
-	src/libelogind/sd-rtnl/local-addresses.c \
 	src/libelogind/sd-id128/sd-id128.c \
 	src/libelogind/sd-daemon/sd-daemon.c \
 	src/libelogind/sd-login/sd-login.c \
-	src/libelogind/sd-path/sd-path.c \
-	src/libelogind/sd-network/sd-network.c \
-	src/libelogind/sd-network/network-util.h \
-	src/libelogind/sd-network/network-util.c \
-	src/libelogind/sd-hwdb/sd-hwdb.c \
-	src/libelogind/sd-hwdb/hwdb-util.h \
-	src/libelogind/sd-hwdb/hwdb-internal.h \
-	src/libelogind/sd-device/device-internal.h \
-	src/libelogind/sd-device/device-util.h \
-	src/libelogind/sd-device/device-enumerator.c \
-	src/libelogind/sd-device/device-enumerator-private.h \
-	src/libelogind/sd-device/sd-device.c \
-	src/libelogind/sd-device/device-private.c \
-	src/libelogind/sd-device/device-private.h
-
-nodist_libelogind_internal_la_SOURCES = \
-	src/libelogind/libelogind.sym
-
-libelogind_internal_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-pthread
+	src/libelogind/sd-path/sd-path.c
 
 libelogind_internal_la_LIBADD = \
-	libelogind-shared.la
+	libbasic.la \
+	-lresolv
 
-libelogind_internal_la_LDFLAGS = \
-	$(AM_LDFLAGS)
+noinst_LTLIBRARIES += \
+	libelogind-internal.la
 
-lib_LTLIBRARIES += \
-	libelogind.la
+EXTRA_DIST += \
+	src/libelogind/libelogind.pc.in \
+	src/libelogind/sd-bus/DIFFERENCES \
+	src/libelogind/sd-bus/GVARIANT-SERIALIZATION
+
+libelogind_la_SOURCES = \
+	$(libelogind_internal_la_SOURCES)
 
-libelogind_la_SOURCES =
+nodist_libelogind_la_SOURCES = \
+	$(nodist_libelogind_internal_la_SOURCES)
 
 libelogind_la_CFLAGS = \
-	$(AM_CFLAGS)
+	$(libelogind_internal_la_CFLAGS)
 
 libelogind_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBELOGIND_CURRENT):$(LIBELOGIND_REVISION):$(LIBELOGIND_AGE) \
-	-Wl,--version-script=src/libelogind/libelogind.sym
+	-Wl,--version-script=$(top_srcdir)/src/libelogind/libelogind.sym
 
 libelogind_la_LIBADD = \
-	libelogind-internal.la
+	$(libelogind_internal_la_LIBADD)
+
+libelogind-install-hook:
+	libname=libelogind.so && $(move-to-rootlibdir)
+
+libelogind-uninstall-hook:
+	rm -f $(DESTDIR)$(rootlibdir)/libelogind.so*
+
+INSTALL_EXEC_HOOKS += libelogind-install-hook
+UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
 
 pkgconfiglib_DATA += \
 	src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
+	src/systemd/sd-bus.h \
+	src/systemd/sd-bus-protocol.h \
+	src/systemd/sd-bus-vtable.h \
+	src/systemd/sd-event.h \
 	src/systemd/sd-login.h \
-	src/systemd/sd-messages.h \
-	src/systemd/sd-journal.h \
-	src/systemd/_sd-common.h
-
-EXTRA_DIST += \
-	src/libelogind/libelogind.sym.m4 \
-	src/libelogind/libelogind.pc.in \
-	src/libelogind/sd-bus/DIFFERENCES \
-	src/libelogind/sd-bus/GVARIANT-SERIALIZATION
+	src/systemd/sd-id128.h \
+	src/systemd/sd-daemon.h
 
-BUILT_SOURCES += \
-       src/libelogind/libelogind.sym
+lib_LTLIBRARIES += \
+	libelogind.la
 
 # ------------------------------------------------------------------------------
 elogind_SOURCES = \
@@ -788,24 +631,22 @@ libelogind_core_la_SOURCES = \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
+	src/login/logind-utmp.c \
 	src/login/logind-acl.h
 
 libelogind_core_la_LIBADD = \
-	$(UDEV_LIBS) \
-	libelogind-internal.la
+	libshared.la
 
 if HAVE_ACL
 libelogind_core_la_SOURCES += \
 	src/login/logind-acl.c
-
-libelogind_core_la_LIBADD += \
-	libelogind-acl.la
 endif
 
 noinst_LTLIBRARIES += \
 	libelogind-core.la
 
-pkglibexec_PROGRAMS += elogind
+rootlibexec_PROGRAMS += \
+	elogind
 
 loginctl_SOURCES = \
 	src/login/loginctl.c \
@@ -813,63 +654,47 @@ loginctl_SOURCES = \
 	src/login/sysfs-show.c
 
 loginctl_LDADD = \
-	$(UDEV_LIBS) \
-	libelogind-internal.la \
-	libelogind-shared.la
+	libshared.la
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
 	loginctl
 
-logind_cgroups_agent_SOURCES = \
-	src/cgroups-agent/cgroups-agent.c
-
-logind_cgroups_agent_LDADD = \
-	libelogind-internal.la \
-	libelogind-shared.la
-
-pkglibexec_PROGRAMS += \
-	logind-cgroups-agent
-
 dist_bashcompletion_DATA += \
 	shell-completion/bash/loginctl
 
 dist_zshcompletion_DATA += \
-	shell-completion/zsh/_loginctl
+	shell-completion/zsh/_loginctl \
+	shell-completion/zsh/_elogind-inhibit
 
-systemd_inhibit_SOURCES = \
+elogind_inhibit_SOURCES = \
 	src/login/inhibit.c
 
-systemd_inhibit_LDADD = \
-	libelogind-internal.la \
-	libelogind-shared.la
+elogind_inhibit_LDADD = \
+	libshared.la
 
-bin_PROGRAMS += \
-	systemd-inhibit
+rootbin_PROGRAMS += \
+	elogind-inhibit
 
 test_login_SOURCES = \
 	src/libelogind/sd-login/test-login.c
 
 test_login_LDADD = \
-	libelogind-internal.la \
-	libelogind-shared.la
+	libshared.la
 
 test_login_shared_SOURCES = \
 	src/login/test-login-shared.c
 
 test_login_shared_LDADD = \
-	libelogind-internal.la \
-	libelogind-shared.la
+	libshared.la
 
 test_inhibit_SOURCES = \
 	src/login/test-inhibit.c
 
 test_inhibit_LDADD = \
-	libelogind-internal.la \
-	libelogind-shared.la
+	libshared.la
 
 test_login_tables_SOURCES = \
-	src/login/test-login-tables.c \
-	src/shared/test-tables.h
+	src/login/test-login-tables.c
 
 test_login_tables_LDADD = \
 	libelogind-core.la
@@ -889,8 +714,7 @@ pam_elogind_la_SOURCES = \
 
 pam_elogind_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(PAM_CFLAGS) \
-	-fvisibility=hidden
+	$(PAM_CFLAGS)
 
 pam_elogind_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -901,7 +725,7 @@ pam_elogind_la_LDFLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/login/pam_elogind.sym
 
 pam_elogind_la_LIBADD = \
-	libelogind-internal.la \
+	libshared.la \
 	$(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
@@ -919,19 +743,16 @@ dist_dbuspolicy_DATA += \
 	src/login/org.freedesktop.login1.conf
 
 dist_pkgsysconf_DATA += \
-	src/login/logind.conf
+	src/login/elogind.conf
 
 polkitpolicy_files += \
 	src/login/org.freedesktop.login1.policy
 
-SYSTEM_UNIT_ALIASES += \
-	elogind.service dbus-org.freedesktop.login1.service
-
-dist_udevrules_DATA = \
+dist_udevrules_DATA += \
 	src/login/70-uaccess.rules \
 	src/login/70-power-switch.rules
 
-nodist_udevrules_DATA = \
+nodist_udevrules_DATA += \
 	src/login/71-seat.rules \
 	src/login/73-seat-late.rules
 
@@ -947,10 +768,14 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 substitutions = \
+       '|rootlibexecdir=$(rootlibexecdir)|' \
+       '|rootbindir=$(rootbindir)|' \
        '|bindir=$(bindir)|' \
-       '|udevbindir=$(udevbindir)|' \
        '|pkgsysconfdir=$(pkgsysconfdir)|' \
        '|pkgdatadir=$(pkgdatadir)|' \
+       '|udevhwdbdir=$(udevhwdbdir)|' \
+       '|udevrulesdir=$(udevrulesdir)|' \
+       '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
@@ -960,18 +785,29 @@ substitutions = \
        '|includedir=$(includedir)|' \
        '|VERSION=$(VERSION)|' \
        '|rootprefix=$(rootprefix)|' \
+       '|udevlibexecdir=$(udevlibexecdir)|' \
+       '|SUSHELL=$(SUSHELL)|' \
+       '|SULOGIN=$(SULOGIN)|' \
+       '|DEBUGTTY=$(DEBUGTTY)|' \
+       '|KILL=$(KILL)|' \
+       '|KMOD=$(KMOD)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
+       '|QUOTAON=$(QUOTAON)|' \
+       '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
+       '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
+       '|PYTHON=$(PYTHON)|' \
+       '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
+       '|NTP_SERVERS=$(NTP_SERVERS)|' \
+       '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
-       '|systemgidmax=$(SYSTEM_GID_MAX)|'
+       '|systemgidmax=$(SYSTEM_GID_MAX)|' \
+       '|TTY_GID=$(TTY_GID)|'
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
 		< $< > $@
 
-units/%: units/%.in
-	$(SED_PROCESS)
-
 man/%: man/%.in
 	$(SED_PROCESS)
 
@@ -984,9 +820,6 @@ sysctl.d/%: sysctl.d/%.in
 %.conf: %.conf.in
 	$(SED_PROCESS)
 
-src/%.policy.in: src/%.policy.in.in
-	$(SED_PROCESS)
-
 shell-completion/%: shell-completion/%.in
 	$(SED_PROCESS)
 
@@ -1027,13 +860,11 @@ units/user/%: units/user/%.m4
 
 if ENABLE_POLKIT
 nodist_polkitpolicy_DATA = \
-	$(polkitpolicy_files) \
-	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
+	$(polkitpolicy_files)
 endif
 
 EXTRA_DIST += \
-	$(polkitpolicy_in_files) \
-	$(polkitpolicy_in_in_files)
+	$(polkitpolicy_in_files)
 
 # ------------------------------------------------------------------------------
 if ENABLE_MANPAGES
@@ -1043,7 +874,7 @@ man/custom-entities.ent: configure.ac
 	 printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \
 	 > $@ # '
 
-DISTCLEANFILES += \
+CLEANFILES += \
 	man/custom-entities.ent
 
 XSLTPROC_FLAGS = \
@@ -1100,19 +931,159 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
 clean-local: $(CLEAN_LOCAL_HOOKS)
 	rm -rf $(abs_srcdir)/install-tree
+	rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
+	      $(abs_srcdir)/hwdb/iab.txt
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
-	--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
 	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
 	--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
 	--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
-	--enable-kdbus \
-	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
+	--with-rootprefix=$$dc_install_base \
+	--enable-compat-libs
+
+DISTCHECK_CONFIGURE_FLAGS += \
+	--with-sysvinit-path= \
+	--with-sysvrcnd-path=
 
-if ENABLE_GTK_DOC
+if ENABLE_SPLIT_USR
+DISTCHECK_CONFIGURE_FLAGS += \
+	--enable-split-usr
+else
 DISTCHECK_CONFIGURE_FLAGS += \
-	--enable-gtk-doc
+	--disable-split-usr
 endif
+
+#
+# Require python when making dist
+#
+.PHONY: dist-check-python dist-check-compat-libs dist-check-help
+dist-check-python:
+
+dist-check-compat-libs:
+
+dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
+	for i in $(abspath $^); do                                             \
+            if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
+		echo "$(basename $$i) --help output is too wide:";             \
+	        $$i  --help | awk 'length > 80' | grep -E --color=yes '.{80}'; \
+	        exit 1;                                                        \
+            fi; done
+
+dist: dist-check-python dist-check-compat-libs
+
+.PHONY: git-tag
+git-tag:
+	git tag -s "v$(VERSION)" -m "elogind $(VERSION)"
+
+.PHONY: install-tree
+install-tree: all
+	rm -rf $(abs_srcdir)/install-tree
+	$(MAKE) install DESTDIR=$(abs_srcdir)/install-tree
+	tree $(abs_srcdir)/install-tree
+
+# Let's run all tests of the test suite, but under valgrind. Let's
+# exclude the one perl script we have in there
+.PHONY: valgrind-tests
+valgrind-tests: $(TESTS)
+	$(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
+		if file $$f | grep -q shell; then \
+		echo -e "$${x}Skipping non-binary $$f"; else \
+		echo -e "$${x}Running $$f"; \
+		libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
+		x="\n\n"; \
+	done
+
+exported-%: %
+	$(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
+
+exported: $(addprefix exported-, $(lib_LTLIBRARIES))
+	$(AM_V_GEN)cat $^ > $@
+
+.PHONY: check-api-docs
+check-api-docs: exported man
+	$(AM_V_GEN)for symbol in `cat exported` ; do \
+		if test -f $(builddir)/man/$$symbol.html ; then \
+			echo "  Symbol $$symbol() is documented." ; \
+		else \
+			echo "‣ Symbol $$symbol() lacks documentation." ; \
+		fi ; \
+	done
+
+OBJECT_VARIABLES:=$(filter %_OBJECTS,$(.VARIABLES))
+ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v)))
+
+undefined defined: $(ALL_OBJECTS)
+	$(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \
+		$(NM) -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \
+	done | cut -c 20- | cut -d @ -f 1 | sort -u > $@
+
+CLEANFILES += \
+	defined \
+	undefined
+
+.PHONY: check-api-unused
+check-api-unused: defined undefined exported
+	( cat exported undefined ) | sort -u  | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2-
+
+.PHONY: check-includes
+check-includes: $(top_srcdir)/tools/check-includes.pl
+	$(AM_V_GEN) find * -name '*.[hcS]' -type f -print | sort -u \
+		| xargs $(top_srcdir)/tools/check-includes.pl
+
+EXTRA_DIST += \
+	$(top_srcdir)/tools/check-includes.pl
+
+# Stupid test that everything purported to be exported really is
+define generate-sym-test
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_at)printf '#include <stdio.h>\n' > $@
+	$(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@
+	$(AM_V_at)printf 'void* functions[] = {\n' >> $@
+	$(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@
+	$(AM_V_at)printf '};\nint main(void) {\n' >> $@
+	$(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@
+	$(AM_V_at)printf 'return 0; }\n' >> $@
+endef
+
+test-libelogind-sym.c: \
+		$(top_builddir)/src/libelogind/libelogind.sym \
+		src/systemd/sd-daemon.h \
+		src/systemd/sd-login.h \
+		src/systemd/sd-bus.h \
+		src/systemd/sd-path.h \
+		src/systemd/sd-event.h
+	$(generate-sym-test)
+
+test_libelogind_sym_SOURCES = \
+	test-libelogind-sym.c
+test_libelogind_sym_LDADD = \
+	libelogind.la
+
+BUILT_SOURCES += \
+	$(test_libelogind_sym_SOURCES)
+
+tests += \
+	test-libelogind-sym
+
+.PHONY: cppcheck
+cppcheck:
+	cppcheck --enable=all -q $(top_srcdir)
+
+# Used to extract compile flags for YCM.
+print-%:
+	@echo $($*)
+
+git-contrib:
+	@git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+
+EXTRA_DIST += \
+        tools/gdb-sd_dump_hashmaps.py
+
+list-keys:
+	gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --list-keys
+
+add-key:
+	gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -