X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=6601e18d034fa8a0e8e235b6a1df75ab58d795bd;hp=f4cc249540440c592379eba2a5eb00f3f5f511df;hb=f33d3ec1d7521c91da8b30ad5cb345d6416bb07d;hpb=69dd416595bb8c69d7d33779f6088f5a3f503113

diff --git a/Makefile.am b/Makefile.am
index f4cc24954..6601e18d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,16 +4,16 @@
 #  Copyright 2010-2012 Kay Sievers
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 #
 #  systemd is distributed in the hope that it will be useful, but
 #  WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  General Public License for more details.
+#  Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
+#  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -120,12 +120,14 @@ AM_CPPFLAGS = \
 	-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
 	-DX_SERVER=\"$(bindir)/X\" \
 	-DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
+	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/shared \
 	-I $(top_srcdir)/src/readahead \
 	-I $(top_srcdir)/src/login \
 	-I $(top_srcdir)/src/journal \
 	-I $(top_srcdir)/src/systemd \
+	-I $(top_srcdir)/src/core \
 	-I $(top_srcdir)/src/udev
 
 AM_CFLAGS = $(WARNINGFLAGS)
@@ -455,7 +457,9 @@ endif
 dist_doc_DATA = \
 	README \
 	NEWS \
-	LICENSE \
+	LICENSE.LGPL2.1 \
+	LICENSE.GPL2 \
+	LICENSE.MIT \
 	DISTRO_PORTING
 
 pkgconfigdata_DATA = \
@@ -575,29 +579,67 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/pager.c \
 	src/shared/pager.h \
 	src/shared/ioprio.h \
+	src/shared/socket-util.c \
+	src/shared/socket-util.h \
+	src/shared/cgroup-util.c \
+	src/shared/cgroup-util.h \
+	src/shared/dbus-common.c \
+	src/shared/dbus-common.h \
+	src/shared/hostname-setup.c \
+	src/shared/hostname-setup.h \
+	src/shared/logs-show.c \
+	src/shared/logs-show.h \
+	src/shared/cgroup-show.c \
+	src/shared/cgroup-show.h \
+	src/shared/unit-name.c \
+	src/shared/unit-name.h \
+	src/shared/utmp-wtmp.c \
+	src/shared/utmp-wtmp.h \
+	src/shared/watchdog.c \
+	src/shared/watchdog.h \
+	src/shared/umount.c \
+	src/shared/umount.h \
+	src/shared/spawn-ask-password-agent.c \
+	src/shared/spawn-ask-password-agent.h \
+	src/shared/mount-setup.c \
+	src/shared/mount-setup.h \
+	src/shared/machine-id-setup.c \
+	src/shared/machine-id-setup.h \
+	src/shared/loopback-setup.h \
+	src/shared/loopback-setup.c \
+	src/shared/specifier.c \
+	src/shared/specifier.h \
+	src/shared/spawn-polkit-agent.c \
+	src/shared/spawn-polkit-agent.h \
 	src/shared/list.h \
 	src/shared/macro.h
 
+libsystemd_shared_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-	libsystemd-shared-selinux.la
-
-libsystemd_shared_selinux_la_SOURCES = \
-	src/shared/cgroup-util.c \
-	src/shared/cgroup-util.h \
-	src/shared/socket-util.c \
-	src/shared/socket-util.h \
+	libsystemd-label.la
+
+libsystemd_label_la_SOURCES = \
+	src/shared/install.c \
+	src/shared/install.h \
+	src/shared/path-lookup.c \
+	src/shared/path-lookup.h \
+	src/shared/cgroup-label.c \
+	src/shared/socket-label.c \
 	src/shared/label.c \
 	src/shared/label.h \
 	src/shared/mkdir.c \
 	src/shared/mkdir.h
 
-libsystemd_shared_selinux_la_CFLAGS = \
+libsystemd_label_la_CFLAGS = \
 	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(SELINUX_CFLAGS)
 
-libsystemd_shared_selinux_la_LIBADD = \
-	libsystemd-shared.la \
+libsystemd_label_la_LIBADD = \
 	$(SELINUX_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -627,12 +669,13 @@ libsystemd_audit_la_LIBADD = \
 	libsystemd-capability.la
 
 # ------------------------------------------------------------------------------
+if HAVE_ACL
 noinst_LTLIBRARIES += \
 	libsystemd-acl.la
 
 libsystemd_acl_la_SOURCES = \
-	src/shared/acl.c \
-	src/shared/acl.h
+	src/shared/acl-util.c \
+	src/shared/acl-util.h
 
 libsystemd_acl_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -640,134 +683,108 @@ libsystemd_acl_la_CFLAGS = \
 
 libsystemd_acl_la_LIBADD = \
 	$(ACL_LIBS)
+endif
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-core.la
 
 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/fdset.c \
-	src/fdset.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/watchdog.c \
-	src/watchdog.h \
 	src/def.h \
 	src/missing.h \
-	src/securebits.h \
 	src/linux/auto_dev-ioctl.h \
 	src/linux/fanotify.h \
-	src/initreq.h \
-	src/special.h \
-	src/dbus-common.h \
-	src/bus-errors.h \
-	src/cgroup-show.h \
-	src/build.h \
-	src/umount.h \
-	src/ask-password-api.h \
-	src/sysfs-show.h \
-	src/polkit.h \
-	src/dbus-loop.h \
-	src/spawn-agent.h \
-	src/logs-show.h
+	src/core/unit.c \
+	src/core/unit.h \
+	src/core/job.c \
+	src/core/job.h \
+	src/core/manager.c \
+	src/core/manager.h \
+	src/core/load-fragment.c \
+	src/core/load-fragment.h \
+	src/core/service.c \
+	src/core/service.h \
+	src/core/automount.c \
+	src/core/automount.h \
+	src/core/mount.c \
+	src/core/mount.h \
+	src/core/swap.c \
+	src/core/swap.h \
+	src/core/device.c \
+	src/core/device.h \
+	src/core/target.c \
+	src/core/target.h \
+	src/core/snapshot.c \
+	src/core/snapshot.h \
+	src/core/socket.c \
+	src/core/socket.h \
+	src/core/timer.c \
+	src/core/timer.h \
+	src/core/path.c \
+	src/core/path.h \
+	src/core/load-dropin.c \
+	src/core/load-dropin.h \
+	src/core/execute.c \
+	src/core/execute.h \
+	src/core/dbus.c \
+	src/core/dbus.h \
+	src/core/dbus-manager.c \
+	src/core/dbus-manager.h \
+	src/core/dbus-unit.c \
+	src/core/dbus-unit.h \
+	src/core/dbus-job.c \
+	src/core/dbus-job.h \
+	src/core/dbus-service.c \
+	src/core/dbus-service.h \
+	src/core/dbus-socket.c \
+	src/core/dbus-socket.h \
+	src/core/dbus-timer.c \
+	src/core/dbus-timer.h \
+	src/core/dbus-target.c \
+	src/core/dbus-target.h \
+	src/core/dbus-mount.c \
+	src/core/dbus-mount.h \
+	src/core/dbus-automount.c \
+	src/core/dbus-automount.h \
+	src/core/dbus-swap.c \
+	src/core/dbus-swap.h \
+	src/core/dbus-snapshot.c \
+	src/core/dbus-snapshot.h \
+	src/core/dbus-device.c \
+	src/core/dbus-device.h \
+	src/core/dbus-execute.c \
+	src/core/dbus-execute.h \
+	src/core/dbus-path.c \
+	src/core/dbus-path.h \
+	src/core/cgroup.c \
+	src/core/cgroup.h \
+	src/core/selinux-setup.c \
+	src/core/selinux-setup.h \
+	src/core/ima-setup.c \
+	src/core/ima-setup.h \
+	src/core/kmod-setup.c \
+	src/core/kmod-setup.h \
+	src/core/locale-setup.h \
+	src/core/locale-setup.c \
+	src/core/fdset.c \
+	src/core/fdset.h \
+	src/core/condition.c \
+	src/core/condition.h \
+	src/core/namespace.c \
+	src/core/namespace.h \
+	src/core/tcpwrap.c \
+	src/core/tcpwrap.h \
+	src/core/cgroup-attr.c \
+	src/core/cgroup-attr.h \
+	src/core/securebits.h \
+	src/core/initreq.h \
+	src/core/special.h \
+	src/core/bus-errors.h \
+	src/core/build.h \
+	src/core/ask-password-api.h \
+	src/core/sysfs-show.h \
+	src/core/polkit.h \
+	src/core/dbus-loop.h
 
 nodist_libsystemd_core_la_SOURCES = \
 	src/load-fragment-gperf.c \
@@ -785,8 +802,9 @@ libsystemd_core_la_CFLAGS = \
 	$(KMOD_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
-	libsystemd-shared-selinux.la \
 	libsystemd-capability.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libudev.la \
 	$(DBUS_LIBS) \
 	$(LIBWRAP_LIBS) \
@@ -837,15 +855,13 @@ test_ns_LDADD = \
 	libsystemd-core.la
 
 test_loopback_SOURCES = \
-	src/test-loopback.c \
-	src/loopback-setup.c
+	src/test-loopback.c
 
 test_loopback_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-shared.la
 
 test_hostname_SOURCES = \
-	src/test-hostname.c \
-	src/hostname-setup.c
+	src/test-hostname.c
 
 test_hostname_LDADD = \
 	libsystemd-shared.la
@@ -861,7 +877,8 @@ test_cgroup_SOURCES = \
 	src/test-cgroup.c
 
 test_cgroup_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 test_env_replace_SOURCES = \
 	src/test-env-replace.c
@@ -870,37 +887,31 @@ test_env_replace_LDADD = \
 	libsystemd-shared.la
 
 test_strv_SOURCES = \
-	src/test-strv.c \
-	src/specifier.c
+	src/test-strv.c
 
 test_strv_LDADD = \
 	libsystemd-shared.la
 
 test_install_SOURCES = \
-	src/test-install.c \
-	src/install.c \
-	src/path-lookup.c \
-	src/unit-name.c
+	src/test-install.c
 
 test_install_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 test_install_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 test_watchdog_SOURCES = \
-	src/test-watchdog.c \
-	src/watchdog.c \
-	src/watchdog.h
+	src/test-watchdog.c
 
 test_watchdog_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
-	src/initctl.c \
-	src/dbus-common.c
+	src/initctl.c
 
 systemd_initctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -913,9 +924,7 @@ systemd_initctl_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
-	src/update-utmp.c \
-	src/dbus-common.c \
-	src/utmp-wtmp.c
+	src/update-utmp.c
 
 systemd_update_utmp_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -929,11 +938,11 @@ systemd_update_utmp_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_shutdownd_SOURCES = \
-	src/utmp-wtmp.c \
 	src/shutdownd.c
 
 systemd_shutdownd_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libsystemd-daemon.la
 
 pkginclude_HEADERS += \
@@ -941,14 +950,11 @@ pkginclude_HEADERS += \
 
 # ------------------------------------------------------------------------------
 systemd_shutdown_SOURCES = \
-	src/mount-setup.c \
-	src/umount.c \
-	src/shutdown.c \
-	src/watchdog.c \
-	src/watchdog.h
+	src/shutdown.c
 
 systemd_shutdown_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libudev.la
 
 # ------------------------------------------------------------------------------
@@ -968,15 +974,16 @@ systemd_tmpfiles_SOURCES = \
 	src/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
-	src/machine-id-setup.c \
 	src/machine-id-main.c
 
 systemd_machine_id_setup_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libsystemd-id128.la
 
 # ------------------------------------------------------------------------------
@@ -988,8 +995,7 @@ systemd_sysctl_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_fsck_SOURCES = \
-	src/fsck.c \
-	src/dbus-common.c
+	src/fsck.c
 
 systemd_fsck_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1024,31 +1030,30 @@ systemd_detect_virt_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
-	src/getty-generator.c \
-	src/unit-name.c
+	src/getty-generator.c
 
 systemd_getty_generator_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
 	src/rc-local-generator.c
 
 systemd_rc_local_generator_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_remount_api_vfs_SOURCES = \
-	src/remount-api-vfs.c \
-	src/mount-setup.c
+	src/remount-api-vfs.c
 
 systemd_remount_api_vfs_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_cgroups_agent_SOURCES = \
-	src/cgroups-agent.c \
-	src/dbus-common.c
+	src/cgroups-agent.c
 
 systemd_cgroups_agent_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1060,22 +1065,15 @@ systemd_cgroups_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemctl_SOURCES = \
-	src/systemctl.c \
-	src/utmp-wtmp.c \
-	src/dbus-common.c \
-	src/path-lookup.c \
-	src/cgroup-show.c \
-	src/unit-name.c \
-	src/install.c \
-	src/spawn-agent.c \
-	src/logs-show.c
+	src/systemctl.c
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 systemctl_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libsystemd-daemon.la \
 	libsystemd-journal.la \
 	libsystemd-id128.la \
@@ -1096,7 +1094,8 @@ systemd_ask_password_SOURCES = \
 	src/ask-password-api.c
 
 systemd_ask_password_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_reply_password_SOURCES = \
@@ -1107,27 +1106,26 @@ systemd_reply_password_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
-	src/cgls.c \
-	src/cgroup-show.c
+	src/cgls.c
 
 systemd_cgls_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_cgtop_SOURCES = \
 	src/cgtop.c
 
 systemd_cgtop_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_nspawn_SOURCES = \
-	src/nspawn.c \
-	src/loopback-setup.c
+	src/nspawn.c
 
 systemd_nspawn_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
 	libsystemd-capability.la \
+	libsystemd-shared.la \
 	libsystemd-daemon.la
 
 # ------------------------------------------------------------------------------
@@ -1140,11 +1138,11 @@ systemd_stdio_bridge_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
 	src/tty-ask-password-agent.c \
-	src/ask-password-api.c \
-	src/utmp-wtmp.c
+	src/ask-password-api.c
 
 systemd_tty_ask_password_agent_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 libsystemd_daemon_la_SOURCES = \
@@ -1156,6 +1154,7 @@ libsystemd_daemon_la_CFLAGS = \
 	-DSD_EXPORT_SYMBOLS
 
 libsystemd_daemon_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-shared \
 	-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
@@ -1384,7 +1383,7 @@ libudev_core_la_CFLAGS = \
 libudev_core_la_LIBADD = \
 	libudev-private.la \
 	libsystemd-daemon.la \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
@@ -1421,7 +1420,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
 	libudev-core.la \
-	libsystemd-shared-selinux.la
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 TESTS = \
@@ -1611,6 +1610,7 @@ libgudev_1_0_la_LIBADD = \
 	$(GLIB_LIBS)
 
 libgudev_1_0_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
 	-export-dynamic -no-undefined \
 	-export-symbols-regex '^g_udev_.*'
@@ -1809,7 +1809,7 @@ dist_udevkeymapforcerel_DATA = \
 	src/udev/keymap/force-release-maps/common-volume-keys
 
 src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
-	$(AM_V_at)mkdir -p src/keymap
+	$(AM_V_at)mkdir -p src/udev/keymap
 	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
 src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt
@@ -1850,6 +1850,7 @@ libsystemd_id128_la_CFLAGS = \
 	-fvisibility=hidden
 
 libsystemd_id128_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-shared \
 	-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
@@ -1861,7 +1862,7 @@ test_id128_SOURCES = \
 	src/test-id128.c
 
 test_id128_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	libsystemd-id128.la
 
 noinst_PROGRAMS += \
@@ -1902,11 +1903,18 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
 	src/journal/journald.c \
+	src/journal/journald.h \
 	src/journal/sd-journal.c \
 	src/journal/journal-file.c \
+	src/journal/journal-file.h \
 	src/journal/lookup3.c \
+	src/journal/lookup3.h \
 	src/journal/journal-rate-limit.c \
-	src/journal/sparse-endian.h
+	src/journal/journal-rate-limit.h \
+	src/journal/sparse-endian.h \
+	src/journal/journal-def.h \
+	src/journal/journal-internal.h \
+	src/journal/compress.h
 
 nodist_systemd_journald_SOURCES = \
 	src/journal/journald-gperf.c
@@ -1914,7 +1922,8 @@ nodist_systemd_journald_SOURCES = \
 systemd_journald_CFLAGS =
 
 systemd_journald_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
 	libsystemd-login.la \
@@ -1941,15 +1950,14 @@ systemd_cat_SOURCES = \
 	src/journal/cat.c
 
 systemd_cat_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	libsystemd-journal.la
 
 journalctl_SOURCES = \
-	src/journal/journalctl.c \
-	src/logs-show.c
+	src/journal/journalctl.c
 
 journalctl_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	libsystemd-journal.la \
 	libsystemd-id128.la
 
@@ -1971,7 +1979,8 @@ test_journal_SOURCES = \
 	src/journal/journal-send.c
 
 test_journal_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libsystemd-id128.la
 
 if HAVE_XZ
@@ -1990,7 +1999,7 @@ test_journal_send_SOURCES = \
 	src/journal/test-journal-send.c
 
 test_journal_send_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	libsystemd-journal.la
 
 libsystemd_journal_la_SOURCES = \
@@ -2004,12 +2013,13 @@ libsystemd_journal_la_CFLAGS = \
 	-fvisibility=hidden
 
 libsystemd_journal_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-shared \
 	-version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
 
 libsystemd_journal_la_LIBADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	libsystemd-id128.la
 
 if HAVE_XZ
@@ -2090,13 +2100,6 @@ INSTALL_DATA_HOOKS += \
 	journal-install-data-hook
 
 EXTRA_DIST += \
-	src/journal/journald.h \
-	src/journal/journal-def.h \
-	src/journal/journal-internal.h \
-	src/journal/journal-file.h \
-	src/journal/lookup3.h \
-	src/journal/compress.h \
-	src/journal/journal-rate-limit.h \
 	src/journal/libsystemd-journal.pc.in \
 	src/journal/libsystemd-journal.sym \
 	units/systemd-journald.service.in \
@@ -2113,7 +2116,8 @@ systemd_coredump_SOURCES = \
 systemd_coredump_LDADD = \
 	libsystemd-journal.la \
 	libsystemd-login.la \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
 	systemd-coredump
@@ -2202,7 +2206,8 @@ endif
 if ENABLE_READAHEAD
 systemd_readahead_collect_SOURCES = \
 	src/readahead/readahead-collect.c \
-	src/readahead/readahead-common.c
+	src/readahead/readahead-common.c \
+	src/readahead/readahead-common.h
 
 systemd_readahead_collect_LDADD = \
 	libsystemd-shared.la \
@@ -2218,6 +2223,9 @@ systemd_readahead_replay_LDADD = \
 	libsystemd-daemon.la \
 	libudev.la
 
+pkginclude_HEADERS += \
+	src/systemd/sd-readahead.h
+
 rootlibexec_PROGRAMS += \
 	systemd-readahead-collect \
 	systemd-readahead-replay
@@ -2231,8 +2239,6 @@ nodist_systemunit_DATA += \
 	units/systemd-readahead-done.service
 
 EXTRA_DIST += \
-	src/systemd/sd-readahead.h \
-	src/readahead/readahead-common.h \
 	units/systemd-readahead-collect.service.in \
 	units/systemd-readahead-replay.service.in \
 	units/systemd-readahead-done.service.in
@@ -2277,7 +2283,8 @@ systemd_random_seed_SOURCES = \
 	src/random-seed.c
 
 systemd_random_seed_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 randomseed-install-data-hook:
 	$(MKDIR_P) -m 0755 \
@@ -2314,16 +2321,17 @@ systemd_cryptsetup_CFLAGS = \
 	$(LIBCRYPTSETUP_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libudev.la \
 	$(LIBCRYPTSETUP_LIBS)
 
 systemd_cryptsetup_generator_SOURCES = \
-	src/cryptsetup/cryptsetup-generator.c \
-	src/unit-name.c
+	src/cryptsetup/cryptsetup-generator.c
 
 systemd_cryptsetup_generator_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 cryptsetup-install-data-hook:
 	$(MKDIR_P) -m 0755 \
@@ -2340,7 +2348,6 @@ endif
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
 	src/hostname/hostnamed.c \
-	src/dbus-common.c \
 	src/polkit.c
 
 systemd_hostnamed_CFLAGS = \
@@ -2391,7 +2398,6 @@ endif
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
 	src/locale/localed.c \
-	src/dbus-common.c \
 	src/polkit.c
 
 systemd_localed_CFLAGS = \
@@ -2399,7 +2405,8 @@ systemd_localed_CFLAGS = \
 	$(DBUS_CFLAGS)
 
 systemd_localed_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libsystemd-daemon.la \
 	$(DBUS_LIBS)
 
@@ -2452,7 +2459,6 @@ endif
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
 	src/timedate/timedated.c \
-	src/dbus-common.c \
 	src/polkit.c
 
 systemd_timedated_CFLAGS = \
@@ -2516,7 +2522,6 @@ systemd_logind_SOURCES = \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
-	src/dbus-common.c \
 	src/dbus-loop.c \
 	src/polkit.c \
 	src/login/logind-acl.h
@@ -2529,7 +2534,8 @@ systemd_logind_CFLAGS = \
 	$(DBUS_CFLAGS)
 
 systemd_logind_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
 	libudev.la \
@@ -2547,7 +2553,7 @@ systemd_user_sessions_SOURCES = \
 	src/login/user-sessions.c
 
 systemd_user_sessions_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
 	systemd-logind \
@@ -2555,16 +2561,14 @@ rootlibexec_PROGRAMS += \
 
 loginctl_SOURCES = \
 	src/login/loginctl.c \
-	src/login/sysfs-show.c \
-	src/dbus-common.c \
-	src/cgroup-show.c
+	src/login/sysfs-show.c
 
 loginctl_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 loginctl_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	libudev.la \
 	$(DBUS_LIBS)
 
@@ -2576,7 +2580,7 @@ test_login_SOURCES = \
 
 test_login_LDADD = \
 	libsystemd-login.la \
-	libsystemd-shared-selinux.la
+	libsystemd-shared.la
 
 noinst_PROGRAMS += \
 	test-login
@@ -2589,17 +2593,17 @@ libsystemd_login_la_CFLAGS = \
 	-fvisibility=hidden
 
 libsystemd_login_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-shared \
 	-version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
 
 libsystemd_login_la_LIBADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-shared.la
 
 if HAVE_PAM
 pam_systemd_la_SOURCES = \
-	src/login/pam-module.c \
-	src/dbus-common.c
+	src/login/pam-module.c
 
 pam_systemd_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2608,6 +2612,7 @@ pam_systemd_la_CFLAGS = \
 	-fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-module \
 	-export-dynamic \
 	-avoid-version \
@@ -2617,7 +2622,7 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
 	libsystemd-daemon.la \
 	libsystemd-audit.la \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	$(PAM_LIBS) \
 	$(DBUS_LIBS)
 
@@ -2672,7 +2677,7 @@ polkitpolicy_in_files += \
 logind-install-data-hook:
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
-                $(DESTDIR)$(localstatedir)/lib/systemd
+		$(DESTDIR)$(localstatedir)/lib/systemd
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f dbus-org.freedesktop.login1.service && \
 		$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@@ -2688,7 +2693,8 @@ systemd_multi_seat_x_SOURCES = \
 	src/login/multi-seat-x.c
 
 systemd_multi_seat_x_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libudev.la
 
 rootlibexec_PROGRAMS += \