chiark / gitweb /
build-sys: add $(AM_LDFLAGS) where needed
[elogind.git] / Makefile.am
index a8f2150bbadaeaeddadd6a03623dca9c79298964..2f01a68f76d5fa42330e80d0eaff8ddc526c0d6d 100644 (file)
@@ -290,6 +290,7 @@ dist_systemunit_DATA = \
        units/remote-fs-pre.target \
        units/network.target \
        units/nss-lookup.target \
+       units/nss-user-lookup.target \
        units/mail-transfer-agent.target \
        units/http-daemon.target \
        units/poweroff.target \
@@ -517,10 +518,7 @@ MANPAGES = \
        man/systemd-cat.1 \
        man/systemd-machine-id-setup.1 \
        man/journald.conf.5 \
-       man/journalctl.1 \
-       man/udev.7 \
-       man/udevadm.8 \
-       man/udevd.8
+       man/journalctl.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -551,15 +549,13 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
-libsystemd_basic_la_SOURCES = \
+libsystemd_shared_la_SOURCES = \
        src/shared/util.c \
        src/shared/util.h \
        src/shared/virt.c \
        src/shared/virt.h \
-       src/shared/label.c \
-       src/shared/label.h \
        src/shared/hashmap.c \
        src/shared/hashmap.h \
        src/shared/set.c \
@@ -568,8 +564,6 @@ libsystemd_basic_la_SOURCES = \
        src/shared/strv.h \
        src/shared/conf-parser.c \
        src/shared/conf-parser.h \
-       src/shared/socket-util.c \
-       src/shared/socket-util.h \
        src/shared/log.c \
        src/shared/log.h \
        src/shared/ratelimit.h \
@@ -578,16 +572,32 @@ libsystemd_basic_la_SOURCES = \
        src/shared/exit-status.h \
        src/shared/utf8.c \
        src/shared/utf8.h \
+       src/shared/pager.c \
+       src/shared/pager.h \
+       src/shared/ioprio.h \
+       src/shared/list.h \
+       src/shared/macro.h
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-shared-selinux.la
+
+libsystemd_shared_selinux_la_SOURCES = \
        src/shared/cgroup-util.c \
        src/shared/cgroup-util.h \
-       src/shared/pager.c \
-       src/shared/pager.h
+       src/shared/socket-util.c \
+       src/shared/socket-util.h \
+       src/shared/label.c \
+       src/shared/label.h \
+       src/shared/mkdir.c \
+       src/shared/mkdir.h
 
-libsystemd_basic_la_CFLAGS = \
+libsystemd_shared_selinux_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(SELINUX_CFLAGS)
 
-libsystemd_basic_la_LIBADD = \
+libsystemd_shared_selinux_la_LIBADD = \
+       libsystemd-shared.la \
        $(SELINUX_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -740,11 +750,8 @@ libsystemd_core_la_SOURCES = \
        src/cgroup-attr.h \
        src/watchdog.c \
        src/watchdog.h \
-       src/macro.h \
        src/def.h \
-       src/ioprio.h \
        src/missing.h \
-       src/list.h \
        src/securebits.h \
        src/linux/auto_dev-ioctl.h \
        src/linux/fanotify.h \
@@ -754,7 +761,6 @@ libsystemd_core_la_SOURCES = \
        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 \
@@ -779,7 +785,7 @@ libsystemd_core_la_CFLAGS = \
        $(KMOD_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-capability.la \
        libudev.la \
        $(DBUS_LIBS) \
@@ -835,40 +841,40 @@ test_loopback_SOURCES = \
        src/loopback-setup.c
 
 test_loopback_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 test_hostname_SOURCES = \
        src/test-hostname.c \
        src/hostname-setup.c
 
 test_hostname_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 test_daemon_SOURCES = \
        src/test-daemon.c
 
 test_daemon_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
        src/test-cgroup.c
 
 test_cgroup_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 test_env_replace_SOURCES = \
        src/test-env-replace.c
 
 test_env_replace_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 test_strv_SOURCES = \
        src/test-strv.c \
        src/specifier.c
 
 test_strv_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 test_install_SOURCES = \
        src/test-install.c \
@@ -881,7 +887,7 @@ test_install_CFLAGS = \
        $(DBUS_CFLAGS)
 
 test_install_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 test_watchdog_SOURCES = \
        src/test-watchdog.c \
@@ -889,7 +895,7 @@ test_watchdog_SOURCES = \
        src/watchdog.h
 
 test_watchdog_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
@@ -901,7 +907,7 @@ systemd_initctl_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_initctl_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
@@ -917,7 +923,7 @@ systemd_update_utmp_CFLAGS = \
        $(AUDIT_CFLAGS)
 
 systemd_update_utmp_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        $(DBUS_LIBS) \
        $(AUDIT_LIBS)
 
@@ -927,9 +933,13 @@ systemd_shutdownd_SOURCES = \
        src/shutdownd.c
 
 systemd_shutdownd_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-daemon.la
 
+pkginclude_HEADERS += \
+       src/systemd/sd-shutdown.h
+
+# ------------------------------------------------------------------------------
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
        src/umount.c \
@@ -938,7 +948,7 @@ systemd_shutdown_SOURCES = \
        src/watchdog.h
 
 systemd_shutdown_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libudev.la
 
 # ------------------------------------------------------------------------------
@@ -950,7 +960,7 @@ systemd_modules_load_CFLAGS = \
        $(KMOD_CFLAGS)
 
 systemd_modules_load_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        $(KMOD_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -958,7 +968,7 @@ systemd_tmpfiles_SOURCES = \
        src/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
@@ -966,7 +976,7 @@ systemd_machine_id_setup_SOURCES = \
        src/machine-id-main.c
 
 systemd_machine_id_setup_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-id128.la
 
 # ------------------------------------------------------------------------------
@@ -974,7 +984,7 @@ systemd_sysctl_SOURCES = \
        src/sysctl.c
 
 systemd_sysctl_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_fsck_SOURCES = \
@@ -986,7 +996,7 @@ systemd_fsck_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_fsck_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libudev.la \
        $(DBUS_LIBS)
 
@@ -995,14 +1005,14 @@ systemd_timestamp_SOURCES = \
        src/timestamp.c
 
 systemd_timestamp_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_ac_power_SOURCES = \
        src/ac-power.c
 
 systemd_ac_power_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libudev.la
 
 # ------------------------------------------------------------------------------
@@ -1010,7 +1020,7 @@ systemd_detect_virt_SOURCES = \
        src/detect-virt.c
 
 systemd_detect_virt_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
@@ -1018,14 +1028,14 @@ systemd_getty_generator_SOURCES = \
        src/unit-name.c
 
 systemd_getty_generator_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
        src/rc-local-generator.c
 
 systemd_rc_local_generator_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 # ------------------------------------------------------------------------------
 systemd_remount_api_vfs_SOURCES = \
@@ -1033,7 +1043,7 @@ systemd_remount_api_vfs_SOURCES = \
        src/mount-setup.c
 
 systemd_remount_api_vfs_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_cgroups_agent_SOURCES = \
@@ -1045,7 +1055,7 @@ systemd_cgroups_agent_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_cgroups_agent_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        $(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1065,7 +1075,7 @@ systemctl_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemctl_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-daemon.la \
        libsystemd-journal.la \
        libsystemd-id128.la \
@@ -1077,7 +1087,7 @@ systemd_notify_SOURCES = \
        src/readahead/sd-readahead.c
 
 systemd_notify_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la
 
 # ------------------------------------------------------------------------------
@@ -1086,14 +1096,14 @@ systemd_ask_password_SOURCES = \
        src/ask-password-api.c
 
 systemd_ask_password_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 # ------------------------------------------------------------------------------
 systemd_reply_password_SOURCES = \
        src/reply-password.c
 
 systemd_reply_password_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
@@ -1101,14 +1111,14 @@ systemd_cgls_SOURCES = \
        src/cgroup-show.c
 
 systemd_cgls_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 # ------------------------------------------------------------------------------
 systemd_cgtop_SOURCES = \
        src/cgtop.c
 
 systemd_cgtop_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 # ------------------------------------------------------------------------------
 systemd_nspawn_SOURCES = \
@@ -1116,7 +1126,7 @@ systemd_nspawn_SOURCES = \
        src/loopback-setup.c
 
 systemd_nspawn_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-capability.la \
        libsystemd-daemon.la
 
@@ -1125,7 +1135,7 @@ systemd_stdio_bridge_SOURCES = \
        src/bridge.c
 
 systemd_stdio_bridge_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
@@ -1134,7 +1144,7 @@ systemd_tty_ask_password_agent_SOURCES = \
        src/utmp-wtmp.c
 
 systemd_tty_ask_password_agent_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 # ------------------------------------------------------------------------------
 libsystemd_daemon_la_SOURCES = \
@@ -1146,6 +1156,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
@@ -1265,19 +1276,25 @@ libudev_private_la_SOURCES =\
        src/udev/libudev-device-private.c \
        src/udev/libudev-queue-private.c
 
-libudev_private_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default
-
 if HAVE_SELINUX
 libudev_private_la_SOURCES +=\
        src/udev/libudev-selinux-private.c
+endif
+
+libudev_private_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SELINUX_CFLAGS)
+       -fvisibility=default
 
 libudev_private_la_LIBADD = \
        $(SELINUX_LIBS)
-endif
 
 # ------------------------------------------------------------------------------
+MANPAGES += \
+       man/udev.7 \
+       man/udevadm.8 \
+       man/udevd.8
+
 udev-confdirs:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
        -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices
@@ -1367,8 +1384,8 @@ libudev_core_la_CFLAGS = \
 
 libudev_core_la_LIBADD = \
        libudev-private.la \
-       libsystemd-basic.la \
        libsystemd-daemon.la \
+       libsystemd-shared-selinux.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
@@ -1404,7 +1421,8 @@ udevadm_SOURCES = \
        src/udev/udevadm-test-builtin.c
 
 udevadm_LDADD = \
-       libudev-core.la
+       libudev-core.la \
+       libsystemd-shared-selinux.la
 
 # ------------------------------------------------------------------------------
 TESTS = \
@@ -1427,7 +1445,7 @@ test_udev_SOURCES = \
 test_udev_LDADD = \
        libudev-core.la \
        libudev-private.la \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 test_udev_DEPENDENCIES = \
        src/udev/test/sys
@@ -1451,7 +1469,7 @@ ata_id_SOURCES = \
 
 ata_id_LDADD = \
        libudev-private.la \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
        ata_id
@@ -1462,7 +1480,7 @@ cdrom_id_SOURCES = \
 
 cdrom_id_LDADD = \
        libudev.la \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
        cdrom_id
@@ -1489,7 +1507,7 @@ scsi_id_SOURCES =\
 
 scsi_id_LDADD = \
        libudev-private.la \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
        scsi_id
@@ -1516,7 +1534,7 @@ accelerometer_SOURCES = \
 
 accelerometer_LDADD = \
        libudev.la -lm \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
        accelerometer
@@ -1594,6 +1612,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_.*'
@@ -1833,18 +1852,19 @@ 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
 
 libsystemd_id128_la_LIBADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 test_id128_SOURCES = \
        src/test-id128.c
 
 test_id128_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-id128.la
 
 noinst_PROGRAMS += \
@@ -1897,7 +1917,7 @@ nodist_systemd_journald_SOURCES = \
 systemd_journald_CFLAGS =
 
 systemd_journald_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
        libsystemd-login.la \
@@ -1924,7 +1944,7 @@ systemd_cat_SOURCES = \
        src/journal/cat.c
 
 systemd_cat_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-journal.la
 
 journalctl_SOURCES = \
@@ -1932,7 +1952,7 @@ journalctl_SOURCES = \
        src/logs-show.c
 
 journalctl_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-journal.la \
        libsystemd-id128.la
 
@@ -1954,7 +1974,7 @@ test_journal_SOURCES = \
        src/journal/journal-send.c
 
 test_journal_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-id128.la
 
 if HAVE_XZ
@@ -1973,7 +1993,7 @@ test_journal_send_SOURCES = \
        src/journal/test-journal-send.c
 
 test_journal_send_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-journal.la
 
 libsystemd_journal_la_SOURCES = \
@@ -1987,12 +2007,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-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-id128.la
 
 if HAVE_XZ
@@ -2028,7 +2049,7 @@ UNINSTALL_EXEC_HOOKS += \
 
 noinst_PROGRAMS += \
        test-journal \
-        test-journal-send
+       test-journal-send
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
@@ -2094,9 +2115,9 @@ systemd_coredump_SOURCES = \
        src/journal/coredump.c
 
 systemd_coredump_LDADD = \
-       libsystemd-basic.la \
        libsystemd-journal.la \
-       libsystemd-login.la
+       libsystemd-login.la \
+       libsystemd-shared-selinux.la
 
 rootlibexec_PROGRAMS += \
        systemd-coredump
@@ -2117,7 +2138,7 @@ systemd_binfmt_SOURCES = \
        src/binfmt/binfmt.c
 
 systemd_binfmt_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-binfmt
@@ -2156,7 +2177,7 @@ systemd_vconsole_setup_SOURCES = \
        src/vconsole/vconsole-setup.c
 
 systemd_vconsole_setup_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-vconsole-setup
@@ -2188,7 +2209,7 @@ systemd_readahead_collect_SOURCES = \
        src/readahead/readahead-common.c
 
 systemd_readahead_collect_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
        libudev.la
 
@@ -2197,7 +2218,7 @@ systemd_readahead_replay_SOURCES = \
        src/readahead/readahead-common.c
 
 systemd_readahead_replay_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
        libudev.la
 
@@ -2240,7 +2261,7 @@ systemd_quotacheck_SOURCES = \
        src/quotacheck.c
 
 systemd_quotacheck_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared.la
 endif
 
 # ------------------------------------------------------------------------------
@@ -2260,7 +2281,7 @@ systemd_random_seed_SOURCES = \
        src/random-seed.c
 
 systemd_random_seed_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 randomseed-install-data-hook:
        $(MKDIR_P) -m 0755 \
@@ -2297,16 +2318,16 @@ systemd_cryptsetup_CFLAGS = \
        $(LIBCRYPTSETUP_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
-       $(LIBCRYPTSETUP_LIBS) \
+       libsystemd-shared-selinux.la \
        libudev.la \
-       libsystemd-basic.la
+       $(LIBCRYPTSETUP_LIBS)
 
 systemd_cryptsetup_generator_SOURCES = \
        src/cryptsetup/cryptsetup-generator.c \
        src/unit-name.c
 
 systemd_cryptsetup_generator_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 cryptsetup-install-data-hook:
        $(MKDIR_P) -m 0755 \
@@ -2331,7 +2352,7 @@ systemd_hostnamed_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_hostnamed_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
@@ -2382,7 +2403,7 @@ systemd_localed_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_localed_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
@@ -2443,7 +2464,7 @@ systemd_timedated_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_timedated_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
@@ -2486,17 +2507,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
@@ -2506,7 +2533,7 @@ systemd_logind_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_logind_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
        libudev.la \
@@ -2524,7 +2551,7 @@ systemd_user_sessions_SOURCES = \
        src/login/user-sessions.c
 
 systemd_user_sessions_LDADD = \
-       libsystemd-basic.la
+       libsystemd-shared-selinux.la
 
 rootlibexec_PROGRAMS += \
        systemd-logind \
@@ -2541,7 +2568,7 @@ loginctl_CFLAGS = \
        $(DBUS_CFLAGS)
 
 loginctl_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libudev.la \
        $(DBUS_LIBS)
 
@@ -2552,8 +2579,8 @@ test_login_SOURCES = \
        src/login/test-login.c
 
 test_login_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-login.la
+       libsystemd-login.la \
+       libsystemd-shared-selinux.la
 
 noinst_PROGRAMS += \
        test-login
@@ -2566,12 +2593,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-basic.la
+       libsystemd-shared-selinux.la
 
 if HAVE_PAM
 pam_systemd_la_SOURCES = \
@@ -2585,6 +2613,7 @@ pam_systemd_la_CFLAGS = \
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -module \
        -export-dynamic \
        -avoid-version \
@@ -2592,8 +2621,9 @@ pam_systemd_la_LDFLAGS = \
        -export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
-       libsystemd-basic.la \
        libsystemd-daemon.la \
+       libsystemd-audit.la \
+       libsystemd-shared-selinux.la \
        $(PAM_LIBS) \
        $(DBUS_LIBS)
 
@@ -2664,16 +2694,14 @@ systemd_multi_seat_x_SOURCES = \
        src/login/multi-seat-x.c
 
 systemd_multi_seat_x_LDADD = \
-       libsystemd-basic.la \
+       libsystemd-shared-selinux.la \
        libudev.la
 
 rootlibexec_PROGRAMS += \
        systemd-multi-seat-x
 
 dist_udevrules_DATA += \
-       src/login/70-uaccess.rules
-
-dist_udevrules_DATA += \
+       src/login/70-uaccess.rules \
        src/login/71-seat.rules
 
 nodist_udevrules_DATA += \
@@ -2733,12 +2761,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