isis: Cleanup CLI, split into parts which are shared, fabricd and isisd

Remove isis_vty.c and create three new files isis_vty_common.c,
isis_vty_fabricd.c and isis_vty_isisd.c which are built into both
daemons, only fabricd and only isisd, respectively.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>

2 files changed, 16 insertions, 3 deletions

diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index 936640c83..350b6fede 100644
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -64,7 +64,9 @@ 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.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
 
diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index 0eb5944ab..690e9a12c 100755
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -201,9 +201,20 @@ sub scan_file {
 }
 
 foreach (@ARGV) {
-    scan_file($_, 0);
     if (/\/isisd\//) {
-        scan_file($_, 1);
+        # We scan all the IS-IS files twice, once for isisd,
+        # once for fabricd. Exceptions are made for the files
+        # that are not shared between the two.
+        if (/isis_vty_isisd.c/) {
+            scan_file($_, 0);
+        } elsif (/isis_vty_fabricd.c/) {
+            scan_file($_, 1);
+        } else {
+            scan_file($_, 0);
+            scan_file($_, 1);
+        }
+    } else {
+        scan_file($_, 0);
     }
 }