summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Stefano Lattarini2011-12-281-0/+1
|\ | | | | | | | | * maint: maint: autogenerate ChangeLog
| * maint: autogenerate ChangeLogStefano Lattarini2011-12-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the practice set by various other GNU projects, we start to automatically generate the ChangeLog file from the git commit messages. This will avoid duplication (as the ChangeLog entries were always inserted both in the git commit message and in the version-controlled ChangeLog file), and potential problems with spurious merge conflicts (which, although greatly mitigated by Bruno Haible's `git-merge-changelog' helper program, have never been completely solved). * ChangeLog: Moved ... * ChangeLog.11:... to this. * Makefile.am (EXTRA_DIST): Add it. (gitlog_to_changelog_command, gitlog_to_changelog_options): New variables. (ChangeLog, am--changelog-regen-hook): New targets. * .gitignore: Add ChangeLog.
* | Merge branch 'master' into testsuite-workStefano Lattarini2011-12-241-5/+52
|\ \ | | | | | | | | | | | | | | | | | | * master: 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
| * \ Merge branch 'maint'Stefano Lattarini2011-12-241-5/+55
| |\ \ |/ / / | | _ | | | | | | | | | | * 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
| * gitignore: use only one .gitignore file, in the top-level directoryStefano Lattarini2011-12-241-10/+56
| | | | | | | | | | | | | | | | * 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.
* | Merge branch 'maint' into master.Stefano Lattarini2011-12-221-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * repo: don't commit generated files in the git repository anymoreStefano Lattarini2011-12-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been quite some time since autoconf and libtool have stopped committing the generated autotools files in their git repositories, with no significant ill effects we're aware of. It's true that the autoconf bootstrap process has now the minor annoyance that a pre-installed autoconf is required to complete it; but luckily automake will not have a similar annoyance, since our bootstrap script take care, through some hoops, to use the very automake and aclocal versions from the current git checkout to generate the required aclocal.m4 and Makefile.in files. In fact, this has been a necessity also in the past, because automake has been known to use in its own build system new development features that hadn't been present in any previously released automake distribution. * aclocal.m4: Delete. * configure: Likewise. * Makefile.in: Likewise. * doc/Makefile.in: Likewise. * lib/Automake/Makefile.in: Likewise. * lib/Automake/tests/Makefile.in: Likewise. * lib/Makefile.in: Likewise. * lib/am/Makefile.in: Likewise. * m4/Makefile.in: Likewise. * tests/Makefile.in: Likewise. * .gitignore: Ignore configure, aclocal.m4, and all the Makefile.in files. * configure.ac (AC_PREREQ): New macro call, to require the latest autoconf (2.68 for the moment).
* | gitignore: more use of anchorsStefano Lattarini2011-08-091-8/+8
| | | | | | | | | | | | | | | | | | | | * .gitignore: Anchor files that are intended to be ignored only if found in the same directory of the `.gitignore' file, not also in its subdirectories. * doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore, lib/Automake/tests/.gitignore, tests/.gitignore: Likewise. Also, where needed, add new entries that were once implied by the non-anchored entries in the upper-level `.gitignore' files.
* | Fixups and tests for cscope functionality.Ralf Wildenhues2009-09-261-0/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems cscope is not able to take into account relative file names of included cscope.files files, but it is able to canonicalize file names containing '../' sequences. This patch makes the cscope references relative again, and fixes some corner cases. * .gitignore: Ignore files generated by `make cscope'. * NEWS: Reword a bit. * THANKS: Update. * automake.in (handle_tags): Use $(am__cd). Provide default empty rule for the `cscope' target, for empty sources. * lib/am/tags.am (cscopelist): Construct relative path to files in $(srcdir) if $(srcdir) is relative. [TOPDIR_P] (cscope): Do not depend on cscope-clean. Only invoke $(CSCOPE) if cscope.files is nonemtpy. (clean-cscope): Rename from ... (cscopeclean): ... this. (cscope.files): Depend on clean-cscope. (distclean-tags) [!TOPDIR_P]: No need to remove cscope files here. * tests/cscope.test, tests/cscope2.test, tests/cscope3.test: New tests. * tests/Makefile.am: Adjust. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* git metadata update.Ralf Wildenhues2008-06-161-0/+2
| | | | | * .gitattributes: Use merge-changelog driver for ChangeLog. * .gitignore: Ignore configure.lineno, config.status.lineno.
* .gitignore, doc/.gitignore, lib/Automake/.gitignoreRalf Wildenhues2007-10-121-0/+9
tests/.gitignore: New files.