build: move vtysh & manpage listings to subdir.am

Since we're now building through one large Makefile, we can easily put
things with their daemons and crossreference nicely.

Signed-off-by: David Lamparter <equinox@diac24.net>

23 files changed, 155 insertions, 221 deletions

diff --git a/Makefile.am b/Makefile.am
index fc1beaeea..aae89a90d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,6 +88,7 @@ pkginclude_HEADERS =
 nodist_pkginclude_HEADERS =
 dist_examples_DATA =
 man_MANS =
+vtysh_scan =
 
 ## libtool, the self-made GNU scourge
 ## ... this should fix relinking
diff --git a/babeld/subdir.am b/babeld/subdir.am
index 6f91f7393..e1f2cb0a0 100644
--- a/babeld/subdir.am
+++ b/babeld/subdir.am
@@ -6,6 +6,11 @@ if BABELD
 noinst_LIBRARIES += babeld/libbabel.a
 sbin_PROGRAMS += babeld/babeld
 dist_examples_DATA += babeld/babeld.conf.sample
+vtysh_scan += \
+	$(top_srcdir)/babeld/babel_interface.c \
+	$(top_srcdir)/babeld/babel_zebra.c \
+	$(top_srcdir)/babeld/babeld.c \
+	# end
 endif
 
 babeld_libbabel_a_SOURCES = \
diff --git a/bfdd/subdir.am b/bfdd/subdir.am
index 86923f5ce..7447519b2 100644
--- a/bfdd/subdir.am
+++ b/bfdd/subdir.am
@@ -6,6 +6,8 @@ if BFDD
 noinst_LIBRARIES += bfdd/libbfd.a
 sbin_PROGRAMS += bfdd/bfdd
 dist_examples_DATA += bfdd/bfdd.conf.sample
+vtysh_scan += $(top_srcdir)/bfdd/bfdd_vty.c
+rstman8_DATA += $(MANBUILD)/bfdd.8
 endif
 
 bfdd_libbfd_a_SOURCES = \
diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
index 82b268c31..2e0bb1ae6 100644
--- a/bgpd/bgp_rpki.c
+++ b/bgpd/bgp_rpki.c
@@ -49,6 +49,7 @@
 #include "bgpd/bgp_route.h"
 #include "lib/network.h"
 #include "lib/thread.h"
+#ifndef VTYSH_EXTRACT_PL
 #include "rtrlib/rtrlib.h"
 #include "rtrlib/rtr_mgr.h"
 #include "rtrlib/lib/ip.h"
@@ -56,6 +57,7 @@
 #if defined(FOUND_SSH)
 #include "rtrlib/transport/ssh/ssh_transport.h"
 #endif
+#endif
 #include "hook.h"
 #include "libfrr.h"
 #include "version.h"
diff --git a/bgpd/subdir.am b/bgpd/subdir.am
index e24516acd..7bb8b8ed8 100644
--- a/bgpd/subdir.am
+++ b/bgpd/subdir.am
@@ -11,12 +11,40 @@ dist_examples_DATA += \
 	bgpd/bgpd.conf.sample2 \
 	bgpd/bgpd.conf.vnc.sample \
 	# end
+vtysh_scan += \
+	$(top_srcdir)/bgpd/bgp_bfd.c \
+	$(top_srcdir)/bgpd/bgp_debug.c \
+	$(top_srcdir)/bgpd/bgp_dump.c \
+	$(top_srcdir)/bgpd/bgp_evpn_vty.c \
+	$(top_srcdir)/bgpd/bgp_filter.c \
+	$(top_srcdir)/bgpd/bgp_mplsvpn.c \
+	$(top_srcdir)/bgpd/bgp_nexthop.c \
+	$(top_srcdir)/bgpd/bgp_route.c \
+	$(top_srcdir)/bgpd/bgp_routemap.c \
+	$(top_srcdir)/bgpd/bgp_vty.c \
+	$(top_srcdir)/bgpd/bgp_flowspec_vty.c \
+	# end
+
+# can be loaded as DSO - always include for vtysh
+if RPKI
+vtysh_scan += $(top_srcdir)/bgpd/bgp_rpki.c
+endif
+
+if ENABLE_BGP_VNC
+vtysh_scan += \
+	$(top_srcdir)/bgpd/rfapi/bgp_rfapi_cfg.c \
+	$(top_srcdir)/bgpd/rfapi/rfapi.c \
+	$(top_srcdir)/bgpd/rfapi/rfapi_vty.c \
+	$(top_srcdir)/bgpd/rfapi/vnc_debug.c \
+	# end
+endif
 if SNMP
 module_LTLIBRARIES += bgpd/bgpd_snmp.la
 endif
 if RPKI
 module_LTLIBRARIES += bgpd/bgpd_rpki.la
 endif
+rstman8_DATA += $(MANBUILD)/bgpd.8
 endif
 
 bgpd_libbgp_a_SOURCES = \
diff --git a/doc/manpages/subdir.am b/doc/manpages/subdir.am
index 20efd523f..0ce9161db 100644
--- a/doc/manpages/subdir.am
+++ b/doc/manpages/subdir.am
@@ -49,79 +49,6 @@ rstman8_DATA =
 
 rstman1_DATA += $(MANBUILD)/frr.1
 
-if PIMD
-rstman8_DATA += $(MANBUILD)/pimd.8
-rstman8_DATA += $(MANBUILD)/mtracebis.8
-endif
-
-if PBRD
-rstman8_DATA += $(MANBUILD)/pbrd.8
-endif
-
-if BGPD
-rstman8_DATA += $(MANBUILD)/bgpd.8
-endif
-
-if ISISD
-rstman8_DATA += $(MANBUILD)/isisd.8
-endif
-
-if OSPF6D
-rstman8_DATA += $(MANBUILD)/ospf6d.8
-endif
-
-if OSPFCLIENT
-rstman8_DATA += $(MANBUILD)/ospfclient.8
-endif
-
-if OSPFD
-rstman8_DATA += $(MANBUILD)/ospfd.8
-endif
-
-if LDPD
-rstman8_DATA += $(MANBUILD)/ldpd.8
-endif
-
-if RIPD
-rstman8_DATA += $(MANBUILD)/ripd.8
-endif
-
-if RIPNGD
-rstman8_DATA += $(MANBUILD)/ripngd.8
-endif
-
-if NHRPD
-rstman8_DATA += $(MANBUILD)/nhrpd.8
-endif
-
-if VTYSH
-rstman1_DATA += $(MANBUILD)/vtysh.1
-endif
-
-if WATCHFRR
-rstman8_DATA += $(MANBUILD)/watchfrr.8
-endif
-
-if ZEBRA
-rstman8_DATA += $(MANBUILD)/zebra.8
-endif
-
-if EIGRPD
-rstman8_DATA += $(MANBUILD)/eigrpd.8
-endif
-
-if SHARPD
-rstman8_DATA += $(MANBUILD)/sharpd.8
-endif
-
-if STATICD
-rstman8_DATA += $(MANBUILD)/staticd.8
-endif
-
-if BFDD
-rstman8_DATA += $(MANBUILD)/bfdd.8
-endif
-
 # dependency
 $(rstman8_DATA) $(rstman1_DATA): $(MANBUILD)/man.stamp
 
diff --git a/eigrpd/subdir.am b/eigrpd/subdir.am
index 2635d555d..75b77feee 100644
--- a/eigrpd/subdir.am
+++ b/eigrpd/subdir.am
@@ -6,6 +6,12 @@ if EIGRPD
 noinst_LIBRARIES += eigrpd/libeigrp.a
 sbin_PROGRAMS += eigrpd/eigrpd
 dist_examples_DATA += eigrpd/eigrpd.conf.sample
+vtysh_scan += \
+	$(top_srcdir)/eigrpd/eigrp_dump.c \
+	$(top_srcdir)/eigrpd/eigrp_vty.c \
+	# end
+#	$(top_srcdir)/eigrpd/eigrp_routemap.c
+rstman8_DATA += $(MANBUILD)/eigrpd.8
 endif
 
 eigrpd_libeigrp_a_SOURCES = \
diff --git a/isisd/subdir.am b/isisd/subdir.am
index a45b9ca47..855cd9dc5 100644
--- a/isisd/subdir.am
+++ b/isisd/subdir.am
@@ -6,6 +6,16 @@ if ISISD
 noinst_LIBRARIES += isisd/libisis.a
 sbin_PROGRAMS += isisd/isisd
 dist_examples_DATA += isisd/isisd.conf.sample
+vtysh_scan += \
+	$(top_srcdir)/isisd/isis_redist.c \
+	$(top_srcdir)/isisd/isis_spf.c \
+	$(top_srcdir)/isisd/isis_te.c \
+	$(top_srcdir)/isisd/isis_vty_common.c \
+	$(top_srcdir)/isisd/isis_vty_fabricd.c \
+	$(top_srcdir)/isisd/isis_vty_isisd.c \
+	$(top_srcdir)/isisd/isisd.c \
+	# end
+rstman8_DATA += $(MANBUILD)/isisd.8
 endif
 
 if FABRICD
diff --git a/ldpd/subdir.am b/ldpd/subdir.am
index 2d87be0cd..b42f401f2 100644
--- a/ldpd/subdir.am
+++ b/ldpd/subdir.am
@@ -6,6 +6,8 @@ if LDPD
 noinst_LIBRARIES += ldpd/libldp.a
 sbin_PROGRAMS += ldpd/ldpd
 dist_examples_DATA += ldpd/ldpd.conf.sample
+vtysh_scan += $(top_srcdir)/ldpd/ldp_vty_cmds.c
+rstman8_DATA += $(MANBUILD)/ldpd.8
 endif
 
 ldpd_libldp_a_SOURCES = \
diff --git a/lib/subdir.am b/lib/subdir.am
index ef0cefe7a..09deb9bc1 100644
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -84,6 +84,22 @@ lib_libfrr_la_SOURCES = \
 	lib/logicalrouter.c \
 	# end
 
+vtysh_scan += \
+	$(top_srcdir)/lib/distribute.c \
+	$(top_srcdir)/lib/filter.c \
+	$(top_srcdir)/lib/if.c \
+	$(top_srcdir)/lib/if_rmap.c \
+	$(top_srcdir)/lib/keychain.c \
+	$(top_srcdir)/lib/logicalrouter.c \
+	$(top_srcdir)/lib/nexthop_group.c \
+	$(top_srcdir)/lib/plist.c \
+	$(top_srcdir)/lib/routemap.c \
+	$(top_srcdir)/lib/vrf.c \
+	$(top_srcdir)/lib/vty.c \
+	# end
+# can be loaded as DSO - always include for vtysh
+vtysh_scan += $(top_srcdir)/lib/agentx.c
+
 lib/plist_clippy.c: $(CLIPPY_DEPS)
 lib/plist.lo: lib/plist_clippy.c
 lib/nexthop_group_clippy.c: $(CLIPPY_DEPS)
diff --git a/nhrpd/subdir.am b/nhrpd/subdir.am
index d66e96822..f7575971e 100644
--- a/nhrpd/subdir.am
+++ b/nhrpd/subdir.am
@@ -4,6 +4,8 @@
 
 if NHRPD
 sbin_PROGRAMS += nhrpd/nhrpd
+vtysh_scan += $(top_srcdir)/nhrpd/nhrp_vty.c
+rstman8_DATA += $(MANBUILD)/nhrpd.8
 endif
 
 nhrpd_nhrpd_LDADD = lib/libfrr.la @LIBCAP@ @CARES_LIBS@
diff --git a/ospf6d/subdir.am b/ospf6d/subdir.am
index 8a6c4a5cc..5338e1ea3 100644
--- a/ospf6d/subdir.am
+++ b/ospf6d/subdir.am
@@ -6,9 +6,27 @@ if OSPF6D
 noinst_LIBRARIES += ospf6d/libospf6.a
 sbin_PROGRAMS += ospf6d/ospf6d
 dist_examples_DATA += ospf6d/ospf6d.conf.sample
+vtysh_scan += \
+	$(top_srcdir)/ospf6d/ospf6_abr.c \
+	$(top_srcdir)/ospf6d/ospf6_asbr.c \
+	$(top_srcdir)/ospf6d/ospf6_area.c \
+	$(top_srcdir)/ospf6d/ospf6_bfd.c \
+	$(top_srcdir)/ospf6d/ospf6_flood.c \
+	$(top_srcdir)/ospf6d/ospf6_interface.c \
+	$(top_srcdir)/ospf6d/ospf6_intra.c \
+	$(top_srcdir)/ospf6d/ospf6_lsa.c \
+	$(top_srcdir)/ospf6d/ospf6_message.c \
+	$(top_srcdir)/ospf6d/ospf6_neighbor.c \
+	$(top_srcdir)/ospf6d/ospf6_route.c \
+	$(top_srcdir)/ospf6d/ospf6_spf.c \
+	$(top_srcdir)/ospf6d/ospf6_top.c \
+	$(top_srcdir)/ospf6d/ospf6_zebra.c \
+	$(top_srcdir)/ospf6d/ospf6d.c \
+	# end
 if SNMP
 module_LTLIBRARIES += ospf6d/ospf6d_snmp.la
 endif
+rstman8_DATA += $(MANBUILD)/ospf6d.8
 endif
 
 ospf6d_libospf6_a_SOURCES = \
diff --git a/ospfclient/subdir.am b/ospfclient/subdir.am
index 834d4aaba..d880f9fc7 100644
--- a/ospfclient/subdir.am
+++ b/ospfclient/subdir.am
@@ -5,6 +5,7 @@
 if OSPFCLIENT
 lib_LTLIBRARIES += ospfclient/libfrrospfapiclient.la
 sbin_PROGRAMS += ospfclient/ospfclient
+rstman8_DATA += $(MANBUILD)/ospfclient.8
 endif
 
 ospfclient_libfrrospfapiclient_la_LDFLAGS = -version-info 0:0:0
diff --git a/ospfd/subdir.am b/ospfd/subdir.am
index cd659a9bc..2b42b5230 100644
--- a/ospfd/subdir.am
+++ b/ospfd/subdir.am
@@ -6,9 +6,20 @@ if OSPFD
 noinst_LIBRARIES += ospfd/libfrrospf.a
 sbin_PROGRAMS += ospfd/ospfd
 dist_examples_DATA += ospfd/ospfd.conf.sample
+vtysh_scan += \
+	$(top_srcdir)/ospfd/ospf_bfd.c \
+	$(top_srcdir)/ospfd/ospf_dump.c \
+	$(top_srcdir)/ospfd/ospf_opaque.c \
+	$(top_srcdir)/ospfd/ospf_ri.c \
+	$(top_srcdir)/ospfd/ospf_routemap.c \
+	$(top_srcdir)/ospfd/ospf_te.c \
+	$(top_srcdir)/ospfd/ospf_sr.c \
+	$(top_srcdir)/ospfd/ospf_vty.c \
+	# end
 if SNMP
 module_LTLIBRARIES += ospfd/ospfd_snmp.la
 endif
+rstman8_DATA += $(MANBUILD)/ospfd.8
 endif
 
 ospfd_libfrrospf_a_SOURCES = \
diff --git a/pbrd/subdir.am b/pbrd/subdir.am
index 42ab39321..49a07e1f6 100644
--- a/pbrd/subdir.am
+++ b/pbrd/subdir.am
@@ -6,6 +6,11 @@ if PBRD
 noinst_LIBRARIES += pbrd/libpbr.a
 sbin_PROGRAMS += pbrd/pbrd
 dist_examples_DATA += pbrd/pbrd.conf.sample
+vtysh_scan += \
+	$(top_srcdir)/pbrd/pbr_vty.c \
+	$(top_srcdir)/pbrd/pbr_debug.c \
+	# end
+rstman8_DATA += $(MANBUILD)/pbrd.8
 endif
 
 pbrd_libpbr_a_SOURCES = \
diff --git a/pimd/subdir.am b/pimd/subdir.am
index 55d56ece9..00cabb99b 100644
--- a/pimd/subdir.am
+++ b/pimd/subdir.am
@@ -8,6 +8,9 @@ sbin_PROGRAMS += pimd/pimd
 bin_PROGRAMS += pimd/mtracebis
 noinst_PROGRAMS += pimd/test_igmpv3_join
 dist_examples_DATA += pimd/pimd.conf.sample
+vtysh_scan += $(top_srcdir)/pimd/pim_cmd.c
+rstman8_DATA += $(MANBUILD)/pimd.8
+rstman8_DATA += $(MANBUILD)/mtracebis.8
 endif
 
 pimd_libpim_a_SOURCES = \
diff --git a/ripd/subdir.am b/ripd/subdir.am
index 612db1a7a..f2c54c835 100644
--- a/ripd/subdir.am
+++ b/ripd/subdir.am
@@ -6,9 +6,18 @@ if RIPD
 noinst_LIBRARIES += ripd/librip.a
 sbin_PROGRAMS += ripd/ripd
 dist_examples_DATA += ripd/ripd.conf.sample
+vtysh_scan += \
+	$(top_srcdir)/ripd/rip_debug.c \
+	$(top_srcdir)/ripd/rip_interface.c \
+	$(top_srcdir)/ripd/rip_offset.c \
+	$(top_srcdir)/ripd/rip_zebra.c \
+	$(top_srcdir)/ripd/ripd.c \
+	# end
+
 if SNMP
 module_LTLIBRARIES += ripd/ripd_snmp.la
 endif
+rstman8_DATA += $(MANBUILD)/ripd.8
 endif
 
 ripd_librip_a_SOURCES = \
diff --git a/ripngd/subdir.am b/ripngd/subdir.am
index 1f7ff09d6..0948b2334 100644
--- a/ripngd/subdir.am
+++ b/ripngd/subdir.am
@@ -5,6 +5,14 @@
 if RIPNGD
 noinst_LIBRARIES += ripngd/libripng.a
 sbin_PROGRAMS += ripngd/ripngd
+vtysh_scan += \
+	$(top_srcdir)/ripngd/ripng_debug.c \
+	$(top_srcdir)/ripngd/ripng_interface.c \
+	$(top_srcdir)/ripngd/ripng_offset.c \
+	$(top_srcdir)/ripngd/ripng_zebra.c \
+	$(top_srcdir)/ripngd/ripngd.c \
+	# end
+rstman8_DATA += $(MANBUILD)/ripngd.8
 endif
 
 ripngd_libripng_a_SOURCES = \
diff --git a/sharpd/subdir.am b/sharpd/subdir.am
index 490a2ba78..ecc62af14 100644
--- a/sharpd/subdir.am
+++ b/sharpd/subdir.am
@@ -6,6 +6,8 @@ if SHARPD
 noinst_LIBRARIES += sharpd/libsharp.a
 sbin_PROGRAMS += sharpd/sharpd
 dist_examples_DATA += sharpd/sharpd.conf.sample
+vtysh_scan += $(top_srcdir)/sharpd/sharp_vty.c
+rstman8_DATA += $(MANBUILD)/sharpd.8
 endif
 
 sharpd_libsharp_a_SOURCES = \
diff --git a/staticd/subdir.am b/staticd/subdir.am
index 3b06a92e2..f1071545a 100644
--- a/staticd/subdir.am
+++ b/staticd/subdir.am
@@ -6,6 +6,8 @@ if STATICD
 noinst_LIBRARIES += staticd/libstatic.a
 sbin_PROGRAMS += staticd/staticd
 dist_examples_DATA += staticd/staticd.conf.sample
+vtysh_scan += $(top_srcdir)/staticd/static_vty.c
+rstman8_DATA += $(MANBUILD)/staticd.8
 endif
 
 staticd_libstatic_a_SOURCES = \
diff --git a/vtysh/subdir.am b/vtysh/subdir.am
index ca288ea9e..3d40f37d2 100644
--- a/vtysh/subdir.am
+++ b/vtysh/subdir.am
@@ -5,6 +5,7 @@
 if VTYSH
 bin_PROGRAMS += vtysh/vtysh
 dist_examples_DATA += vtysh/vtysh.conf.sample
+rstman1_DATA += $(MANBUILD)/vtysh.1
 endif
 
 vtysh_vtysh_SOURCES = \
@@ -27,156 +28,10 @@ vtysh_vtysh_LDADD = lib/libfrr.la @LIBCAP@ @LIBREADLINE@ @LIBS@ @CURSES@ @LIBPAM
 
 EXTRA_DIST += vtysh/extract.pl
 
-vtysh_scan =
-
-if PIMD
-vtysh_scan += $(top_srcdir)/pimd/pim_cmd.c
-endif
-
-if BGPD
-vtysh_scan += $(top_srcdir)/bgpd/bgp_bfd.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_debug.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_dump.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_evpn_vty.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_filter.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_mplsvpn.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_nexthop.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_route.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_routemap.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_vty.c
-vtysh_scan += $(top_srcdir)/bgpd/bgp_flowspec_vty.c
-if ENABLE_BGP_VNC
-vtysh_scan += $(top_srcdir)/bgpd/rfapi/bgp_rfapi_cfg.c
-vtysh_scan += $(top_srcdir)/bgpd/rfapi/rfapi.c
-vtysh_scan += $(top_srcdir)/bgpd/rfapi/rfapi_vty.c
-vtysh_scan += $(top_srcdir)/bgpd/rfapi/vnc_debug.c
-endif
-endif
-
-if RPKI
-vtysh_scan += $(top_srcdir)/bgpd/bgp_rpki.c
-endif
-
-if ISISD
-vtysh_scan += $(top_srcdir)/isisd/isis_redist.c
-vtysh_scan += $(top_srcdir)/isisd/isis_spf.c
-vtysh_scan += $(top_srcdir)/isisd/isis_te.c
-vtysh_scan += $(top_srcdir)/isisd/isis_vty_common.c
-vtysh_scan += $(top_srcdir)/isisd/isis_vty_fabricd.c
-vtysh_scan += $(top_srcdir)/isisd/isis_vty_isisd.c
-vtysh_scan += $(top_srcdir)/isisd/isisd.c
-endif
-
-if OSPFD
-vtysh_scan += $(top_srcdir)/ospfd/ospf_bfd.c
-vtysh_scan += $(top_srcdir)/ospfd/ospf_dump.c
-vtysh_scan += $(top_srcdir)/ospfd/ospf_opaque.c
-vtysh_scan += $(top_srcdir)/ospfd/ospf_ri.c
-vtysh_scan += $(top_srcdir)/ospfd/ospf_routemap.c
-vtysh_scan += $(top_srcdir)/ospfd/ospf_te.c
-vtysh_scan += $(top_srcdir)/ospfd/ospf_sr.c
-vtysh_scan += $(top_srcdir)/ospfd/ospf_vty.c
-endif
-
-if OSPF6D
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_abr.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_asbr.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_area.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_bfd.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_flood.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_interface.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_intra.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_lsa.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_message.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_neighbor.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_route.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_spf.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_top.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6_zebra.c
-vtysh_scan += $(top_srcdir)/ospf6d/ospf6d.c
-endif
-
-if RIPD
-vtysh_scan += $(top_srcdir)/ripd/rip_debug.c
-vtysh_scan += $(top_srcdir)/ripd/rip_interface.c
-vtysh_scan += $(top_srcdir)/ripd/rip_offset.c
-vtysh_scan += $(top_srcdir)/ripd/rip_zebra.c
-vtysh_scan += $(top_srcdir)/ripd/ripd.c
-endif
-
-if RIPNGD
-vtysh_scan += $(top_srcdir)/ripngd/ripng_debug.c
-vtysh_scan += $(top_srcdir)/ripngd/ripng_interface.c
-vtysh_scan += $(top_srcdir)/ripngd/ripng_offset.c
-vtysh_scan += $(top_srcdir)/ripngd/ripng_zebra.c
-vtysh_scan += $(top_srcdir)/ripngd/ripngd.c
-endif
-
-if LDPD
-vtysh_scan += $(top_srcdir)/ldpd/ldp_vty_cmds.c
-endif
-
-if NHRPD
-vtysh_scan += $(top_srcdir)/nhrpd/nhrp_vty.c
-endif
-
-if EIGRPD
-vtysh_scan += $(top_srcdir)/eigrpd/eigrp_dump.c
-#vtysh_scan += $(top_srcdir)/eigrpd/eigrp_routemap.c
-vtysh_scan += $(top_srcdir)/eigrpd/eigrp_vty.c
-endif
-
-if BABELD
-vtysh_scan += $(top_srcdir)/babeld/babel_interface.c
-vtysh_scan += $(top_srcdir)/babeld/babel_zebra.c
-vtysh_scan += $(top_srcdir)/babeld/babeld.c
-endif
-
-if SHARPD
-vtysh_scan += $(top_srcdir)/sharpd/sharp_vty.c
-endif
-
-if SNMP
-vtysh_scan += $(top_srcdir)/lib/agentx.c
-endif
-
-if PBRD
-vtysh_scan += $(top_srcdir)/pbrd/pbr_vty.c
-vtysh_scan += $(top_srcdir)/pbrd/pbr_debug.c
-endif
-
-if STATICD
-vtysh_scan += $(top_srcdir)/staticd/static_vty.c
-endif
-
-if BFDD
-vtysh_scan += $(top_srcdir)/bfdd/bfdd_vty.c
-endif
-
-vtysh_vtysh_cmd_FILES = $(vtysh_scan) \
-		  $(top_srcdir)/lib/keychain.c $(top_srcdir)/lib/routemap.c \
-		  $(top_srcdir)/lib/filter.c $(top_srcdir)/lib/plist.c \
-		  $(top_srcdir)/lib/distribute.c $(top_srcdir)/lib/if_rmap.c \
-		  $(top_srcdir)/lib/vrf.c $(top_srcdir)/lib/if.c \
-		  $(top_srcdir)/lib/vty.c $(top_srcdir)/zebra/debug.c \
-		  $(top_srcdir)/lib/logicalrouter.c \
-		  $(top_srcdir)/lib/nexthop_group.c \
-		  $(top_srcdir)/zebra/interface.c \
-		  $(top_srcdir)/zebra/irdp_interface.c \
-		  $(top_srcdir)/zebra/rtadv.c $(top_srcdir)/zebra/zebra_vty.c \
-		  $(top_srcdir)/zebra/zserv.c $(top_srcdir)/zebra/router-id.c \
-		  $(top_srcdir)/zebra/zebra_routemap.c \
-	          $(top_srcdir)/zebra/zebra_fpm.c \
-		  $(top_srcdir)/zebra/zebra_ptm.c \
-		  $(top_srcdir)/zebra/zebra_mpls_vty.c \
-		  $(top_srcdir)/zebra/zebra_pw.c \
-		  $(top_srcdir)/watchfrr/watchfrr_vty.c \
-		  # end
-
 AM_V_EXTRACT = $(am__v_EXTRACT_$(V))
 am__v_EXTRACT_ = $(am__v_EXTRACT_$(AM_DEFAULT_VERBOSITY))
 am__v_EXTRACT_0 = @echo "  EXTRACT " $@;
 am__v_EXTRACT_1 =
 
-vtysh/vtysh_cmd.c: $(vtysh_vtysh_cmd_FILES) vtysh/extract.pl
-	$(AM_V_EXTRACT) vtysh/extract.pl $(vtysh_vtysh_cmd_FILES) > vtysh/vtysh_cmd.c
+vtysh/vtysh_cmd.c: $(vtysh_scan) vtysh/extract.pl
+	$(AM_V_EXTRACT) vtysh/extract.pl $(vtysh_scan) > vtysh/vtysh_cmd.c
diff --git a/watchfrr/subdir.am b/watchfrr/subdir.am
index 931f11ef6..96df81d4a 100644
--- a/watchfrr/subdir.am
+++ b/watchfrr/subdir.am
@@ -4,6 +4,8 @@
 
 if WATCHFRR
 sbin_PROGRAMS += watchfrr/watchfrr
+vtysh_scan += $(top_srcdir)/watchfrr/watchfrr_vty.c
+rstman8_DATA += $(MANBUILD)/watchfrr.8
 endif
 
 noinst_HEADERS += \
diff --git a/zebra/subdir.am b/zebra/subdir.am
index 5dc375031..91bd792b0 100644
--- a/zebra/subdir.am
+++ b/zebra/subdir.am
@@ -5,6 +5,22 @@
 if ZEBRA
 sbin_PROGRAMS += zebra/zebra
 dist_examples_DATA += zebra/zebra.conf.sample
+vtysh_scan += \
+	$(top_srcdir)/zebra/debug.c \
+	$(top_srcdir)/zebra/interface.c \
+	$(top_srcdir)/zebra/router-id.c \
+	$(top_srcdir)/zebra/rtadv.c \
+	$(top_srcdir)/zebra/zebra_mpls_vty.c \
+	$(top_srcdir)/zebra/zebra_ptm.c \
+	$(top_srcdir)/zebra/zebra_pw.c \
+	$(top_srcdir)/zebra/zebra_routemap.c \
+	$(top_srcdir)/zebra/zebra_vty.c \
+	$(top_srcdir)/zebra/zserv.c \
+	# end
+
+# can be loaded as DSO - always include for vtysh
+vtysh_scan += $(top_srcdir)/zebra/irdp_interface.c
+vtysh_scan += $(top_srcdir)/zebra/zebra_fpm.c
 
 if IRDP
 module_LTLIBRARIES += zebra/zebra_irdp.la
@@ -16,6 +32,7 @@ if FPM
 module_LTLIBRARIES += zebra/zebra_fpm.la
 endif
 
+rstman8_DATA += $(MANBUILD)/zebra.8
 ## endif ZEBRA
 endif