X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=8d58c52e8f8b94218790599708eb92e5393209c7;hp=da25b1dfbd1f53b08b48995dde21089206084420;hb=51f6888bfc86ad92c9a4e081c7c8c33e60bf4fbd;hpb=feef0842cfa8abe8b76c16e026217bad7e90f283

diff --git a/Makefile.am b/Makefile.am
index da25b1dfb..8d58c52e8 100644
--- 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
@@ -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
@@ -654,8 +656,6 @@ noinst_LTLIBRARIES += \
 libsystemd_shared_la_SOURCES = \
 	src/shared/linux/auto_dev-ioctl.h \
 	src/shared/linux/fanotify.h \
-	src/shared/linux/seccomp.h \
-	src/shared/linux/seccomp-bpf.h \
 	src/shared/ioprio.h \
 	src/shared/missing.h \
 	src/shared/initreq.h \
@@ -763,8 +763,6 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/net-util.h \
 	src/shared/errno-list.c \
 	src/shared/errno-list.h \
-	src/shared/syscall-list.c \
-	src/shared/syscall-list.h \
 	src/shared/audit.c \
 	src/shared/audit.h \
 	src/shared/xml.c \
@@ -772,9 +770,7 @@ libsystemd_shared_la_SOURCES = \
 
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
-	src/shared/errno-to-name.h \
-	src/shared/syscall-from-name.h \
-	src/shared/syscall-to-name.h
+	src/shared/errno-to-name.h
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -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,14 +1014,15 @@ libsystemd_core_la_CFLAGS = \
 	$(LIBWRAP_CFLAGS) \
 	$(PAM_CFLAGS) \
 	$(AUDIT_CFLAGS) \
+	$(CAP_CFLAGS) \
 	$(KMOD_CFLAGS) \
+	$(SECCOMP_CFLAGS) \
 	-pthread
 
 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 \
@@ -1013,7 +1030,13 @@ libsystemd_core_la_LIBADD = \
 	$(PAM_LIBS) \
 	$(AUDIT_LIBS) \
 	$(CAP_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 $@)
@@ -1026,33 +1049,13 @@ CLEANFILES += \
 	src/core/load-fragment-gperf.gperf \
 	src/core/load-fragment-gperf.c \
 	src/core/load-fragment-gperf-nulstr.c \
-	src/shared/syscall-list.txt \
-	src/shared/syscall-from-name.gperf \
 	src/shared/errno-list.txt \
 	src/shared/errno-from-name.gperf
 
 BUILT_SOURCES += \
-	src/shared/syscall-from-name.h \
-	src/shared/syscall-to-name.h \
 	src/shared/errno-from-name.h \
 	src/shared/errno-to-name.h
 
-src/shared/syscall-list.txt:
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); if ($$2 !~ /SYSCALL_BASE/) print $$2; }' > $@
-
-src/shared/syscall-from-name.gperf: src/shared/syscall-list.txt
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
-
-src/shared/syscall-from-name.h: src/shared/syscall-from-name.gperf
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
-
-src/shared/syscall-to-name.h: src/shared/syscall-list.txt
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
-
 src/shared/errno-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }'  > $@
@@ -1339,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 = \
@@ -1365,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 = \
@@ -1470,7 +1473,6 @@ systemd_analyze_SOURCES = \
 
 systemd_analyze_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1479,7 +1481,6 @@ systemd_initctl_SOURCES = \
 
 systemd_initctl_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1492,7 +1493,6 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la \
 	$(AUDIT_LIBS)
 
@@ -1502,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 += \
@@ -1643,7 +1643,6 @@ systemd_fsck_SOURCES = \
 
 systemd_fsck_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libudev-internal.la \
 	libsystemd-shared.la
 
@@ -1722,8 +1721,7 @@ bootctl_SOURCES = \
 
 bootctl_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-internal.la \
-	libsystemd-daemon-internal.la
+	libsystemd-internal.la
 
 bin_PROGRAMS += \
 	bootctl
@@ -1767,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:
@@ -1800,7 +1799,6 @@ systemd_cgroups_agent_SOURCES = \
 
 systemd_cgroups_agent_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1813,7 +1811,6 @@ systemctl_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-logs.la \
 	libsystemd-journal-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1822,7 +1819,7 @@ systemd_notify_SOURCES = \
 	src/readahead/sd-readahead.c
 
 systemd_notify_LDADD = \
-	libsystemd-daemon-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1862,12 +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 \
-	libsystemd-shared.la
+	libudev-internal.la \
+	libsystemd-shared.la \
+	libsystemd-seccomp.la \
+	$(SECCOMP_LIBS)
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -1877,7 +1880,6 @@ systemd_run_LDADD = \
 	libsystemd-label.la \
 	libsystemd-capability.la \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1886,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:
@@ -1921,56 +1923,6 @@ systemd_tty_ask_password_agent_LDADD = \
 	libsystemd-label.la \
 	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 = \
 	src/libsystemd/libsystemd.sym \
@@ -1984,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 \
@@ -2032,6 +1985,7 @@ 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
@@ -2040,8 +1994,8 @@ nodist_libsystemd_la_SOURCES = \
 	src/libsystemd/sd-bus/bus-error-mapping.c
 
 libsystemd_la_LIBADD = \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la \
+	$(RT_LIBS) \
 	-lresolv
 
 libsystemd_la_CFLAGS = \
@@ -2058,7 +2012,20 @@ pkgconfiglib_DATA += \
 
 pkginclude_HEADERS += \
 	src/systemd/sd-login.h \
-	src/systemd/sd-id128.h
+	src/systemd/sd-id128.h \
+	src/systemd/sd-daemon.h
+
+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
 
 EXTRA_DIST += \
 	src/libsystemd/sd-bus/bus-error-mapping.gperf \
@@ -2124,7 +2091,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 \
@@ -2154,7 +2120,6 @@ test_bus_chat_CFLAGS = \
 
 test_bus_chat_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 test_bus_cleanup_SOURCES = \
@@ -2162,7 +2127,6 @@ test_bus_cleanup_SOURCES = \
 
 test_bus_cleanup_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 test_bus_server_SOURCES = \
@@ -2174,7 +2138,6 @@ test_bus_server_CFLAGS = \
 
 test_bus_server_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 test_bus_objects_SOURCES = \
@@ -2187,7 +2150,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 \
@@ -2198,7 +2160,6 @@ test_bus_error_SOURCES = \
 
 test_bus_error_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 test_bus_gvariant_SOURCES = \
@@ -2206,7 +2167,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 \
@@ -2223,7 +2183,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
@@ -2233,7 +2192,6 @@ test_bus_match_SOURCES = \
 
 test_bus_match_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 test_bus_kernel_SOURCES = \
@@ -2241,7 +2199,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 \
@@ -2256,7 +2213,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 = \
@@ -2264,7 +2220,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 = \
@@ -2279,7 +2234,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 \
@@ -2301,7 +2255,6 @@ test_event_SOURCES = \
 
 test_event_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 test_rtnl_SOURCES = \
@@ -2309,7 +2262,6 @@ test_rtnl_SOURCES = \
 
 test_rtnl_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 test_resolve_SOURCES = \
@@ -2330,7 +2282,6 @@ busctl_SOURCES = \
 
 busctl_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la \
 	libsystemd-dump.la \
 	libsystemd-capability.la \
@@ -2378,7 +2329,6 @@ test_dhcp_client_SOURCES = \
 test_dhcp_client_LDADD = \
 	libsystemd-dhcp.la \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 tests += \
@@ -2424,7 +2374,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 += \
@@ -2607,7 +2557,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) \
@@ -2985,7 +2934,6 @@ test_id128_SOURCES = \
 
 test_id128_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 tests += \
@@ -3001,7 +2949,7 @@ systemd_activate_SOURCES = \
 
 systemd_activate_LDADD = \
 	libsystemd-label.la \
-	libsystemd-daemon-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -3158,7 +3106,6 @@ libsystemd_journal_la_LDFLAGS = \
 
 libsystemd_journal_la_LIBADD = \
 	libsystemd-label.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
@@ -3213,7 +3160,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
 
@@ -3365,7 +3311,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)
@@ -3401,7 +3346,6 @@ systemd_socket_proxyd_LDADD = \
 	libsystemd-logs.la \
 	libsystemd-internal.la \
 	libsystemd-journal-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -3508,7 +3452,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
 
@@ -3684,7 +3628,6 @@ systemd_hostnamed_SOURCES = \
 systemd_hostnamed_LDADD = \
 	libsystemd-label.la \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3716,7 +3659,6 @@ hostnamectl_SOURCES = \
 
 hostnamectl_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3743,7 +3685,6 @@ systemd_bus_driverd_SOURCES = \
 
 systemd_bus_driverd_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3780,7 +3721,6 @@ systemd_localed_SOURCES = \
 systemd_localed_LDADD = \
 	libsystemd-label.la \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 nodist_systemunit_DATA += \
@@ -3821,7 +3761,6 @@ localectl_SOURCES = \
 
 localectl_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3851,7 +3790,6 @@ systemd_timedated_SOURCES = \
 systemd_timedated_LDADD = \
 	libsystemd-label.la \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3887,7 +3825,6 @@ timedatectl_SOURCES = \
 
 timedatectl_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3945,7 +3882,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
@@ -3958,12 +3894,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
 
@@ -4020,7 +3958,6 @@ nodist_systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
 	libudev-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-internal.la \
 	libsystemd-dhcp.la \
 	libsystemd-label.la \
@@ -4047,7 +3984,6 @@ test_network_LDADD = \
 	libudev-internal.la \
 	libsystemd-internal.la \
 	libsystemd-dhcp.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
@@ -4103,7 +4039,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
@@ -4136,8 +4071,7 @@ loginctl_SOURCES = \
 loginctl_LDADD = \
 	libsystemd-internal.la \
 	libudev-internal.la \
-	libsystemd-shared.la \
-	libsystemd-daemon-internal.la
+	libsystemd-shared.la
 
 rootbin_PROGRAMS += \
 	loginctl
@@ -4154,7 +4088,6 @@ systemd_inhibit_SOURCES = \
 
 systemd_inhibit_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 rootbin_PROGRAMS += \
@@ -4179,7 +4112,6 @@ test_inhibit_SOURCES = \
 
 test_inhibit_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
 test_login_tables_SOURCES = \
@@ -4216,7 +4148,6 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
 	libsystemd-capability.la \
 	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
 	libsystemd-shared.la \
 	$(PAM_LIBS)
 
@@ -4366,7 +4297,7 @@ _daemon_la_LDFLAGS = \
 
 _daemon_la_LIBADD = \
 	$(PYTHON_DEVEL_LIBS) \
-	libsystemd-daemon.la
+	libsystemd.la
 
 _reader_la_SOURCES = \
 	src/python-systemd/_reader.c \
@@ -4386,9 +4317,8 @@ _reader_la_LDFLAGS = \
 
 _reader_la_LIBADD = \
 	$(PYTHON_DEVEL_LIBS) \
-	libsystemd-journal.la \
 	libsystemd.la \
-	libsystemd-daemon-internal.la \
+	libsystemd-journal.la \
 	libsystemd-shared.la
 
 login_la_SOURCES = \
@@ -4409,9 +4339,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 = \
@@ -4497,29 +4425,49 @@ 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-login.c \
-	libsystemd-id128.c
+	libsystemd-id128.c \
+	libsystemd-daemon.c
 
 libsystemd-%.c: src/compat-libs/libsystemd-%.sym
 	$(generate-fake-lib)
 
 lib_LTLIBRARIES += \
 	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
@@ -4528,7 +4476,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 = \
@@ -4965,11 +4914,12 @@ test-libsystemd-sym.c: \
 	src/libsystemd/libsystemd.sym \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-utf8.h \
+	src/systemd/sd-daemon.h \
 	src/systemd/sd-login.h
 	$(generate-sym-test)
 
 test-libsystemd-daemon-sym.c: \
-	src/libsystemd-daemon/libsystemd-daemon.sym \
+	src/compat-libs/libsystemd-daemon.sym \
 	src/systemd/sd-daemon.h
 	$(generate-sym-test)
 
@@ -5025,24 +4975,24 @@ test_libudev_sym_LDADD = \
 
 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-login-sym \
-	test-libsystemd-id128-sym
+	test-libsystemd-id128-sym \
+	test-libsystemd-daemon-sym
 endif
 
 .PHONY: cppcheck