diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-22 22:16:12 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-22 22:57:04 +0100 |
| commit | 72c8dcb2f15d3a70fa43b6a8592072ddd22e6bb3 (patch) | |
| tree | 0fcefdc476ad44978121bd165864262876249421 /.gitignore | |
| parent | c5f878aba841b360f499cf528a60ec49064fa269 (diff) | |
| parent | dcc28ec3ee113b576a84134c0a138119ba21bd4e (diff) | |
| download | automake-72c8dcb2f15d3a70fa43b6a8592072ddd22e6bb3.tar.gz | |
Merge branch 'maint' into master.
* m4/regex.m4: Bump serial number by some notches, for good
measure. Prefer the deprecation message from maint over that
from master.
* m4/python.m4: Bump serial number.
* tests/Makefile.am (canon6.log): Depend on `libtool-macros.log'.
(canon7.log): Likewise.
(extradep2.log): Likewise.
(ar-lib4.log): Likewise.
(ar-lib6a.log): Likewise.
(ar-lib6b.log): Likewise.
(vartypo2): Likewise.
(posixsubst-ltlibraries.log): Likewise.
* tests/defs: Adjust the path of the included `get.sh' scripts
generated by `libtool-macros.test' and `gettext-macros.test'.
* aclocal.m4: Delete, it's auto-generated now.
* configure: Likewise.
* Makefile.in: Likewise.
* doc/Makefile.in: Likewise.
* m4/Makefile.in: Likewise.
* tests/Makefile.in: Likewise.
* lib/Makefile.in: Likewise.
* lib/am/Makefile.in: Likewise.
* lib/Automake/Makefile.in: Likewise.
* lib/Automake/tests/Makefile.in: Likewise.
* .gitignore: Correctly ignored the autogenerated files
that are not committed anymore.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 68a7fdea9..96d603ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,14 @@ /autom4te.cache /aclocal /automake +/aclocal.m4 +/configure /config.cache /config.log /config.status /config.status.lineno /configure.lineno +Makefile.in Makefile cscope.files cscope.in.out |