Simplify version control metadata.

* .cvsignore: Delete.
* bin/.cvsignore: Likewise.
* config/.cvsignore: Likewise.
* doc/.cvsignore: Likewise.
* lib/.cvsignore: Likewise.
* lib/autoconf/.cvsignore: Likewise.
* lib/Autom4te/.cvsignore: Likewise.
* lib/autoscan/.cvsignore: Likewise.
* lib/autotest/.cvsignore: Likewise.
* lib/emacs/.cvsignore: Likewise.
* lib/m4sugar/.cvsignore: Likewise.
* man/.cvsignore: Likewise.
* tests/.cvsignore: Likewise.
* bin/.gitignore: Likewise.
* build-aux/.gitignore: Likewise.
* config/.gitignore: Likewise.
* doc/.gitignore: Likewise.
* lib/.gitignore: Likewise.
* lib/autoconf/.gitignore: Likewise.
* lib/Autom4te/.gitignore: Likewise.
* lib/autoscan/.gitignore: Likewise.
* lib/autotest/.gitignore: Likewise.
* lib/emacs/.gitignore: Likewise.
* lib/m4sugar/.gitignore: Likewise.
* man/.gitignore: Likewise.
* tests/.gitignore: Likewise.
* .gitignore: Consolidate all rules into one file.

Signed-off-by: Eric Blake <ebb9@byu.net>

28 files changed, 89 insertions, 228 deletions

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 247c5dc7..00000000
--- a/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-Makefile
-config.cache
-config.log
-config.status
-configure.scan
-autoconf-[0-9].*
-*.log
-log
-releases
-autom4te.cache
-.#*
-.git
diff --git a/.gitignore b/.gitignore
index 96e8b08c..f36511cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,67 @@
 *.log
+*.m4f
+*.tmp
 *~
 .#*
 .version
 CVS
-Fetchdir
-INSTALL
+/Fetchdir
+/INSTALL
 Makefile
 Makefile.in
-TAGS
-aclocal.m4
-autoconf-[0-9].*
-autom4te.cache
-config.cache
-config.log
-config.status
-configure
-configure.scan
-log
-releases
-tags
+/TAGS
+/aclocal.m4
+/autoconf-[0-9].*
+/autom4te.cache
+/bin/autoheader
+/bin/autoconf
+/bin/autoconf.in
+/bin/autom4te
+/bin/autoreconf
+/bin/autoscan
+/bin/autoupdate
+/bin/ifnames
+/build-aux/elisp-comp
+/build-aux/install-sh
+/build-aux/mdate-sh
+/build-aux/missing
+/build-aux/mkinstalldirs
+/config.cache
+/config.log
+/config.status
+/configure
+/configure.scan
+/doc/*.??
+!/doc/Makefile.am
+/doc/*.???
+/doc/*.info*
+/doc/manual
+/doc/stamp-vti
+/doc/standards
+/doc/version.texi
+/lib/autom4te.cfg
+/lib/autoscan/autoscan.list
+/lib/emacs/*.elc
+/lib/emacs/elc-stamp
+/lib/m4sugar/version.m4
+/log
+/man/*.[1-9]
+/man/autoscan.log
+/releases
+/tags
+/tests/ac*.at
+/tests/atconfig
+/tests/atlocal
+/tests/autoconf
+/tests/autoheader
+/tests/autom4te
+/tests/autoreconf
+/tests/autoscan
+/tests/autoupdate
+/tests/expr
+/tests/ifnames
+/tests/mktests.stamp
+/tests/package.m4
+/tests/testsuite
+/tests/testsuite.dir
+/tests/wrapper.in
diff --git a/ChangeLog b/ChangeLog
index 6a048e43..0c317234 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,34 @@
 2009-08-14  Eric Blake  <ebb9@byu.net>
 
+	Simplify version control metadata.
+	* .cvsignore: Delete.
+	* bin/.cvsignore: Likewise.
+	* config/.cvsignore: Likewise.
+	* doc/.cvsignore: Likewise.
+	* lib/.cvsignore: Likewise.
+	* lib/autoconf/.cvsignore: Likewise.
+	* lib/Autom4te/.cvsignore: Likewise.
+	* lib/autoscan/.cvsignore: Likewise.
+	* lib/autotest/.cvsignore: Likewise.
+	* lib/emacs/.cvsignore: Likewise.
+	* lib/m4sugar/.cvsignore: Likewise.
+	* man/.cvsignore: Likewise.
+	* tests/.cvsignore: Likewise.
+	* bin/.gitignore: Likewise.
+	* build-aux/.gitignore: Likewise.
+	* config/.gitignore: Likewise.
+	* doc/.gitignore: Likewise.
+	* lib/.gitignore: Likewise.
+	* lib/autoconf/.gitignore: Likewise.
+	* lib/Autom4te/.gitignore: Likewise.
+	* lib/autoscan/.gitignore: Likewise.
+	* lib/autotest/.gitignore: Likewise.
+	* lib/emacs/.gitignore: Likewise.
+	* lib/m4sugar/.gitignore: Likewise.
+	* man/.gitignore: Likewise.
+	* tests/.gitignore: Likewise.
+	* .gitignore: Consolidate all rules into one file.
+
 	Normalize remaining copyright lines.
 	* BUGS: Reformat copyright line, using UPDATE_COPYRIGHT_FORCE.
 	* NEWS: Likewise.
diff --git a/bin/.cvsignore b/bin/.cvsignore
deleted file mode 100644
index 7905e796..00000000
--- a/bin/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-Makefile
-autoconf.in
-autoheader
-autoconf
-autom4te
-autoreconf
-autoscan
-autoupdate
-ifnames
-autom4te.cache
diff --git a/bin/.gitignore b/bin/.gitignore
deleted file mode 100644
index 7905e796..00000000
--- a/bin/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-Makefile
-autoconf.in
-autoheader
-autoconf
-autom4te
-autoreconf
-autoscan
-autoupdate
-ifnames
-autom4te.cache
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
deleted file mode 100644
index 4d07c5a1..00000000
--- a/build-aux/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-elisp-comp
-install-sh
-mdate-sh
-missing
-mkinstalldirs
diff --git a/config/.cvsignore b/config/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/config/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/config/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644
index ddccc901..00000000
--- a/doc/.cvsignore
+++ /dev/null
@@ -1,36 +0,0 @@
-*.AC
-*.ACs
-*.AT
-*.ATs
-*.cp
-*.cps
-*.cv
-*.cvs
-*.ev
-*.evs
-*.fn
-*.fns
-*.MS
-*.MSs
-*.ov
-*.ovs
-*.pr
-*.prs
-*.vr
-*.vrs
-*.ky
-*.aux
-*.dvi
-*.info
-*.log
-Makefile
-autoconf
-*.pdf
-*.pg
-*.ps
-stamp-vti
-standards
-*.tmp
-*.toc
-*.tp
-version.texi
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index c806b1e0..00000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1,38 +0,0 @@
-*.AC
-*.ACs
-*.AT
-*.ATs
-*.aux
-*.cp
-*.cps
-*.cv
-*.cvs
-*.dvi
-*.ev
-*.evs
-*.fn
-*.fns
-*.html
-*.htp
-*.info*
-*.ky
-*.log
-*.MS
-*.MSs
-*.ov
-*.ovs
-*.pdf
-*.pg
-*.pr
-*.prs
-*.ps
-*.tmp
-*.toc
-*.tp
-*.vr
-*.vrs
-Makefile
-manual
-stamp-vti
-standards
-version.texi
diff --git a/lib/.cvsignore b/lib/.cvsignore
deleted file mode 100644
index 7e1cfa18..00000000
--- a/lib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-autom4te.cfg
diff --git a/lib/.gitignore b/lib/.gitignore
deleted file mode 100644
index 7e1cfa18..00000000
--- a/lib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-autom4te.cfg
diff --git a/lib/Autom4te/.cvsignore b/lib/Autom4te/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/lib/Autom4te/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/Autom4te/.gitignore b/lib/Autom4te/.gitignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/lib/Autom4te/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/autoconf/.cvsignore b/lib/autoconf/.cvsignore
deleted file mode 100644
index 5c7f2d5b..00000000
--- a/lib/autoconf/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-*.m4f
diff --git a/lib/autoconf/.gitignore b/lib/autoconf/.gitignore
deleted file mode 100644
index 5c7f2d5b..00000000
--- a/lib/autoconf/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-*.m4f
diff --git a/lib/autoscan/.cvsignore b/lib/autoscan/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/lib/autoscan/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/autoscan/.gitignore b/lib/autoscan/.gitignore
deleted file mode 100644
index 0644ad12..00000000
--- a/lib/autoscan/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-autoscan.list
diff --git a/lib/autotest/.cvsignore b/lib/autotest/.cvsignore
deleted file mode 100644
index ad1ca241..00000000
--- a/lib/autotest/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-autotest.m4f
diff --git a/lib/autotest/.gitignore b/lib/autotest/.gitignore
deleted file mode 100644
index ad1ca241..00000000
--- a/lib/autotest/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-autotest.m4f
diff --git a/lib/emacs/.cvsignore b/lib/emacs/.cvsignore
deleted file mode 100644
index b6ef6776..00000000
--- a/lib/emacs/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-*.elc
-elc-stamp
diff --git a/lib/emacs/.gitignore b/lib/emacs/.gitignore
deleted file mode 100644
index b6ef6776..00000000
--- a/lib/emacs/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-*.elc
-elc-stamp
diff --git a/lib/m4sugar/.cvsignore b/lib/m4sugar/.cvsignore
deleted file mode 100644
index 15dc523f..00000000
--- a/lib/m4sugar/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-m4sh.m4f
-m4sugar.m4f
-version.m4
diff --git a/lib/m4sugar/.gitignore b/lib/m4sugar/.gitignore
deleted file mode 100644
index 15dc523f..00000000
--- a/lib/m4sugar/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-m4sh.m4f
-m4sugar.m4f
-version.m4
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index f8a50b71..00000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.1
-Makefile
-autoscan.log
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index f8a50b71..00000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.1
-Makefile
-autoscan.log
diff --git a/tests/.cvsignore b/tests/.cvsignore
deleted file mode 100644
index 18f90bc6..00000000
--- a/tests/.cvsignore
+++ /dev/null
@@ -1,32 +0,0 @@
-*.log
-*.tmp
-Makefile
-acautoheader.at
-acautoupdate.at
-acc.at
-acfortran.at
-acfunctions.at
-acgeneral.at
-acheaders.at
-aclang.at
-aclibs.at
-acprograms.at
-acspecific.at
-acstatus.at
-actypes.at
-atconfig
-atlocal
-autoconf
-autoheader
-autom4te
-autom4te.cache
-autoreconf
-autoscan
-autoupdate
-expr
-ifnames
-mktests.stamp
-package.m4
-testsuite
-testsuite.dir
-wrapper.in
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index 18f90bc6..00000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-*.log
-*.tmp
-Makefile
-acautoheader.at
-acautoupdate.at
-acc.at
-acfortran.at
-acfunctions.at
-acgeneral.at
-acheaders.at
-aclang.at
-aclibs.at
-acprograms.at
-acspecific.at
-acstatus.at
-actypes.at
-atconfig
-atlocal
-autoconf
-autoheader
-autom4te
-autom4te.cache
-autoreconf
-autoscan
-autoupdate
-expr
-ifnames
-mktests.stamp
-package.m4
-testsuite
-testsuite.dir
-wrapper.in