Synchronize with Evolution's git.mk.

It knows how to handle GSettings schemas.

diff --git a/git.mk b/git.mk
index 5ab41ba..7b11ca4 100644 (file)
--- 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, mallard, intltool, gsettings.
 #
 #
 # KNOWN ISSUES:
@@ -52,6 +52,11 @@
 #   And add those files to git.  See vte/gnome-pty-helper/git.mk for
 #   example.
 #
+# ChangeLog
+#
+# - 2012-03-28 Use temporary file for docs to avoid hitting ARG_MAX
+# - 2010-12-06 Add support for Mallard docs
+# - 2010-12-06 Start this change log
 
 git-all: git-mk-install
 
@@ -81,7 +86,13 @@ git-mk-install:
 
 ### .gitignore generation
 
+
 $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+       @echo $(_DOC_C_DOCS) > $@.docs.tmp
+       @echo $(_DOC_LC_DOCS) >> $@.docs.tmp
+       @echo $(_DOC_OMF_ALL) >> $@.docs.tmp
+       @echo $(_DOC_DSK_ALL) >> $@.docs.tmp
+       @echo $(_DOC_HTML_ALL) >> $@.docs.tmp
        $(AM_V_GEN) \
        { \
                if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
@@ -93,18 +104,22 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                xml html \
                        ; do echo /$$x; done; \
                fi; \
-               if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+               if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
                        for x in \
-                               $(_DOC_C_DOCS) \
-                               $(_DOC_LC_DOCS) \
-                               $(_DOC_OMF_ALL) \
-                               $(_DOC_DSK_ALL) \
-                               $(_DOC_HTML_ALL) \
+                               $$(cat $@.docs.tmp) \
+                               $(_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,12 +174,14 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        "*.bak" \
                        "*~" \
                        ".*.sw[nop]" \
+                       ".dirstamp" \
                ; do echo /$$x; done; \
        } | \
        sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
        sed 's@/[.]/@/@g' | \
        LC_ALL=C sort | uniq > $@.tmp && \
        mv $@.tmp $@;
+       @rm -f $@.docs.tmp
 
 all: $(srcdir)/.gitignore gitignore-recurse-maybe
 gitignore-recurse-maybe: