X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=ae927af907a5816c24cc10e442c20d48927d9128;hb=7c99d940c11e4da1863a218b6b70dd16e65b7518;hp=8d3d451372a2be620de6938f98291e6e12f28e66;hpb=f8f14b3654bcd8d6c6cfd118e50775f6a2328a35;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 8d3d45137..ae927af90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,6 +177,7 @@ AM_CPPFLAGS = \
 	-DKEXEC=\"$(KEXEC)\" \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/shared \
+	-I $(top_srcdir)/src/network \
 	-I $(top_srcdir)/src/login \
 	-I $(top_srcdir)/src/journal \
 	-I $(top_srcdir)/src/systemd \
@@ -1783,14 +1784,10 @@ systemd_cgroups_agent_LDADD = \
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
-systemctl_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemctl_LDADD = \
 	libsystemd-units.la \
 	libsystemd-label.la \
-	libsystemd-dbus.la \
+	libsystemd-bus-internal.la \
 	libsystemd-logs.la \
 	libsystemd-login-internal.la \
 	libsystemd-journal-internal.la \
@@ -2024,7 +2021,7 @@ tests += \
 	test-bus-objects \
 	test-event
 
-noinst_PROGRAMS += \
+bin_PROGRAMS += \
 	busctl
 
 test_bus_marshal_SOURCES = \
@@ -3774,6 +3771,59 @@ EXTRA_DIST += \
 
 endif
 
+# ------------------------------------------------------------------------------
+rootlibexec_PROGRAMS += \
+	systemd-networkd
+
+systemd_networkd_SOURCES = \
+	src/network/networkd.h \
+	src/network/networkd.c \
+	src/network/networkd-link.c \
+	src/network/networkd-network.c \
+	src/network/networkd-address.c \
+	src/network/networkd-route.c \
+	src/network/networkd-manager.c
+
+nodist_systemd_networkd_SOURCES = \
+	src/network/networkd-gperf.c
+
+systemd_networkd_LDADD = \
+	libudev-internal.la \
+	libsystemd-bus.la \
+	libsystemd-rtnl.la \
+	libsystemd-shared.la
+
+nodist_systemunit_DATA += \
+	units/systemd-networkd.service
+
+MULTI_USER_TARGET_WANTS += \
+	systemd-networkd.service
+
+test_network_SOURCES = \
+	src/network/test-network.c \
+	src/network/networkd.h \
+	src/network/networkd-link.c \
+	src/network/networkd-network.c \
+	src/network/networkd-address.c \
+	src/network/networkd-route.c \
+	src/network/networkd-manager.c \
+	src/network/networkd-gperf.c
+
+test_network_LDADD = \
+	libudev-internal.la \
+	libsystemd-bus.la \
+	libsystemd-rtnl.la \
+	libsystemd-shared.la
+
+tests += test-network
+
+EXTRA_DIST += \
+	src/network/networkd-gperf.gperf \
+	units/systemd-networkd.service.in
+
+CLEANFILES += \
+	src/network/networkd-gperf.c
+
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
@@ -4582,3 +4632,18 @@ check-api-docs: $(lib_LTLIBRARIES) man
 			echo "‣ Symbol $$symbol() lacks documentation." ; \
 		fi ; \
 	 done
+
+OBJECT_VARIABLES:=$(filter %_OBJECTS,$(.VARIABLES))
+ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v)))
+
+undefined defined: $(ALL_OBJECTS)
+	$(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \
+		nm -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \
+	done | cut -c 20- | cut -d @ -f 1 | sort -u > $@
+
+CLEANFILES += \
+	defined \
+	undefined
+
+check-api-unused: defined undefined
+	diff -u undefined defined | grep ^+ | grep -v ^+++ | cut -c2-