build grp-network

5 files changed, 16 insertions, 13 deletions

diff --git a/config.mk.in b/config.mk.in
index 308cda4f3c..68e62ff1a9 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -115,7 +115,7 @@ libsystemd.DEPENDS                   =   $(topoutdir)/src/libsystemd/libsystemd.
 
 libudev.CPPFLAGS                     = -I$(topsrcdir)/src/libudev/include
 libudev.DEPENDS                      =   $(topoutdir)/src/libudev/src/libudev.la
-libudev-internal.CPPFLAGS            = $(libudev.CPPFLAGS) $(libbasic.CPPFLAGS)
+libudev-internal.CPPFLAGS            = -I$(topsrcdir)/src/libudev/src $(libudev.CPPFLAGS) $(libbasic.CPPFLAGS)
 libudev-internal.DEPENDS             =   $(topoutdir)/src/libudev/src/libudev-internal.la
 # -core libs
 libcore.CPPFLAGS                     = -I$(topsrcdir)/src/grp-system/libcore $(libshared.CPPFLAGS)
@@ -128,14 +128,14 @@ libjournal-core.DEPENDS    =   $(topoutdir)/src/grp-journal/libjournal-core/libj
 #liblogind-core.DEPENDS     =
 libmachine-core.CPPFLAGS   = -I$(topsrcdir)/src/grp-machine/libmachine-core/include
 libmachine-core.DEPENDS    =   $(topoutdir)/src/grp-machine/libmachine-core/src/libmachine-core.la
-#libnetworkd-core.CPPFLAGS  =
-#libnetworkd-core.DEPENDS   =
+libnetworkd-core.CPPFLAGS  = -I$(topsrcdir)/src/grp-network/libnetworkd-core $(libsystemd-internal.CPPFLAGS) $(libsystemd-network.CPPFLAGS) $(libshared.CPPFLAGS) $(libudev-internal.CPPFLAGS)
+libnetworkd-core.DEPENDS   =   $(topoutdir)/src/grp-network/libnetworkd-core/libnetworkd-core.la
 libudev-core.CPPFLAGS      = -I$(topoutdir)/src/grp-udev/libudev-core $(libsystemd-network.CPPFLAGS) $(libshared.CPPFLAGS)
 libudev-core.DEPENDS       =   $(topoutdir)/src/grp-udev/libudev-core/libudev-core.la
 libbasic-dns.CPPFLAGS      = -I$(topoutdir)/src/grp-resolve/libbasic-dns -I$(topsrcdir)/src/grp-resolve/libbasic-dns
 libbasic-dns.DEPENDS       =   $(topoutdir)/src/grp-resolve/libbasic-dns/libbasic-dns.la
 libimport.CPPFLAGS         = -I$(topsrcdir)/src/grp-machine/grp-import/libimport
-libimport.DEPENDS          =   $(topoutdir)/src/grp-machine/grp-import/libimport/libimport.la $(libbasic.DEPENDS)
+libimport.DEPENDS          =   $(topoutdir)/src/grp-machine/grp-import/libimport/libimport.la
 # NSS modules
 libnss_myhostname.CPPFLAGS =
 libnss_myhostname.DEPENDS  =
diff --git a/src/grp-network/Makefile b/src/grp-network/Makefile
index 54f06b1822..e819a376d7 100644
--- a/src/grp-network/Makefile
+++ b/src/grp-network/Makefile
@@ -73,9 +73,9 @@ 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
+nested.subdirs += libnetworkd-core
+nested.subdirs += networkctl
+nested.subdirs += systemd-networkd
+nested.subdirs += systemd-networkd-wait-online
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/libnetworkd-core/Makefile b/src/grp-network/libnetworkd-core/Makefile
index 53d65460f2..4375a4d4f3 100644
--- a/src/grp-network/libnetworkd-core/Makefile
+++ b/src/grp-network/libnetworkd-core/Makefile
@@ -88,6 +88,10 @@ nodist_libnetworkd_core_la_SOURCES = \
 
 libnetworkd_core_la_LIBADD = \
 	libsystemd-network.la \
+	libsystemd-internal.la \
+	libfirewall.la \
 	libshared.la
 
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
index 49f18a8cd9..c372dd7860 100644
--- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
+++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c
@@ -20,8 +20,8 @@
 #include <arpa/inet.h>
 #include <net/if.h>
 
-#include <linux/if_tunnel.h>
 #include <linux/ip.h>
+#include <linux/if_tunnel.h>
 #include <linux/ip6_tunnel.h>
 
 #include "basic/missing.h"
diff --git a/src/grp-network/systemd-networkd/Makefile b/src/grp-network/systemd-networkd/Makefile
index 764b51a2ba..d6ef3bb91d 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 = \
+	libbasic.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