34 files changed, 85 insertions, 428 deletions

diff --git a/.gitignore b/.gitignore
index c5fd0ced9..8c62f0553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,87 +1,87 @@
-compile
-config.log
-config.h
-config.cache
-config.status
-config.guess
-config.sub
-ltmain.sh
-stamp-h
-stamp-h[0-9]*
+### autoconf/automake root stuff
+
+/compile
+/config.log
+/config.h
+/config.cache
+/config.status
+/config.guess
+/config.sub
+/ltmain.sh
+/stamp-h
+/stamp-h[0-9]*
 *-stamp
-Makefile
-INSTALL
+/INSTALL
+/depcomp
+/missing
+/install-sh
+/mkinstalldirs
+/ylwrap
+/autom4te*.cache
+/configure.lineno
+/configure
+/config.h.in
+/confdefs.h
+/conftest
+/conftest.err
+/aclocal.m4
+/libtool
+
+/Makefile
+/Makefile.in
+
+### autoconf/automake subdir stuff
+
 .deps
-depcomp
-missing
-install-sh
-mkinstalldirs
-ylwrap
-autom4te*.cache
-configure.lineno
-configure
-config.h.in
-confdefs.h
-conftest
-conftest.err
-aclocal.m4
-Makefile.in
-*.tar.gz
-*.tar.gz.asc
+.libs
+
+### build outputs
+
+*.o
+*.lo
+*.a
+*.la
+*.so
+*.loT
+*.pb.h
+*.pb-c.h
+*.pb-c.c
+*_clippy.c
+
+### dist
+
 *.tar.?z
+*.tar.?z.asc
+*.tar.asc
+*.deb
+*.ddeb
+*.dsc
+*.changes
+
+### other garbage
+
 .nfs*
-libtool
-.libs
 .arch-inventory
 .arch-ids
 {arch}
 build
+.cache
 .msg
 .rebase-*
 *~
-*.o
-*.loT
-m4/*.m4
-!m4/ax_sys_weak_alias.m4
-!m4/ax_compare_version.m4
-!m4/ax_prog_perl_modules.m4
-!m4/pkg.m4
-debian/autoreconf.after
-debian/autoreconf.before
-debian/files
-debian/frr-dbg.debhelper.log
-debian/frr-dbg.substvars
-debian/frr-dbg/
-debian/frr-doc.debhelper.log
-debian/frr-doc.substvars
-debian/frr-doc/
-debian/frr.debhelper.log
-debian/frr.postinst.debhelper
-debian/frr.postrm.debhelper
-debian/frr.prerm.debhelper
-debian/frr.substvars
-debian/frr/
-debian/tmp/
-*.deb
-*.ddeb
-*.dsc
-*.changes
-*.pyc
+*.bak
 *.swp
+*.pyc
+__pycache__
+*.patch
+*.diff
 cscope.*
-*.pb.h
-*.pb-c.h
-*.pb-c.c
 TAGS
 tags
 GTAGS
 GSYMS
 GRTAGS
 GPATH
-*.la
-*.lo
 compile_commands.json
 .dirstamp
-
-# clippy generated source
-*_clippy.c
+refix
diff --git a/bfdd/.gitignore b/bfdd/.gitignore
index e554d1b33..2b020911f 100644
--- a/bfdd/.gitignore
+++ b/bfdd/.gitignore
@@ -1,3 +1,2 @@
 # ignore binary files
-*.a
 bfdd
diff --git a/bgpd/.gitignore b/bgpd/.gitignore
index 7e2e6293a..2e77195b9 100644
--- a/bgpd/.gitignore
+++ b/bgpd/.gitignore
@@ -1,18 +1,3 @@
-!Makefile
-Makefile.in
-*.o
 bgpd
 bgp_btoa
 bgpd.conf
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.a
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
diff --git a/doc/.gitignore b/doc/.gitignore
index d99a6a5b2..fa2b50832 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,4 +1,3 @@
-!Makefile
 mdate-sh
 draft-zebra-00.txt
 *.pdf
@@ -6,7 +5,6 @@ draft-zebra-00.txt
 frr.ps
 frr.dvi
 stamp-vti
-.nfs*
 *.aux
 *.cp
 *.cps
@@ -20,8 +18,4 @@ stamp-vti
 *.toc
 *.tp
 *.vr
-.arch-inventory
-.arch-ids
-*~
-*.loT
 refix
diff --git a/doc/mpls/.gitignore b/doc/mpls/.gitignore
deleted file mode 100644
index b0a4a4619..000000000
--- a/doc/mpls/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.arch-ids
-.arch-inventory
-*~
-*.loT
-
diff --git a/eigrpd/.gitignore b/eigrpd/.gitignore
index 5b72399e7..0303c6f0d 100644
--- a/eigrpd/.gitignore
+++ b/eigrpd/.gitignore
@@ -1,18 +1,2 @@
-!Makefile
-Makefile.in
-*.o
-*.a
 eigrpd
 eigrpd.conf
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
-
diff --git a/fpm/.gitignore b/fpm/.gitignore
deleted file mode 100644
index 17e90443e..000000000
--- a/fpm/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-!Makefile
-Makefile.in
-*.o
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.a
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
diff --git a/init/.gitignore b/init/.gitignore
deleted file mode 100644
index 30b4bc99e..000000000
--- a/init/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-.nfs*
-*~
-*.loT
-
diff --git a/isisd/.gitignore b/isisd/.gitignore
index 865cc3825..b6184ca0f 100644
--- a/isisd/.gitignore
+++ b/isisd/.gitignore
@@ -1,16 +1,3 @@
-!Makefile
-Makefile.in
-*.o
 isisd
 fabricd
-.deps
 isisd.conf
-.nfs*
-*.lo
-*.la
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
-*.a
diff --git a/ldpd/.gitignore b/ldpd/.gitignore
index a2f4b5169..ec8a5c408 100644
--- a/ldpd/.gitignore
+++ b/ldpd/.gitignore
@@ -1,17 +1,2 @@
-!Makefile
-Makefile.in
-*.o
 ldpd
 ldpd.conf
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.a
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
diff --git a/lib/.gitignore b/lib/.gitignore
index 072146dbd..6176b30f8 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,26 +1,13 @@
-!Makefile
-Makefile.in
-*.o
-*.lo
-*.la
-version.c
-version.h
-gitversion.h
-gitversion.h.tmp
-.deps
-.nfs*
-.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
-route_types.h
-memtypes.h
-command_lex.c
-command_lex.h
-command_parse.c
-command_parse.h
-refix
-grammar_sandbox
-clippy
-defun_lex.c
+/version.c
+/version.h
+/gitversion.h
+/gitversion.h.tmp
+/route_types.h
+/memtypes.h
+/command_lex.c
+/command_lex.h
+/command_parse.c
+/command_parse.h
+/grammar_sandbox
+/clippy
+/defun_lex.c
diff --git a/m4/.gitignore b/m4/.gitignore
index 798188b0b..357e65588 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,8 +1,8 @@
-Makefile
-Makefile.in
-.arch-inventory
-.arch-ids
-*~
-*.loT
+*.m4
+
+!ax_compare_version.m4
+!ax_prog_perl_modules.m4
 !ax_pthread.m4
 !ax_sys_weak_alias.m4
+!ax_sys_weak_alias.m4
+!pkg.m4
diff --git a/nhrpd/.gitignore b/nhrpd/.gitignore
index 3f4738127..3d4d56d58 100644
--- a/nhrpd/.gitignore
+++ b/nhrpd/.gitignore
@@ -1,2 +1 @@
-!Makefile
 nhrpd
diff --git a/ospf6d/.gitignore b/ospf6d/.gitignore
index 744af2d5c..e398b1ca5 100644
--- a/ospf6d/.gitignore
+++ b/ospf6d/.gitignore
@@ -1,18 +1,2 @@
-!Makefile
-Makefile.in
-*.o
-*.patch
 ospf6d
 ospf6d.conf
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
-*.a
diff --git a/ospfclient/.gitignore b/ospfclient/.gitignore
index 1740b04fb..9be70451f 100644
--- a/ospfclient/.gitignore
+++ b/ospfclient/.gitignore
@@ -1,16 +1 @@
-!Makefile
-Makefile.in
-*.o
 ospfclient
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
-refix
diff --git a/ospfd/.gitignore b/ospfd/.gitignore
index 752c875a6..fc65db33e 100644
--- a/ospfd/.gitignore
+++ b/ospfd/.gitignore
@@ -1,17 +1,2 @@
-!Makefile
-Makefile.in
-*.o
 ospfd
 ospfd.conf
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
-*.a
diff --git a/pbrd/.gitignore b/pbrd/.gitignore
index ff95d8852..86622ea17 100644
--- a/pbrd/.gitignore
+++ b/pbrd/.gitignore
@@ -1,15 +1 @@
-!Makefile
-Makefile.in
-libpbr.a
 pbrd
-tags
-TAGS
-.deps
-*.o
-*.lo
-*.la
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
diff --git a/pimd/.gitignore b/pimd/.gitignore
index 1f56cfaec..b1780df75 100644
--- a/pimd/.gitignore
+++ b/pimd/.gitignore
@@ -1,17 +1,3 @@
-!Makefile
-Makefile.in
-libpim.a
 pimd
 mtracebis
 test_igmpv3_join
-tags
-TAGS
-.deps
-*.o
-*.lo
-*.la
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
diff --git a/pkgsrc/.gitignore b/pkgsrc/.gitignore
index 63e9a66d8..c97f963b3 100644
--- a/pkgsrc/.gitignore
+++ b/pkgsrc/.gitignore
@@ -1,8 +1 @@
-Makefile
-Makefile.in
 *.sh
-.arch-inventory
-.arch-ids
-*~
-*.loT
-
diff --git a/ports/.gitignore b/ports/.gitignore
deleted file mode 100644
index dd5bf7c67..000000000
--- a/ports/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.arch-inventory
-.arch-ids
-
-*~
-*.loT
-
diff --git a/ports/files/.gitignore b/ports/files/.gitignore
deleted file mode 100644
index dd5bf7c67..000000000
--- a/ports/files/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.arch-inventory
-.arch-ids
-
-*~
-*.loT
-
diff --git a/ports/pkg/.gitignore b/ports/pkg/.gitignore
deleted file mode 100644
index dd5bf7c67..000000000
--- a/ports/pkg/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.arch-inventory
-.arch-ids
-
-*~
-*.loT
-
diff --git a/qpb/.gitignore b/qpb/.gitignore
deleted file mode 100644
index 17e90443e..000000000
--- a/qpb/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-!Makefile
-Makefile.in
-*.o
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.a
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
diff --git a/redhat/.gitignore b/redhat/.gitignore
index a38f1c06e..15804cea0 100644
--- a/redhat/.gitignore
+++ b/redhat/.gitignore
@@ -1,10 +1,2 @@
 zebra.spec
 frr.spec
-Makefile
-Makefile.in
-.nfs*
-.arch-inventory
-.arch-ids
-*~
-*.loT
-
diff --git a/ripd/.gitignore b/ripd/.gitignore
index 177250ca6..f149501d6 100644
--- a/ripd/.gitignore
+++ b/ripd/.gitignore
@@ -1,17 +1,2 @@
-!Makefile
-Makefile.in
-*.o
 ripd
 ripd.conf
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
-*.a
diff --git a/ripngd/.gitignore b/ripngd/.gitignore
index 213384d13..e6a8ee6be 100644
--- a/ripngd/.gitignore
+++ b/ripngd/.gitignore
@@ -1,17 +1,2 @@
-!Makefile
-Makefile.in
-*.o
 ripngd
 ripngd.conf
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
-*.a
diff --git a/sharpd/.gitignore b/sharpd/.gitignore
index cc33cfc18..91b9f2e90 100644
--- a/sharpd/.gitignore
+++ b/sharpd/.gitignore
@@ -1,17 +1,2 @@
-Makefile
-Makefile.in
-*.o
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.a
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
 sharpd
 sharpd.conf
diff --git a/snapcraft/.gitignore b/snapcraft/.gitignore
index ac7860290..a4796fd73 100644
--- a/snapcraft/.gitignore
+++ b/snapcraft/.gitignore
@@ -3,4 +3,3 @@ parts
 prime
 stage
 frr*.snap
-!*/Makefile
diff --git a/solaris/.gitignore b/solaris/.gitignore
index a249b6199..3f1a0385a 100644
--- a/solaris/.gitignore
+++ b/solaris/.gitignore
@@ -17,6 +17,3 @@ depend.smf
 frr.init
 *.pkg
 *.pkg.gz
-*~
-*.loT
-*.a
diff --git a/tests/.gitignore b/tests/.gitignore
index 5d414ef3d..37cd245de 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,24 +1,6 @@
-!Makefile
-Makefile.in
-*.o
-tags
-TAGS
-.cache
-.deps
-.nfs*
-*~
-*.loT
-*.lo
-*.la
-*.libs
-*.bak
 *.log
 *.sum
 *.xml
-*.pyc
-.arch-inventory
-.arch-ids
-__pycache__
 .pytest_cache
 /bgpd/test_aspath
 /bgpd/test_bgp_table
diff --git a/tools/.gitignore b/tools/.gitignore
index 7bf3be9db..d400dfe8f 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,10 +1,2 @@
-!Makefile
-.arch-inventory
-.arch-ids
-
-*~
-*.loT
-.libs
-*.o
 /permutations
 /ssd
diff --git a/vtysh/.gitignore b/vtysh/.gitignore
index e63d1e2de..c1a39b8a1 100644
--- a/vtysh/.gitignore
+++ b/vtysh/.gitignore
@@ -1,16 +1,3 @@
-!Makefile
-Makefile.in
-*.o
 vtysh
-tags
-TAGS
-.deps
 vtysh_cmd.c
-.nfs*
 extract.pl
-.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
-
diff --git a/watchfrr/.gitignore b/watchfrr/.gitignore
index b8c020c04..b3f5a6cd9 100644
--- a/watchfrr/.gitignore
+++ b/watchfrr/.gitignore
@@ -1,16 +1 @@
-!Makefile
-Makefile.in
-*.o
 watchfrr
-tags
-TAGS
-.deps
-.nfs*
-*.lo
-*.la
-*.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT
-
diff --git a/zebra/.gitignore b/zebra/.gitignore
index 4a06756a2..41a86e7d7 100644
--- a/zebra/.gitignore
+++ b/zebra/.gitignore
@@ -1,15 +1,3 @@
-!Makefile
-Makefile.in
-*.o
 zebra
 zebra.conf
 client
-tags
-TAGS
-.deps
-.nfs*
-.libs
-.arch-inventory
-.arch-ids
-*~
-*.loT