bus: make bus ref counting atomic

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0ac99a68893c4f072df9cb0434cca905bdcf8ccd..526598277ae1c0f2c1f4fdd7a42eba86abd9a838 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
        units/systemd-remount-fs.service \
+       units/systemd-update-utmp.service \
        units/systemd-update-utmp-runlevel.service \
-       units/systemd-update-utmp-shutdown.service \
        units/systemd-tmpfiles-setup-dev.service \
        units/systemd-tmpfiles-setup.service \
        units/systemd-tmpfiles-clean.service \
@@ -463,8 +463,8 @@ EXTRA_DIST += \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-remount-fs.service.in \
+       units/systemd-update-utmp.service.in \
        units/systemd-update-utmp-runlevel.service.in \
-       units/systemd-update-utmp-shutdown.service.in \
        units/systemd-tmpfiles-setup-dev.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in \
@@ -695,7 +695,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/fileio.h \
        src/shared/output-mode.h \
        src/shared/MurmurHash3.c \
-       src/shared/MurmurHash3.h
+       src/shared/MurmurHash3.h \
+       src/shared/refcnt.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1718,6 +1719,7 @@ EXTRA_DIST += \
 libsystemd_bus_la_SOURCES = \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
+       src/systemd/sd-memfd.h \
        src/libsystemd-bus/sd-bus.c \
        src/libsystemd-bus/bus-control.c \
        src/libsystemd-bus/bus-control.h \
@@ -1739,7 +1741,8 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-match.h \
        src/libsystemd-bus/bus-bloom.c \
        src/libsystemd-bus/bus-bloom.h \
-       src/libsystemd-bus/kdbus.h
+       src/libsystemd-bus/kdbus.h \
+       src/libsystemd-bus/sd-memfd.c
 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \
@@ -1755,7 +1758,9 @@ tests += \
        test-bus-chat \
        test-bus-server \
        test-bus-match \
-       test-bus-kernel
+       test-bus-kernel \
+       test-bus-memfd \
+       test-bus-zero-copy
 
 noinst_PROGRAMS += \
        busctl
@@ -1827,6 +1832,26 @@ test_bus_kernel_LDADD = \
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 
+test_bus_memfd_SOURCES = \
+       src/libsystemd-bus/test-bus-memfd.c
+
+test_bus_memfd_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_memfd_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
+test_bus_zero_copy_SOURCES = \
+       src/libsystemd-bus/test-bus-zero-copy.c
+
+test_bus_zero_copy_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_zero_copy_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
 busctl_SOURCES = \
        src/libsystemd-bus/busctl.c
 
@@ -3138,8 +3163,7 @@ rootlibexec_PROGRAMS += \
        systemd-random-seed
 
 nodist_systemunit_DATA += \
-       units/systemd-random-seed-save.service \
-       units/systemd-random-seed-load.service
+       units/systemd-random-seed.service
 
 systemd_random_seed_SOURCES = \
        src/random-seed/random-seed.c
@@ -3148,16 +3172,13 @@ systemd_random_seed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
-SHUTDOWN_TARGET_WANTS += \
-       systemd-random-seed-save.service
 SYSINIT_TARGET_WANTS += \
-       systemd-random-seed-load.service
+       systemd-random-seed.service
 
 endif
 
 EXTRA_DIST += \
-       units/systemd-random-seed-save.service.in \
-       units/systemd-random-seed-load.service.in
+       units/systemd-random-seed.service.in
 
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
@@ -4050,8 +4071,8 @@ RUNLEVEL4_TARGET_WANTS += \
 RUNLEVEL5_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 endif
-SHUTDOWN_TARGET_WANTS += \
-       systemd-update-utmp-shutdown.service
+SYSINIT_TARGET_WANTS += \
+       systemd-update-utmp.service
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
        systemd-fsck-root.service \