diff options
| author | Christian Franke <chris@opensourcerouting.org> | 2018-03-22 14:44:01 +0100 |
|---|---|---|
| committer | Christian Franke <chris@opensourcerouting.org> | 2018-09-05 11:38:12 +0200 |
| commit | ef020087a502267607ee746c0ca2b2a0d92e4ec0 (patch) | |
| tree | f2590232c8a87d2e5c177f325fde7399528d1dbf /isisd/subdir.am | |
| parent | vtysh: support fabricd (diff) | |
| download | frr-ef020087a502267607ee746c0ca2b2a0d92e4ec0.tar.xz frr-ef020087a502267607ee746c0ca2b2a0d92e4ec0.zip | |
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>
Diffstat (limited to 'isisd/subdir.am')
| -rw-r--r-- | isisd/subdir.am | 83 |
1 files changed, 49 insertions, 34 deletions
diff --git a/isisd/subdir.am b/isisd/subdir.am index 085b0cb84..5593f2a4e 100644 --- a/isisd/subdir.am +++ b/isisd/subdir.am @@ -14,34 +14,6 @@ sbin_PROGRAMS += isisd/fabricd dist_examples_DATA += isisd/fabricd.conf.sample endif -isisd_libisis_a_SOURCES = \ - isisd/dict.c \ - isisd/isis_adjacency.c \ - isisd/isis_circuit.c \ - isisd/isis_csm.c \ - isisd/isis_dr.c \ - isisd/isis_dynhn.c \ - isisd/isis_errors.c \ - isisd/isis_events.c \ - isisd/isis_flags.c \ - isisd/isis_lsp.c \ - isisd/isis_lsp_hash.c \ - isisd/isis_memory.c \ - isisd/isis_misc.c \ - isisd/isis_mt.c \ - isisd/isis_pdu.c \ - isisd/isis_redist.c \ - isisd/isis_route.c \ - isisd/isis_routemap.c \ - isisd/isis_spf.c \ - isisd/isis_te.c \ - isisd/isis_tlvs.c \ - isisd/isis_vty.c \ - isisd/isis_zebra.c \ - isisd/isisd.c \ - isisd/iso_checksum.c \ - # end - noinst_HEADERS += \ isisd/dict.h \ isisd/isis_adjacency.h \ @@ -67,24 +39,67 @@ noinst_HEADERS += \ isisd/isis_spf.h \ isisd/isis_te.h \ isisd/isis_tlvs.h \ + isisd/isis_vty_common.h \ isisd/isis_zebra.h \ isisd/isisd.h \ isisd/iso_checksum.h \ # end -isisd_isisd_LDADD = isisd/libisis.a lib/libfrr.la @LIBCAP@ -isisd_isisd_SOURCES = \ +LIBISIS_SOURCES = \ + isisd/dict.c \ + isisd/isis_adjacency.c \ + isisd/isis_circuit.c \ + isisd/isis_csm.c \ + isisd/isis_dr.c \ + isisd/isis_dynhn.c \ + isisd/isis_errors.c \ + isisd/isis_events.c \ + isisd/isis_flags.c \ + isisd/isis_lsp.c \ + isisd/isis_lsp_hash.c \ + isisd/isis_memory.c \ + isisd/isis_misc.c \ + isisd/isis_mt.c \ + isisd/isis_pdu.c \ + isisd/isis_redist.c \ + isisd/isis_route.c \ + isisd/isis_routemap.c \ + isisd/isis_spf.c \ + isisd/isis_te.c \ + isisd/isis_tlvs.c \ + isisd/isis_vty_common.c \ + isisd/isis_zebra.c \ + isisd/isisd.c \ + isisd/iso_checksum.c \ + # end + +ISIS_SOURCES = \ isisd/isis_bpf.c \ isisd/isis_dlpi.c \ isisd/isis_main.c \ isisd/isis_pfpacket.c \ # end +ISIS_LDADD_COMMON = lib/libfrr.la @LIBCAP@ + +# Building isisd + +isisd_libisis_a_SOURCES = \ + $(LIBISIS_SOURCES) \ + isisd/isis_vty_isisd.c \ + #end +isisd_isisd_LDADD = isisd/libisis.a $(ISIS_LDADD_COMMON) +isisd_isisd_SOURCES = $(ISIS_SOURCES) + +# Building fabricd + FABRICD_CPPFLAGS = -DFABRICD=1 $(AM_CPPFLAGS) -isisd_libfabric_a_SOURCES = $(isisd_libisis_a_SOURCES) +isisd_libfabric_a_SOURCES = \ + $(LIBISIS_SOURCES) \ + isisd/isis_vty_fabricd.c \ + #end isisd_libfabric_a_CPPFLAGS = $(FABRICD_CPPFLAGS) - -isisd_fabricd_LDADD = isisd/libfabric.a lib/libfrr.la @LIBCAP@ -isisd_fabricd_SOURCES = $(isisd_isisd_SOURCES) +isisd_fabricd_LDADD = isisd/libfabric.a $(ISIS_LDADD_COMMON) +isisd_fabricd_SOURCES = $(ISIS_SOURCES) isisd_fabricd_CPPFLAGS = $(FABRICD_CPPFLAGS) |