Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts:
#	src/libshared/Makefile

92 files changed, 174 insertions, 139 deletions

diff --git a/Makefile.am b/Makefile.am
index eca7e59435..bb232871d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1041,6 +1041,8 @@ libbasic_la_LIBADD = \
 	-lm
 
 #@src/libshared/Makefile -------------------------------------------------------
+at.subdirs += src
+#@src/libshared/src/Makefile
 noinst_LTLIBRARIES += \
 	libshared.la
 
diff --git a/move.sh b/move.sh
index 0808720e44..9a420b344c 100755
--- a/move.sh
+++ b/move.sh
@@ -26,6 +26,18 @@ move_files() (
 	mkdir src/libbasic/include/basic
 	mv src/libbasic/.gitignore src/libbasic/*.h src/libbasic/include/basic/
 
+	mv -T src/lib{shared,core}/linux
+
+	mkdir src/libfirewall
+	mv -T src/lib{shared,firewall}/firewall-util.c
+	mv -T src/lib{shared,firewall}/firewall-util.h
+
+	mkdir src/libshared/src
+	mv src/libshared/*.c src/libshared/src/
+	mkdir src/libshared/include
+	mkdir src/libshared/include/shared
+	mv src/libshared/*.h src/libshared/include/shared/
+
 	pfix=(
 		dbus1-generator
 		debug-generator
@@ -95,8 +107,6 @@ move_files() (
 	mv -T {shell-completion/zsh/_,src/kernel-install/zsh-completion_}kernel-install
 	mv -T {man,src/kernel-install}/kernel-install.xml
 
-	mv -T src/lib{shared,core}/linux
-
 	mkdir src/libsystemd/include
 	mv -T src/{,libsystemd/include}/systemd
 
@@ -115,10 +125,6 @@ move_files() (
 	mkdir src/grp-system
 	mv -T src/{,grp-system}/systemctl
 
-	mkdir src/libfirewall
-	mv -T src/lib{shared,firewall}/firewall-util.c
-	mv -T src/lib{shared,firewall}/firewall-util.h
-
 	mkdir src/grp-system/systemd
 	mv -T src/{libcore,grp-system/systemd}/main.c
 	mv -T src/{libcore,grp-system/systemd}/macros.systemd.in
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 66000b782c..7ed2706100 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -23,137 +23,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-noinst_LTLIBRARIES += \
-	libshared.la
-
-libshared_la_SOURCES = \
-	src/shared/output-mode.h \
-	src/shared/output-mode.c \
-	src/shared/gpt.h \
-	src/shared/udev-util.h \
-	src/shared/linux/auto_dev-ioctl.h \
-	src/shared/initreq.h \
-	src/shared/dns-domain.c \
-	src/shared/dns-domain.h \
-	src/shared/efivars.c \
-	src/shared/efivars.h \
-	src/shared/fstab-util.c \
-	src/shared/fstab-util.h \
-	src/shared/sleep-config.c \
-	src/shared/sleep-config.h \
-	src/shared/conf-parser.c \
-	src/shared/conf-parser.h \
-	src/shared/pager.c \
-	src/shared/pager.h \
-	src/shared/spawn-polkit-agent.c \
-	src/shared/spawn-polkit-agent.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/base-filesystem.c \
-	src/shared/base-filesystem.h \
-	src/shared/uid-range.c \
-	src/shared/uid-range.h \
-	src/shared/install.c \
-	src/shared/install.h \
-	src/shared/install-printf.c \
-	src/shared/install-printf.h \
-	src/shared/path-lookup.c \
-	src/shared/path-lookup.h \
-	src/shared/specifier.c \
-	src/shared/specifier.h \
-	src/shared/dev-setup.c \
-	src/shared/dev-setup.h \
-	src/shared/dropin.c \
-	src/shared/dropin.h \
-	src/shared/condition.c \
-	src/shared/condition.h \
-	src/shared/clean-ipc.c \
-	src/shared/clean-ipc.h \
-	src/shared/generator.h \
-	src/shared/generator.c \
-	src/shared/acpi-fpdt.h \
-	src/shared/acpi-fpdt.c \
-	src/shared/boot-timestamps.h \
-	src/shared/boot-timestamps.c \
-	src/shared/cgroup-show.c \
-	src/shared/cgroup-show.h \
-	src/shared/utmp-wtmp.h \
-	src/shared/watchdog.c \
-	src/shared/watchdog.h \
-	src/shared/spawn-ask-password-agent.c \
-	src/shared/spawn-ask-password-agent.h \
-	src/shared/ask-password-api.c \
-	src/shared/ask-password-api.h \
-	src/shared/switch-root.h \
-	src/shared/switch-root.c \
-	src/shared/import-util.c \
-	src/shared/import-util.h \
-	src/shared/sysctl-util.c \
-	src/shared/sysctl-util.h \
-	src/shared/bus-util.c \
-	src/shared/bus-util.h \
-	src/shared/logs-show.c \
-	src/shared/logs-show.h \
-	src/shared/machine-image.c \
-	src/shared/machine-image.h \
-	src/shared/machine-pool.c \
-	src/shared/machine-pool.h \
-	src/shared/resolve-util.c \
-	src/shared/resolve-util.h \
-	src/shared/bus-unit-util.c \
-	src/shared/bus-unit-util.h \
-	src/shared/tests.h \
-	src/shared/tests.c
-
-ifneq ($(HAVE_UTMP),)
-libshared_la_SOURCES += \
-	src/shared/utmp-wtmp.c
-endif # HAVE_UTMP
-
-ifneq ($(HAVE_SECCOMP),)
-libshared_la_SOURCES += \
-	src/shared/seccomp-util.h \
-	src/shared/seccomp-util.c
-endif # HAVE_SECCOMP
-
-ifneq ($(HAVE_ACL),)
-libshared_la_SOURCES += \
-	src/shared/acl-util.c \
-	src/shared/acl-util.h
-endif # HAVE_ACL
-
-libshared_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(ACL_CFLAGS) \
-	$(LIBIDN_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-libshared_la_LIBADD = \
-	libsystemd-internal.la \
-	libudev-internal.la \
-	$(ACL_LIBS) \
-	$(LIBIDN_LIBS) \
-	$(SECCOMP_LIBS)
-
-systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
-systemd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\"
-systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\"
-systemd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\"
-systemd.CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\"
-systemd.CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\"
-systemd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\"
-
-systemd.CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(libexecdir)/systemd-fsck\"
-
-systemd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(bindir)/systemd-tty-ask-password-agent\"
-
-systemd.CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\"
-systemd.CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\"
-
-systemd.CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\"
-
+at.subdirs += src
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/acl-util.h b/src/libshared/include/shared/acl-util.h
index af5bcb5b4f..af5bcb5b4f 100644
--- a/src/libshared/acl-util.h
+++ b/src/libshared/include/shared/acl-util.h
diff --git a/src/libshared/acpi-fpdt.h b/src/libshared/include/shared/acpi-fpdt.h
index 3da32c08ad..3da32c08ad 100644
--- a/src/libshared/acpi-fpdt.h
+++ b/src/libshared/include/shared/acpi-fpdt.h
diff --git a/src/libshared/apparmor-util.h b/src/libshared/include/shared/apparmor-util.h
index 524f740152..524f740152 100644
--- a/src/libshared/apparmor-util.h
+++ b/src/libshared/include/shared/apparmor-util.h
diff --git a/src/libshared/ask-password-api.h b/src/libshared/include/shared/ask-password-api.h
index 770ab1f5c0..770ab1f5c0 100644
--- a/src/libshared/ask-password-api.h
+++ b/src/libshared/include/shared/ask-password-api.h
diff --git a/src/libshared/base-filesystem.h b/src/libshared/include/shared/base-filesystem.h
index 49599f0a60..49599f0a60 100644
--- a/src/libshared/base-filesystem.h
+++ b/src/libshared/include/shared/base-filesystem.h
diff --git a/src/libshared/boot-timestamps.h b/src/libshared/include/shared/boot-timestamps.h
index 00ea7e3009..00ea7e3009 100644
--- a/src/libshared/boot-timestamps.h
+++ b/src/libshared/include/shared/boot-timestamps.h
diff --git a/src/libshared/bus-unit-util.h b/src/libshared/include/shared/bus-unit-util.h
index 8327189a63..8327189a63 100644
--- a/src/libshared/bus-unit-util.h
+++ b/src/libshared/include/shared/bus-unit-util.h
diff --git a/src/libshared/bus-util.h b/src/libshared/include/shared/bus-util.h
index 73f2ea0749..73f2ea0749 100644
--- a/src/libshared/bus-util.h
+++ b/src/libshared/include/shared/bus-util.h
diff --git a/src/libshared/cgroup-show.h b/src/libshared/include/shared/cgroup-show.h
index 5c1d6e6d98..5c1d6e6d98 100644
--- a/src/libshared/cgroup-show.h
+++ b/src/libshared/include/shared/cgroup-show.h
diff --git a/src/libshared/clean-ipc.h b/src/libshared/include/shared/clean-ipc.h
index 44a83afcf7..44a83afcf7 100644
--- a/src/libshared/clean-ipc.h
+++ b/src/libshared/include/shared/clean-ipc.h
diff --git a/src/libshared/condition.h b/src/libshared/include/shared/condition.h
index fd798460d1..fd798460d1 100644
--- a/src/libshared/condition.h
+++ b/src/libshared/include/shared/condition.h
diff --git a/src/libshared/conf-parser.h b/src/libshared/include/shared/conf-parser.h
index f7423d45e7..f7423d45e7 100644
--- a/src/libshared/conf-parser.h
+++ b/src/libshared/include/shared/conf-parser.h
diff --git a/src/libshared/dev-setup.h b/src/libshared/include/shared/dev-setup.h
index 5766a62060..5766a62060 100644
--- a/src/libshared/dev-setup.h
+++ b/src/libshared/include/shared/dev-setup.h
diff --git a/src/libshared/dns-domain.h b/src/libshared/include/shared/dns-domain.h
index 72e4cb0104..72e4cb0104 100644
--- a/src/libshared/dns-domain.h
+++ b/src/libshared/include/shared/dns-domain.h
diff --git a/src/libshared/dropin.h b/src/libshared/include/shared/dropin.h
index 44235405f6..44235405f6 100644
--- a/src/libshared/dropin.h
+++ b/src/libshared/include/shared/dropin.h
diff --git a/src/libshared/efivars.h b/src/libshared/include/shared/efivars.h
index 547b161367..547b161367 100644
--- a/src/libshared/efivars.h
+++ b/src/libshared/include/shared/efivars.h
diff --git a/src/libshared/fstab-util.h b/src/libshared/include/shared/fstab-util.h
index 3d9e7ab907..3d9e7ab907 100644
--- a/src/libshared/fstab-util.h
+++ b/src/libshared/include/shared/fstab-util.h
diff --git a/src/libshared/gcrypt-util.h b/src/libshared/include/shared/gcrypt-util.h
index cf33b3c59c..cf33b3c59c 100644
--- a/src/libshared/gcrypt-util.h
+++ b/src/libshared/include/shared/gcrypt-util.h
diff --git a/src/libshared/generator.h b/src/libshared/include/shared/generator.h
index a6017c1b76..a6017c1b76 100644
--- a/src/libshared/generator.h
+++ b/src/libshared/include/shared/generator.h
diff --git a/src/libshared/gpt.h b/src/libshared/include/shared/gpt.h
index 07153b51f4..07153b51f4 100644
--- a/src/libshared/gpt.h
+++ b/src/libshared/include/shared/gpt.h
diff --git a/src/libshared/ima-util.h b/src/libshared/include/shared/ima-util.h
index 5be94761fd..5be94761fd 100644
--- a/src/libshared/ima-util.h
+++ b/src/libshared/include/shared/ima-util.h
diff --git a/src/libshared/import-util.h b/src/libshared/include/shared/import-util.h
index 353fa9045c..353fa9045c 100644
--- a/src/libshared/import-util.h
+++ b/src/libshared/include/shared/import-util.h
diff --git a/src/libshared/initreq.h b/src/libshared/include/shared/initreq.h
index 710037d84b..710037d84b 100644
--- a/src/libshared/initreq.h
+++ b/src/libshared/include/shared/initreq.h
diff --git a/src/libshared/install-printf.h b/src/libshared/include/shared/install-printf.h
index 8a570fc265..8a570fc265 100644
--- a/src/libshared/install-printf.h
+++ b/src/libshared/include/shared/install-printf.h
diff --git a/src/libshared/install.h b/src/libshared/include/shared/install.h
index b16c752a9b..b16c752a9b 100644
--- a/src/libshared/install.h
+++ b/src/libshared/include/shared/install.h
diff --git a/src/libshared/logs-show.h b/src/libshared/include/shared/logs-show.h
index 11a64a092e..11a64a092e 100644
--- a/src/libshared/logs-show.h
+++ b/src/libshared/include/shared/logs-show.h
diff --git a/src/libshared/machine-image.h b/src/libshared/include/shared/machine-image.h
index 30a005e114..30a005e114 100644
--- a/src/libshared/machine-image.h
+++ b/src/libshared/include/shared/machine-image.h
diff --git a/src/libshared/machine-pool.h b/src/libshared/include/shared/machine-pool.h
index fe99b7e0ae..fe99b7e0ae 100644
--- a/src/libshared/machine-pool.h
+++ b/src/libshared/include/shared/machine-pool.h
diff --git a/src/libshared/output-mode.h b/src/libshared/include/shared/output-mode.h
index 9a8d8127d3..9a8d8127d3 100644
--- a/src/libshared/output-mode.h
+++ b/src/libshared/include/shared/output-mode.h
diff --git a/src/libshared/pager.h b/src/libshared/include/shared/pager.h
index 2a3cbe1721..2a3cbe1721 100644
--- a/src/libshared/pager.h
+++ b/src/libshared/include/shared/pager.h
diff --git a/src/libshared/path-lookup.h b/src/libshared/include/shared/path-lookup.h
index b5df3d9fef..b5df3d9fef 100644
--- a/src/libshared/path-lookup.h
+++ b/src/libshared/include/shared/path-lookup.h
diff --git a/src/libshared/ptyfwd.h b/src/libshared/include/shared/ptyfwd.h
index 8f32184433..8f32184433 100644
--- a/src/libshared/ptyfwd.h
+++ b/src/libshared/include/shared/ptyfwd.h
diff --git a/src/libshared/resolve-util.h b/src/libshared/include/shared/resolve-util.h
index 8df46599ad..8df46599ad 100644
--- a/src/libshared/resolve-util.h
+++ b/src/libshared/include/shared/resolve-util.h
diff --git a/src/libshared/seccomp-util.h b/src/libshared/include/shared/seccomp-util.h
index 4ed2afc1b2..4ed2afc1b2 100644
--- a/src/libshared/seccomp-util.h
+++ b/src/libshared/include/shared/seccomp-util.h
diff --git a/src/libshared/sleep-config.h b/src/libshared/include/shared/sleep-config.h
index ad10039ff4..ad10039ff4 100644
--- a/src/libshared/sleep-config.h
+++ b/src/libshared/include/shared/sleep-config.h
diff --git a/src/libshared/spawn-ask-password-agent.h b/src/libshared/include/shared/spawn-ask-password-agent.h
index fb0749b13f..fb0749b13f 100644
--- a/src/libshared/spawn-ask-password-agent.h
+++ b/src/libshared/include/shared/spawn-ask-password-agent.h
diff --git a/src/libshared/spawn-polkit-agent.h b/src/libshared/include/shared/spawn-polkit-agent.h
index 42b2989ded..42b2989ded 100644
--- a/src/libshared/spawn-polkit-agent.h
+++ b/src/libshared/include/shared/spawn-polkit-agent.h
diff --git a/src/libshared/specifier.h b/src/libshared/include/shared/specifier.h
index 6b1623ee61..6b1623ee61 100644
--- a/src/libshared/specifier.h
+++ b/src/libshared/include/shared/specifier.h
diff --git a/src/libshared/switch-root.h b/src/libshared/include/shared/switch-root.h
index a7a080b3e8..a7a080b3e8 100644
--- a/src/libshared/switch-root.h
+++ b/src/libshared/include/shared/switch-root.h
diff --git a/src/libshared/sysctl-util.h b/src/libshared/include/shared/sysctl-util.h
index 2decb39f58..2decb39f58 100644
--- a/src/libshared/sysctl-util.h
+++ b/src/libshared/include/shared/sysctl-util.h
diff --git a/src/libshared/test-tables.h b/src/libshared/include/shared/test-tables.h
index 228e510104..228e510104 100644
--- a/src/libshared/test-tables.h
+++ b/src/libshared/include/shared/test-tables.h
diff --git a/src/libshared/tests.h b/src/libshared/include/shared/tests.h
index 93f09013a1..93f09013a1 100644
--- a/src/libshared/tests.h
+++ b/src/libshared/include/shared/tests.h
diff --git a/src/libshared/udev-util.h b/src/libshared/include/shared/udev-util.h
index 7765918a12..7765918a12 100644
--- a/src/libshared/udev-util.h
+++ b/src/libshared/include/shared/udev-util.h
diff --git a/src/libshared/uid-range.h b/src/libshared/include/shared/uid-range.h
index 4044eb4c9c..4044eb4c9c 100644
--- a/src/libshared/uid-range.h
+++ b/src/libshared/include/shared/uid-range.h
diff --git a/src/libshared/utmp-wtmp.h b/src/libshared/include/shared/utmp-wtmp.h
index 50dde37b16..50dde37b16 100644
--- a/src/libshared/utmp-wtmp.h
+++ b/src/libshared/include/shared/utmp-wtmp.h
diff --git a/src/libshared/watchdog.h b/src/libshared/include/shared/watchdog.h
index 78e1406f5d..78e1406f5d 100644
--- a/src/libshared/watchdog.h
+++ b/src/libshared/include/shared/watchdog.h
diff --git a/src/libshared/src/Makefile b/src/libshared/src/Makefile
new file mode 100644
index 0000000000..077d7aa9f5
--- /dev/null
+++ b/src/libshared/src/Makefile
@@ -0,0 +1,159 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+noinst_LTLIBRARIES += \
+	libshared.la
+
+libshared_la_SOURCES = \
+	src/shared/output-mode.h \
+	src/shared/output-mode.c \
+	src/shared/gpt.h \
+	src/shared/udev-util.h \
+	src/shared/linux/auto_dev-ioctl.h \
+	src/shared/initreq.h \
+	src/shared/dns-domain.c \
+	src/shared/dns-domain.h \
+	src/shared/efivars.c \
+	src/shared/efivars.h \
+	src/shared/fstab-util.c \
+	src/shared/fstab-util.h \
+	src/shared/sleep-config.c \
+	src/shared/sleep-config.h \
+	src/shared/conf-parser.c \
+	src/shared/conf-parser.h \
+	src/shared/pager.c \
+	src/shared/pager.h \
+	src/shared/spawn-polkit-agent.c \
+	src/shared/spawn-polkit-agent.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/base-filesystem.c \
+	src/shared/base-filesystem.h \
+	src/shared/uid-range.c \
+	src/shared/uid-range.h \
+	src/shared/install.c \
+	src/shared/install.h \
+	src/shared/install-printf.c \
+	src/shared/install-printf.h \
+	src/shared/path-lookup.c \
+	src/shared/path-lookup.h \
+	src/shared/specifier.c \
+	src/shared/specifier.h \
+	src/shared/dev-setup.c \
+	src/shared/dev-setup.h \
+	src/shared/dropin.c \
+	src/shared/dropin.h \
+	src/shared/condition.c \
+	src/shared/condition.h \
+	src/shared/clean-ipc.c \
+	src/shared/clean-ipc.h \
+	src/shared/generator.h \
+	src/shared/generator.c \
+	src/shared/acpi-fpdt.h \
+	src/shared/acpi-fpdt.c \
+	src/shared/boot-timestamps.h \
+	src/shared/boot-timestamps.c \
+	src/shared/cgroup-show.c \
+	src/shared/cgroup-show.h \
+	src/shared/utmp-wtmp.h \
+	src/shared/watchdog.c \
+	src/shared/watchdog.h \
+	src/shared/spawn-ask-password-agent.c \
+	src/shared/spawn-ask-password-agent.h \
+	src/shared/ask-password-api.c \
+	src/shared/ask-password-api.h \
+	src/shared/switch-root.h \
+	src/shared/switch-root.c \
+	src/shared/import-util.c \
+	src/shared/import-util.h \
+	src/shared/sysctl-util.c \
+	src/shared/sysctl-util.h \
+	src/shared/bus-util.c \
+	src/shared/bus-util.h \
+	src/shared/logs-show.c \
+	src/shared/logs-show.h \
+	src/shared/machine-image.c \
+	src/shared/machine-image.h \
+	src/shared/machine-pool.c \
+	src/shared/machine-pool.h \
+	src/shared/resolve-util.c \
+	src/shared/resolve-util.h \
+	src/shared/bus-unit-util.c \
+	src/shared/bus-unit-util.h \
+	src/shared/tests.h \
+	src/shared/tests.c
+
+ifneq ($(HAVE_UTMP),)
+libshared_la_SOURCES += \
+	src/shared/utmp-wtmp.c
+endif # HAVE_UTMP
+
+ifneq ($(HAVE_SECCOMP),)
+libshared_la_SOURCES += \
+	src/shared/seccomp-util.h \
+	src/shared/seccomp-util.c
+endif # HAVE_SECCOMP
+
+ifneq ($(HAVE_ACL),)
+libshared_la_SOURCES += \
+	src/shared/acl-util.c \
+	src/shared/acl-util.h
+endif # HAVE_ACL
+
+libshared_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(ACL_CFLAGS) \
+	$(LIBIDN_CFLAGS) \
+	$(SECCOMP_CFLAGS)
+
+libshared_la_LIBADD = \
+	libsystemd-internal.la \
+	libudev-internal.la \
+	$(ACL_LIBS) \
+	$(LIBIDN_LIBS) \
+	$(SECCOMP_LIBS)
+
+systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+systemd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\"
+systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\"
+systemd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\"
+systemd.CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\"
+systemd.CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\"
+systemd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\"
+
+systemd.CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(libexecdir)/systemd-fsck\"
+
+systemd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(bindir)/systemd-tty-ask-password-agent\"
+
+systemd.CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\"
+systemd.CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\"
+
+systemd.CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\"
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/acl-util.c b/src/libshared/src/acl-util.c
index a29790a115..a29790a115 100644
--- a/src/libshared/acl-util.c
+++ b/src/libshared/src/acl-util.c
diff --git a/src/libshared/acpi-fpdt.c b/src/libshared/src/acpi-fpdt.c
index 844db82645..844db82645 100644
--- a/src/libshared/acpi-fpdt.c
+++ b/src/libshared/src/acpi-fpdt.c
diff --git a/src/libshared/apparmor-util.c b/src/libshared/src/apparmor-util.c
index 6d1861d2ee..6d1861d2ee 100644
--- a/src/libshared/apparmor-util.c
+++ b/src/libshared/src/apparmor-util.c
diff --git a/src/libshared/ask-password-api.c b/src/libshared/src/ask-password-api.c
index deff185c0b..deff185c0b 100644
--- a/src/libshared/ask-password-api.c
+++ b/src/libshared/src/ask-password-api.c
diff --git a/src/libshared/base-filesystem.c b/src/libshared/src/base-filesystem.c
index 85276bbc8c..85276bbc8c 100644
--- a/src/libshared/base-filesystem.c
+++ b/src/libshared/src/base-filesystem.c
diff --git a/src/libshared/boot-timestamps.c b/src/libshared/src/boot-timestamps.c
index 5d2d39aaed..5d2d39aaed 100644
--- a/src/libshared/boot-timestamps.c
+++ b/src/libshared/src/boot-timestamps.c
diff --git a/src/libshared/bus-unit-util.c b/src/libshared/src/bus-unit-util.c
index c78f428875..c78f428875 100644
--- a/src/libshared/bus-unit-util.c
+++ b/src/libshared/src/bus-unit-util.c
diff --git a/src/libshared/bus-util.c b/src/libshared/src/bus-util.c
index 5a03339b79..5a03339b79 100644
--- a/src/libshared/bus-util.c
+++ b/src/libshared/src/bus-util.c
diff --git a/src/libshared/cgroup-show.c b/src/libshared/src/cgroup-show.c
index 84cd322997..84cd322997 100644
--- a/src/libshared/cgroup-show.c
+++ b/src/libshared/src/cgroup-show.c
diff --git a/src/libshared/clean-ipc.c b/src/libshared/src/clean-ipc.c
index b92cd28f67..b92cd28f67 100644
--- a/src/libshared/clean-ipc.c
+++ b/src/libshared/src/clean-ipc.c
diff --git a/src/libshared/condition.c b/src/libshared/src/condition.c
index e089a9cb66..e089a9cb66 100644
--- a/src/libshared/condition.c
+++ b/src/libshared/src/condition.c
diff --git a/src/libshared/conf-parser.c b/src/libshared/src/conf-parser.c
index 5a8c698fba..5a8c698fba 100644
--- a/src/libshared/conf-parser.c
+++ b/src/libshared/src/conf-parser.c
diff --git a/src/libshared/dev-setup.c b/src/libshared/src/dev-setup.c
index df80e3c63d..df80e3c63d 100644
--- a/src/libshared/dev-setup.c
+++ b/src/libshared/src/dev-setup.c
diff --git a/src/libshared/dns-domain.c b/src/libshared/src/dns-domain.c
index 9d01c074ef..9d01c074ef 100644
--- a/src/libshared/dns-domain.c
+++ b/src/libshared/src/dns-domain.c
diff --git a/src/libshared/dropin.c b/src/libshared/src/dropin.c
index f045ebaf5a..f045ebaf5a 100644
--- a/src/libshared/dropin.c
+++ b/src/libshared/src/dropin.c
diff --git a/src/libshared/efivars.c b/src/libshared/src/efivars.c
index 0a16f8473f..0a16f8473f 100644
--- a/src/libshared/efivars.c
+++ b/src/libshared/src/efivars.c
diff --git a/src/libshared/fstab-util.c b/src/libshared/src/fstab-util.c
index e13941d9cd..e13941d9cd 100644
--- a/src/libshared/fstab-util.c
+++ b/src/libshared/src/fstab-util.c
diff --git a/src/libshared/gcrypt-util.c b/src/libshared/src/gcrypt-util.c
index f222de6b4f..f222de6b4f 100644
--- a/src/libshared/gcrypt-util.c
+++ b/src/libshared/src/gcrypt-util.c
diff --git a/src/libshared/generator.c b/src/libshared/src/generator.c
index b4ab498a21..b4ab498a21 100644
--- a/src/libshared/generator.c
+++ b/src/libshared/src/generator.c
diff --git a/src/libshared/ima-util.c b/src/libshared/src/ima-util.c
index 789064d653..789064d653 100644
--- a/src/libshared/ima-util.c
+++ b/src/libshared/src/ima-util.c
diff --git a/src/libshared/import-util.c b/src/libshared/src/import-util.c
index 10e47f3061..10e47f3061 100644
--- a/src/libshared/import-util.c
+++ b/src/libshared/src/import-util.c
diff --git a/src/libshared/install-printf.c b/src/libshared/src/install-printf.c
index e1635b462c..e1635b462c 100644
--- a/src/libshared/install-printf.c
+++ b/src/libshared/src/install-printf.c
diff --git a/src/libshared/install.c b/src/libshared/src/install.c
index c453ba65b0..c453ba65b0 100644
--- a/src/libshared/install.c
+++ b/src/libshared/src/install.c
diff --git a/src/libshared/logs-show.c b/src/libshared/src/logs-show.c
index c1bcdf690b..c1bcdf690b 100644
--- a/src/libshared/logs-show.c
+++ b/src/libshared/src/logs-show.c
diff --git a/src/libshared/machine-image.c b/src/libshared/src/machine-image.c
index a4e4ba6856..a4e4ba6856 100644
--- a/src/libshared/machine-image.c
+++ b/src/libshared/src/machine-image.c
diff --git a/src/libshared/machine-pool.c b/src/libshared/src/machine-pool.c
index 861c30ac1a..861c30ac1a 100644
--- a/src/libshared/machine-pool.c
+++ b/src/libshared/src/machine-pool.c
diff --git a/src/libshared/output-mode.c b/src/libshared/src/output-mode.c
index 1ed9b3845d..1ed9b3845d 100644
--- a/src/libshared/output-mode.c
+++ b/src/libshared/src/output-mode.c
diff --git a/src/libshared/pager.c b/src/libshared/src/pager.c
index a25ad795a7..a25ad795a7 100644
--- a/src/libshared/pager.c
+++ b/src/libshared/src/pager.c
diff --git a/src/libshared/path-lookup.c b/src/libshared/src/path-lookup.c
index 36e621232f..36e621232f 100644
--- a/src/libshared/path-lookup.c
+++ b/src/libshared/src/path-lookup.c
diff --git a/src/libshared/ptyfwd.c b/src/libshared/src/ptyfwd.c
index ca3ed5e16e..ca3ed5e16e 100644
--- a/src/libshared/ptyfwd.c
+++ b/src/libshared/src/ptyfwd.c
diff --git a/src/libshared/resolve-util.c b/src/libshared/src/resolve-util.c
index d80a2fba7c..d80a2fba7c 100644
--- a/src/libshared/resolve-util.c
+++ b/src/libshared/src/resolve-util.c
diff --git a/src/libshared/seccomp-util.c b/src/libshared/src/seccomp-util.c
index 49884d99b7..49884d99b7 100644
--- a/src/libshared/seccomp-util.c
+++ b/src/libshared/src/seccomp-util.c
diff --git a/src/libshared/sleep-config.c b/src/libshared/src/sleep-config.c
index 212a7f32c9..212a7f32c9 100644
--- a/src/libshared/sleep-config.c
+++ b/src/libshared/src/sleep-config.c
diff --git a/src/libshared/spawn-ask-password-agent.c b/src/libshared/src/spawn-ask-password-agent.c
index 4a7411a1df..4a7411a1df 100644
--- a/src/libshared/spawn-ask-password-agent.c
+++ b/src/libshared/src/spawn-ask-password-agent.c
diff --git a/src/libshared/spawn-polkit-agent.c b/src/libshared/src/spawn-polkit-agent.c
index 7b62e576ee..7b62e576ee 100644
--- a/src/libshared/spawn-polkit-agent.c
+++ b/src/libshared/src/spawn-polkit-agent.c
diff --git a/src/libshared/specifier.c b/src/libshared/src/specifier.c
index dded146aa4..dded146aa4 100644
--- a/src/libshared/specifier.c
+++ b/src/libshared/src/specifier.c
diff --git a/src/libshared/switch-root.c b/src/libshared/src/switch-root.c
index 750e631a6f..750e631a6f 100644
--- a/src/libshared/switch-root.c
+++ b/src/libshared/src/switch-root.c
diff --git a/src/libshared/sysctl-util.c b/src/libshared/src/sysctl-util.c
index b84502376d..b84502376d 100644
--- a/src/libshared/sysctl-util.c
+++ b/src/libshared/src/sysctl-util.c
diff --git a/src/libshared/tests.c b/src/libshared/src/tests.c
index b53deeb66f..b53deeb66f 100644
--- a/src/libshared/tests.c
+++ b/src/libshared/src/tests.c
diff --git a/src/libshared/uid-range.c b/src/libshared/src/uid-range.c
index 4d97503c0a..4d97503c0a 100644
--- a/src/libshared/uid-range.c
+++ b/src/libshared/src/uid-range.c
diff --git a/src/libshared/utmp-wtmp.c b/src/libshared/src/utmp-wtmp.c
index 1a19898c6b..1a19898c6b 100644
--- a/src/libshared/utmp-wtmp.c
+++ b/src/libshared/src/utmp-wtmp.c
diff --git a/src/libshared/watchdog.c b/src/libshared/src/watchdog.c
index 4eaf022e21..4eaf022e21 100644
--- a/src/libshared/watchdog.c
+++ b/src/libshared/src/watchdog.c