Drop .cvsignore and redundant .gitignore files.

* .cvsignore: Delete.  We are moving further away from CVS.
* build-aux/.cvsignore: Likewise.
* checks/.cvsignore: Likewise.
* doc/.cvsignore: Likewise.
* examples/.cvsignore: Likewise.
* src/.cvsignore: Likewise.
* .gitignore: Consolidate from other files.
* build-aux/.gitignore: Delete, now that it is consolidated.
* checks/.gitignore: Likewise.
* doc/.gitignore: Likewise.
* examples/.gitignore: Likewise.
* src/.gitignore: Likewise.
* bootstrap: Simplify accordingly.

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

14 files changed, 62 insertions, 137 deletions

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 89903caf..00000000
--- a/.cvsignore
+++ /dev/null
@@ -1,30 +0,0 @@
-*.tar.bz2
-*.tar.gz
-.tarball-version
-.version
-aclocal.m4
-autom4te.cache
-config.cache
-config.guess
-config.h
-config.log
-config.status
-config.sub
-config-h.in
-configure
-configure.lineno
-depcomp
-gendocs.sh
-GNUmakefile
-gnupload
-install-sh
-lib
-link-warning.h
-m4-*
-Makefile.in
-Makefile
-missing
-stamp-h
-stamp-h1
-stamp-h.in
-tests
diff --git a/.gitignore b/.gitignore
index b6e029cb..1074fdac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,56 @@
 *~
+*.a
+*.exe
+*.o
 *.orig
 *.rej
 *.tar.bz2
 *.tar.gz
-.tarball-version
-.version
-aclocal.m4
-autom4te.cache
-config.cache
+*.tar.lzma
+*.tar.xz
+.deps
+/.tarball-version
+/.version
+/aclocal.m4
+/autom4te.cache
+/build-aux/.gitignore
+/checks/[0-9][0-9].*
+/checks/[0-9][0-9][0-9].*
+/checks/stamp-checks
+/config.cache
 /config.guess
-config.h
-config.log
-config.status
+/config.h
+/config.log
+/config.status
 /config.sub
-config-h.in
-configure
-configure.lineno
-CVS
+/config-h.in
+/configure
+/configure.lineno
+/CVS
 /depcomp
-gendocs.sh
-GNUmakefile
-gnupload
+/doc/.gitignore
+/doc/m4.1
+/doc/m4.??
+/doc/m4.???
+/doc/m4.html
+/doc/m4.info*
+/doc/manual
+/doc/stamp-vti
+/doc/version.texi
+/gendocs.sh
+/GNUmakefile
+/gnupload
 /install-sh
-lib
-link-warning.h
-m4-*
+/lib
+/link-warning.h
+/m4-*
+/m4/.gitignore
+/m4/gnulib-comp.m4
 Makefile.in
 Makefile
 /missing
-stamp-h
-stamp-h1
-stamp-h.in
-tests
+/src/m4
+/stamp-h
+/stamp-h1
+/stamp-h.in
+/tests
diff --git a/ChangeLog b/ChangeLog
index 30a84d8d..3362dc80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2009-05-14  Eric Blake  <ebb9@byu.net>
+
+	Drop .cvsignore and redundant .gitignore files.
+	* .cvsignore: Delete.  We are moving further away from CVS.
+	* build-aux/.cvsignore: Likewise.
+	* checks/.cvsignore: Likewise.
+	* doc/.cvsignore: Likewise.
+	* examples/.cvsignore: Likewise.
+	* src/.cvsignore: Likewise.
+	* .gitignore: Consolidate from other files.
+	* build-aux/.gitignore: Delete, now that it is consolidated.
+	* checks/.gitignore: Likewise.
+	* doc/.gitignore: Likewise.
+	* examples/.gitignore: Likewise.
+	* src/.gitignore: Likewise.
+	* bootstrap: Simplify accordingly.
+
 2009-04-21  Eric Blake  <ebb9@byu.net>
 
 	Be more explicit about default quoting characters.
diff --git a/bootstrap b/bootstrap
index 697b3505..81b87e31 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2009-03-23
+# bootstrap (GNU M4) version 2009-05-14
 # Written by Gary V. Vaughan  <gary@gnu.org>
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
@@ -211,26 +211,6 @@ func_update ()
 ## Version control. ##
 ## ---------------- ##
 
-# gnulib-tool updates m4/.{git,cvs}ignore and lib/.{git,cvs}ignore, and
-# keeping generated files under version control does not make sense.
-# Since lib is entirely ignored, we only need to prepopulate the m4 ignore
-# files with generated files not tracked by gnulib-tool.
-if test -f $config_macro_dir/.gitignore ; then
-  :
-else
-  func_echo "creating initial $config_macro_dir/.cvsignore"
-  cat > $config_macro_dir/.cvsignore <<\EOF
-# files created by gnulib, but that gnulib doesn't track
-*~
-.cvsignore
-.gitignore
-gnulib-comp.m4
-# gnulib-tool edits below here
-EOF
-  func_echo "creating initial $config_macro_dir/.gitignore"
-  cp $config_macro_dir/.cvsignore $config_macro_dir/.gitignore
-fi
-
 # See if we can use gnulib's git-merge-changelog merge driver.
 if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
   if git config merge.merge-changelog.driver >/dev/null ; then
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
deleted file mode 100644
index 8196f1a4..00000000
--- a/build-aux/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-announce-gen
-config.rpath
-gendocs.sh
-git-version-gen
-gnupload
-link-warning.h
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
deleted file mode 100644
index b82803d9..00000000
--- a/build-aux/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/announce-gen
-/config.rpath
-/gendocs.sh
-/git-version-gen
-/gnupload
-/link-warning.h
diff --git a/checks/.cvsignore b/checks/.cvsignore
deleted file mode 100644
index cfdeddf8..00000000
--- a/checks/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-[0-9][0-9][0-9].*
-Makefile
-stamp-checks
diff --git a/checks/.gitignore b/checks/.gitignore
deleted file mode 100644
index cfdeddf8..00000000
--- a/checks/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-[0-9][0-9][0-9].*
-Makefile
-stamp-checks
diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644
index 81f5a1e7..00000000
--- a/doc/.cvsignore
+++ /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/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index 81f5a1e7..00000000
--- 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/.cvsignore b/examples/.cvsignore
deleted file mode 100644
index 3dda7298..00000000
--- a/examples/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/examples/.gitignore b/examples/.gitignore
deleted file mode 100644
index 3dda7298..00000000
--- a/examples/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9b593c0f..00000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.o
-Makefile.in
-Makefile
-m4
-m4.exe
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9b593c0f..00000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.o
-Makefile.in
-Makefile
-m4
-m4.exe