Merge pull request #911 from opensourcerouting/non-recursive-2

more non-recursive build, fix cross-compile, & doc build mangling

4 files changed, 70 insertions, 47 deletions

diff --git a/eigrpd/.gitignore b/eigrpd/.gitignore
index cd46e50c6..5b72399e7 100644
--- a/eigrpd/.gitignore
+++ b/eigrpd/.gitignore
@@ -1,4 +1,4 @@
-Makefile
+!Makefile
 Makefile.in
 *.o
 *.a
diff --git a/eigrpd/Makefile b/eigrpd/Makefile
new file mode 100644
index 000000000..b6d60764e
--- /dev/null
+++ b/eigrpd/Makefile
@@ -0,0 +1,10 @@
+all: ALWAYS
+	@$(MAKE) -s -C .. eigrpd/eigrpd
+%: ALWAYS
+	@$(MAKE) -s -C .. eigrpd/$@
+
+Makefile:
+	#nothing
+ALWAYS:
+.PHONY: ALWAYS makefiles
+.SUFFIXES:
diff --git a/eigrpd/Makefile.am b/eigrpd/Makefile.am
deleted file mode 100644
index 9ee792e55..000000000
--- a/eigrpd/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-
-AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
-DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
-INSTALL_SDATA=@INSTALL@ -m 600
-
-AM_CFLAGS = $(WERROR)
-
-noinst_LIBRARIES = libeigrp.a
-sbin_PROGRAMS = eigrpd
-
-libeigrp_a_SOURCES = \
-	eigrpd.c eigrp_zebra.c \
-	eigrp_interface.c eigrp_neighbor.c \
-	eigrp_dump.c eigrp_vty.c \
-	eigrp_network.c eigrp_packet.c \
-	eigrp_topology.c eigrp_fsm.c \
-	eigrp_hello.c eigrp_update.c \
-	eigrp_query.c eigrp_reply.c \
-	eigrp_snmp.c eigrp_siaquery.c \
-	eigrp_siareply.c eigrp_filter.c \
-	eigrp_memory.c
-
-
-eigrpdheaderdir = $(pkgincludedir)/eigrpd
-
-eigrpdheader_HEADERS = \
-	eigrp_topology.h eigrp_dump.h eigrpd.h
-
-noinst_HEADERS = \
-	eigrp_const.h eigrp_structs.h \
-	eigrp_macros.h eigrp_interface.h \
-	eigrp_neighbor.h eigrp_network.h \
-	eigrp_packet.h eigrp_memory.h \
-	eigrp_zebra.h eigrp_vty.h \
-	eigrp_snmp.h eigrp_filter.h \
-	eigrp_fsm.h
-
-eigrpd_SOURCES = eigrp_main.c $(libeigrp_a_SOURCES)
-
-eigrpd_LDADD = ../lib/libfrr.la @LIBCAP@
-
-EXTRA_DIST = EIGRP-MIB.txt
-
-examplesdir = $(exampledir)
-dist_examples_DATA = eigrpd.conf.sample
diff --git a/eigrpd/subdir.am b/eigrpd/subdir.am
new file mode 100644
index 000000000..2c6b1e321
--- /dev/null
+++ b/eigrpd/subdir.am
@@ -0,0 +1,59 @@
+#
+# eigrpd
+#
+
+if EIGRPD
+noinst_LIBRARIES += eigrpd/libeigrp.a
+sbin_PROGRAMS += eigrpd/eigrpd
+dist_examples_DATA += eigrpd/eigrpd.conf.sample
+endif
+
+eigrpd_libeigrp_a_SOURCES = \
+	eigrpd/eigrp_dump.c \
+	eigrpd/eigrp_filter.c \
+	eigrpd/eigrp_fsm.c \
+	eigrpd/eigrp_hello.c \
+	eigrpd/eigrp_interface.c \
+	eigrpd/eigrp_memory.c \
+	eigrpd/eigrp_neighbor.c \
+	eigrpd/eigrp_network.c \
+	eigrpd/eigrp_packet.c \
+	eigrpd/eigrp_query.c \
+	eigrpd/eigrp_reply.c \
+	eigrpd/eigrp_siaquery.c \
+	eigrpd/eigrp_siareply.c \
+	eigrpd/eigrp_snmp.c \
+	eigrpd/eigrp_topology.c \
+	eigrpd/eigrp_update.c \
+	eigrpd/eigrp_vty.c \
+	eigrpd/eigrp_zebra.c \
+	eigrpd/eigrpd.c \
+	# end
+
+eigrpdheaderdir = $(pkgincludedir)/eigrpd
+eigrpdheader_HEADERS = \
+	eigrpd/eigrp_dump.h \
+	eigrpd/eigrp_topology.h \
+	eigrpd/eigrpd.h \
+	# end
+
+noinst_HEADERS += \
+	eigrpd/eigrp_const.h \
+	eigrpd/eigrp_filter.h \
+	eigrpd/eigrp_fsm.h \
+	eigrpd/eigrp_interface.h \
+	eigrpd/eigrp_macros.h \
+	eigrpd/eigrp_memory.h \
+	eigrpd/eigrp_neighbor.h \
+	eigrpd/eigrp_network.h \
+	eigrpd/eigrp_packet.h \
+	eigrpd/eigrp_snmp.h \
+	eigrpd/eigrp_structs.h \
+	eigrpd/eigrp_vty.h \
+	eigrpd/eigrp_zebra.h \
+	# end
+
+eigrpd_eigrpd_SOURCES = eigrpd/eigrp_main.c
+eigrpd_eigrpd_LDADD = eigrpd/libeigrp.a lib/libfrr.la @LIBCAP@
+
+EXTRA_DIST += eigrpd/EIGRP-MIB.txt