From 1f32ac0356cfc5c961570d7291d70603d85efa8b Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 28 Sep 2010 14:16:46 -0400 Subject: Bug 630812 - Ignore gnome-doc-utils, .dirstamp and GSettings files in git.mk Patches from Philip Withnall. [PATCH 1/3] Ignore gnome-doc-utils' .mo files and generated headers gnome-doc-utils can optionally generate a header (specified in DOC_H_FILE) which is cleaned by gnome-doc-utils.make in mostlyclean. Additionally, it generates MO files for the documentation translations which are also cleaned by gnome-doc-utils.make in mostlyclean. [PATCH 2/3] Ignore .dirstamp files These are automatically removed on distclean by automake under some circumstances. [PATCH 3/3] Ignore files generated by gsettings.m4 gsettings.m4 generates .valid files and can optionally generate enum files, which are all removed on mostlyclean by gsettings.m4. --- git.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/git.mk b/git.mk index 5ab41bab..894adb47 100644 --- a/git.mk +++ b/git.mk @@ -40,7 +40,7 @@ # build dir. # # This file knows how to handle autoconf, automake, libtool, gtk-doc, -# gnome-doc-utils, intltool. +# gnome-doc-utils, intltool, gsettings. # # # KNOWN ISSUES: @@ -100,11 +100,19 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(_DOC_OMF_ALL) \ $(_DOC_DSK_ALL) \ $(_DOC_HTML_ALL) \ + $(_DOC_MOFILES) \ $(_DOC_POFILES) \ + $(DOC_H_FILE) \ "*/.xml2po.mo" \ "*/*.omf.out" \ ; do echo /$$x; done; \ fi; \ + if test "x$(gsettings_SCHEMAS)" = x; then :; else \ + for x in \ + $(gsettings_SCHEMAS:.xml=.valid) \ + $(gsettings__enum_file) \ + ; do echo /$$x; done; \ + fi; \ if test -f $(srcdir)/po/Makefile.in.in; then \ for x in \ po/Makefile.in.in \ @@ -159,6 +167,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk "*.bak" \ "*~" \ ".*.sw[nop]" \ + ".dirstamp" \ ; do echo /$$x; done; \ } | \ sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ -- cgit v1.2.1