chiark / gitweb /
do not install drop-in files; the shared library should be used by default
[elogind.git] / Makefile.am
index 119967fcd364a71aecd81c0375bd135ddf38671d..4c2d165302198742435fab95308b8a6cd02cdf62 100644 (file)
@@ -69,6 +69,8 @@ INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 INSTALL_DATA_HOOKS =
 pkginclude_HEADERS =
+lib_LTLIBRARIES =
+pkgconfiglib_DATA =
 polkitpolicy_in_files =
 
 AM_CPPFLAGS = \
@@ -94,7 +96,9 @@ AM_CPPFLAGS = \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-       -I $(top_srcdir)/src
+       -I $(top_srcdir)/src \
+       -I $(top_srcdir)/src/readahead \
+       -I $(top_srcdir)/src/login
 
 if TARGET_GENTOO
 AM_CPPFLAGS += \
@@ -132,16 +136,16 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/usr/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_MAGEIA
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
-if TARGET_MAGEIA
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+       -DDEFAULT_FONT=\"latarcyrheb-sun16\"
 endif
 endif
 endif
@@ -184,11 +188,7 @@ rootlibexec_PROGRAMS = \
        systemd-modules-load \
        systemd-remount-api-vfs \
        systemd-kmsg-syslogd \
-       systemd-vconsole-setup \
        systemd-reply-password \
-       systemd-readahead-collect \
-       systemd-readahead-replay \
-       systemd-user-sessions \
        systemd-fsck \
        systemd-quotacheck \
        systemd-timestamp \
@@ -207,9 +207,6 @@ systemgenerator_PROGRAMS += \
        systemd-cryptsetup-generator
 endif
 
-lib_LTLIBRARIES = \
-       libsystemd-daemon.la
-
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
@@ -314,7 +311,6 @@ dist_systemunit_DATA = \
        units/sound.target \
        units/bluetooth.target \
        units/smartcard.target \
-       units/systemd-readahead-done.timer \
        units/systemd-tmpfiles-clean.timer \
        units/quotaon.service \
        units/systemd-ask-password-wall.path \
@@ -335,18 +331,13 @@ nodist_systemunit_DATA = \
        units/systemd-shutdownd.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
-       units/systemd-vconsole-setup.service \
        units/systemd-remount-api-vfs.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
        units/systemd-random-seed-save.service \
        units/systemd-random-seed-load.service \
-       units/systemd-readahead-collect.service \
-       units/systemd-readahead-replay.service \
-       units/systemd-readahead-done.service \
        units/systemd-tmpfiles-setup.service \
        units/systemd-tmpfiles-clean.service \
-       units/systemd-user-sessions.service \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
@@ -377,18 +368,13 @@ EXTRA_DIST += \
        units/systemd-shutdownd.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
-       units/systemd-vconsole-setup.service.in \
        units/systemd-remount-api-vfs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
        units/systemd-random-seed-save.service.in \
        units/systemd-random-seed-load.service.in \
-       units/systemd-readahead-collect.service.in \
-       units/systemd-readahead-replay.service.in \
-       units/systemd-readahead-done.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in \
-       units/systemd-user-sessions.service.in \
        units/systemd-ask-password-wall.service.in \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
@@ -402,8 +388,6 @@ EXTRA_DIST += \
        units/quotacheck.service.in \
        units/user@.service.in \
        systemd.pc.in \
-       libsystemd-daemon.pc.in \
-       src/libsystemd-daemon.sym \
        introspect.awk \
        src/73-seat-late.rules.in \
        src/99-systemd.rules.in \
@@ -471,18 +455,11 @@ endif
 dist_doc_DATA = \
        README \
        LICENSE \
-       DISTRO_PORTING \
-       src/sd-daemon.h \
-       src/sd-daemon.c \
-       src/sd-readahead.h \
-       src/sd-readahead.c
+       DISTRO_PORTING
 
 pkgconfigdata_DATA = \
        systemd.pc
 
-pkgconfiglib_DATA = \
-       libsystemd-daemon.pc
-
 # First passed through sed, followed by intltool
 polkitpolicy_in_in_files = \
        src/org.freedesktop.systemd1.policy.in.in
@@ -617,7 +594,6 @@ EXTRA_DIST += \
        src/linux/auto_dev-ioctl.h \
        src/linux/fanotify.h \
        src/initreq.h \
-       src/sd-readahead.h \
        src/special.h \
        src/dbus-common.h \
        src/bus-errors.h \
@@ -625,7 +601,6 @@ EXTRA_DIST += \
        src/build.h \
        src/shutdownd.h \
        src/umount.h \
-       src/readahead-common.h \
        src/ask-password-api.h \
        src/pager.h \
        src/sysfs-show.h \
@@ -642,11 +617,6 @@ MANPAGES = \
        man/systemd-nspawn.1 \
        man/systemd-tmpfiles.8 \
        man/systemd-notify.1 \
-       man/sd_notify.3 \
-       man/sd_readahead.3 \
-       man/sd_booted.3 \
-       man/sd_listen_fds.3 \
-       man/sd_is_fifo.3 \
        man/systemd.unit.5 \
        man/systemd.service.5 \
        man/systemd.socket.5 \
@@ -660,8 +630,6 @@ MANPAGES = \
        man/systemd.snapshot.5 \
        man/systemd.exec.5 \
        man/daemon.7 \
-       man/sd-daemon.7 \
-       man/sd-readahead.7 \
        man/runlevel.8 \
        man/telinit.8 \
        man/halt.8 \
@@ -672,57 +640,21 @@ MANPAGES = \
        man/hostname.5 \
        man/timezone.5 \
        man/machine-id.5 \
-       man/vconsole.conf.5 \
        man/locale.conf.5 \
        man/os-release.5 \
        man/machine-info.5 \
        man/modules-load.d.5 \
        man/sysctl.d.5 \
-       man/systemd-ask-password.1 \
-       man/sd_pid_get_session.3 \
-       man/sd_uid_get_state.3 \
-       man/sd_session_is_active.3 \
-       man/sd_seat_get_active.3 \
-       man/sd_get_seats.3
+       man/systemd-ask-password.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
        man/poweroff.8 \
-       man/sd_is_socket.3 \
-       man/sd_is_socket_unix.3 \
-       man/sd_is_socket_inet.3 \
-       man/sd_is_mq.3 \
-       man/sd_notifyf.3 \
-       man/init.1 \
-       man/sd_session_get_uid.3 \
-       man/sd_session_get_seat.3 \
-       man/sd_pid_get_owner_uid.3 \
-       man/sd_uid_is_on_seat.3 \
-       man/sd_uid_get_sessions.3 \
-       man/sd_uid_get_seats.3 \
-       man/sd_seat_get_sessions.3 \
-       man/sd_seat_can_multi_session.3 \
-       man/sd_get_sessions.3 \
-       man/sd_get_uids.3
+       man/init.1
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
-man/sd_is_socket.3: man/sd_is_fifo.3
-man/sd_is_socket_unix.3: man/sd_is_fifo.3
-man/sd_is_socket_inet.3: man/sd_is_fifo.3
-man/sd_is_mq.3: man/sd_is_fifo.3
-man/sd_notifyf.3: man/sd_notify.3
 man/init.1: man/systemd.1
-man/sd_session_get_uid.3: man/sd_session_is_active.3
-man/sd_session_get_seat.3: man/sd_session_is_active.3
-man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
-man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
-man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
-man/sd_uid_get_seats.3: man/sd_uid_get_state.3
-man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
-man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
-man/sd_get_sessions.3: man/sd_get_seats.3
-man/sd_get_uids.3: man/sd_get_seats.3
 
 dist_man_MANS = \
        $(MANPAGES) \
@@ -803,18 +735,12 @@ test_cgroup_SOURCES = \
        src/test-cgroup.c \
        src/cgroup-util.c
 
-test_cgroup_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_cgroup_LDADD = \
        libsystemd-basic.la
 
 test_env_replace_SOURCES = \
        src/test-env-replace.c
 
-test_env_replace_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_env_replace_LDADD = \
        libsystemd-basic.la
 
@@ -822,9 +748,6 @@ test_strv_SOURCES = \
        src/test-strv.c \
        src/specifier.c
 
-test_strv_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_strv_LDADD = \
        libsystemd-basic.la
 
@@ -881,9 +804,6 @@ systemd_update_utmp_LDADD = \
 systemd_random_seed_SOURCES = \
        src/random-seed.c
 
-systemd_random_seed_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_random_seed_LDADD = \
        libsystemd-basic.la
 
@@ -920,18 +840,12 @@ systemd_shutdown_LDADD = \
 systemd_modules_load_SOURCES = \
        src/modules-load.c
 
-systemd_modules_load_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_modules_load_LDADD = \
        libsystemd-basic.la
 
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles.c
 
-systemd_tmpfiles_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_tmpfiles_LDADD = \
        libsystemd-basic.la
 
@@ -940,18 +854,12 @@ systemd_machine_id_setup_SOURCES = \
        src/machine-id-main.c \
        src/sd-id128.c
 
-systemd_machine_id_setup_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_machine_id_setup_LDADD = \
        libsystemd-basic.la
 
 systemd_sysctl_SOURCES = \
        src/sysctl.c
 
-systemd_sysctl_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_sysctl_LDADD = \
        libsystemd-basic.la
 
@@ -972,18 +880,12 @@ systemd_fsck_LDADD = \
 systemd_quotacheck_SOURCES = \
        src/quotacheck.c
 
-systemd_quotacheck_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_quotacheck_LDADD = \
        libsystemd-basic.la
 
 systemd_timestamp_SOURCES = \
        src/timestamp.c
 
-systemd_timestamp_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_timestamp_LDADD = \
        libsystemd-basic.la
 
@@ -1001,9 +903,6 @@ systemd_ac_power_LDADD = \
 systemd_detect_virt_SOURCES = \
        src/detect-virt.c
 
-systemd_detect_virt_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_detect_virt_LDADD = \
        libsystemd-basic.la
 
@@ -1012,9 +911,9 @@ systemd_cryptsetup_SOURCES = \
        src/ask-password-api.c
 
 systemd_cryptsetup_CFLAGS = \
+       $(AM_CFLAGS) \
        $(LIBCRYPTSETUP_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(AM_CFLAGS)
+       $(UDEV_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
        $(LIBCRYPTSETUP_LIBS) \
@@ -1025,9 +924,6 @@ systemd_cryptsetup_generator_SOURCES = \
        src/cryptsetup-generator.c \
        src/unit-name.c
 
-systemd_cryptsetup_generator_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_cryptsetup_generator_LDADD = \
        libsystemd-basic.la
 
@@ -1035,48 +931,20 @@ systemd_getty_generator_SOURCES = \
        src/getty-generator.c \
        src/unit-name.c
 
-systemd_getty_generator_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_getty_generator_LDADD = \
        libsystemd-basic.la
 
 systemd_rc_local_generator_SOURCES = \
        src/rc-local-generator.c
 
-systemd_rc_local_generator_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_rc_local_generator_LDADD = \
        libsystemd-basic.la
 
-systemd_user_sessions_SOURCES = \
-       src/user-sessions.c \
-       src/cgroup-util.c
-
-systemd_user_sessions_CFLAGS = \
-       $(AM_CFLAGS)
-
-systemd_user_sessions_LDADD = \
-       libsystemd-basic.la
-
-systemd_vconsole_setup_SOURCES = \
-       src/vconsole-setup.c
-
-systemd_vconsole_setup_CFLAGS = \
-       $(AM_CFLAGS)
-
-systemd_vconsole_setup_LDADD = \
-       libsystemd-basic.la
-
 systemd_remount_api_vfs_SOURCES = \
        src/remount-api-vfs.c \
        src/mount-setup.c \
        src/exit-status.c
 
-systemd_remount_api_vfs_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_remount_api_vfs_LDADD = \
        libsystemd-basic.la
 
@@ -1096,9 +964,6 @@ systemd_kmsg_syslogd_SOURCES = \
        src/kmsg-syslogd.c \
        src/fdset.c
 
-systemd_kmsg_syslogd_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_kmsg_syslogd_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
@@ -1127,7 +992,7 @@ systemctl_LDADD = \
 
 systemd_notify_SOURCES = \
        src/notify.c \
-       src/sd-readahead.c
+       src/readahead/sd-readahead.c
 
 systemd_notify_LDADD = \
        libsystemd-basic.la \
@@ -1146,39 +1011,12 @@ systemd_reply_password_SOURCES = \
 systemd_reply_password_LDADD = \
        libsystemd-basic.la
 
-systemd_readahead_collect_SOURCES = \
-       src/readahead-collect.c \
-       src/readahead-common.c
-
-systemd_readahead_collect_CFLAGS = \
-       $(UDEV_CFLAGS)
-
-systemd_readahead_collect_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(UDEV_LIBS)
-
-systemd_readahead_replay_SOURCES = \
-       src/readahead-replay.c \
-       src/readahead-common.c
-
-systemd_readahead_replay_CFLAGS = \
-       $(UDEV_CFLAGS)
-
-systemd_readahead_replay_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(UDEV_LIBS)
-
 systemd_cgls_SOURCES = \
        src/cgls.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
        src/pager.c
 
-systemd_cgls_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_cgls_LDADD = \
        libsystemd-basic.la
 
@@ -1187,9 +1025,6 @@ systemd_nspawn_SOURCES = \
        src/cgroup-util.c \
        src/loopback-setup.c
 
-systemd_nspawn_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_nspawn_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
@@ -1239,12 +1074,7 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
        --pkg=gtk+-2.0 \
        --pkg=linux \
        --pkg=gio-unix-2.0 \
-       --pkg=libnotify
-if LIBNOTIFY07
-systemd_gnome_ask_password_agent_VALAFLAGS += \
-       -D LIBNOTIFY07
-endif
-systemd_gnome_ask_password_agent_VALAFLAGS += \
+       --pkg=libnotify \
        -g
 
 systemd_gnome_ask_password_agent_LDADD = \
@@ -1295,8 +1125,35 @@ libsystemd-daemon-uninstall-hook:
 UNINSTALL_EXEC_HOOKS += \
        libsystemd-daemon-uninstall-hook
 
+lib_LTLIBRARIES += \
+       libsystemd-daemon.la
+
+pkgconfiglib_DATA += \
+       libsystemd-daemon.pc
+
+MANPAGES += \
+       man/sd-daemon.7 \
+       man/sd_notify.3 \
+       man/sd_listen_fds.3 \
+       man/sd_is_fifo.3 \
+       man/sd_booted.3
+
+MANPAGES_ALIAS += \
+       man/sd_is_socket.3 \
+       man/sd_is_socket_unix.3 \
+       man/sd_is_socket_inet.3 \
+       man/sd_is_mq.3 \
+       man/sd_notifyf.3
+
+man/sd_is_socket.3: man/sd_is_fifo.3
+man/sd_is_socket_unix.3: man/sd_is_fifo.3
+man/sd_is_socket_inet.3: man/sd_is_fifo.3
+man/sd_is_mq.3: man/sd_is_fifo.3
+man/sd_notifyf.3: man/sd_notify.3
+
 EXTRA_DIST += \
-       ${libsystemd_daemon_la_SOURCES:.c=.h}
+       libsystemd-daemon.pc.in \
+       src/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
 libsystemd_id128_la_SOURCES = \
@@ -1318,9 +1175,6 @@ test_id128_SOURCES = \
        src/test-id128.c \
        src/sd-id128.c
 
-test_id128_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_id128_LDADD = \
        libsystemd-basic.la
 
@@ -1396,16 +1250,13 @@ systemd_journalctl_SOURCES = \
        src/sd-id128.c \
        src/pager.c
 
-systemd_journalctl_CFLAGS = \
-       $(AM_CFLAGS)
-
 systemd_journalctl_LDADD = \
        libsystemd-basic.la
 
 if HAVE_XZ
 systemd_journalctl_SOURCES += \
        src/journal/compress.c
-systemd_journalctl_CFLAGS += \
+systemd_journalctl_CFLAGS = \
        $(XZ_CFLAGS)
 systemd_journalctl_LDADD += \
        $(XZ_LIBS)
@@ -1555,6 +1406,87 @@ EXTRA_DIST += \
        units/systemd-binfmt.service.in
 endif
 
+# ------------------------------------------------------------------------------
+if ENABLE_VCONSOLE
+systemd_vconsole_setup_SOURCES = \
+       src/vconsole/vconsole-setup.c
+
+systemd_vconsole_setup_LDADD = \
+       libsystemd-basic.la
+
+rootlibexec_PROGRAMS += \
+       systemd-vconsole-setup
+
+nodist_systemunit_DATA += \
+       units/systemd-vconsole-setup.service
+
+vconsole-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f systemd-vconsole-setup.service && \
+               $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service )
+
+INSTALL_DATA_HOOKS += \
+       vconsole-install-data-hook
+
+MANPAGES += \
+       man/vconsole.conf.5
+
+EXTRA_DIST += \
+       units/systemd-vconsole-setup.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_READAHEAD
+systemd_readahead_collect_SOURCES = \
+       src/readahead/readahead-collect.c \
+       src/readahead/readahead-common.c
+
+systemd_readahead_collect_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(UDEV_LIBS)
+
+systemd_readahead_collect_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS)
+
+systemd_readahead_replay_SOURCES = \
+       src/readahead/readahead-replay.c \
+       src/readahead/readahead-common.c
+
+systemd_readahead_replay_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS)
+
+systemd_readahead_replay_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(UDEV_LIBS)
+
+rootlibexec_PROGRAMS += \
+       systemd-readahead-collect \
+       systemd-readahead-replay
+
+dist_systemunit_DATA += \
+       units/systemd-readahead-done.timer
+
+nodist_systemunit_DATA += \
+       units/systemd-readahead-collect.service \
+       units/systemd-readahead-replay.service \
+       units/systemd-readahead-done.service
+
+EXTRA_DIST += \
+       src/readahead/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
+
+MANPAGES += \
+       man/sd_readahead.3 \
+       man/sd-readahead.7
+endif
+
 # ------------------------------------------------------------------------------
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
@@ -1734,10 +1666,6 @@ systemd_logind_SOURCES += \
        src/acl-util.c
 endif
 
-systemd_logind_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -I $(top_srcdir)/src/login
-
 systemd_logind_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
@@ -1751,8 +1679,16 @@ systemd_logind_LDADD = \
        $(UDEV_LIBS) \
        $(ACL_LIBS)
 
+systemd_user_sessions_SOURCES = \
+       src/login/user-sessions.c \
+       src/cgroup-util.c
+
+systemd_user_sessions_LDADD = \
+       libsystemd-basic.la
+
 rootlibexec_PROGRAMS += \
-       systemd-logind
+       systemd-logind \
+       systemd-user-sessions
 
 systemd_loginctl_SOURCES = \
        src/login/loginctl.c \
@@ -1803,7 +1739,7 @@ libsystemd_login_la_LIBADD = \
 
 if HAVE_PAM
 pam_systemd_la_SOURCES = \
-       src/pam-module.c \
+       src/login/pam-module.c \
        src/dbus-common.c
 
 pam_systemd_la_CFLAGS = \
@@ -1849,7 +1785,8 @@ UNINSTALL_EXEC_HOOKS += \
        libsystemd-login-uninstall-hook
 
 nodist_systemunit_DATA += \
-       units/systemd-logind.service
+       units/systemd-logind.service \
+       units/systemd-user-sessions.service
 
 dist_dbussystemservice_DATA += \
        src/login/org.freedesktop.login1.service
@@ -1877,8 +1814,9 @@ logind-install-data-hook:
                rm -f dbus-org.freedesktop.login1.service && \
                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f systemd-logind.service && \
-               $(LN_S) ../systemd-logind.service systemd-logind.service )
+               rm -f systemd-logind.service systemd-user-sessions.service && \
+               $(LN_S) ../systemd-logind.service systemd-logind.service && \
+               $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
 
 INSTALL_DATA_HOOKS += \
        logind-install-data-hook
@@ -1914,21 +1852,47 @@ MANPAGES += \
        man/systemd-logind.conf.5 \
        man/sd-login.7 \
        man/systemd-loginctl.1 \
-       man/sd_login_monitor_new.3
+       man/sd_login_monitor_new.3 \
+       man/sd_pid_get_session.3 \
+       man/sd_uid_get_state.3 \
+       man/sd_session_is_active.3 \
+       man/sd_seat_get_active.3 \
+       man/sd_get_seats.3
 
 MANPAGES_ALIAS += \
        man/sd_login_monitor_unref.3 \
        man/sd_login_monitor_flush.3 \
-       man/sd_login_monitor_get_fd.3
+       man/sd_login_monitor_get_fd.3 \
+       man/sd_session_get_uid.3 \
+       man/sd_session_get_seat.3 \
+       man/sd_pid_get_owner_uid.3 \
+       man/sd_uid_is_on_seat.3 \
+       man/sd_uid_get_sessions.3 \
+       man/sd_uid_get_seats.3 \
+       man/sd_seat_get_sessions.3 \
+       man/sd_seat_can_multi_session.3 \
+       man/sd_get_sessions.3 \
+       man/sd_get_uids.3
 
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
+man/sd_session_get_uid.3: man/sd_session_is_active.3
+man/sd_session_get_seat.3: man/sd_session_is_active.3
+man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
+man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
+man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
+man/sd_uid_get_seats.3: man/sd_uid_get_state.3
+man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
+man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
+man/sd_get_sessions.3: man/sd_get_seats.3
+man/sd_get_uids.3: man/sd_get_seats.3
 
 EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        units/systemd-logind.service.in \
-        src/login/libsystemd-login.pc.in \
+       units/systemd-user-sessions.service.in \
+       src/login/libsystemd-login.pc.in \
        src/login/libsystemd-login.sym \
        src/login/logind.h \
        src/login/logind-device.h \
@@ -2195,9 +2159,8 @@ systemd-install-data-hook:
                $(LN_S) reboot.target ctrl-alt-del.target && \
                $(LN_S) getty@.service autovt@.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
+               rm -f getty.target systemd-ask-password-wall.path && \
                $(LN_S) ../getty.target getty.target && \
-               $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
                $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path)
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
                rm -f getty@tty1.service && \
@@ -2212,7 +2175,6 @@ systemd-install-data-hook:
                        sys-kernel-debug.mount \
                        sys-kernel-security.mount \
                        sys-fs-fuse-connections.mount \
-                       systemd-vconsole-setup.service \
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
                        systemd-tmpfiles-setup.service \
@@ -2226,7 +2188,6 @@ systemd-install-data-hook:
                $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
                $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \
                $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
-               $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
                $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \