summaryrefslogtreecommitdiffstats
path: root/isisd/Makefile.am
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2015-05-29 05:48:31 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-09-19 22:31:04 +0200
commit4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8 (patch)
tree14b33d958cb88df6195994c78ee74b781e7968a6 /isisd/Makefile.am
parentlib: migrate to new memory-type handling (diff)
downloadfrr-4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8.tar.xz
frr-4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8.zip
*: split & distribute memtypes and stop (re|ab)using lib/ MTYPEs
This is a rather large mechanical commit that splits up the memory types defined in lib/memtypes.c and distributes them into *_memory.[ch] files in the individual daemons. The zebra change is slightly annoying because there is no nice place to put the #include "zebra_memory.h" statement. bgpd, ospf6d, isisd and some tests were reusing MTYPEs defined in the library for its own use. This is bad practice and would break when the memtype are made static. Acked-by: Vincent JARDIN <vincent.jardin@6wind.com> Acked-by: Donald Sharp <sharpd@cumulusnetworks.com> [CF: rebased for cmaster-next] Signed-off-by: David Lamparter <equinox@opensourcerouting.org> Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'isisd/Makefile.am')
-rw-r--r--isisd/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/isisd/Makefile.am b/isisd/Makefile.am
index bfe2e9477..c14351ca3 100644
--- a/isisd/Makefile.am
+++ b/isisd/Makefile.am
@@ -13,6 +13,7 @@ sbin_PROGRAMS = isisd
SUBDIRS = topology
libisis_a_SOURCES = \
+ isis_memory.c \
isis_adjacency.c isis_lsp.c dict.c isis_circuit.c isis_pdu.c \
isis_tlv.c isisd.c isis_misc.c isis_zebra.c isis_dr.c \
isis_flags.c isis_dynhn.c iso_checksum.c isis_csm.c isis_events.c \
@@ -21,6 +22,7 @@ libisis_a_SOURCES = \
noinst_HEADERS = \
+ isis_memory.h \
isisd.h isis_pdu.h isis_tlv.h isis_adjacency.h isis_constants.h \
isis_lsp.h dict.h isis_circuit.h isis_misc.h isis_network.h \
isis_zebra.h isis_dr.h isis_flags.h isis_dynhn.h isis_common.h \