Merge pull request #13235 from Orange-OpenSource/link-state

[mirror_frr.git] / isisd / subdir.am

diff --git a/isisd/subdir.am b/isisd/subdir.am
index 4cefe6e10b9a3f38571d2a4bed608da9c0955e79..6bd2477b198b2363d5e0ba32a37e8728d18f66ca 100644 (file)
--- a/isisd/subdir.am
+++ b/isisd/subdir.am
@@ -5,17 +5,6 @@
 if ISISD
 noinst_LIBRARIES += isisd/libisis.a
 sbin_PROGRAMS += isisd/isisd
-dist_examples_DATA += isisd/isisd.conf.sample
-vtysh_scan += \
-       isisd/isis_cli.c \
-       isisd/isis_ldp_sync.c \
-       isisd/isis_redist.c \
-       isisd/isis_spf.c \
-       isisd/isis_te.c \
-       isisd/isis_sr.c \
-       isisd/isis_vty_fabricd.c \
-       isisd/isisd.c \
-       # end
 vtysh_daemons += isisd
 if SNMP
 module_LTLIBRARIES += isisd/isisd_snmp.la
@@ -26,23 +15,11 @@ endif
 if FABRICD
 noinst_LIBRARIES += isisd/libfabric.a
 sbin_PROGRAMS += isisd/fabricd
-dist_examples_DATA += isisd/fabricd.conf.sample
-if !ISISD
-vtysh_scan += \
-       isisd/isis_cli.c \
-       isisd/isis_ldp_sync.c \
-       isisd/isis_redist.c \
-       isisd/isis_spf.c \
-       isisd/isis_te.c \
-       isisd/isis_sr.c \
-       isisd/isis_vty_fabricd.c \
-       isisd/isisd.c \
-       # end
-endif
 vtysh_daemons += fabricd
 endif
 
 noinst_HEADERS += \
+       isisd/isis_affinitymap.h \
        isisd/isis_adjacency.h \
        isisd/isis_bfd.h \
        isisd/isis_circuit.h \
@@ -69,6 +46,7 @@ noinst_HEADERS += \
        isisd/isis_spf.h \
        isisd/isis_spf_private.h \
        isisd/isis_sr.h \
+       isisd/isis_flex_algo.h \
        isisd/isis_te.h \
        isisd/isis_tlvs.h \
        isisd/isis_tx_queue.h \
@@ -79,6 +57,7 @@ noinst_HEADERS += \
        # end
 
 LIBISIS_SOURCES = \
+       isisd/isis_affinitymap.c \
        isisd/isis_adjacency.c \
        isisd/isis_bfd.c \
        isisd/isis_circuit.c \
@@ -100,6 +79,7 @@ LIBISIS_SOURCES = \
        isisd/isis_routemap.c \
        isisd/isis_spf.c \
        isisd/isis_sr.c \
+       isisd/isis_flex_algo.c \
        isisd/isis_te.c \
        isisd/isis_tlvs.c \
        isisd/isis_tx_queue.c \
@@ -140,8 +120,8 @@ nodist_isisd_isisd_SOURCES = \
        # end
 
 isisd_isisd_snmp_la_SOURCES = isisd/isis_snmp.c
-isisd_isisd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS) -std=gnu11
-isisd_isisd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
+isisd_isisd_snmp_la_CFLAGS = $(AM_CFLAGS) $(SNMP_CFLAGS) -std=gnu11
+isisd_isisd_snmp_la_LDFLAGS = $(MODULE_LDFLAGS)
 isisd_isisd_snmp_la_LIBADD = lib/libfrrsnmp.la
 
 # Building fabricd