X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=vtysh%2FMakefile.am;h=29ffa7e22b7e4a199dfe8b20a3b929d844917c65;hb=1ec1afd6cbff38e50bf5800a0503da71db7c836d;hp=090382b99beab5fd6cd95845e8d49708d06f3fe6;hpb=46c323a66bee2899292885085ec7e7b51be095c3;p=mirror_frr.git

diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index 090382b99..29ffa7e22 100644
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -30,7 +30,7 @@ vtysh_SOURCES = vtysh_main.c vtysh.c vtysh_user.c vtysh_config.c
 nodist_vtysh_SOURCES = vtysh_cmd.c
 CLEANFILES = vtysh_cmd.c
 noinst_HEADERS = vtysh.h vtysh_user.h
-vtysh_LDADD = ../lib/libzebra.la @LIBCAP@ @LIBREADLINE@
+vtysh_LDADD = ../lib/libfrr.la @LIBCAP@ @LIBREADLINE@
 
 examplesdir = $(exampledir)
 dist_examples_DATA = vtysh.conf.sample
@@ -44,31 +44,81 @@ vtysh_scan += $(top_srcdir)/pimd/pim_cmd.c
 endif
 
 if BGPD
-vtysh_scan += $(top_srcdir)/bgpd/*.c
+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_route.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_routemap.c
+vtysh_scan += $(top_srcdir)/bgpd/bgp_vty.c
 endif
 
 if ISISD
-vtysh_scan += $(top_srcdir)/isisd/*.c
+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.c
+vtysh_scan += $(top_srcdir)/isisd/isisd.c
 endif
 
 if OSPFD
-vtysh_scan += $(top_srcdir)/ospfd/*.c
+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_vty.c
 endif
 
 if OSPF6D
-vtysh_scan += $(top_srcdir)/ospf6d/*.c
-endif
-
-if LDPD
-vtysh_scan += $(top_srcdir)/ldpd/ldp_vty_cmds.c
+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/*.c
+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/*.c
+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 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 SNMP
+vtysh_scan += $(top_srcdir)/lib/agentx.c
 endif
 
 vtysh_cmd_FILES = $(vtysh_scan) \
@@ -89,5 +139,22 @@ vtysh_cmd_FILES = $(vtysh_scan) \
 		  $(top_srcdir)/watchfrr/watchfrr_vty.c \
 	          $(BGP_VNC_RFAPI_SRC) $(BGP_VNC_RFP_SRC)
 
-vtysh_cmd.c: $(vtysh_cmd_FILES) extract.pl
-	./extract.pl $(vtysh_cmd_FILES) > vtysh_cmd.c
+# this is slightly iffy... ldp_vty_cmds.c can be located in either
+# $srcdir or $builddir depending on whether it's coming pre-built from a
+# dist tarball or being built.  automake uses VPATH to find it, but that
+# doesn't work here...
+# so after running "make ldp_vty_cmds.c", the file can be in either of the
+# two directories.  we need to do some magic to find out which.
+vtysh_cmd_DEPS = $(vtysh_cmd_FILES)
+if LDPD
+$(top_builddir)/ldpd/ldp_vty_cmds.c:
+	make -C "$(top_builddir)/ldpd" ldp_vty_cmds.c
+vtysh_cmd_DEPS += $(top_builddir)/ldpd/ldp_vty_cmds.c
+endif
+
+vtysh_cmd.c: $(vtysh_cmd_DEPS) extract.pl
+	if test -n "${LDPD}"; then \
+		ldpcmds="$(top_srcdir)/ldpd/ldp_vty_cmds.c"; \
+		test -f "$(top_builddir)/ldpd/ldp_vty_cmds.c" && ldpcmds="$(top_builddir)/ldpd/ldp_vty_cmds.c"; \
+	fi; \
+	./extract.pl $(vtysh_cmd_FILES) $${ldpcmds} > vtysh_cmd.c