.gitignores: Organize and clean up.

Divide into sections and add headings; add leading `/' to patterns which
are only expected to match in the same directory as the `.gitignore'
file; and add trailing `/' to patterns which should match directories.

diff --git a/.gitignore b/.gitignore
index 9c2b37ddd413de38bf3b51d837ea91dd6d8e583c..3a327810cdc02aa157563b08db31e9a0b4cd145b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,22 @@
+## Pervasive build machinery.

 Makefile.in
 Makefile.in

-/aclocal.m4
-/configure
+
+## Additional kinds of object files.
+*.sage.py
+*.t
+*.to
+
+## Other common files.

 /COPYING.LIB
 /COPYING.LIB

+
+## Top-level generated files.
+/aclocal.m4

 /autom4te.cache/
 /config/
 /autom4te.cache/
 /config/

+/configure

 /precomp/
 /precomp/

-*.sage.py
-*.t
-*.to
+
+## m4 configuration macros installed by `aclocal' and `libtoolize'.
+/m4/ax_*.m4
+/m4/libtool.m4
+/m4/lt*.m4

diff --git a/debian/.gitignore b/debian/.gitignore
index 4b961cd836d8ff2cfed3f34f7dc50755e603b4ca..c5fc51642d6da5b455ba45635de3e53b67a7987d 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,10 +1,13 @@
-files
-tmp
-substvars
-*.substvars
-*.debhelper
-catacomb
-catacomb-bin
-catacomb-data
-catacomb-dev
-catacomb2
+## General stuff.
+/build/
+/files
+/substvars
+/tmp/
+/*.debhelper
+/*.substvars
+
+## Individual packages.
+/catacomb-bin/
+/catacomb-data/
+/catacomb-dev/
+/catacomb2/

diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644 (file)
index 94f2b51..0000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-libtool.m4
-lt*.m4

diff --git a/pub/.gitignore b/pub/.gitignore
new file mode 100644 (file)
index 0000000..769d67f
--- /dev/null
+++ b/pub/.gitignore
@@ -0,0 +1,2 @@
+## Generated test vector files.
+/t/ed25519

diff --git a/pub/t/.gitignore b/pub/t/.gitignore
deleted file mode 100644 (file)
index 1da7fc0..0000000
--- a/pub/t/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-ed25519

diff --git a/symm/.gitignore b/symm/.gitignore
index 5c18b1263c7c93ade71a93961faa74ae3641a26e..689f11d05b9519010e568ff50d3ad2256f33557c 100644 (file)
--- a/symm/.gitignore
+++ b/symm/.gitignore
@@ -1,41 +1,11 @@
-/modes/
+## Generated modes.

 /modes.am
 /modes.am

+/modes/
+
+## Stub implementation files.

 /stubs.am
 /stubs.gen-stamp
 
 /stubs.am
 /stubs.gen-stamp
 

-/t/salsa20
-/t/sha3
-
-/sha224.c
-/sha224.h
-/sha384.h
-/sha384.c
-/sha512-224.c
-/sha512-224.h
-/sha512-256.c
-/sha512-256.h
-
-/safersk.c
-/safersk.h
-
-/whirlpool256.c
-/whirlpool256.h
-
-/sha3-224.c
-/sha3-224.h
-/sha3-256.c
-/sha3-256.h
-/sha3-384.c
-/sha3-384.h
-/sha3-512.c
-/sha3-512.h
-/kmac128.h
-/kmac256.h
-/shake128.h
-/shake256.h
-/shake128-xof.h
-/shake256-xof.h
-

 /chacha20.h
 /chacha12.h
 /chacha8.h
 /chacha20.h
 /chacha12.h
 /chacha8.h


@@ -53,6 +23,11 @@
 /chacha12-poly1305.h
 /chacha8-poly1305.h
 
 /chacha12-poly1305.h
 /chacha8-poly1305.h
 

+/kmac128.h
+/kmac256.h
+
+/safersk.[ch]
+

 /salsa2012.h
 /salsa208.h
 /salsa20-ietf.h
 /salsa2012.h
 /salsa208.h
 /salsa20-ietf.h


@@ -67,3 +42,29 @@
 /salsa20-poly1305.h
 /salsa2012-poly1305.h
 /salsa208-poly1305.h
 /salsa20-poly1305.h
 /salsa2012-poly1305.h
 /salsa208-poly1305.h

+
+/sha224.[ch]
+/sha384.[ch]
+/sha512-224.[ch]
+/sha512-256.[ch]
+
+/sha3-224.[ch]
+/sha3-256.[ch]
+/sha3-384.[ch]
+/sha3-512.[ch]
+
+/shake128.h
+/shake256.h
+/shake128-xof.h
+/shake256-xof.h
+
+/whirlpool256.[ch]
+
+## Generated test vector files.
+/t/cast256
+/t/mars
+/t/rijndael
+/t/salsa20
+/t/serpent
+/t/sha3
+/t/twofish

diff --git a/symm/t/.gitignore b/symm/t/.gitignore
deleted file mode 100644 (file)
index 88cf471..0000000
--- a/symm/t/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-cast256
-mars
-rijndael
-serpent
-twofish