[PATCH 7/7] maint: merge gitignore files

[Eric Blake]

Now that we aren't mirroring .cvsignore files off of the
.gitignore files, we don't need to maintain a hierarchy.

* build-aux/.gitignore: Delete.
* checks/.gitignore: Likewise.
* doc/.gitignore: Likewise.
* examples/.gitignore: Likewise.
* src/.gitignore: Likewise.
* .gitignore: Cover rules from deleted files.

Signed-off-by: Eric Blake <address@hidden>
---
 .gitignore           | 29 +++++++++++++++++++++++++++--
 ChangeLog            |  8 ++++++++
 build-aux/.gitignore | 10 ----------
 checks/.gitignore    |  3 ---
 doc/.gitignore       | 15 ---------------
 examples/.gitignore  |  2 --
 src/.gitignore       |  6 ------
 7 files changed, 35 insertions(+), 38 deletions(-)
 delete mode 100644 build-aux/.gitignore
 delete mode 100644 checks/.gitignore
 delete mode 100644 doc/.gitignore
 delete mode 100644 examples/.gitignore
 delete mode 100644 src/.gitignore

diff --git a/.gitignore b/.gitignore
index 28bbd8e..a336b02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,26 @@
 *~
 *.bak
+*.exe
+*.o
 *.orig
 *.rej
 *.tar.bz2
 *.tar.gz
+.deps
 .tarball-version
 .version
 aclocal.m4
 autom4te.cache
-/build-aux/missing
-/build-aux/snippet
+/build-aux/*
+!/build-aux/compile
+!/build-aux/config.guess
+!/build-aux/config.sub
+!/build-aux/depcomp
+!/build-aux/install-sh
+!/build-aux/mdate-sh
+!/build-aux/texinfo.tex
+/checks/[0-9][0-9][0-9].*
+/checks/stamp-checks
 config.cache
 /config.guess
 config.h
@@ -21,6 +32,19 @@ configure
 configure.lineno
 CVS
 /depcomp
+/doc/fdl-1.3.texi
+/doc/gendocs_template
+/doc/gpl-3.0.texi
+/doc/m4.1
+/doc/m4.??
+/doc/m4.???
+/doc/m4.html
+/doc/m4.info*
+/doc/manual
+/doc/mdate-sh
+/doc/stamp-vti
+/doc/texinfo.tex
+/doc/version.texi
 gendocs.sh
 GNUmakefile
 gnupload
@@ -33,6 +57,7 @@ m4-*
 Makefile.in
 Makefile
 /missing
+/src/m4
 stamp-h
 stamp-h1
 stamp-h.in
diff --git a/ChangeLog b/ChangeLog
index 0459597..c726d5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-09-04  Eric Blake  <address@hidden>

+       maint: merge gitignore files
+       * build-aux/.gitignore: Delete.
+       * checks/.gitignore: Likewise.
+       * doc/.gitignore: Likewise.
+       * examples/.gitignore: Likewise.
+       * src/.gitignore: Likewise.
+       * .gitignore: Cover rules from deleted files.
+
        maint: drop CVS cruft
        * .cvsignore: Remove.
        * build-aux/.cvsignore: Likewise.
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
deleted file mode 100644
index 4d70d8d..0000000
--- a/build-aux/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/announce-gen
-/config.rpath
-/gendocs.sh
-/git-version-gen
-/gnu-web-doc-update
-/gnupload
-/link-warning.h
-/update-copyright
-/useless-if-before-free
-/vc-list-files
diff --git a/checks/.gitignore b/checks/.gitignore
deleted file mode 100644
index cfdeddf..0000000
--- a/checks/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-[0-9][0-9][0-9].*
-Makefile
-stamp-checks
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index 81f5a1e..0000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-fdl-1.3.texi
-gendocs_template
-gpl-3.0.texi
-m4.1
-m4.??
-m4.???
-m4.html
-m4.info*
-Makefile.in
-Makefile
-manual
-mdate-sh
-stamp-vti
-texinfo.tex
-version.texi
diff --git a/examples/.gitignore b/examples/.gitignore
deleted file mode 100644
index 3dda729..0000000
--- a/examples/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9b593c0..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.o
-Makefile.in
-Makefile
-m4
-m4.exe
-- 
1.7.11.4