On Mon, Feb 22, 2010 at 05:01:34PM -0700, Eric Blake wrote:
Fallout from the new bootstrap.
* .gitignore: Commit sorting done by bootstrap. * build-aux/.gitignore: Likewise. * po/.gitignore: Likewise. ---
Hmm, on review, this doubles some entries in build-aux/.gitignore. That seems like an upstream bug in gnulib's bootstrap that we might ought to revisit. For that matter, why do we version control multiple .gitignore? These can be consolidated into a single top-level file. I can prepare further patches along these lines, if others think it would be worthwhile.
We had multiple .gitignore for historic reasons - we had many .cvsignore and auto-generated .gitignore from them. These days we can consolidate them all That said we probably want to go one step further & auto-generate the .gitignore files from the automake rules. I do this in GTK-VNC using this makefile snippet in the top level http://git.gnome.org/browse/gtk-vnc/tree/git.mk then each Makefile.am just adds -include $(top_srcdir)/git.mk
.gitignore | 20 ++++++++++---------- build-aux/.gitignore | 12 ++++++++++-- po/.gitignore | 27 ++++++++++++++------------- 3 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/.gitignore b/.gitignore index d9a4aea..a638e0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,21 @@ +*#*# +*.#*# *.a *.o +*.orig +*.rej *~ .git .git-module-status +/GNUmakefile +/maint.mk ABOUT-NLS COPYING +ChangeLog INSTALL Makefile Makefile.in +NEWS aclocal.m4 autom4te.cache config.cache @@ -22,6 +30,7 @@ configure coverage cscope.files cscope.out +gnulib/ libtool libvirt-*.tar.gz libvirt.pc @@ -34,14 +43,5 @@ results.log stamp-h stamp-h.in stamp-h1 -update.log tests/*.log -/GNUmakefile -/maint.mk -gnulib/ -*.orig -*.rej -*#*# -*.#*# -ChangeLog -NEWS +update.log diff --git a/build-aux/.gitignore b/build-aux/.gitignore index af7a347..29b1e03 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -1,7 +1,15 @@ * -/link-warning.h -/mktempd /arg-nonnull.h /gitlog-to-changelog +/link-warning.h +/mktempd /useless-if-before-free /vc-list-files +arg-nonnull.h +config.rpath +gitlog-to-changelog +mkinstalldirs +mktempd +useless-if-before-free +vc-list-files +warn-on-use.h diff --git a/po/.gitignore b/po/.gitignore index 40ff7c8..9f7b57f 100644 --- a/po/.gitignore +++ b/po/.gitignore @@ -1,16 +1,17 @@ -stamp-po -remove-potcdate.sin -quot.sed -insert-header.sin *.gmo -en@quot.header -en@boldquot.header -boldquot.sed -Rules-quot -POTFILES -Makevars.template -Makefile.in.in -Makefile.in Makefile -remove-potcdate.sed +Makefile.in +Makefile.in.in Makevars +Makevars.template +POTFILES +Rules-quot +boldquot.sed +en@boldquot.header +en@quot.header +insert-header.sed +insert-header.sin +quot.sed +remove-potcdate.sed +remove-potcdate.sin +stamp-po --
ACK Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|