Signed-off-by: David Lamparter <equi...@opensourcerouting.org> Acked-by: Vincent JARDIN <vincent.jar...@6wind.com> Acked-by: Donald Sharp <sha...@cumulusnetworks.com> --- lib/.gitignore | 1 - lib/Makefile.am | 10 +++------- lib/memtypes.c | 16 ---------------- lib/memtypes.pl | 6 ------ 4 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 lib/memtypes.c delete mode 100755 lib/memtypes.pl
diff --git a/lib/.gitignore b/lib/.gitignore index 02aa432..930d737 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -14,5 +14,4 @@ gitversion.h.tmp .arch-ids *~ *.loT -memtypes.h route_types.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 9b52931..1e9b05f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -13,11 +13,11 @@ libzebra_la_SOURCES = \ sockunion.c prefix.c thread.c if.c buffer.c table.c hash.c \ filter.c routemap.c distribute.c stream.c str.c log.c plist.c \ zclient.c sockopt.c smux.c agentx.c snmp.c md5.c if_rmap.c keychain.c privs.c \ - sigevent.c pqueue.c jhash.c memtypes.c workqueue.c vrf.c \ + sigevent.c pqueue.c jhash.c workqueue.c vrf.c \ memory.c \ memory_vty.c -BUILT_SOURCES = memtypes.h route_types.h gitversion.h +BUILT_SOURCES = route_types.h gitversion.h libzebra_la_DEPENDENCIES = @LIB_REGEX@ @@ -29,7 +29,7 @@ pkginclude_HEADERS = \ memory.h network.h prefix.h routemap.h distribute.h sockunion.h \ str.h stream.h table.h thread.h vector.h version.h vty.h zebra.h \ plist.h zclient.h sockopt.h smux.h md5.h if_rmap.h keychain.h \ - privs.h sigevent.h pqueue.h jhash.h zassert.h memtypes.h \ + privs.h sigevent.h pqueue.h jhash.h zassert.h \ workqueue.h route_types.h libospf.h vrf.h fifo.h \ memory_vty.h @@ -39,13 +39,9 @@ noinst_HEADERS = \ EXTRA_DIST = \ regex.c regex-gnu.h \ queue.h \ - memtypes.pl \ route_types.pl route_types.txt \ gitversion.pl -memtypes.h: $(srcdir)/memtypes.c $(srcdir)/memtypes.pl - @PERL@ $(srcdir)/memtypes.pl < $(srcdir)/memtypes.c > $@ - route_types.h: $(srcdir)/route_types.txt $(srcdir)/route_types.pl @PERL@ $(srcdir)/route_types.pl < $(srcdir)/route_types.txt > $@ diff --git a/lib/memtypes.c b/lib/memtypes.c deleted file mode 100644 index fe78f50..0000000 --- a/lib/memtypes.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Memory type definitions. This file is parsed by memtypes.awk to extract - * MTYPE_ and memory_list_.. information in order to autogenerate - * memtypes.h. - * - * The script is sensitive to the format (though not whitespace), see - * the top of memtypes.awk for more details. - */ - -#include "zebra.h" -#include "memory.h" - -DEFINE_MGROUP(BABELD, "babeld") -DEFINE_MTYPE(BABELD, BABEL, "Babel structure") -DEFINE_MTYPE(BABELD, BABEL_IF, "Babel interface") - diff --git a/lib/memtypes.pl b/lib/memtypes.pl deleted file mode 100755 index 0955161..0000000 --- a/lib/memtypes.pl +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/perl -while (<STDIN>) { - $_ =~ s/DEFINE_MTYPE\([^,]+,\s*([^,]+)\s*,.*\)/DECLARE_MTYPE\($1\)/; - $_ =~ s/DEFINE_MGROUP\(([^,]+),.*\)/DECLARE_MGROUP\($1\)/; - print $_; -} -- 2.3.6 _______________________________________________ Quagga-dev mailing list Quagga-dev@lists.quagga.net https://lists.quagga.net/mailman/listinfo/quagga-dev