From 9994130f1d052b851bfffdd44d85e0a1c461a5cb Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 28 Jul 2016 14:28:22 -0400 Subject: [PATCH] vtysh: Do not run extract.pl over protocols that are not configured Dynamically figure out the list of .c files that we need to scan based upon whether or not the daemon is --enabled via configure. Ticket: CM-12081 Signed-off-by: Donald Sharp Reviewed-by: Quentin Young --- vtysh/Makefile.am | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am index 2180a78629..d4a74487ec 100644 --- a/vtysh/Makefile.am +++ b/vtysh/Makefile.am @@ -20,10 +20,37 @@ dist_examples_DATA = vtysh.conf.sample EXTRA_DIST = extract.pl -vtysh_cmd_FILES = $(top_srcdir)/bgpd/*.c $(top_srcdir)/isisd/*.c \ - $(top_srcdir)/ospfd/*.c $(top_srcdir)/ospf6d/*.c \ - $(top_srcdir)/ripd/*.c $(top_srcdir)/ripngd/*.c \ - $(top_srcdir)/pimd/pim_cmd.c \ +vtysh_scan = + +if PIMD +vtysh_scan += $(top_srcdir)/pimd/pim_cmd.c +endif + +if BGPD +vtysh_scan += $(top_srcdir)/bgpd/*.c +endif + +if ISISD +vtysh_scan += $(top_srcdir)/isisd/*.c +endif + +if OSPFD +vtysh_scan += $(top_srcdir)/ospfd/*.c +endif + +if OSPF6D +vtysh_scan += $(top_srcdir)/ospf6d/*.c +endif + +if RIPD +vtysh_scan += $(top_srcdir)/ripd/*.c +endif + +if RIPNGD +vtysh_scan += $(top_srcdir)/ripngd/*.c +endif + +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 \ -- 2.39.5