X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=b95ddf2b4cb06896a8bae1c74f6c0898f8cbd42b;hp=e65406faa058be1215c002925d8c53e9ee5264e1;hb=a6f1e036de8f212f33ead7f5387c297afd8be26e;hpb=b22d8a00f48f3c5fc4510b4acd3e1a43e731e592

diff --git a/Makefile.am b/Makefile.am
index e65406faa..b95ddf2b4 100644
--- 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/initrd-switch-root.target \
-	units/ldconfig.service
+	units/initrd-switch-root.target
 
 nodist_systemunit_DATA = \
 	units/getty@.service \
@@ -919,6 +918,16 @@ libsystemd_label_la_CFLAGS = \
 libsystemd_label_la_LIBADD = \
 	$(SELINUX_LIBS)
 
+# -----------------------------------------------------------------------------
+
+if ENABLE_LDCONFIG
+dist_systemunit_DATA += \
+	units/ldconfig.service
+
+SYSINIT_TARGET_WANTS += \
+	ldconfig.service
+endif
+
 # ------------------------------------------------------------------------------
 
 if HAVE_SECCOMP
@@ -4772,6 +4781,7 @@ systemd_resolved_SOURCES = \
 	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 \
@@ -4942,7 +4952,6 @@ libsystemd_networkd_core_la_SOURCES = \
 	src/libsystemd-network/network-internal.h \
 	src/network/networkd.h \
 	src/network/networkd-link.h \
-	src/network/networkd-ipv4ll.h \
 	src/network/networkd-netdev.h \
 	src/network/networkd-netdev-tunnel.h \
 	src/network/networkd-netdev-veth.h \
@@ -4965,6 +4974,7 @@ libsystemd_networkd_core_la_SOURCES = \
 	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 \
@@ -5789,8 +5799,7 @@ endif
 
 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 \