X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=493e15e7c260e7984e450565f0e6eb5aea031d2e;hp=0aebeb2d9809dcdc4101cba2b10f05d11ada5608;hb=79c077224be5a868d0bba66972ef9546dae85977;hpb=082694b75f0217f1c5b8b89590e5018f6d8b0949

diff --git a/Makefile.am b/Makefile.am
index 0aebeb2d9..493e15e7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,6 +126,7 @@ AM_CPPFLAGS = \
 	-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)
@@ -575,29 +576,30 @@ 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/list.h \
 	src/shared/macro.h
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-	libsystemd-shared-selinux.la
+	libsystemd-label.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_SOURCES = \
+	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) \
 	$(SELINUX_CFLAGS)
 
-libsystemd_shared_selinux_la_LIBADD = \
-	libsystemd-shared.la \
+libsystemd_label_la_LIBADD = \
 	$(SELINUX_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -627,12 +629,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,135 +643,131 @@ 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/def.h \
+	src/missing.h \
 	src/dbus-common.c \
 	src/dbus-common.h \
-	src/install.c \
-	src/install.h \
+	src/watchdog.c \
+	src/watchdog.h \
+	src/loopback-setup.h \
+	src/loopback-setup.c \
+	src/hostname-setup.c \
+	src/hostname-setup.h \
 	src/specifier.c \
 	src/specifier.h \
-	src/namespace.c \
-	src/namespace.h \
+	src/install.c \
+	src/install.h \
+	src/path-lookup.c \
+	src/path-lookup.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/utmp-wtmp.c \
+	src/utmp-wtmp.h \
+	src/machine-id-setup.c \
+	src/machine-id-setup.h \
+	src/mount-setup.c \
+	src/mount-setup.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/shutdownd.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 \
+	src/core/spawn-agent.h
 
 nodist_libsystemd_core_la_SOURCES = \
 	src/load-fragment-gperf.c \
@@ -786,8 +785,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) \
@@ -842,7 +842,7 @@ test_loopback_SOURCES = \
 	src/loopback-setup.c
 
 test_loopback_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-shared.la
 
 test_hostname_SOURCES = \
 	src/test-hostname.c \
@@ -862,7 +862,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
@@ -888,7 +889,8 @@ test_install_CFLAGS = \
 	$(DBUS_CFLAGS)
 
 test_install_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 test_watchdog_SOURCES = \
 	src/test-watchdog.c \
@@ -934,18 +936,25 @@ systemd_shutdownd_SOURCES = \
 	src/shutdownd.c
 
 systemd_shutdownd_LDADD = \
+	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la
 
+pkginclude_HEADERS += \
+	src/systemd/sd-shutdown.h
+
+# ------------------------------------------------------------------------------
 systemd_shutdown_SOURCES = \
 	src/mount-setup.c \
 	src/umount.c \
+	src/umount.h \
 	src/shutdown.c \
 	src/watchdog.c \
 	src/watchdog.h
 
 systemd_shutdown_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libudev.la
 
 # ------------------------------------------------------------------------------
@@ -965,7 +974,8 @@ systemd_tmpfiles_SOURCES = \
 	src/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
@@ -973,7 +983,8 @@ systemd_machine_id_setup_SOURCES = \
 	src/machine-id-main.c
 
 systemd_machine_id_setup_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libsystemd-id128.la
 
 # ------------------------------------------------------------------------------
@@ -1025,14 +1036,16 @@ systemd_getty_generator_SOURCES = \
 	src/unit-name.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 = \
@@ -1062,17 +1075,20 @@ systemctl_SOURCES = \
 	src/dbus-common.c \
 	src/path-lookup.c \
 	src/cgroup-show.c \
+	src/cgroup-show.h \
 	src/unit-name.c \
 	src/install.c \
 	src/spawn-agent.c \
-	src/logs-show.c
+	src/logs-show.c \
+	src/logs-show.h
 
 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 \
@@ -1093,7 +1109,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 = \
@@ -1105,17 +1122,18 @@ systemd_reply_password_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
 	src/cgls.c \
-	src/cgroup-show.c
+	src/cgroup-show.c \
+	src/cgroup-show.h
 
 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 = \
@@ -1123,7 +1141,8 @@ systemd_nspawn_SOURCES = \
 	src/loopback-setup.c
 
 systemd_nspawn_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libsystemd-capability.la \
 	libsystemd-daemon.la
 
@@ -1141,7 +1160,8 @@ systemd_tty_ask_password_agent_SOURCES = \
 	src/utmp-wtmp.c
 
 systemd_tty_ask_password_agent_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 libsystemd_daemon_la_SOURCES = \
@@ -1153,6 +1173,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
@@ -1381,7 +1402,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)
 
@@ -1418,7 +1439,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
 	libudev-core.la \
-	libsystemd-shared-selinux.la
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 TESTS = \
@@ -1608,6 +1629,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_.*'
@@ -1847,6 +1869,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
@@ -1858,7 +1881,7 @@ test_id128_SOURCES = \
 	src/test-id128.c
 
 test_id128_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	libsystemd-id128.la
 
 noinst_PROGRAMS += \
@@ -1899,11 +1922,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
@@ -1911,7 +1941,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 \
@@ -1938,15 +1969,16 @@ 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/logs-show.c \
+	src/logs-show.h
 
 journalctl_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	libsystemd-journal.la \
 	libsystemd-id128.la
 
@@ -1968,7 +2000,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
@@ -1987,7 +2020,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 = \
@@ -2001,12 +2034,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
@@ -2087,13 +2121,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 \
@@ -2110,7 +2137,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
@@ -2199,7 +2227,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 \
@@ -2215,6 +2244,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
@@ -2228,8 +2260,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
@@ -2274,7 +2304,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 \
@@ -2311,7 +2342,8 @@ systemd_cryptsetup_CFLAGS = \
 	$(LIBCRYPTSETUP_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libudev.la \
 	$(LIBCRYPTSETUP_LIBS)
 
@@ -2320,7 +2352,8 @@ systemd_cryptsetup_generator_SOURCES = \
 	src/unit-name.c
 
 systemd_cryptsetup_generator_LDADD = \
-	libsystemd-shared-selinux.la
+	libsystemd-label.la \
+	libsystemd-shared.la
 
 cryptsetup-install-data-hook:
 	$(MKDIR_P) -m 0755 \
@@ -2396,7 +2429,8 @@ systemd_localed_CFLAGS = \
 	$(DBUS_CFLAGS)
 
 systemd_localed_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-label.la \
+	libsystemd-shared.la \
 	libsystemd-daemon.la \
 	$(DBUS_LIBS)
 
@@ -2500,17 +2534,23 @@ endif
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
 	src/login/logind.c \
+	src/login/logind.h \
 	src/login/logind-dbus.c \
 	src/login/logind-device.c \
+	src/login/logind-device.h \
 	src/login/logind-seat.c \
-	src/login/logind-seat-dbus.c \
+	src/login/logind-seat.h \
 	src/login/logind-session.c \
-	src/login/logind-session-dbus.c \
+	src/login/logind-session.h \
 	src/login/logind-user.c \
+	src/login/logind-user.h \
+	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/polkit.c \
+	src/login/logind-acl.h
 
 nodist_systemd_logind_SOURCES = \
 	src/login/logind-gperf.c
@@ -2520,7 +2560,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 \
@@ -2538,7 +2579,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 \
@@ -2548,14 +2589,15 @@ loginctl_SOURCES = \
 	src/login/loginctl.c \
 	src/login/sysfs-show.c \
 	src/dbus-common.c \
-	src/cgroup-show.c
+	src/cgroup-show.c \
+	src/cgroup-show.h
 
 loginctl_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 loginctl_LDADD = \
-	libsystemd-shared-selinux.la \
+	libsystemd-shared.la \
 	libudev.la \
 	$(DBUS_LIBS)
 
@@ -2567,7 +2609,7 @@ test_login_SOURCES = \
 
 test_login_LDADD = \
 	libsystemd-login.la \
-	libsystemd-shared-selinux.la
+	libsystemd-shared.la
 
 noinst_PROGRAMS += \
 	test-login
@@ -2580,12 +2622,13 @@ 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 = \
@@ -2599,6 +2642,7 @@ pam_systemd_la_CFLAGS = \
 	-fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-module \
 	-export-dynamic \
 	-avoid-version \
@@ -2606,8 +2650,9 @@ pam_systemd_la_LDFLAGS = \
 	-export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
-	libsystemd-shared.la \
 	libsystemd-daemon.la \
+	libsystemd-audit.la \
+	libsystemd-shared.la \
 	$(PAM_LIBS) \
 	$(DBUS_LIBS)
 
@@ -2678,7 +2723,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 += \
@@ -2745,12 +2791,6 @@ EXTRA_DIST += \
 	src/login/logind-gperf.gperf \
 	src/login/libsystemd-login.pc.in \
 	src/login/libsystemd-login.sym \
-	src/login/logind.h \
-	src/login/logind-device.h \
-	src/login/logind-seat.h \
-	src/login/logind-session.h \
-	src/login/logind-user.h \
-	src/login/logind-acl.h \
 	src/login/73-seat-late.rules.in \
 	units/systemd-logind.service.in \
 	units/systemd-user-sessions.service.in