build-sys: install headers with --enable-kdbus

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 18df6453e510135207553ae5db2561831eb7b76d..0efa5f0df2c7a31beb245cd8f403f655167a608b 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
@@ -196,7 +196,6 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/libsystemd/sd-bus \
        -I $(top_srcdir)/src/libsystemd/sd-event \
        -I $(top_srcdir)/src/libsystemd/sd-rtnl \
-       $(SECCOMP_CFLAGS) \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -352,6 +351,7 @@ dist_bashcompletion_DATA = \
        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
@@ -771,12 +771,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
@@ -816,6 +810,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
@@ -999,6 +1013,7 @@ libsystemd_core_la_CFLAGS = \
        $(LIBWRAP_CFLAGS) \
        $(PAM_CFLAGS) \
        $(AUDIT_CFLAGS) \
+       $(CAP_CFLAGS) \
        $(KMOD_CFLAGS) \
        $(SECCOMP_CFLAGS) \
        -pthread
@@ -1007,7 +1022,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 \
@@ -1015,8 +1029,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 $@)
@@ -1322,7 +1341,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 = \
@@ -1348,7 +1367,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 = \
@@ -1453,7 +1472,6 @@ systemd_analyze_SOURCES = \
 
 systemd_analyze_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1462,7 +1480,6 @@ systemd_initctl_SOURCES = \
 
 systemd_initctl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1475,7 +1492,6 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        $(AUDIT_LIBS)
 
@@ -1485,7 +1501,7 @@ systemd_shutdownd_SOURCES = \
 
 systemd_shutdownd_LDADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 dist_doc_DATA += \
@@ -1626,7 +1642,6 @@ systemd_fsck_SOURCES = \
 
 systemd_fsck_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
 
@@ -1705,8 +1720,7 @@ bootctl_SOURCES = \
 
 bootctl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-internal.la \
-       libsystemd-daemon-internal.la
+       libsystemd-internal.la
 
 bin_PROGRAMS += \
        bootctl
@@ -1784,7 +1798,6 @@ systemd_cgroups_agent_SOURCES = \
 
 systemd_cgroups_agent_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1797,7 +1810,6 @@ systemctl_LDADD = \
        libsystemd-internal.la \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1806,7 +1818,7 @@ systemd_notify_SOURCES = \
        src/readahead/sd-readahead.c
 
 systemd_notify_LDADD = \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1846,13 +1858,17 @@ 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-seccomp.la \
        $(SECCOMP_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1863,7 +1879,6 @@ systemd_run_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1872,7 +1887,6 @@ systemd_bus_proxyd_SOURCES = \
 
 systemd_bus_proxyd_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bus-proxyd-install-hook:
@@ -1908,56 +1922,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 \
@@ -1971,6 +1935,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 \
@@ -2019,6 +1984,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
@@ -2027,8 +1993,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 = \
@@ -2045,7 +2011,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 \
@@ -2111,7 +2090,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 \
@@ -2141,7 +2119,6 @@ test_bus_chat_CFLAGS = \
 
 test_bus_chat_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_cleanup_SOURCES = \
@@ -2149,7 +2126,6 @@ test_bus_cleanup_SOURCES = \
 
 test_bus_cleanup_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_server_SOURCES = \
@@ -2161,7 +2137,6 @@ test_bus_server_CFLAGS = \
 
 test_bus_server_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_objects_SOURCES = \
@@ -2174,7 +2149,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 \
@@ -2185,7 +2159,6 @@ test_bus_error_SOURCES = \
 
 test_bus_error_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_gvariant_SOURCES = \
@@ -2193,7 +2166,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 \
@@ -2210,7 +2182,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
@@ -2220,7 +2191,6 @@ test_bus_match_SOURCES = \
 
 test_bus_match_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_bus_kernel_SOURCES = \
@@ -2228,7 +2198,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 \
@@ -2243,7 +2212,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 = \
@@ -2251,7 +2219,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 = \
@@ -2266,7 +2233,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 \
@@ -2288,7 +2254,6 @@ test_event_SOURCES = \
 
 test_event_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_rtnl_SOURCES = \
@@ -2296,7 +2261,6 @@ test_rtnl_SOURCES = \
 
 test_rtnl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_resolve_SOURCES = \
@@ -2317,7 +2281,6 @@ busctl_SOURCES = \
 
 busctl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-dump.la \
        libsystemd-capability.la \
@@ -2365,7 +2328,6 @@ test_dhcp_client_SOURCES = \
 test_dhcp_client_LDADD = \
        libsystemd-dhcp.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 tests += \
@@ -2411,7 +2373,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 += \
@@ -2594,7 +2556,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) \
@@ -2972,7 +2933,6 @@ test_id128_SOURCES = \
 
 test_id128_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 tests += \
@@ -2988,7 +2948,7 @@ systemd_activate_SOURCES = \
 
 systemd_activate_LDADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -3145,7 +3105,6 @@ libsystemd_journal_la_LDFLAGS = \
 
 libsystemd_journal_la_LIBADD = \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -3200,7 +3159,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
 
@@ -3352,7 +3310,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)
@@ -3388,7 +3345,6 @@ systemd_socket_proxyd_LDADD = \
        libsystemd-logs.la \
        libsystemd-internal.la \
        libsystemd-journal-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -3495,7 +3451,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
 
@@ -3671,7 +3627,6 @@ systemd_hostnamed_SOURCES = \
 systemd_hostnamed_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3703,7 +3658,6 @@ hostnamectl_SOURCES = \
 
 hostnamectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3730,7 +3684,6 @@ systemd_bus_driverd_SOURCES = \
 
 systemd_bus_driverd_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3767,7 +3720,6 @@ systemd_localed_SOURCES = \
 systemd_localed_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 nodist_systemunit_DATA += \
@@ -3808,7 +3760,6 @@ localectl_SOURCES = \
 
 localectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3838,7 +3789,6 @@ systemd_timedated_SOURCES = \
 systemd_timedated_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
@@ -3874,7 +3824,6 @@ timedatectl_SOURCES = \
 
 timedatectl_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
@@ -3932,7 +3881,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
@@ -3945,12 +3893,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
 
@@ -4007,7 +3957,6 @@ nodist_systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
        libudev-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-internal.la \
        libsystemd-dhcp.la \
        libsystemd-label.la \
@@ -4034,7 +3983,6 @@ test_network_LDADD = \
        libudev-internal.la \
        libsystemd-internal.la \
        libsystemd-dhcp.la \
-       libsystemd-daemon-internal.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
@@ -4090,7 +4038,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
@@ -4123,8 +4070,7 @@ loginctl_SOURCES = \
 loginctl_LDADD = \
        libsystemd-internal.la \
        libudev-internal.la \
-       libsystemd-shared.la \
-       libsystemd-daemon-internal.la
+       libsystemd-shared.la
 
 rootbin_PROGRAMS += \
        loginctl
@@ -4141,7 +4087,6 @@ systemd_inhibit_SOURCES = \
 
 systemd_inhibit_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 rootbin_PROGRAMS += \
@@ -4166,7 +4111,6 @@ test_inhibit_SOURCES = \
 
 test_inhibit_LDADD = \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 test_login_tables_SOURCES = \
@@ -4203,7 +4147,6 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-internal.la \
-       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        $(PAM_LIBS)
 
@@ -4353,7 +4296,7 @@ _daemon_la_LDFLAGS = \
 
 _daemon_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd-daemon.la
+       libsystemd.la
 
 _reader_la_SOURCES = \
        src/python-systemd/_reader.c \
@@ -4373,9 +4316,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 = \
@@ -4396,9 +4338,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 = \
@@ -4484,29 +4424,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
@@ -4515,7 +4475,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 = \
@@ -4952,11 +4913,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)
 
@@ -5012,24 +4974,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