chiark / gitweb /
man: document sd_journal_get_cursor()
[elogind.git] / Makefile.am
index ca676e5..50b2a9f 100644 (file)
@@ -24,28 +24,28 @@ AM_MAKEFLAGS = --no-print-directory
 SUBDIRS = . po
 
 LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
 LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=4
-LIBSYSTEMD_LOGIN_AGE=2
+LIBSYSTEMD_LOGIN_CURRENT=3
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=2
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=5
+LIBSYSTEMD_ID128_REVISION=6
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=1
-LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=1
+LIBSYSTEMD_JOURNAL_CURRENT=2
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=2
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -96,6 +96,7 @@ dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_man_MANS =
 dist_pkgsysconf_DATA =
+dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dbusinterface_DATA =
 dist_dbussystemservice_DATA =
@@ -172,12 +173,6 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
-if TARGET_MEEGO
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-else
 if TARGET_ANGSTROM
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
@@ -200,7 +195,6 @@ endif
 endif
 endif
 endif
-endif
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
@@ -307,9 +301,8 @@ dist_systemunit_DATA = \
        units/systemd-ask-password-wall.path \
        units/systemd-ask-password-console.path \
        units/syslog.target \
-       units/systemd-udev-control.socket \
-       units/systemd-udev-kernel.socket \
-       units/systemd-timedated-ntp.target  \
+       units/systemd-udevd-control.socket \
+       units/systemd-udevd-kernel.socket \
        units/system-update.target
 
 nodist_systemunit_DATA = \
@@ -328,28 +321,28 @@ nodist_systemunit_DATA = \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
-       units/halt.service \
        units/emergency.service \
-       units/hibernate.service \
-       units/poweroff.service \
-       units/reboot.service \
-       units/kexec.service \
-       units/fsck@.service \
-       units/fsck-root.service \
        units/rescue.service \
-       units/suspend.service \
        units/user@.service \
-       units/systemd-udev.service \
+       units/systemd-hibernate.service \
+       units/systemd-suspend.service \
+       units/systemd-halt.service \
+       units/systemd-poweroff.service \
+       units/systemd-reboot.service \
+       units/systemd-kexec.service \
+       units/systemd-fsck@.service \
+       units/systemd-fsck-root.service \
+       units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
-       units/systemd-debug-shell.service
+       units/debug-shell.service
 
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
 
 nodist_userunit_DATA = \
-       units/user/exit.service
+       units/user/systemd-exit.service
 
 EXTRA_DIST += \
        units/getty@.service.m4 \
@@ -369,20 +362,20 @@ EXTRA_DIST += \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
        units/emergency.service.in \
-       units/halt.service.in \
-       units/poweroff.service.in \
-       units/reboot.service.in \
-       units/kexec.service.in \
-       units/user/exit.service.in \
-       units/fsck@.service.in \
-       units/fsck-root.service.in \
+       units/systemd-halt.service.in \
+       units/systemd-poweroff.service.in \
+       units/systemd-reboot.service.in \
+       units/systemd-kexec.service.in \
+       units/user/systemd-exit.service.in \
+       units/systemd-fsck@.service.in \
+       units/systemd-fsck-root.service.in \
        units/user@.service.in \
-       units/systemd-udev.service \
+       units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
-       units/systemd-debug-shell.service.in \
-       units/hibernate.service.in \
-       units/suspend.service.in \
+       units/debug-shell.service.in \
+       units/systemd-hibernate.service.in \
+       units/systemd-suspend.service.in \
        introspect.awk \
        man/custom-html.xsl
 
@@ -487,7 +480,33 @@ MANPAGES = \
        man/journald.conf.5 \
        man/systemd-journald.service.8 \
        man/journalctl.1 \
-       man/systemd-inhibit.1
+       man/systemd-inhibit.1 \
+       man/systemd-remount-fs.service.8 \
+       man/systemd-update-utmp-runlevel.service.8 \
+       man/systemd-initctl.service.8 \
+       man/systemd-shutdownd.service.8 \
+       man/systemd-suspend.service.8 \
+       man/systemd-halt.service.8 \
+       man/systemd-fsck@.service.8 \
+       man/systemd-ask-password-console.service.8 \
+       man/systemd-analyze.1 \
+       man/systemd-tty-ask-password-agent.1 \
+       man/systemd-getty-generator.8 \
+       man/systemd-system-update-generator.8 \
+       man/systemd-fstab-generator.8 \
+       man/systemd.preset.5 \
+       man/sd-id128.3 \
+       man/sd_id128_to_string.3 \
+       man/sd_id128_randomize.3 \
+       man/sd-journal.3 \
+       man/sd_journal_print.3 \
+       man/sd_journal_stream_fd.3 \
+       man/sd_journal_open.3 \
+       man/sd_journal_next.3 \
+       man/sd_journal_get_data.3 \
+       man/sd_journal_get_realtime_usec.3 \
+       man/sd_journal_get_cutoff_realtime_usec.3 \
+       man/sd_journal_get_cursor.3
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -495,14 +514,102 @@ MANPAGES_ALIAS = \
        man/init.1 \
        man/systemd-modules-load.8 \
        man/systemd-sysctl.8 \
-       man/systemd-journald.8
+       man/systemd-journald.socket.8 \
+       man/systemd-journald.8 \
+       man/systemd-remount-fs.8 \
+       man/systemd-update-utmp-shutdown.service.8 \
+       man/systemd-update-utmp.8 \
+       man/systemd-initctl.socket.8 \
+       man/systemd-initctl.8 \
+       man/systemd-shutdownd.socket.8 \
+       man/systemd-shutdownd.8 \
+       man/systemd-hibernate.service.8 \
+       man/systemd-sleep.8 \
+       man/systemd-shutdown.8 \
+       man/systemd-poweroff.service.8 \
+       man/systemd-reboot.service.8 \
+       man/systemd-kexec.service.8 \
+       man/systemd-fsck-root.service.8 \
+       man/systemd-ask-password-console.path.8 \
+       man/systemd-ask-password-wall.service.8 \
+       man/systemd-ask-password-wall.path.8 \
+       man/systemd-tmpfiles-setup.service.8 \
+       man/systemd-tmpfiles-clean.service.8 \
+       man/systemd-tmpfiles-clean.timer.8 \
+       man/sd_id128_t.3 \
+       man/SD_ID128_MAKE.3 \
+       man/SD_ID128_FORMAT_STR.3 \
+       man/SD_ID128_FORMAT_VAL.3 \
+       man/sd_id128_equal.3 \
+       man/sd_id128_from_string.3 \
+       man/sd_id128_get_machine.3 \
+       man/sd_id128_get_boot.3 \
+       man/sd_journal_printv.3 \
+       man/sd_journal_send.3 \
+       man/sd_journal_sendv.3 \
+       man/sd_journal_open_directory.3 \
+       man/sd_journal_close.3 \
+       man/sd_journal_previous.3 \
+       man/sd_journal_next_skip.3 \
+       man/sd_journal_previous_skip.3 \
+       man/SD_JOURNAL_FOREACH.3 \
+       man/SD_JOURNAL_FOREACH_BACKWARDS.3 \
+       man/sd_journal_enumerate_data.3 \
+       man/sd_journal_restart_data.3 \
+       man/SD_JOURNAL_FOREACH_DATA.3 \
+       man/sd_journal_get_monotonic_usec.3 \
+       man/sd_journal_get_cutoff_monotonic_usec.3
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
 man/systemd-modules-load.8: man/systemd-modules-load.service.8
 man/systemd-sysctl.8: man/systemd-sysctl.service.8
+man/systemd-journald.socket.8: man/systemd-journald.service.8
 man/systemd-journald.8: man/systemd-journald.service.8
+man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
+man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-initctl.socket.8: man/systemd-initctl.service.8
+man/systemd-initctl.8: man/systemd-initctl.service.8
+man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8
+man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
+man/systemd-hibernate.service.8: man/systemd-suspend.service.8
+man/systemd-sleep.8: man/systemd-suspend.service.8
+man/systemd-shutdown.8: man/systemd-halt.service.8
+man/systemd-poweroff.service.8: man/systemd-halt.service.8
+man/systemd-reboot.service.8: man/systemd-halt.service.8
+man/systemd-kexec.service.8: man/systemd-halt.service.8
+man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
+man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
+man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
+man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
+man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
+man/sd_id128_t.3: man/sd-id128.3
+man/SD_ID128_MAKE.3: man/sd-id128.3
+man/SD_ID128_FORMAT_STR.3: man/sd-id128.3
+man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3
+man/sd_id128_equal.3: man/sd-id128.3
+man/sd_id128_from_string.3: man/sd_id128_to_string.3
+man/sd_id128_get_machine.3: man/sd_id128_randomize.3
+man/sd_id128_get_boot.3: man/sd_id128_randomize.3
+man/sd_journal_printv.3: man/sd_journal_print.3
+man/sd_journal_send.3: man/sd_journal_print.3
+man/sd_journal_sendv.3: man/sd_journal_print.3
+man/sd_journal_open_directory.3: man/sd_journal_open.3
+man/sd_journal_close.3: man/sd_journal_open.3
+man/sd_journal_previous.3: man/sd_journal_next.3
+man/sd_journal_next_skip.3: man/sd_journal_next.3
+man/sd_journal_previous_skip.3: man/sd_journal_next.3
+man/SD_JOURNAL_FOREACH.3: man/sd_journal_next.3
+man/SD_JOURNAL_FOREACH_BACKWARDS.3: man/sd_journal_next.3
+man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3
+man/sd_journal_restart_data.3: man/sd_journal_get_data.3
+man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3
+man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3
+man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -649,8 +756,9 @@ libsystemd_logs_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libsystemd_logs_la_LIBADD = \
-       libsystemd-journal.la \
-       libsystemd-id128.la
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -799,7 +907,9 @@ libsystemd_core_la_SOURCES = \
        src/core/build.h \
        src/core/sysfs-show.h \
        src/core/switch-root.h \
-       src/core/switch-root.c
+       src/core/switch-root.c \
+       src/core/killall.h \
+       src/core/killall.c
 
 nodist_libsystemd_core_la_SOURCES = \
        src/core/load-fragment-gperf.c \
@@ -849,7 +959,7 @@ systemd_CFLAGS = \
 systemd_LDADD = \
        libsystemd-core.la \
        libsystemd-daemon.la \
-       libsystemd-id128.la \
+       libsystemd-id128-internal.la \
        libsystemd-dbus.la
 
 dist_pkgsysconf_DATA += \
@@ -895,6 +1005,9 @@ EXTRA_DIST += \
        src/core/systemd.pc.in \
        src/core/macros.systemd.in
 
+CLEANFILES += \
+       src/core/macros.systemd
+
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
        test-engine \
@@ -913,7 +1026,8 @@ noinst_PROGRAMS += \
 TESTS += \
        test-job-type \
        test-env-replace \
-       test-strv
+       test-strv \
+       test-unit-name
 
 test_engine_SOURCES = \
        src/test/test-engine.c
@@ -1052,7 +1166,9 @@ systemd_shutdown_SOURCES = \
        src/core/umount.h \
        src/core/shutdown.c \
        src/core/mount-setup.c \
-       src/core/mount-setup.h
+       src/core/mount-setup.h \
+       src/core/killall.h \
+       src/core/killall.c
 
 systemd_shutdown_LDADD = \
        libsystemd-label.la \
@@ -1088,7 +1204,7 @@ systemd_machine_id_setup_SOURCES = \
 systemd_machine_id_setup_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
-       libsystemd-id128.la
+       libsystemd-id128-internal.la
 
 # ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
@@ -1213,8 +1329,8 @@ systemctl_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-journal.la \
-       libsystemd-id128.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la \
        libsystemd-dbus.la \
        libsystemd-logs.la
 
@@ -1329,7 +1445,7 @@ pkgconfiglib_DATA += \
        src/libsystemd-daemon/libsystemd-daemon.pc
 
 MANPAGES += \
-       man/sd-daemon.7 \
+       man/sd-daemon.3 \
        man/sd_notify.3 \
        man/sd_listen_fds.3 \
        man/sd_is_fifo.3 \
@@ -1474,21 +1590,21 @@ CLEANFILES += \
        src/udev/udev.pc
 
 EXTRA_DIST += \
-       units/systemd-udev.service.in \
+       units/systemd-udevd.service.in \
        units/systemd-udev-trigger.service.in \
        units/systemd-udev-settle.service.in
 
 CLEANFILES += \
-       units/systemd-udev.service \
+       units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service
 
 systemd-install-hook:
        mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
-       ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
-       ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
+       ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
+       ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
        mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-       ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service
+       ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
        ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
@@ -2035,12 +2151,15 @@ libsystemd_id128_la_LDFLAGS = \
 libsystemd_id128_la_LIBADD = \
        libsystemd-shared.la
 
+libsystemd_id128_internal_la_SOURCES = \
+       $(libsystemd_id128_la_SOURCES)
+
 test_id128_SOURCES = \
        src/test/test-id128.c
 
 test_id128_LDADD = \
        libsystemd-shared.la \
-       libsystemd-id128.la
+       libsystemd-id128-internal.la
 
 noinst_PROGRAMS += \
        test-id128
@@ -2054,6 +2173,9 @@ pkginclude_HEADERS += \
 lib_LTLIBRARIES += \
        libsystemd-id128.la
 
+noinst_LTLIBRARIES += \
+       libsystemd-id128-internal.la
+
 pkgconfiglib_DATA += \
        src/libsystemd-id128/libsystemd-id128.pc
 
@@ -2106,11 +2228,11 @@ systemd_journald_LDADD = \
        libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
-       libsystemd-id128.la
+       libsystemd-id128-internal.la
 
 if ENABLE_LOGIND
 systemd_journald_LDADD += \
-       libsystemd-login.la
+       libsystemd-login-internal.la
 endif
 
 if HAVE_ACL
@@ -2135,47 +2257,48 @@ systemd_cat_SOURCES = \
 
 systemd_cat_LDADD = \
        libsystemd-shared.la \
-       libsystemd-journal.la
+       libsystemd-journal-internal.la
 
 journalctl_SOURCES = \
        src/journal/journalctl.c
 
 journalctl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-journal.la \
-       libsystemd-id128.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la \
        libsystemd-logs.la
 
 test_journal_SOURCES = \
-       src/journal/test-journal.c \
-       src/journal/sd-journal.c \
-       src/journal/journal-file.c \
-       src/journal/lookup3.c \
-       src/journal/journal-send.c
+       src/journal/test-journal.c
 
 test_journal_LDADD = \
-       libsystemd-label.la \
        libsystemd-shared.la \
-       libsystemd-id128.la
-
-if HAVE_XZ
-test_journal_SOURCES += \
-       src/journal/compress.c
-
-test_journal_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(XZ_CFLAGS)
-
-test_journal_LDADD += \
-       $(XZ_LIBS)
-endif
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
 
 test_journal_send_SOURCES = \
        src/journal/test-journal-send.c
 
 test_journal_send_LDADD = \
        libsystemd-shared.la \
-       libsystemd-journal.la
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
+
+test_journal_match_SOURCES = \
+       src/journal/test-journal-match.c
+
+test_journal_match_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
+
+test_journal_stream_SOURCES = \
+       src/journal/test-journal-stream.c
+
+test_journal_stream_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
 
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
@@ -2195,7 +2318,10 @@ libsystemd_journal_la_LDFLAGS = \
 
 libsystemd_journal_la_LIBADD = \
        libsystemd-shared.la \
-       libsystemd-id128.la
+       libsystemd-id128-internal.la
+
+libsystemd_journal_internal_la_SOURCES = \
+       $(libsystemd_journal_la_SOURCES)
 
 if HAVE_XZ
 libsystemd_journal_la_SOURCES += \
@@ -2207,6 +2333,14 @@ libsystemd_journal_la_CFLAGS += \
 
 libsystemd_journal_la_LIBADD += \
        $(XZ_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS = \
+       $(AM_CFLAGS)
+       $(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD = \
+       $(XZ_LIBS)
+
 endif
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
@@ -2230,7 +2364,14 @@ UNINSTALL_EXEC_HOOKS += \
 
 noinst_PROGRAMS += \
        test-journal \
-       test-journal-send
+       test-journal-send \
+       test-journal-match \
+       test-journal-stream
+
+TESTS += \
+       test-journal
+       test-journal-match \
+       test-journal-stream
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
@@ -2239,6 +2380,9 @@ pkginclude_HEADERS += \
 lib_LTLIBRARIES += \
        libsystemd-journal.la
 
+noinst_LTLIBRARIES += \
+       libsystemd-journal-internal.la
+
 rootlibexec_PROGRAMS += \
        systemd-journald
 
@@ -2252,7 +2396,8 @@ dist_systemunit_DATA += \
        units/systemd-journald.socket
 
 nodist_systemunit_DATA += \
-       units/systemd-journald.service
+       units/systemd-journald.service \
+       units/systemd-journal-flush.service
 
 dist_pkgsysconf_DATA += \
        src/journal/journald.conf
@@ -2278,6 +2423,7 @@ EXTRA_DIST += \
        src/journal/libsystemd-journal.pc.in \
        src/journal/libsystemd-journal.sym \
        units/systemd-journald.service.in \
+       units/systemd-journal-flush.service.in \
        src/journal/journald-gperf.gperf
 
 CLEANFILES += \
@@ -2289,13 +2435,13 @@ systemd_coredump_SOURCES = \
        src/journal/coredump.c
 
 systemd_coredump_LDADD = \
-       libsystemd-journal.la \
+       libsystemd-journal-internal.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
 if ENABLE_LOGIND
 systemd_coredump_LDADD += \
-       libsystemd-login.la
+       libsystemd-login-internal.la
 endif
 
 rootlibexec_PROGRAMS += \
@@ -2430,7 +2576,20 @@ EXTRA_DIST += \
 
 MANPAGES += \
        man/sd_readahead.3 \
-       man/sd-readahead.7
+       man/sd-readahead.3 \
+       man/systemd-readahead-replay.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-readahead-collect.service.8 \
+       man/systemd-readahead-done.service.8 \
+       man/systemd-readahead-done.timer.8 \
+       man/systemd-readahead.8
+
+man/systemd-readahead-collect.service.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead-done.service.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead-done.timer.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead.8: man/systemd-readahead-replay.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2439,16 +2598,25 @@ rootlibexec_PROGRAMS += \
        systemd-quotacheck
 
 nodist_systemunit_DATA += \
-       units/quotacheck.service
+       units/systemd-quotacheck.service
 
 EXTRA_DIST += \
-       units/quotacheck.service.in
+       units/systemd-quotacheck.service.in
 
 systemd_quotacheck_SOURCES = \
        src/quotacheck/quotacheck.c
 
 systemd_quotacheck_LDADD = \
        libsystemd-shared.la
+
+MANPAGES += \
+       man/systemd-quotacheck.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-quotacheck.8
+
+man/systemd-quotacheck.8: man/systemd-quotacheck.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2537,6 +2705,17 @@ cryptsetup-install-data-hook:
 
 INSTALL_DATA_HOOKS += \
        cryptsetup-install-data-hook
+
+MANPAGES += \
+       man/systemd-cryptsetup@.service.8 \
+       man/systemd-cryptsetup-generator.8 \
+       man/crypttab.5
+
+MANPAGES_ALIAS += \
+       man/systemd-cryptsetup.8
+
+man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2584,6 +2763,14 @@ hostnamed-install-data-hook:
 INSTALL_DATA_HOOKS += \
        hostnamed-install-data-hook
 
+MANPAGES += \
+       man/systemd-hostnamed.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-hostnamed.8
+
+man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+
 EXTRA_DIST += \
        units/systemd-hostnamed.service.in
 endif
@@ -2634,10 +2821,18 @@ localed-install-data-hook:
 INSTALL_DATA_HOOKS += \
        localed-install-data-hook
 
+MANPAGES += \
+       man/systemd-localed.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-localed.8
+
+man/systemd-localed.8: man/systemd-localed.service.8
+
 EXTRA_DIST += \
        units/systemd-localed.service.in
 
-dist_pkgdata_DATA = \
+dist_pkgdata_DATA += \
        src/locale/kbd-model-map
 
 dist_noinst_SCRIPT = \
@@ -2693,6 +2888,14 @@ timedated-install-data-hook:
 INSTALL_DATA_HOOKS += \
        timedated-install-data-hook
 
+MANPAGES += \
+       man/systemd-timedated.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-timedated.8
+
+man/systemd-timedated.8: man/systemd-timedated.service.8
+
 EXTRA_DIST += \
        units/systemd-timedated.service.in
 endif
@@ -2787,7 +2990,7 @@ test_login_SOURCES = \
        src/login/test-login.c
 
 test_login_LDADD = \
-       libsystemd-login.la \
+       libsystemd-login-internal.la \
        libsystemd-shared.la
 
 test_inhibit_SOURCES = \
@@ -2821,6 +3024,9 @@ libsystemd_login_la_LDFLAGS = \
 libsystemd_login_la_LIBADD = \
        libsystemd-shared.la
 
+libsystemd_login_internal_la_SOURCES = \
+       $(libsystemd_login_la_SOURCES)
+
 if HAVE_PAM
 pam_systemd_la_SOURCES = \
        src/login/pam-module.c
@@ -2888,6 +3094,9 @@ pkginclude_HEADERS += \
 lib_LTLIBRARIES += \
        libsystemd-login.la
 
+noinst_LTLIBRARIES += \
+       libsystemd-login-internal.la
+
 pkgconfiglib_DATA += \
        src/login/libsystemd-login.pc
 
@@ -2931,14 +3140,15 @@ nodist_udevrules_DATA += \
 MANPAGES += \
        man/systemd-logind.service.8 \
        man/logind.conf.5 \
-       man/sd-login.7 \
+       man/sd-login.3 \
        man/loginctl.1 \
        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
+       man/sd_get_seats.3 \
+       man/systemd-user-sessions.service.8
 
 MANPAGES_ALIAS += \
        man/systemd-logind.8 \
@@ -2959,7 +3169,8 @@ MANPAGES_ALIAS += \
        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_get_uids.3 \
+       man/systemd-user-sessions.8
 
 man/systemd-logind.8: man/systemd-logind.service.8
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
@@ -2980,6 +3191,7 @@ 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
+man/systemd-user-sessions.8: man/systemd-user-sessions.service.8
 
 EXTRA_DIST += \
        src/login/logind-gperf.gperf \
@@ -3189,10 +3401,10 @@ systemd-install-data-hook:
                $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f systemd-remount-fs.service \
-                       fsck-root.service \
+                       systemd-fsck-root.service \
                        tmp.mount && \
                $(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
-               $(LN_S) ../fsck-root.service fsck-root.service && \
+               $(LN_S) ../systemd-fsck-root.service systemd-fsck-root.service && \
                $(LN_S) ../tmp.mount tmp.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
                rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
@@ -3250,29 +3462,12 @@ systemd-install-data-hook:
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if TARGET_MEEGO
-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f network.target && \
-               $(LN_S) $(systemunitdir)/network.target network.target )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-               rm -f * )
-endif
 
 if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service single.service && \
                $(LN_S) prefdm.service display-manager.service && \
                $(LN_S) rescue.service single.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_MANDRIVA
@@ -3281,9 +3476,6 @@ if TARGET_MANDRIVA
                $(LN_S) prefdm.service display-manager.service && \
                $(LN_S) prefdm.service dm.service && \
                $(LN_S) rescue.service single.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_DEBIAN_OR_UBUNTU
@@ -3303,9 +3495,6 @@ if TARGET_MAGEIA
                rm -f display-manager.service && \
                $(LN_S) prefdm.service display-manager.service && \
                $(LN_S) prefdm.service dm.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)