zebra: Fix label manager memory leak (#5680)

[mirror_frr.git] / isisd / subdir.am

diff --git a/isisd/subdir.am b/isisd/subdir.am
index 7571255e59251cc0b22c135da34fd2967b9bd3c0..5dddb7d3455fb50756418841ff83f5793aae19d4 100644 (file)
--- a/isisd/subdir.am
+++ b/isisd/subdir.am
@@ -7,15 +7,14 @@ 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
+man8 += $(MANBUILD)/frr-isisd.8
 endif
 
 if FABRICD
@@ -25,8 +24,8 @@ 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 \
        isisd/isis_common.h \
        isisd/isis_constants.h \
@@ -40,8 +39,10 @@ noinst_HEADERS += \
        isisd/isis_memory.h \
        isisd/isis_misc.h \
        isisd/isis_mt.h \
+       isisd/isis_nb.h \
        isisd/isis_network.h \
        isisd/isis_pdu.h \
+       isisd/isis_pdu_counter.h \
        isisd/isis_redist.h \
        isisd/isis_route.h \
        isisd/isis_routemap.h \
@@ -50,7 +51,6 @@ 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 \
@@ -58,8 +58,8 @@ noinst_HEADERS += \
        # end
 
 LIBISIS_SOURCES = \
-       isisd/dict.c \
        isisd/isis_adjacency.c \
+       isisd/isis_bfd.c \
        isisd/isis_circuit.c \
        isisd/isis_csm.c \
        isisd/isis_dr.c \
@@ -72,6 +72,7 @@ LIBISIS_SOURCES = \
        isisd/isis_misc.c \
        isisd/isis_mt.c \
        isisd/isis_pdu.c \
+       isisd/isis_pdu_counter.c \
        isisd/isis_redist.c \
        isisd/isis_route.c \
        isisd/isis_routemap.c \
@@ -79,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 \
@@ -93,17 +93,28 @@ 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_nb.c \
+       isisd/isis_nb_config.c \
+       isisd/isis_nb_notifications.c \
+       isisd/isis_nb_state.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)