chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile.am: test-bus-memfd went away. Kill its residues in Makefile.am
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 6fbfc59244755249600604be0d0dcd2fc3483030..dbaed73bd57cb2df88d14e193d529f91cecb64ec 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-490,8
+490,7
@@
dist_systemunit_DATA = \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
- units/initrd-switch-root.target \
- units/ldconfig.service
+ units/initrd-switch-root.target
nodist_systemunit_DATA = \
units/getty@.service \
nodist_systemunit_DATA = \
units/getty@.service \
@@
-919,6
+918,16
@@
libsystemd_label_la_CFLAGS = \
libsystemd_label_la_LIBADD = \
$(SELINUX_LIBS)
libsystemd_label_la_LIBADD = \
$(SELINUX_LIBS)
+# -----------------------------------------------------------------------------
+
+if ENABLE_LDCONFIG
+dist_systemunit_DATA += \
+ units/ldconfig.service
+
+SYSINIT_TARGET_WANTS += \
+ ldconfig.service
+endif
+
# ------------------------------------------------------------------------------
if HAVE_SECCOMP
# ------------------------------------------------------------------------------
if HAVE_SECCOMP
@@
-2562,7
+2571,6
@@
tests += \
test-bus-kernel \
test-bus-kernel-bloom \
test-bus-kernel-benchmark \
test-bus-kernel \
test-bus-kernel-bloom \
test-bus-kernel-benchmark \
- test-bus-memfd \
test-bus-zero-copy \
test-bus-introspect \
test-bus-objects \
test-bus-zero-copy \
test-bus-introspect \
test-bus-objects \
@@
-2716,13
+2724,6
@@
test_bus_kernel_benchmark_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
-test_bus_memfd_SOURCES = \
- src/libsystemd/sd-bus/test-bus-memfd.c
-
-test_bus_memfd_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
-
test_bus_zero_copy_SOURCES = \
src/libsystemd/sd-bus/test-bus-zero-copy.c
test_bus_zero_copy_SOURCES = \
src/libsystemd/sd-bus/test-bus-zero-copy.c
@@
-4772,6
+4773,7
@@
systemd_resolved_SOURCES = \
src/resolve/resolved-bus.h \
src/resolve/resolved-link.h \
src/resolve/resolved-link.c \
src/resolve/resolved-bus.h \
src/resolve/resolved-link.h \
src/resolve/resolved-link.c \
+ src/resolve/resolved-def.h \
src/resolve/resolved-dns-domain.h \
src/resolve/resolved-dns-domain.c \
src/resolve/resolved-dns-rr.h \
src/resolve/resolved-dns-domain.h \
src/resolve/resolved-dns-domain.c \
src/resolve/resolved-dns-rr.h \
@@
-4963,6
+4965,8
@@
libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-netdev-bond.c \
src/network/networkd-netdev-bridge.c \
src/network/networkd-link.c \
src/network/networkd-netdev-bond.c \
src/network/networkd-netdev-bridge.c \
src/network/networkd-link.c \
+ src/network/networkd-ipv4ll.c \
+ src/network/networkd-dhcp4.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
@@
-5787,8
+5791,7
@@
endif
SYSINIT_TARGET_WANTS += \
systemd-update-utmp.service \
SYSINIT_TARGET_WANTS += \
systemd-update-utmp.service \
- systemd-update-done.service \
- ldconfig.service
+ systemd-update-done.service
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \