5 files changed, 26 insertions, 9 deletions
diff --git a/src/grp-network/Makefile b/src/grp-network/Makefile
index 504395e39d..d5e6d62689 100644
--- a/src/grp-network/Makefile
+++ b/src/grp-network/Makefile
@@ -23,7 +23,8 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-dist_network_DATA = \
+# TODO
+_dist_network_DATA = \
 	network/99-default.link \
 	network/80-container-host0.network \
 	network/80-container-ve.network \
@@ -72,10 +73,8 @@ gperf_gperf_sources += \
 	src/network/networkd-network-gperf.gperf \
 	src/network/networkd-netdev-gperf.gperf
 
-EXTRA_DIST += \
-	units/systemd-networkd.service.m4.in \
-	units/systemd-networkd-wait-online.service.in \
-	test/networkd-test.py
+dist_systempreset_DATA = \
+	90-networkd.preset
 
 nested.subdirs += libnetworkd-core
 nested.subdirs += networkctl
diff --git a/src/grp-network/libnetworkd-core/Makefile b/src/grp-network/libnetworkd-core/Makefile
index 321c05d7ea..5afee3d399 100644
--- a/src/grp-network/libnetworkd-core/Makefile
+++ b/src/grp-network/libnetworkd-core/Makefile
@@ -92,6 +92,10 @@ nodist_libnetworkd_core_la_SOURCES = \
 
 libnetworkd_core_la_LIBADD = \
 	libsystemd-network.la \
+	libsystemd-internal.la \
+	libsystemd-firewall.la \
 	libsystemd-shared.la
 
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/networkctl/Makefile b/src/grp-network/networkctl/Makefile
index 7b651c7f74..4343011157 100644
--- a/src/grp-network/networkctl/Makefile
+++ b/src/grp-network/networkctl/Makefile
@@ -30,6 +30,7 @@ networkctl_SOURCES = \
 	src/network/networkctl.c
 
 networkctl_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	libsystemd-network.la
 
diff --git a/src/grp-network/systemd-networkd-wait-online/Makefile b/src/grp-network/systemd-networkd-wait-online/Makefile
index 421bb9a673..1b0c801833 100644
--- a/src/grp-network/systemd-networkd-wait-online/Makefile
+++ b/src/grp-network/systemd-networkd-wait-online/Makefile
@@ -37,7 +37,17 @@ systemd_networkd_wait_online_SOURCES = \
 	src/network/networkd-wait-online-link.c
 
 systemd_networkd_wait_online_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-network.la \
 	libsystemd-shared.la
 
+nodist_systemunit_DATA += \
+	units/systemd-networkd-wait-online.service
+
+GENERAL_ALIASES += \
+	$(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
+
+EXTRA_DIST += \
+	units/systemd-networkd-wait-online.service.in
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/systemd-networkd/Makefile b/src/grp-network/systemd-networkd/Makefile
index 118f627c16..9036159c70 100644
--- a/src/grp-network/systemd-networkd/Makefile
+++ b/src/grp-network/systemd-networkd/Makefile
@@ -30,6 +30,7 @@ systemd_networkd_SOURCES = \
 	src/network/networkd.c
 
 systemd_networkd_LDADD = \
+	libsystemd-basic.la \
 	libnetworkd-core.la
 
 ifneq ($(HAVE_LIBIPTC),)
@@ -41,8 +42,7 @@ dist_systemunit_DATA += \
 	units/systemd-networkd.socket
 
 nodist_systemunit_DATA += \
-	units/systemd-networkd.service \
-	units/systemd-networkd-wait-online.service
+	units/systemd-networkd.service
 
 dist_systemunit_DATA_busnames += \
 	units/org.freedesktop.network1.busname
@@ -55,8 +55,7 @@ dist_dbuspolicy_DATA += \
 
 GENERAL_ALIASES += \
 	$(systemunitdir)/systemd-networkd.socket $(pkgsysconfdir)/system/sockets.target.wants/systemd-networkd.socket \
-	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
-	$(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
+	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
 
 SYSTEM_UNIT_ALIASES += \
 	systemd-networkd.service dbus-org.freedesktop.network1.service
@@ -64,4 +63,8 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.network1.busname
 
+EXTRA_DIST += \
+	units/systemd-networkd.service.m4.in \
+	test/networkd-test.py
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk