diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-24 10:53:41 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-24 10:53:41 +0100 |
commit | e3351076de09b744d3387699fa20f1ec85f9ba58 (patch) | |
tree | f09c24ec4b6019add34952c8644f0e628cc0a40a /.gitignore | |
parent | 3749d843083e552232579a85288e7dfee126ad91 (diff) | |
parent | bfc83bdec2e6e39a3275ae0c51b29a86603b49ad (diff) | |
download | automake-e3351076de09b744d3387699fa20f1ec85f9ba58.tar.gz |
Merge branch 'maint'
* maint:
gitignore: use only one .gitignore file, in the top-level directory
tests: one more fixlet for gettext macros requirement
tests: fix handling of gettext macros requirement
tests: fix failure due to debugging code forgotten into a test
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 60 |
1 files changed, 55 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 96d603ea0..552fa1761 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,65 @@ -/autom4te.cache -/aclocal -/automake +Makefile.in +Makefile /aclocal.m4 /configure +/autom4te.cache /config.cache /config.log /config.status /config.status.lineno /configure.lineno -Makefile.in -Makefile +/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/aclocal-1.* +/tests/automake-1.* +/tests/defs-static +/tests/instspc-tests.am +/tests/parallel-tests.am +/tests/instspc-*-build.test +/tests/instspc-*-install.test +/tests/*.test-t +/tests/*-p.test cscope.files cscope.in.out cscope.out |