man: don't advertise sd-daemon as embeddable anymore

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 61d678f7d20bd143c2aad89cf6a287fcc127955b..d93b05a5e6264c8956f94189a8f5966f2b7a4868 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ LIBSYSTEMD_LOGIN_REVISION=2
 LIBSYSTEMD_LOGIN_AGE=9
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=10
+LIBSYSTEMD_DAEMON_REVISION=11
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
@@ -56,7 +56,7 @@ LIBSYSTEMD_ID128_REVISION=27
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=3
+LIBSYSTEMD_JOURNAL_REVISION=4
 LIBSYSTEMD_JOURNAL_AGE=11
 
 LIBSYSTEMD_CURRENT=0
@@ -348,9 +348,11 @@ systemgenerator_PROGRAMS = \
        systemd-system-update-generator
 
 dist_bashcompletion_DATA = \
+       shell-completion/bash/busctl \
        shell-completion/bash/journalctl \
        shell-completion/bash/systemctl \
        shell-completion/bash/systemd-analyze \
+       shell-completion/bash/systemd-delta \
        shell-completion/bash/systemd-run \
        shell-completion/bash/udevadm \
        shell-completion/bash/kernel-install
@@ -770,12 +772,6 @@ nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
        src/shared/errno-to-name.h
 
-if HAVE_SECCOMP
-libsystemd_shared_la_SOURCES += \
-       src/shared/seccomp-util.h \
-       src/shared/seccomp-util.c
-endif
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-units.la
@@ -815,6 +811,26 @@ libsystemd_label_la_CFLAGS = \
 libsystemd_label_la_LIBADD = \
        $(SELINUX_LIBS)
 
+# ------------------------------------------------------------------------------
+
+if HAVE_SECCOMP
+
+noinst_LTLIBRARIES += \
+       libsystemd-seccomp.la
+
+libsystemd_seccomp_la_SOURCES = \
+       src/shared/seccomp-util.h \
+       src/shared/seccomp-util.c
+
+libsystemd_seccomp_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
+libsystemd_seccomp_la_LIBADD = \
+       $(SECCOMP_LIBS)
+
+endif
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-logs.la
@@ -998,6 +1014,7 @@ libsystemd_core_la_CFLAGS = \
        $(LIBWRAP_CFLAGS) \
        $(PAM_CFLAGS) \
        $(AUDIT_CFLAGS) \
+       $(CAP_CFLAGS) \
        $(KMOD_CFLAGS) \
        $(SECCOMP_CFLAGS) \
        -pthread
@@ -1006,7 +1023,6 @@ libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
        libudev-internal.la \
        libsystemd-shared.la \
        libsystemd-internal.la \
@@ -1014,8 +1030,13 @@ libsystemd_core_la_LIBADD = \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
        $(CAP_LIBS) \
-       $(SECCOMP_LIBS) \
-       $(KMOD_LIBS)
+       $(KMOD_LIBS) \
+       $(SECCOMP_LIBS)
+
+if HAVE_SECCOMP
+libsystemd_core_la_LIBADD += \
+       libsystemd-seccomp.la
+endif
 
 src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
        $(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1321,7 +1342,7 @@ test_daemon_SOURCES = \
        src/test/test-daemon.c
 
 test_daemon_LDADD = \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 test_cgroup_SOURCES = \
@@ -1347,7 +1368,7 @@ test_cgroup_util_SOURCES = \
 
 test_cgroup_util_LDADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 test_env_replace_SOURCES = \
@@ -1452,7 +1473,6 @@ systemd_analyze_SOURCES = \
 
 systemd_analyze_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1461,7 +1481,6 @@ systemd_initctl_SOURCES = \
 
 systemd_initctl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1474,7 +1493,6 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        $(AUDIT_LIBS)
 
@@ -1484,7 +1502,7 @@ systemd_shutdownd_SOURCES = \
 
 systemd_shutdownd_LDADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 dist_doc_DATA += \
@@ -1625,7 +1643,6 @@ systemd_fsck_SOURCES = \
 
 systemd_fsck_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
 
@@ -1704,8 +1721,7 @@ bootctl_SOURCES = \
 
 bootctl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-internal.la \
-       libsystemd-daemon-internal.la
+       libsystemd-internal.la
 
 bin_PROGRAMS += \
        bootctl
@@ -1749,6 +1765,7 @@ systemd_dbus1_generator_LDADD = \
        libsystemd-internal.la
 
 dbus1-generator-install-hook:
+       $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
        $(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
 
 dbus1-generator-uninstall-hook:
@@ -1782,7 +1799,6 @@ systemd_cgroups_agent_SOURCES = \
 
 systemd_cgroups_agent_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1795,7 +1811,6 @@ systemctl_LDADD = \
        libsystemd-internal.la \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1804,7 +1819,7 @@ systemd_notify_SOURCES = \
        src/readahead/sd-readahead.c
 
 systemd_notify_LDADD = \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1844,13 +1859,18 @@ systemd_nspawn_SOURCES = \
        src/core/loopback-setup.c \
        src/core/loopback-setup.h
 
+systemd_nspawn_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 systemd_nspawn_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libudev-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-seccomp.la \
+       $(SECCOMP_LIBS)
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -1860,7 +1880,6 @@ systemd_run_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1869,10 +1888,10 @@ systemd_bus_proxyd_SOURCES = \
 
 systemd_bus_proxyd_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bus-proxyd-install-hook:
+       $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
        $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
 
 bus-proxyd-uninstall-hook:
@@ -1905,57 +1924,7 @@ systemd_tty_ask_password_agent_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-libsystemd_daemon_la_SOURCES = \
-       src/libsystemd-daemon/libsystemd-daemon.sym \
-       src/libsystemd-daemon/sd-daemon.c
-
-libsystemd_daemon_internal_la_SOURCES = \
-       $(libsystemd_daemon_la_SOURCES)
-
-libsystemd_daemon_internal_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -DSD_DAEMON_DISABLE_MQ
-
-libsystemd_daemon_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden \
-       -DSD_EXPORT_SYMBOLS
-
-libsystemd_daemon_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
-
-libsystemd_daemon_la_LIBADD =  \
-       $(RT_LIBS)
-
-pkginclude_HEADERS += \
-       src/systemd/sd-daemon.h
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-daemon-install-hook:
-       libname=libsystemd-daemon.so && $(move-to-rootlibdir)
-
-libsystemd-daemon-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-daemon-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook
-
-lib_LTLIBRARIES += \
-       libsystemd-daemon.la
-
-noinst_LTLIBRARIES += \
-       libsystemd-daemon-internal.la
-
-pkgconfiglib_DATA += \
-       src/libsystemd-daemon/libsystemd-daemon.pc
-
-EXTRA_DIST += \
-       src/libsystemd-daemon/libsystemd-daemon.pc.in
-
-# ------------------------------------------------------------------------------
-libsystemd_la_SOURCES = \
+libsystemd_internal_la_SOURCES = \
        src/libsystemd/libsystemd.sym \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
@@ -1967,6 +1936,7 @@ libsystemd_la_SOURCES = \
        src/systemd/sd-resolve.h \
        src/systemd/sd-login.h \
        src/systemd/sd-id128.h \
+       src/systemd/sd-daemon.h \
        src/libsystemd/sd-bus/sd-bus.c \
        src/libsystemd/sd-bus/bus-control.c \
        src/libsystemd/sd-bus/bus-control.h \
@@ -2015,33 +1985,31 @@ libsystemd_la_SOURCES = \
        src/libsystemd/sd-resolve/sd-resolve.c \
        src/libsystemd/sd-resolve/resolve-util.h \
        src/libsystemd/sd-id128/sd-id128.c \
+       src/libsystemd/sd-daemon/sd-daemon.c \
        src/login/sd-login.c \
        src/login/login-shared.c \
        src/login/login-shared.h
 
-nodist_libsystemd_la_SOURCES = \
+nodist_libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-bus/bus-error-mapping.c
 
-libsystemd_la_LIBADD = \
-       libsystemd-daemon-internal.la \
-       libsystemd-shared.la \
-       -lresolv
-
-libsystemd_la_CFLAGS = \
+libsystemd_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
        -pthread
 
-libsystemd_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
+noinst_LTLIBRARIES += \
+       libsystemd-internal.la
 
-pkgconfiglib_DATA += \
-       src/libsystemd/libsystemd.pc
+libsystemd_dump_la_SOURCES = \
+       src/libsystemd/sd-bus/bus-dump.c \
+       src/libsystemd/sd-bus/bus-dump.h
 
-pkginclude_HEADERS += \
-       src/systemd/sd-login.h \
-       src/systemd/sd-id128.h
+libsystemd_dump_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(CAP_CFLAGS)
+
+noinst_LTLIBRARIES += \
+       libsystemd-dump.la
 
 EXTRA_DIST += \
        src/libsystemd/sd-bus/bus-error-mapping.gperf \
@@ -2052,31 +2020,49 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/libsystemd/sd-bus/bus-error-mapping.c
 
-lib_LTLIBRARIES += \
-       libsystemd.la
+libsystemd_la_SOURCES = \
+       $(libsystemd_internal_la_SOURCES) \
+       $(libsystemd_journal_internal_la_SOURCES)
 
-libsystemd_internal_la_SOURCES = \
-       $(libsystemd_la_SOURCES)
+nodist_libsystemd_la_SOURCES = \
+       $(nodist_libsystemd_internal_la_SOURCES)
 
-nodist_libsystemd_internal_la_SOURCES = \
-       $(nodist_libsystemd_la_SOURCES)
+libsystemd_la_CFLAGS = \
+       $(libsystemd_internal_la_CFLAGS)
 
-libsystemd_internal_la_CFLAGS = \
-       $(libsystemd_la_CFLAGS)
+libsystemd_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
 
-noinst_LTLIBRARIES += \
-       libsystemd-internal.la
+libsystemd_la_LIBADD = \
+       libsystemd-shared.la \
+       $(libsystemd_journal_internal_la_LIBADD) \
+       $(RT_LIBS) \
+       -lresolv
 
-libsystemd_dump_la_SOURCES = \
-       src/libsystemd/sd-bus/bus-dump.c \
-       src/libsystemd/sd-bus/bus-dump.h
+pkgconfiglib_DATA += \
+       src/libsystemd/libsystemd.pc
 
-libsystemd_dump_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
+pkginclude_HEADERS += \
+       src/systemd/sd-login.h \
+       src/systemd/sd-id128.h \
+       src/systemd/sd-daemon.h
 
-noinst_LTLIBRARIES += \
-       libsystemd-dump.la
+if ENABLE_KDBUS
+pkginclude_HEADERS += \
+       src/systemd/sd-bus.h \
+       src/systemd/sd-bus-protocol.h \
+       src/systemd/sd-bus-vtable.h \
+       src/systemd/sd-memfd.h \
+       src/systemd/sd-utf8.h \
+       src/systemd/sd-event.h \
+       src/systemd/sd-rtnl.h \
+       src/systemd/sd-resolve.h
+endif
+
+lib_LTLIBRARIES += \
+       libsystemd.la
 
 tests += \
        test-bus-marshal \
@@ -2107,7 +2093,6 @@ test_bus_marshal_SOURCES = \
 
 test_bus_marshal_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2137,7 +2122,6 @@ test_bus_chat_CFLAGS = \
 
 test_bus_chat_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_cleanup_SOURCES = \
@@ -2145,7 +2129,6 @@ test_bus_cleanup_SOURCES = \
 
 test_bus_cleanup_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_server_SOURCES = \
@@ -2157,7 +2140,6 @@ test_bus_server_CFLAGS = \
 
 test_bus_server_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_objects_SOURCES = \
@@ -2170,7 +2152,6 @@ test_bus_objects_CFLAGS = \
 
 test_bus_objects_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2181,7 +2162,6 @@ test_bus_error_SOURCES = \
 
 test_bus_error_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_gvariant_SOURCES = \
@@ -2189,7 +2169,6 @@ test_bus_gvariant_SOURCES = \
 
 test_bus_gvariant_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2206,7 +2185,6 @@ test_bus_creds_SOURCES = \
 
 test_bus_creds_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la
@@ -2216,7 +2194,6 @@ test_bus_match_SOURCES = \
 
 test_bus_match_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_kernel_SOURCES = \
@@ -2224,7 +2201,6 @@ test_bus_kernel_SOURCES = \
 
 test_bus_kernel_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2239,7 +2215,6 @@ test_bus_kernel_bloom_SOURCES = \
 
 test_bus_kernel_bloom_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_kernel_benchmark_SOURCES = \
@@ -2247,7 +2222,6 @@ test_bus_kernel_benchmark_SOURCES = \
 
 test_bus_kernel_benchmark_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_memfd_SOURCES = \
@@ -2262,7 +2236,6 @@ test_bus_zero_copy_SOURCES = \
 
 test_bus_zero_copy_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2284,7 +2257,6 @@ test_event_SOURCES = \
 
 test_event_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_rtnl_SOURCES = \
@@ -2292,7 +2264,6 @@ test_rtnl_SOURCES = \
 
 test_rtnl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_resolve_SOURCES = \
@@ -2313,7 +2284,6 @@ busctl_SOURCES = \
 
 busctl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2361,7 +2331,6 @@ test_dhcp_client_SOURCES = \
 test_dhcp_client_LDADD = \
        libsystemd-dhcp.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 tests += \
@@ -2407,7 +2376,7 @@ libudev_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
 
 libudev_la_LIBADD = \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 pkgconfiglib_DATA += \
@@ -2590,7 +2559,6 @@ libudev_core_la_CFLAGS = \
 libudev_core_la_LIBADD = \
        libudev-internal.la \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
@@ -2968,7 +2936,6 @@ test_id128_SOURCES = \
 
 test_id128_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 tests += \
@@ -2984,7 +2951,7 @@ systemd_activate_SOURCES = \
 
 systemd_activate_LDADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -3109,68 +3076,6 @@ test_catalog_CPPFLAGS = \
 test_catalog_LDADD = \
        libsystemd-journal-core.la
 
-libsystemd_journal_la_SOURCES = \
-       src/journal/libsystemd-journal.sym \
-       src/journal/sd-journal.c \
-       src/systemd/sd-journal.h \
-       src/systemd/_sd-common.h \
-       src/journal/journal-file.c \
-       src/journal/journal-file.h \
-       src/journal/journal-vacuum.c \
-       src/journal/journal-vacuum.h \
-       src/journal/journal-verify.c \
-       src/journal/journal-verify.h \
-       src/journal/lookup3.c \
-       src/journal/lookup3.h \
-       src/journal/journal-send.c \
-       src/journal/journal-def.h \
-       src/journal/compress.h \
-       src/journal/catalog.c \
-       src/journal/catalog.h \
-       src/journal/mmap-cache.c \
-       src/journal/mmap-cache.h
-
-libsystemd_journal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden
-
-libsystemd_journal_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -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-label.la \
-       libsystemd-daemon-internal.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la
-
-libsystemd_journal_internal_la_SOURCES = \
-       $(libsystemd_journal_la_SOURCES)
-
-# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS = \
-       $(AM_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD =
-
-if HAVE_XZ
-libsystemd_journal_la_SOURCES += \
-       src/journal/compress.c
-
-libsystemd_journal_la_CFLAGS += \
-       $(XZ_CFLAGS)
-
-libsystemd_journal_la_LIBADD += \
-       $(XZ_LIBS)
-
-libsystemd_journal_internal_la_CFLAGS += \
-       $(XZ_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD += \
-       $(XZ_LIBS)
-endif
-
 libsystemd_journal_core_la_SOURCES = \
        src/journal/journald-kmsg.c \
        src/journal/journald-kmsg.h \
@@ -3196,7 +3101,6 @@ libsystemd_journal_core_la_LIBADD = \
        libudev-internal.la \
        libsystemd-capability.la \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -3208,45 +3112,6 @@ endif
 noinst_LTLIBRARIES += \
        libsystemd-journal-core.la
 
-if HAVE_GCRYPT
-libsystemd_journal_la_SOURCES += \
-       src/journal/journal-authenticate.c \
-       src/journal/journal-authenticate.h \
-       src/journal/fsprg.c \
-       src/journal/fsprg.h
-
-libsystemd_journal_la_CFLAGS += \
-       $(GCRYPT_CFLAGS) \
-       -Wno-pointer-arith
-
-libsystemd_journal_la_LIBADD += \
-       $(GCRYPT_LIBS)
-
-libsystemd_journal_internal_la_CFLAGS += \
-       $(GCRYPT_CFLAGS) \
-       -Wno-pointer-arith
-
-libsystemd_journal_internal_la_LIBADD += \
-       $(GCRYPT_LIBS)
-endif
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if
-# needed. Also, grant read access to new journal files to members of
-# "adm" and "wheel".
-libsystemd-journal-install-hook:
-       libname=libsystemd-journal.so && $(move-to-rootlibdir)
-       -$(MKDIR_P) $(DESTDIR)/var/log/journal
-       -chown 0:0 $(DESTDIR)/var/log/journal
-       -chmod 755 $(DESTDIR)/var/log/journal
-       -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
-       -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
-
-libsystemd-journal-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-journal-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-journal-uninstall-hook
-
 # ------------------------------------------------------------------------------
 
 # Update catalog on installation. Do not bother if installing
@@ -3284,8 +3149,57 @@ pkginclude_HEADERS += \
        src/systemd/sd-messages.h \
        src/systemd/_sd-common.h
 
-lib_LTLIBRARIES += \
-       libsystemd-journal.la
+libsystemd_journal_internal_la_SOURCES = \
+       src/journal/sd-journal.c \
+       src/systemd/sd-journal.h \
+       src/systemd/_sd-common.h \
+       src/journal/journal-file.c \
+       src/journal/journal-file.h \
+       src/journal/journal-vacuum.c \
+       src/journal/journal-vacuum.h \
+       src/journal/journal-verify.c \
+       src/journal/journal-verify.h \
+       src/journal/lookup3.c \
+       src/journal/lookup3.h \
+       src/journal/journal-send.c \
+       src/journal/journal-def.h \
+       src/journal/compress.h \
+       src/journal/catalog.c \
+       src/journal/catalog.h \
+       src/journal/mmap-cache.c \
+       src/journal/mmap-cache.h
+
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
+libsystemd_journal_internal_la_CFLAGS =
+       $(AM_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD =
+
+if HAVE_XZ
+libsystemd_journal_internal_la_SOURCES += \
+       src/journal/compress.c
+
+libsystemd_journal_internal_la_CFLAGS += \
+       $(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD += \
+       $(XZ_LIBS)
+endif
+
+if HAVE_GCRYPT
+libsystemd_journal_internal_la_SOURCES += \
+       src/journal/journal-authenticate.c \
+       src/journal/journal-authenticate.h \
+       src/journal/fsprg.c \
+       src/journal/fsprg.h
+
+libsystemd_journal_internal_la_LIBADD += \
+       $(GCRYPT_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS += \
+       $(GCRYPT_CFLAGS) \
+       -Wno-pointer-arith
+endif
 
 noinst_LTLIBRARIES += \
        libsystemd-journal-internal.la
@@ -3309,9 +3223,6 @@ nodist_systemunit_DATA += \
 dist_pkgsysconf_DATA += \
        src/journal/journald.conf
 
-pkgconfiglib_DATA += \
-       src/journal/libsystemd-journal.pc
-
 dist_catalog_DATA = \
        catalog/systemd.fr.catalog \
        catalog/systemd.ru.catalog \
@@ -3325,7 +3236,6 @@ SYSINIT_TARGET_WANTS += \
        systemd-journal-flush.service
 
 EXTRA_DIST += \
-       src/journal/libsystemd-journal.pc.in \
        units/systemd-journald.service.in \
        units/systemd-journal-flush.service.in \
        src/journal/journald-gperf.gperf
@@ -3348,7 +3258,6 @@ systemd_journal_gatewayd_SOURCES = \
 systemd_journal_gatewayd_LDADD = \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
        $(MICROHTTPD_LIBS)
@@ -3384,7 +3293,6 @@ systemd_socket_proxyd_LDADD = \
        libsystemd-logs.la \
        libsystemd-internal.la \
        libsystemd-journal-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -3491,7 +3399,7 @@ systemd_readahead_SOURCES = \
        src/readahead/readahead-common.h
 
 systemd_readahead_LDADD = \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
 
@@ -3667,7 +3575,6 @@ systemd_hostnamed_SOURCES = \
 systemd_hostnamed_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3699,7 +3606,6 @@ hostnamectl_SOURCES = \
 
 hostnamectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3726,7 +3632,6 @@ systemd_bus_driverd_SOURCES = \
 
 systemd_bus_driverd_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3763,7 +3668,6 @@ systemd_localed_SOURCES = \
 systemd_localed_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 nodist_systemunit_DATA += \
@@ -3804,7 +3708,6 @@ localectl_SOURCES = \
 
 localectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3834,7 +3737,6 @@ systemd_timedated_SOURCES = \
 systemd_timedated_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3870,7 +3772,6 @@ timedatectl_SOURCES = \
 
 timedatectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3928,7 +3829,6 @@ libsystemd_machine_core_la_SOURCES = \
 
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
@@ -3941,12 +3841,14 @@ machinectl_SOURCES = \
 
 machinectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootbin_PROGRAMS += \
        machinectl
 
+dist_bashcompletion_DATA += \
+       shell-completion/bash/machinectl
+
 test_machine_tables_SOURCES = \
        src/machine/test-machine-tables.c
 
@@ -4003,7 +3905,6 @@ nodist_systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
        libudev-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libsystemd-dhcp.la \
        libsystemd-label.la \
@@ -4030,7 +3931,6 @@ test_network_LDADD = \
        libudev-internal.la \
        libsystemd-internal.la \
        libsystemd-dhcp.la \
-       libsystemd-daemon-internal.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
@@ -4086,7 +3986,6 @@ libsystemd_logind_core_la_SOURCES = \
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
@@ -4119,8 +4018,7 @@ loginctl_SOURCES = \
 loginctl_LDADD = \
        libsystemd-internal.la \
        libudev-internal.la \
-       libsystemd-shared.la \
-       libsystemd-daemon-internal.la
+       libsystemd-shared.la
 
 rootbin_PROGRAMS += \
        loginctl
@@ -4137,7 +4035,6 @@ systemd_inhibit_SOURCES = \
 
 systemd_inhibit_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootbin_PROGRAMS += \
@@ -4162,7 +4059,6 @@ test_inhibit_SOURCES = \
 
 test_inhibit_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_login_tables_SOURCES = \
@@ -4199,7 +4095,6 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        $(PAM_LIBS)
 
@@ -4306,7 +4201,7 @@ _journal_la_LDFLAGS = \
 
 _journal_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd-journal.la
+       libsystemd.la
 
 id128_la_SOURCES = \
        src/python-systemd/id128.c \
@@ -4349,7 +4244,7 @@ _daemon_la_LDFLAGS = \
 
 _daemon_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd-daemon.la
+       libsystemd.la
 
 _reader_la_SOURCES = \
        src/python-systemd/_reader.c \
@@ -4369,9 +4264,7 @@ _reader_la_LDFLAGS = \
 
 _reader_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd-journal.la \
        libsystemd.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 login_la_SOURCES = \
@@ -4392,9 +4285,7 @@ login_la_LDFLAGS = \
 
 login_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd-journal.la \
        libsystemd.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 dist_pkgpyexec_PYTHON = \
@@ -4447,6 +4338,24 @@ define generate-fake-lib
        $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/void new_\1(void);\n__asm__(".symver new_\1,\1@LIBSYSTEMD_209");\nstatic void (*resolve_\1(void)) (void) {\n\treturn new_\1;\n}\nvoid \1(void) __attribute__((ifunc("resolve_\1")));\nobsolete_lib(\1,$(notdir $(basename $<)));\n/p' <$< >$@
 endef
 
+libsystemd_journal_la_SOURCES = \
+       libsystemd-journal.c \
+       src/compat-libs/libsystemd-journal.sym
+
+libsystemd_journal_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=default \
+       -imacros $(top_srcdir)/src/compat-libs/linkwarning.h \
+       -fno-lto
+
+libsystemd_journal_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym
+
+libsystemd_journal_la_LIBADD = \
+       libsystemd.la
+
 libsystemd_login_la_SOURCES = \
        libsystemd-login.c \
        src/compat-libs/libsystemd-login.sym
@@ -4480,29 +4389,51 @@ libsystemd_id128_la_LDFLAGS = \
 libsystemd_id128_la_LIBADD = \
        libsystemd.la
 
+libsystemd_daemon_la_SOURCES = \
+       libsystemd-daemon.c \
+       src/compat-libs/libsystemd-daemon.sym
+
+libsystemd_daemon_la_CFLAGS = \
+       $(libsystemd_login_la_CFLAGS)
+
+libsystemd_daemon_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym
+
+libsystemd_daemon_la_LIBADD = \
+       libsystemd.la
+
 BUILT_SOURCES += \
+       libsystemd-journal.c \
        libsystemd-login.c \
-       libsystemd-id128.c
+       libsystemd-id128.c \
+       libsystemd-daemon.c
 
 libsystemd-%.c: src/compat-libs/libsystemd-%.sym
        $(generate-fake-lib)
 
 lib_LTLIBRARIES += \
+       libsystemd-journal.la \
        libsystemd-login.la \
-       libsystemd-id128.la
+       libsystemd-id128.la \
+       libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
        src/compat-libs/libsystemd-login.pc \
-       src/compat-libs/libsystemd-id128.pc
+       src/compat-libs/libsystemd-id128.pc \
+       src/compat-libs/libsystemd-daemon.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 compat-lib-install-hook:
        libname=libsystemd-login.so && $(move-to-rootlibdir)
        libname=libsystemd-id128.so && $(move-to-rootlibdir)
+       libname=libsystemd-daemon.so && $(move-to-rootlibdir)
 
 compat-lib-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
 
 INSTALL_EXEC_HOOKS += compat-lib-install-hook
 UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
@@ -4511,7 +4442,8 @@ endif
 
 EXTRA_DIST += \
        src/compat-libs/libsystemd-login.pc.in \
-       src/compat-libs/libsystemd-id128.pc.in
+       src/compat-libs/libsystemd-id128.pc.in \
+       src/compat-libs/libsystemd-daemon.pc.in
 
 # ------------------------------------------------------------------------------
 substitutions = \
@@ -4945,42 +4877,58 @@ define generate-sym-test
 endef
 
 test-libsystemd-sym.c: \
-       src/libsystemd/libsystemd.sym \
-       src/systemd/sd-bus.h \
-       src/systemd/sd-utf8.h \
-       src/systemd/sd-login.h
+               src/libsystemd/libsystemd.sym \
+               src/systemd/sd-journal.h \
+               src/systemd/sd-daemon.h \
+               src/systemd/sd-login.h \
+               src/systemd/sd-bus.h \
+               src/systemd/sd-utf8.h
+       $(generate-sym-test)
+
+test-libudev-sym.c: \
+               src/libudev/libudev.sym \
+               src/udev/udev.h
        $(generate-sym-test)
 
+test_libsystemd_sym_SOURCES = \
+       test-libsystemd-sym.c
+test_libsystemd_sym_LDADD = \
+       libsystemd.la
+
+test_libudev_sym_SOURCES = \
+       test-libudev-sym.c
+test_libudev_sym_LDADD = \
+       libudev.la
+
+BUILT_SOURCES += \
+       $(test_libsystemd_sym_SOURCES) \
+       $(test_libudev_sym_SOURCES)
+
+tests += \
+       test-libsystemd-sym \
+       test-libudev-sym
+
+if ENABLE_COMPAT_LIBS
 test-libsystemd-daemon-sym.c: \
-       src/libsystemd-daemon/libsystemd-daemon.sym \
-       src/systemd/sd-daemon.h
+               src/compat-libs/libsystemd-daemon.sym \
+               src/systemd/sd-daemon.h
        $(generate-sym-test)
 
 test-libsystemd-id128-sym.c: \
-       src/compat-libs/libsystemd-id128.sym \
-       src/systemd/sd-id128.h
+               src/compat-libs/libsystemd-id128.sym \
+               src/systemd/sd-id128.h
        $(generate-sym-test)
 
 test-libsystemd-journal-sym.c: \
-       src/journal/libsystemd-journal.sym \
-       src/systemd/sd-journal.h
+               src/compat-libs/libsystemd-journal.sym \
+               src/systemd/sd-journal.h
        $(generate-sym-test)
 
 test-libsystemd-login-sym.c: \
-       src/compat-libs/libsystemd-login.sym \
-       src/systemd/sd-login.h
+               src/compat-libs/libsystemd-login.sym \
+               src/systemd/sd-login.h
        $(generate-sym-test)
 
-test-libudev-sym.c: \
-       src/libudev/libudev.sym \
-       src/udev/udev.h
-       $(generate-sym-test)
-
-test_libsystemd_sym_SOURCES = \
-       test-libsystemd-sym.c
-test_libsystemd_sym_LDADD = \
-       libsystemd.la
-
 test_libsystemd_daemon_sym_SOURCES = \
        test-libsystemd-daemon-sym.c
 test_libsystemd_daemon_sym_LDADD = \
@@ -5001,31 +4949,17 @@ test_libsystemd_login_sym_SOURCES = \
 test_libsystemd_login_sym_LDADD = \
        libsystemd-login.la
 
-test_libudev_sym_SOURCES = \
-       test-libudev-sym.c
-test_libudev_sym_LDADD = \
-       libudev.la
-
 BUILT_SOURCES += \
-       $(test_libsystemd_sym_SOURCES) \
-       $(test_libsystemd_daemon_sym_SOURCES) \
        $(test_libsystemd_journal_sym_SOURCES) \
-       $(test_libudev_sym_SOURCES)
-
-tests += \
-       test-libsystemd-sym \
-       test-libsystemd-daemon-sym \
-       test-libsystemd-journal-sym \
-       test-libudev-sym
-
-if ENABLE_COMPAT_LIBS
-BUILT_SOURCES += \
        $(test_libsystemd_login_sym_SOURCES) \
-       $(test_libsystemd_id128_sym_SOURCES)
+       $(test_libsystemd_id128_sym_SOURCES) \
+       $(test_libsystemd_daemon_sym_SOURCES)
 
 tests += \
+       test-libsystemd-journal-sym \
        test-libsystemd-login-sym \
-       test-libsystemd-id128-sym
+       test-libsystemd-id128-sym \
+       test-libsystemd-daemon-sym
 endif
 
 .PHONY: cppcheck