X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=55a945b65b7b40acaba9fad0b559f1be5e64c1fe;hp=ffb10d69c37a78be45bd56eaaf698fbc3dc26684;hb=1fee9de5096fe9955b89523aedecf8962ab0e8c5;hpb=f459b6025f9368116d8c410376546c157314c205

diff --git a/Makefile.am b/Makefile.am
index ffb10d69c..55a945b65 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 \
@@ -2020,7 +2021,7 @@ tests += \
 	test-bus-objects \
 	test-event
 
-noinst_PROGRAMS += \
+bin_PROGRAMS += \
 	busctl
 
 test_bus_marshal_SOURCES = \
@@ -3770,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 = \
@@ -4570,11 +4624,31 @@ valgrind-tests: $(TESTS)
 		[ "$$f" == "$${f/.pl/}" ] && libtool --mode=execute valgrind --leak-check=full --error-exitcode=55 $(builddir)/$$f ; \
 	done
 
-check-api-docs: $(lib_LTLIBRARIES) man
-	for symbol in `for f in $(lib_LTLIBRARIES) ; do nm -g --defined-only $(builddir)/.libs/"$${f/.la/.so}" 2>&1 /dev/null | grep " T " | cut -d" " -f3 ; done` ; do \
+exported: $(lib_LTLIBRARIES)
+	$(AM_V_GEN)for f in $(lib_LTLIBRARIES) ; do \
+		nm -g --defined-only $(builddir)/.libs/"$${f/.la/.so}" 2>&1 /dev/null | grep " T " | cut -d" " -f3 ; \
+	done > $@
+
+check-api-docs: exported man
+	for symbol in `cat exported` ; do \
 		if test -f $(builddir)/man/$$symbol.html ; then \
 			echo "  Symbol $$symbol() is documented." ; \
 		else \
 			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 exported
+	( cat exported undefined ) | sort -u  | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2-