[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-597-gbfc83bd

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=bfc83bdec2e6e39a3275ae0c51b29a86603b49ad

The branch, maint has been updated
       via  bfc83bdec2e6e39a3275ae0c51b29a86603b49ad (commit)
      from  eada913864b278ccaf93f4589b4e24d9d5e82202 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .gitignore                    |   66 ++++++++++++++++++++++++++++++++++------
 ChangeLog                     |    9 +++++
 doc/.gitignore                |   27 -----------------
 doc/amhello/.gitignore        |    8 -----
 lib/Automake/.gitignore       |    1 -
 lib/Automake/tests/.gitignore |    2 -
 tests/.gitignore              |    8 -----
 7 files changed, 65 insertions(+), 56 deletions(-)
 delete mode 100644 doc/.gitignore
 delete mode 100644 doc/amhello/.gitignore
 delete mode 100644 lib/Automake/.gitignore
 delete mode 100644 lib/Automake/tests/.gitignore
 delete mode 100644 tests/.gitignore

diff --git a/.gitignore b/.gitignore
index fe65429..4782321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,60 @@
-aclocal.m4
-configure
-autom4te.cache
 Makefile.in
 Makefile
-aclocal
-automake
-config.cache
-config.log
-config.status
-config.status.lineno
-configure.lineno
+/aclocal.m4
+/configure
+/autom4te.cache
+/config.cache
+/config.log
+/config.status
+/config.status.lineno
+/configure.lineno
+/aclocal
+/automake
+/doc/amhello-*.tar.gz
+/doc/automake.info
+/doc/automake.info-[0-9]
+/doc/automake*.1
+/doc/aclocal*.1
+/doc/stamp-vti
+/doc/version.texi
+/doc/automake.ac
+/doc/automake.aux
+/doc/automake.cm
+/doc/automake.cp
+/doc/automake.cps
+/doc/automake.dvi
+/doc/automake.fn
+/doc/automake.fns
+/doc/automake.html
+/doc/automake.ky
+/doc/automake.log
+/doc/automake.op
+/doc/automake.pdf
+/doc/automake.pg
+/doc/automake.ps
+/doc/automake.toc
+/doc/automake.tp
+/doc/automake.tr
+/doc/automake.vr
+/doc/automake.vrs
+/doc/amhello/Makefile.in
+/doc/amhello/aclocal.m4
+/doc/amhello/config.h.in
+/doc/amhello/config.h.in~
+/doc/amhello/configure
+/doc/amhello/depcomp
+/doc/amhello/install-sh
+/doc/amhello/missing
+/lib/Automake/Config.pm
+/lib/Automake/tests/*.log
+/lib/Automake/tests/*.log-t
+/tests/*.log
+/tests/*.log-t
+/tests/*.dir
+/tests/*-p.test
+/tests/aclocal-1.*
+/tests/automake-1.*
+/tests/defs
+/tests/parallel-tests.am
 tags
 TAGS
diff --git a/ChangeLog b/ChangeLog
index a83bb6e..86a761d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-12-24  Stefano Lattarini  <address@hidden>
 
+       gitignore: use only one .gitignore file, in the top-level directory
+       * doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore,
+       lib/Automake/tests/.gitignore, tests/.gitignore: Deleted, their
+       contents merged into ...
+       * .gitignore: ... this top-level file.  Since we are at it, improve
+       it by anchoring files where it makes sense.
+
+2011-12-24  Stefano Lattarini  <address@hidden>
+
        tests: one more fixlet for gettext macros requirement
        * tests/gettext-macros.test (configure.in): Add calls to
        AC_INIT and AC_PROG_CC, to avoid a spurious failure in the
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index 2554ab9..0000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-amhello-*.tar.gz
-automake.info
-automake.info-[0-9]
-automake*.1
-aclocal*.1
-stamp-vti
-version.texi
-automake.ac
-automake.aux
-automake.cm
-automake.cp
-automake.cps
-automake.dvi
-automake.fn
-automake.fns
-automake.html
-automake.ky
-automake.log
-automake.op
-automake.pdf
-automake.pg
-automake.ps
-automake.toc
-automake.tp
-automake.tr
-automake.vr
-automake.vrs
diff --git a/doc/amhello/.gitignore b/doc/amhello/.gitignore
deleted file mode 100644
index 466b7a6..0000000
--- a/doc/amhello/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile.in
-aclocal.m4
-config.h.in
-config.h.in~
-configure
-depcomp
-install-sh
-missing
diff --git a/lib/Automake/.gitignore b/lib/Automake/.gitignore
deleted file mode 100644
index d539f93..0000000
--- a/lib/Automake/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Config.pm
diff --git a/lib/Automake/tests/.gitignore b/lib/Automake/tests/.gitignore
deleted file mode 100644
index ffbdfaf..0000000
--- a/lib/Automake/tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-*.log-t
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index 3c1f990..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-aclocal-*
-automake-*
-defs
-parallel-tests.am
-*.dir
-*.log
-*.log-t
-*-p.test


hooks/post-receive
-- 
GNU Automake