build: non-recursive watchfrr & tools

(also forgot to remove AC_SUBST(ISISD) earlier)

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

Makefile.am

@@ -16,6 +16,7 @@ examplesdir = $(exampledir)
 
 bin_PROGRAMS =
 sbin_PROGRAMS =
+sbin_SCRIPTS =
 noinst_PROGRAMS =
 noinst_HEADERS =
 noinst_LIBRARIES =
@@ -35,8 +36,10 @@ $(AUTOMAKE_DUMMY)install-sbinPROGRAMS: install-libLTLIBRARIES
 
 include lib/subdir.am
 include zebra/subdir.am
+include watchfrr/subdir.am
 include qpb/subdir.am
 include fpm/subdir.am
+include tools/subdir.am
 
 include ripd/subdir.am
 include ripngd/subdir.am
@@ -52,13 +55,13 @@ include eigrpd/subdir.am
 SUBDIRS = . @LIBRFP@ @RFPTEST@ \
 	 @BGPD@ \
          @PIMD@ \
-	 @WATCHFRR@ @VTYSH@ @DOC@ \
-         @SOLARIS@ tests tools
+	 @VTYSH@ @DOC@ \
+         @SOLARIS@ tests
 
 DIST_SUBDIRS = . bgpd \
-	  watchfrr vtysh doc tests \
+	  vtysh doc tests \
 	  solaris pimd bgpd/rfp-example/librfp \
-	  bgpd/rfp-example/rfptest tools \
+	  bgpd/rfp-example/rfptest \
 	  # end
 
 if PKGSRC
@@ -100,12 +103,6 @@ EXTRA_DIST += \
 	snapcraft/helpers \
 	snapcraft/snap \
 	\
-	tools/multiple-bgpd.sh \
-	tools/rrcheck.pl \
-	tools/rrlookup.pl \
-	tools/zc.pl \
-	tools/zebra.el \
-	\
 	vtysh/Makefile.am \
 	vtysh/Makefile.in \
 	# end

configure.ac

@@ -1337,8 +1337,6 @@ AC_SUBST(RFPTEST)
 AC_SUBST(LIBRFP)
 AC_SUBST(RFPINC)
 AC_SUBST(BGPD)
-AC_SUBST(WATCHFRR)
-AC_SUBST(ISISD)
 AC_SUBST(PIMD)
 AC_SUBST(SOLARIS)
 AC_SUBST(VTYSH)
@@ -1812,12 +1810,11 @@ AC_CACHE_VAL(ac_cv_htonl_works,
 AC_MSG_RESULT($ac_cv_htonl_works)
 
 AC_CONFIG_FILES([Makefile
-	  bgpd/Makefile watchfrr/Makefile
+	  bgpd/Makefile
 	  vtysh/Makefile
 	  doc/Makefile tests/Makefile
 	  bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile
 	  pimd/Makefile
-	  tools/Makefile
 	  redhat/frr.spec
 	  snapcraft/snapcraft.yaml
 	  lib/version.h

tools/.gitignore

@@ -1,3 +1,4 @@
+!Makefile
 .arch-inventory
 .arch-ids
 

tools/Makefile

@@ -0,0 +1,10 @@
+all: ALWAYS
+	@echo please specify a target to build
+%: ALWAYS
+	@$(MAKE) -s -C .. tools/$@
+
+Makefile:
+	#nothing
+ALWAYS:
+.PHONY: ALWAYS makefiles
+.SUFFIXES:

tools/Makefile.am

@@ -1,16 +0,0 @@
-AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
-DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
-AM_CFLAGS = $(WERROR)
-EXTRA_DIST =
-
-bin_PROGRAMS = permutations
-sbin_PROGRAMS = ssd
-
-permutations_SOURCES = permutations.c
-permutations_LDADD = ../lib/libfrr.la
-
-sbin_SCRIPTS = frr-reload.py frr
-
-EXTRA_DIST += frr.service frr-reload.py frr etc
-
-ssd_SOURCES = start-stop-daemon.c

tools/subdir.am

@@ -0,0 +1,27 @@
+#
+# tools
+#
+
+noinst_PROGRAMS += tools/permutations
+sbin_PROGRAMS += tools/ssd
+sbin_SCRIPTS += \
+	tools/frr-reload.py \
+	tools/frr \
+	# end
+
+tools_permutations_SOURCES = tools/permutations.c
+tools_permutations_LDADD = lib/libfrr.la
+
+tools_ssd_SOURCES = tools/start-stop-daemon.c
+
+EXTRA_DIST += \
+	tools/etc \
+	tools/frr \
+	tools/frr-reload.py \
+	tools/frr.service \
+	tools/multiple-bgpd.sh \
+	tools/rrcheck.pl \
+	tools/rrlookup.pl \
+	tools/zc.pl \
+	tools/zebra.el \
+	# end

watchfrr/.gitignore

@@ -1,4 +1,4 @@
-Makefile
+!Makefile
 Makefile.in
 *.o
 watchfrr

watchfrr/Makefile

@@ -0,0 +1,10 @@
+all: ALWAYS
+	@$(MAKE) -s -C .. watchfrr/watchfrr
+%: ALWAYS
+	@$(MAKE) -s -C .. watchfrr/$@
+
+Makefile:
+	#nothing
+ALWAYS:
+.PHONY: ALWAYS makefiles
+.SUFFIXES:

watchfrr/Makefile.am

@@ -1,11 +0,0 @@
-## Process this file with Automake to create Makefile.in
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
-AM_CFLAGS = $(WERROR)
-
-sbin_PROGRAMS = watchfrr
-
-noinst_HEADERS = watchfrr.h
-
-watchfrr_SOURCES = watchfrr.c watchfrr_vty.c
-watchfrr_LDADD = ../lib/libfrr.la @LIBCAP@

watchfrr/subdir.am

@@ -0,0 +1,17 @@
+#
+# watchfrr
+#
+
+if WATCHFRR
+sbin_PROGRAMS += watchfrr/watchfrr
+endif
+
+noinst_HEADERS += \
+	watchfrr/watchfrr.h \
+	# end
+
+watchfrr_watchfrr_LDADD = lib/libfrr.la @LIBCAP@
+watchfrr_watchfrr_SOURCES = \
+	watchfrr/watchfrr.c \
+	watchfrr/watchfrr_vty.c \
+	# end