Merge pull request #4849 from sworleys/Label-Append-Resolve_2

[mirror_frr.git] / isisd / subdir.am

diff --git a/isisd/subdir.am b/isisd/subdir.am
index 29ec1cdd1744322d5aea659ff196ad96097b4c47..24f24022a506ca88bf8e27113dda0f715aeadd3e 100644 (file)
--- a/isisd/subdir.am
+++ b/isisd/subdir.am
@@ -7,12 +7,11 @@ noinst_LIBRARIES += isisd/libisis.a
 sbin_PROGRAMS += isisd/isisd
 dist_examples_DATA += isisd/isisd.conf.sample
 vtysh_scan += \
+       $(top_srcdir)/isisd/isis_cli.c \
        $(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
 man8 += $(MANBUILD)/isisd.8
@@ -25,7 +24,6 @@ dist_examples_DATA += isisd/fabricd.conf.sample
 endif
 
 noinst_HEADERS += \
-       isisd/dict.h \
        isisd/isis_adjacency.h \
        isisd/isis_bfd.h \
        isisd/isis_circuit.h \
@@ -52,15 +50,14 @@ noinst_HEADERS += \
        isisd/isis_te.h \
        isisd/isis_tlvs.h \
        isisd/isis_tx_queue.h \
-       isisd/isis_vty_common.h \
        isisd/isis_zebra.h \
        isisd/isisd.h \
        isisd/iso_checksum.h \
        isisd/fabricd.h \
+       isisd/isis_cli.h \
        # end
 
 LIBISIS_SOURCES = \
-       isisd/dict.c \
        isisd/isis_adjacency.c \
        isisd/isis_bfd.c \
        isisd/isis_circuit.c \
@@ -83,7 +80,6 @@ LIBISIS_SOURCES = \
        isisd/isis_te.c \
        isisd/isis_tlvs.c \
        isisd/isis_tx_queue.c \
-       isisd/isis_vty_common.c \
        isisd/isis_zebra.c \
        isisd/isisd.c \
        isisd/iso_checksum.c \
@@ -97,17 +93,25 @@ ISIS_SOURCES = \
        isisd/isis_pfpacket.c \
        # end
 
-ISIS_LDADD_COMMON = lib/libfrr.la @LIBCAP@
+ISIS_LDADD_COMMON = lib/libfrr.la $(LIBCAP)
 
 # Building isisd
 
 isisd_libisis_a_SOURCES = \
        $(LIBISIS_SOURCES) \
-       isisd/isis_vty_isisd.c \
+       isisd/isis_northbound.c \
+       isisd/isis_cli.c \
        #end
+
+isisd/isis_cli_clippy.c: $(CLIPPY_DEPS)
+isisd/isis_cli.$(OBJEXT): isisd/isis_cli_clippy.c
+
 isisd_isisd_LDADD = isisd/libisis.a $(ISIS_LDADD_COMMON)
 isisd_isisd_SOURCES = $(ISIS_SOURCES)
-
+nodist_isisd_isisd_SOURCES = \
+       yang/frr-isisd.yang.c \
+       # end
+       
 # Building fabricd
 
 FABRICD_CPPFLAGS = -DFABRICD=1 $(AM_CPPFLAGS)