build: non-recursive ospf*

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

14 files changed, 234 insertions, 146 deletions

diff --git a/Makefile.am b/Makefile.am
index 5c4c9139d6..68c2dde340 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,15 +31,18 @@ include fpm/subdir.am
 
 include ripd/subdir.am
 include ripngd/subdir.am
+include ospfd/subdir.am
+include ospf6d/subdir.am
+include ospfclient/subdir.am
 
 SUBDIRS = . @LIBRFP@ @RFPTEST@ \
-	 @BGPD@ @OSPFD@ @OSPF6D@ @LDPD@ \
+	 @BGPD@ @LDPD@ \
          @ISISD@ @PIMD@ @NHRPD@ @EIGRPD@ @BABELD@ \
-	 @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ \
+	 @WATCHFRR@ @VTYSH@ @DOC@ \
          @SOLARIS@ tests tools
 
-DIST_SUBDIRS = . bgpd ospfd ospf6d ldpd \
-	  isisd watchfrr vtysh ospfclient doc tests \
+DIST_SUBDIRS = . bgpd ldpd \
+	  isisd watchfrr vtysh doc tests \
 	  solaris pimd nhrpd eigrpd bgpd/rfp-example/librfp \
 	  bgpd/rfp-example/rfptest tools babeld \
 	  # end
diff --git a/configure.ac b/configure.ac
index 243b18d0f9..c734f9d8ef 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1248,13 +1248,7 @@ fi
 AM_CONDITIONAL(BGPD, test "x$BGPD" = "xbgpd")
 
 AM_CONDITIONAL(RIPD, test "${enable_ripd}" != "no")
-
-if test "${enable_ospfd}" = "no";then
-  OSPFD=""
-else
-  OSPFD="ospfd"
-fi
-AM_CONDITIONAL(OSPFD, test "x$OSPFD" = "xospfd")
+AM_CONDITIONAL(OSPFD, test "${enable_ospfd}" != "no")
 
 if test "${enable_ldpd}" = "no";then
   LDPD=""
@@ -1312,11 +1306,7 @@ case "${enable_babeld}" in
 esac
 AM_CONDITIONAL(BABELD, test "x$BABELD" = "xbabeld")
 
-case "${enable_ospf6d}" in
-  "no" ) OSPF6D="";;
-  *    ) OSPF6D="ospf6d";;
-esac
-AM_CONDITIONAL(OSPF6D, test "x$OSPF6D" = "xospf6d")
+AM_CONDITIONAL(OSPF6D, test "${enable_ospf6d}" != "no")
 
 case "${enable_isisd}" in
   "no" ) ISISD="";;
@@ -1363,8 +1353,6 @@ AC_SUBST(LIBRFP)
 AC_SUBST(RFPINC)
 AC_SUBST(BABELD)
 AC_SUBST(BGPD)
-AC_SUBST(OSPFD)
-AC_SUBST(OSPF6D)
 AC_SUBST(LDPD)
 AC_SUBST(NHRPD)
 AC_SUBST(EIGRPD)
@@ -1374,8 +1362,6 @@ AC_SUBST(PIMD)
 AC_SUBST(SOLARIS)
 AC_SUBST(VTYSH)
 AC_SUBST(CURSES)
-AC_SUBST(OSPFCLIENT)
-AC_SUBST(OSPFAPI)
 AC_CHECK_LIB(crypt, crypt, [],
 		    [AC_CHECK_LIB(crypto, DES_crypt)])
 AC_CHECK_LIB(resolv, res_init)
@@ -1820,9 +1806,9 @@ AC_CACHE_VAL(ac_cv_htonl_works,
 AC_MSG_RESULT($ac_cv_htonl_works)
 
 AC_CONFIG_FILES([Makefile
-	  bgpd/Makefile ospfd/Makefile watchfrr/Makefile
-	  ospf6d/Makefile ldpd/Makefile isisd/Makefile vtysh/Makefile
-	  doc/Makefile ospfclient/Makefile tests/Makefile
+	  bgpd/Makefile watchfrr/Makefile
+	  ldpd/Makefile isisd/Makefile vtysh/Makefile
+	  doc/Makefile tests/Makefile
 	  bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile
 	  babeld/Makefile
 	  pimd/Makefile
diff --git a/ospf6d/.gitignore b/ospf6d/.gitignore
index 3fef0b7804..744af2d5ce 100644
--- a/ospf6d/.gitignore
+++ b/ospf6d/.gitignore
@@ -1,5 +1,5 @@
+!Makefile
 Makefile.in
-Makefile
 *.o
 *.patch
 ospf6d
diff --git a/ospf6d/Makefile b/ospf6d/Makefile
new file mode 100644
index 0000000000..97b37b8c60
--- /dev/null
+++ b/ospf6d/Makefile
@@ -0,0 +1,10 @@
+all: ALWAYS
+	@$(MAKE) -s -C .. ospf6d/ospf6d
+%: ALWAYS
+	@$(MAKE) -s -C .. ospf6d/$@
+
+Makefile:
+	#nothing
+ALWAYS:
+.PHONY: ALWAYS makefiles
+.SUFFIXES:
diff --git a/ospf6d/Makefile.am b/ospf6d/Makefile.am
deleted file mode 100644
index 75dd8ffe46..0000000000
--- a/ospf6d/Makefile.am
+++ /dev/null
@@ -1,43 +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 = libospf6.a
-module_LTLIBRARIES =
-sbin_PROGRAMS = ospf6d
-
-libospf6_a_SOURCES = \
-	ospf6_memory.c \
-	ospf6_network.c ospf6_message.c ospf6_lsa.c ospf6_lsdb.c \
-	ospf6_top.c ospf6_area.c ospf6_interface.c ospf6_neighbor.c \
-	ospf6_flood.c ospf6_route.c ospf6_intra.c ospf6_zebra.c \
-	ospf6_spf.c ospf6_proto.c ospf6_asbr.c ospf6_abr.c \
-	ospf6d.c ospf6_bfd.c
-
-noinst_HEADERS = \
-	ospf6_memory.h \
-	ospf6_network.h ospf6_message.h ospf6_lsa.h ospf6_lsdb.h \
-	ospf6_top.h ospf6_area.h ospf6_interface.h ospf6_neighbor.h \
-	ospf6_flood.h ospf6_route.h ospf6_intra.h ospf6_zebra.h \
-	ospf6_spf.h ospf6_proto.h ospf6_asbr.h ospf6_abr.h \
-	ospf6d.h ospf6_bfd.h
-
-ospf6d_SOURCES = \
-	ospf6_main.c $(libospf6_a_SOURCES)
-
-ospf6d_LDADD = ../lib/libfrr.la @LIBCAP@
-
-if SNMP
-module_LTLIBRARIES += ospf6d_snmp.la
-endif
-ospf6d_snmp_la_SOURCES = ospf6_snmp.c
-ospf6d_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
-ospf6d_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
-ospf6d_snmp_la_LIBADD = ../lib/libfrrsnmp.la
-
-examplesdir = $(exampledir)
-dist_examples_DATA = ospf6d.conf.sample
diff --git a/ospf6d/subdir.am b/ospf6d/subdir.am
new file mode 100644
index 0000000000..76a64cd637
--- /dev/null
+++ b/ospf6d/subdir.am
@@ -0,0 +1,66 @@
+#
+# ospf6d
+#
+
+if OSPF6D
+noinst_LIBRARIES += ospf6d/libospf6.a
+sbin_PROGRAMS += ospf6d/ospf6d
+dist_examples_DATA += ospf6d/ospf6d.conf.sample
+if SNMP
+module_LTLIBRARIES += ospf6d/ospf6d_snmp.la
+endif
+endif
+
+ospf6d_libospf6_a_SOURCES = \
+	ospf6d/ospf6_abr.c \
+	ospf6d/ospf6_area.c \
+	ospf6d/ospf6_asbr.c \
+	ospf6d/ospf6_bfd.c \
+	ospf6d/ospf6_flood.c \
+	ospf6d/ospf6_interface.c \
+	ospf6d/ospf6_intra.c \
+	ospf6d/ospf6_lsa.c \
+	ospf6d/ospf6_lsdb.c \
+	ospf6d/ospf6_memory.c \
+	ospf6d/ospf6_message.c \
+	ospf6d/ospf6_neighbor.c \
+	ospf6d/ospf6_network.c \
+	ospf6d/ospf6_proto.c \
+	ospf6d/ospf6_route.c \
+	ospf6d/ospf6_spf.c \
+	ospf6d/ospf6_top.c \
+	ospf6d/ospf6_zebra.c \
+	ospf6d/ospf6d.c \
+	# end
+
+noinst_HEADERS += \
+	ospf6d/ospf6_abr.h \
+	ospf6d/ospf6_area.h \
+	ospf6d/ospf6_asbr.h \
+	ospf6d/ospf6_bfd.h \
+	ospf6d/ospf6_flood.h \
+	ospf6d/ospf6_interface.h \
+	ospf6d/ospf6_intra.h \
+	ospf6d/ospf6_lsa.h \
+	ospf6d/ospf6_lsdb.h \
+	ospf6d/ospf6_memory.h \
+	ospf6d/ospf6_message.h \
+	ospf6d/ospf6_neighbor.h \
+	ospf6d/ospf6_network.h \
+	ospf6d/ospf6_proto.h \
+	ospf6d/ospf6_route.h \
+	ospf6d/ospf6_spf.h \
+	ospf6d/ospf6_top.h \
+	ospf6d/ospf6_zebra.h \
+	ospf6d/ospf6d.h \
+	# end
+
+ospf6d_ospf6d_LDADD = ospf6d/libospf6.a lib/libfrr.la @LIBCAP@
+ospf6d_ospf6d_SOURCES = \
+	ospf6d/ospf6_main.c \
+	# end
+
+ospf6d_ospf6d_snmp_la_SOURCES = ospf6d/ospf6_snmp.c
+ospf6d_ospf6d_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
+ospf6d_ospf6d_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
+ospf6d_ospf6d_snmp_la_LIBADD = lib/libfrrsnmp.la
diff --git a/ospfclient/.gitignore b/ospfclient/.gitignore
index a6000f8021..1740b04fbc 100644
--- a/ospfclient/.gitignore
+++ b/ospfclient/.gitignore
@@ -1,4 +1,4 @@
-Makefile
+!Makefile
 Makefile.in
 *.o
 ospfclient
diff --git a/ospfclient/Makefile b/ospfclient/Makefile
new file mode 100644
index 0000000000..3da2a5b897
--- /dev/null
+++ b/ospfclient/Makefile
@@ -0,0 +1,10 @@
+all: ALWAYS
+	@$(MAKE) -s -C .. ospfclient/ospfclient
+%: ALWAYS
+	@$(MAKE) -s -C .. ospfclient/$@
+
+Makefile:
+	#nothing
+ALWAYS:
+.PHONY: ALWAYS makefiles
+.SUFFIXES:
diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am
deleted file mode 100644
index b4e362bbb3..0000000000
--- a/ospfclient/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-## Automake.am for OSPF API client
-AUTOMAKE_OPTIONS = subdir-objects
-
-AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
-AM_CFLAGS = $(WERROR)
-
-lib_LTLIBRARIES = libfrrospfapiclient.la
-libfrrospfapiclient_la_LDFLAGS = -version-info 0:0:0
-libfrrospfapiclient_la_LIBADD = ../lib/libfrr.la
-
-sbin_PROGRAMS = ospfclient
-
-libfrrospfapiclient_la_SOURCES = \
-	ospf_apiclient.c
-
-ospfapiheaderdir = $(pkgincludedir)/ospfapi
-
-ospfapiheader_HEADERS = \
-	ospf_apiclient.h
-
-ospfclient_SOURCES = \
-	ospfclient.c
-
-ospfclient_LDADD = libfrrospfapiclient.la \
-	../lib/libfrr.la @LIBCAP@
-
-ospfclient_CFLAGS = $(AM_CFLAGS)
-ospfclient_LDFLAGS = $(AM_LDFLAGS)
diff --git a/ospfclient/subdir.am b/ospfclient/subdir.am
new file mode 100644
index 0000000000..834d4aaba7
--- /dev/null
+++ b/ospfclient/subdir.am
@@ -0,0 +1,30 @@
+#
+# ospfclient
+#
+
+if OSPFCLIENT
+lib_LTLIBRARIES += ospfclient/libfrrospfapiclient.la
+sbin_PROGRAMS += ospfclient/ospfclient
+endif
+
+ospfclient_libfrrospfapiclient_la_LDFLAGS = -version-info 0:0:0
+ospfclient_libfrrospfapiclient_la_LIBADD = lib/libfrr.la
+ospfclient_libfrrospfapiclient_la_SOURCES = \
+	ospfclient/ospf_apiclient.c \
+	# end
+
+if OSPFCLIENT
+ospfapiheaderdir = $(pkgincludedir)/ospfapi
+ospfapiheader_HEADERS = \
+	ospfclient/ospf_apiclient.h \
+	# end
+endif
+
+ospfclient_ospfclient_LDADD = \
+	ospfclient/libfrrospfapiclient.la \
+	lib/libfrr.la \
+	@LIBCAP@ \
+	# end
+ospfclient_ospfclient_SOURCES = \
+	ospfclient/ospfclient.c \
+	# end
diff --git a/ospfd/.gitignore b/ospfd/.gitignore
index 4b8787c89e..752c875a62 100644
--- a/ospfd/.gitignore
+++ b/ospfd/.gitignore
@@ -1,4 +1,4 @@
-Makefile
+!Makefile
 Makefile.in
 *.o
 ospfd
diff --git a/ospfd/Makefile b/ospfd/Makefile
new file mode 100644
index 0000000000..e4fab30e19
--- /dev/null
+++ b/ospfd/Makefile
@@ -0,0 +1,10 @@
+all: ALWAYS
+	@$(MAKE) -s -C .. ospfd/ospfd
+%: ALWAYS
+	@$(MAKE) -s -C .. ospfd/$@
+
+Makefile:
+	#nothing
+ALWAYS:
+.PHONY: ALWAYS makefiles
+.SUFFIXES:
diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
deleted file mode 100644
index c6a5ec91d2..0000000000
--- a/ospfd/Makefile.am
+++ /dev/null
@@ -1,49 +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
-AM_CFLAGS = $(WERROR)
-DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
-INSTALL_SDATA=@INSTALL@ -m 600
-
-noinst_LIBRARIES = libfrrospf.a
-module_LTLIBRARIES =
-sbin_PROGRAMS = ospfd
-
-libfrrospf_a_SOURCES = \
-	ospfd.c ospf_zebra.c ospf_interface.c ospf_ism.c ospf_neighbor.c \
-	ospf_nsm.c ospf_dump.c ospf_network.c ospf_packet.c ospf_lsa.c \
-	ospf_spf.c ospf_route.c ospf_ase.c ospf_abr.c ospf_ia.c ospf_flood.c \
-	ospf_lsdb.c ospf_asbr.c ospf_routemap.c \
-	ospf_opaque.c ospf_te.c ospf_ri.c ospf_vty.c ospf_api.c ospf_apiserver.c \
-	ospf_bfd.c ospf_memory.c ospf_dump_api.c
-
-ospfdheaderdir = $(pkgincludedir)/ospfd
-
-ospfdheader_HEADERS = \
-	ospf_api.h ospf_asbr.h ospf_dump.h ospf_lsa.h ospf_lsdb.h \
-	ospf_nsm.h ospf_ism.h ospf_opaque.h ospfd.h \
-	ospf_dump_api.h
-
-noinst_HEADERS = \
-	ospf_interface.h ospf_neighbor.h ospf_network.h ospf_packet.h \
-	ospf_zebra.h ospf_spf.h ospf_route.h ospf_ase.h ospf_abr.h ospf_ia.h \
-	ospf_flood.h ospf_te.h ospf_ri.h ospf_vty.h ospf_apiserver.h \
-	ospf_bfd.h ospf_memory.h
-
-ospfd_SOURCES = ospf_main.c
-
-ospfd_LDADD = libfrrospf.a ../lib/libfrr.la @LIBCAP@ @LIBM@
-
-if SNMP
-module_LTLIBRARIES += ospfd_snmp.la
-endif
-ospfd_snmp_la_SOURCES = ospf_snmp.c
-ospfd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
-ospfd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
-ospfd_snmp_la_LIBADD = ../lib/libfrrsnmp.la
-
-EXTRA_DIST = OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt
-
-examplesdir = $(exampledir)
-dist_examples_DATA = ospfd.conf.sample
-
diff --git a/ospfd/subdir.am b/ospfd/subdir.am
new file mode 100644
index 0000000000..12c2313e65
--- /dev/null
+++ b/ospfd/subdir.am
@@ -0,0 +1,93 @@
+#
+# ospfd
+#
+
+if OSPFD
+noinst_LIBRARIES += ospfd/libfrrospf.a
+sbin_PROGRAMS += ospfd/ospfd
+dist_examples_DATA += ospfd/ospfd.conf.sample
+if SNMP
+module_LTLIBRARIES += ospfd/ospfd_snmp.la
+endif
+endif
+
+ospfd_libfrrospf_a_SOURCES = \
+	ospfd/ospf_abr.c \
+	ospfd/ospf_api.c \
+	ospfd/ospf_apiserver.c \
+	ospfd/ospf_asbr.c \
+	ospfd/ospf_ase.c \
+	ospfd/ospf_bfd.c \
+	ospfd/ospf_dump.c \
+	ospfd/ospf_dump_api.c \
+	ospfd/ospf_flood.c \
+	ospfd/ospf_ia.c \
+	ospfd/ospf_interface.c \
+	ospfd/ospf_ism.c \
+	ospfd/ospf_lsa.c \
+	ospfd/ospf_lsdb.c \
+	ospfd/ospf_memory.c \
+	ospfd/ospf_neighbor.c \
+	ospfd/ospf_network.c \
+	ospfd/ospf_nsm.c \
+	ospfd/ospf_opaque.c \
+	ospfd/ospf_packet.c \
+	ospfd/ospf_ri.c \
+	ospfd/ospf_route.c \
+	ospfd/ospf_routemap.c \
+	ospfd/ospf_spf.c \
+	ospfd/ospf_te.c \
+	ospfd/ospf_vty.c \
+	ospfd/ospf_zebra.c \
+	ospfd/ospfd.c \
+	# end
+
+if OSPFD
+ospfdheaderdir = $(pkgincludedir)/ospfd
+ospfdheader_HEADERS = \
+	ospfd/ospf_api.h \
+	ospfd/ospf_asbr.h \
+	ospfd/ospf_dump.h \
+	ospfd/ospf_dump_api.h \
+	ospfd/ospf_ism.h \
+	ospfd/ospf_lsa.h \
+	ospfd/ospf_lsdb.h \
+	ospfd/ospf_nsm.h \
+	ospfd/ospf_opaque.h \
+	ospfd/ospfd.h \
+	# end
+endif
+
+noinst_HEADERS += \
+	ospfd/ospf_abr.h \
+	ospfd/ospf_apiserver.h \
+	ospfd/ospf_ase.h \
+	ospfd/ospf_bfd.h \
+	ospfd/ospf_flood.h \
+	ospfd/ospf_ia.h \
+	ospfd/ospf_interface.h \
+	ospfd/ospf_memory.h \
+	ospfd/ospf_neighbor.h \
+	ospfd/ospf_network.h \
+	ospfd/ospf_packet.h \
+	ospfd/ospf_ri.h \
+	ospfd/ospf_route.h \
+	ospfd/ospf_spf.h \
+	ospfd/ospf_te.h \
+	ospfd/ospf_vty.h \
+	ospfd/ospf_zebra.h \
+	# end
+
+ospfd_ospfd_LDADD = ospfd/libfrrospf.a lib/libfrr.la @LIBCAP@ @LIBM@
+ospfd_ospfd_SOURCES = ospfd/ospf_main.c
+
+ospfd_ospfd_snmp_la_SOURCES = ospfd/ospf_snmp.c
+ospfd_ospfd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS)
+ospfd_ospfd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
+ospfd_ospfd_snmp_la_LIBADD = lib/libfrrsnmp.la
+
+EXTRA_DIST += \
+	ospfd/ChangeLog.opaque.txt \
+	ospfd/OSPF-MIB.txt \
+	ospfd/OSPF-TRAP-MIB.txt \
+	# end