X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=f261c476daa73783b2a2ed9f3c8e7b93b9454166;hb=21749924e12201d8f5210c5dc9695e18fd16bb93;hp=90b9b93c63c7f78a445253490a7c1578f8f79e7f;hpb=d1ca51b153d7854d49400289ddedc7d493458f71;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 90b9b93c6..f261c476d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3862,41 +3862,13 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_KDBUS
-systemd_bus_driverd_SOURCES = \
-	src/bus-driverd/bus-driverd.c
-
-systemd_bus_driverd_LDADD = \
-	libsystemd-internal.la \
-	libsystemd-shared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-bus-driverd
-
-nodist_systemunit_DATA += \
-	units/systemd-bus-driverd.service
-
 dist_systemunit_DATA += \
-	units/org.freedesktop.DBus.busname \
 	units/org.freedesktop.systemd1.busname
 
 BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.DBus.busname \
 	org.freedesktop.systemd1.busname
-
-nodist_userunit_DATA += \
-	units/user/systemd-bus-driverd.service
-
-USER_BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.DBus.busname
-
-USER_UNIT_ALIASES += \
-	$(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname
 endif
 
-EXTRA_DIST += \
-	units/systemd-bus-driverd.service.in \
-	units/user/systemd-bus-driverd.service.in
-
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
@@ -4162,6 +4134,7 @@ noinst_LTLIBRARIES += \
 	libsystemd-networkd-core.la
 
 libsystemd_networkd_core_la_SOURCES = \
+	src/libsystemd-network/network-internal.h \
 	src/network/networkd.h \
 	src/network/networkd-link.c \
 	src/network/networkd-netdev.c \
@@ -4182,16 +4155,23 @@ libsystemd_networkd_core_la_LIBADD = \
 	libsystemd-shared.la
 
 nodist_systemunit_DATA += \
-	units/systemd-networkd.service
+	units/systemd-networkd.service \
+	units/systemd-networkd-wait-online.service
 
 GENERAL_ALIASES += \
-	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
+	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
+	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
 
 rootlibexec_PROGRAMS += \
 	systemd-networkd-wait-online
 
 systemd_networkd_wait_online_SOURCES = \
-	src/network/networkd-wait-online.c
+	src/libsystemd-network/network-internal.h \
+	src/network/networkd-wait-online.c \
+	src/network/networkd-wait-online.h
+
+nodist_systemd_networkd_wait_online_SOURCES = \
+	src/network/networkd-wait-online-gperf.c
 
 systemd_networkd_wait_online_LDADD = \
 	libsystemd-internal.la \
@@ -4206,14 +4186,19 @@ test_network_LDADD = \
 tests += \
 	test-network
 
+dist_pkgsysconf_DATA += \
+	src/network/networkd-wait-online.conf
+
 EXTRA_DIST += \
 	src/network/networkd-network-gperf.gperf \
 	src/network/networkd-netdev-gperf.gperf \
+	src/network/networkd-wait-online-gperf.gperf \
 	units/systemd-networkd.service.in
 
 CLEANFILES += \
 	src/network/networkd-network-gperf.c \
-	src/network/networkd-netdev-gperf.c
+	src/network/networkd-netdev-gperf.c \
+	src/network/networkd-wait-online-gperf.c
 endif
 
 # ------------------------------------------------------------------------------