chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: actually unmap kdbus pool after use
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index eb85c8dadade1dd94c1f76865fb75f3aa6ace556..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-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-runlevel.service \
- units/systemd-update-utmp-shutdown.service \
units/systemd-tmpfiles-setup-dev.service \
units/systemd-tmpfiles-setup.service \
units/systemd-tmpfiles-clean.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-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-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 \
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/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 += \
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-1758,7
+1759,8
@@
tests += \
test-bus-server \
test-bus-match \
test-bus-kernel \
test-bus-server \
test-bus-match \
test-bus-kernel \
- test-bus-memfd
+ test-bus-memfd \
+ test-bus-zero-copy
noinst_PROGRAMS += \
busctl
noinst_PROGRAMS += \
busctl
@@
-1840,6
+1842,16
@@
test_bus_memfd_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la
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
busctl_SOURCES = \
src/libsystemd-bus/busctl.c
@@
-3151,8
+3163,7
@@
rootlibexec_PROGRAMS += \
systemd-random-seed
nodist_systemunit_DATA += \
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
systemd_random_seed_SOURCES = \
src/random-seed/random-seed.c
@@
-3161,16
+3172,13
@@
systemd_random_seed_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
libsystemd-label.la \
libsystemd-shared.la
-SHUTDOWN_TARGET_WANTS += \
- systemd-random-seed-save.service
SYSINIT_TARGET_WANTS += \
SYSINIT_TARGET_WANTS += \
- systemd-random-seed
-load
.service
+ systemd-random-seed.service
endif
EXTRA_DIST += \
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
# ------------------------------------------------------------------------------
if HAVE_LIBCRYPTSETUP
@@
-4063,8
+4071,8
@@
RUNLEVEL4_TARGET_WANTS += \
RUNLEVEL5_TARGET_WANTS += \
systemd-update-utmp-runlevel.service
endif
RUNLEVEL5_TARGET_WANTS += \
systemd-update-utmp-runlevel.service
endif
-S
HUTDOWN
_TARGET_WANTS += \
- systemd-update-utmp
-shutdown
.service
+S
YSINIT
_TARGET_WANTS += \
+ systemd-update-utmp.service
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
systemd-fsck-root.service \
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
systemd-fsck-root.service \