[git.mk] Add gnome-doc-utils support

diff --git a/Makefile.am b/Makefile.am
index a440d4f..59d3f02 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ MAINTAINERCLEANFILES = \
        $(srcdir)/mkinstalldirs \
        $(srcdir)/omf.make \
        $(srcdir)/xmldocs.make \
+       $(srcdir)/gtk-doc.make \
        $(srcdir)/ChangeLog \
        `find "$(srcdir)" -type f -name Makefile.in -print`
 

diff --git a/git.mk b/git.mk
index 767d7d6..3809d71 100644 (file)
--- a/git.mk
+++ b/git.mk
@@ -35,6 +35,9 @@
 # not tarballs.  It serves no useful purpose in tarballs and clutters the
 # build dir.
 #
+# This file knows how to handle autoconf, automake, libtool, gtk-doc,
+# gnome-doc-utils, intltool.
+#
 #
 # KNOWN ISSUES:
 #
@@ -76,7 +79,8 @@ git-mk-install:
 
 .gitignore: Makefile.am $(top_srcdir)/git.mk
        @echo Generating $@; \
-       GTKDOCGITIGNOREFILES=; test "x$(DOC_MODULE)" = x || \
+       GTKDOCGITIGNOREFILES=; \
+       test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
        GTKDOCGITIGNOREFILES=" \
                $(DOC_MODULE)-decl-list.txt \
                $(DOC_MODULE)-decl.txt \
@@ -84,6 +88,18 @@ git-mk-install:
                tmpl/*.bak \
                xml html \
                "; \
+       GNOMEDOCUTILSGITIGNOREFILES=; \
+       test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \
+       GNOMEDOCUTILSGITIGNOREFILES=" \
+               $(_DOC_C_DOCS) \
+               $(_DOC_LC_DOCS) \
+               $(_DOC_OMF_ALL) \
+               $(_DOC_DSK_ALL) \
+               $(_DOC_HTML_ALL) \
+               $(_DOC_POFILES) \
+               */.xml2po.mo \
+               */*.omf.out \
+               "; \
        INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
        INTLTOOLGITIGNOREFILES=" \
                po/Makefile.in.in \
@@ -93,6 +109,7 @@ git-mk-install:
                po/*.mo \
                po/POTFILES \
                po/stamp-it \
+               po/.intltool-merge-cache \
                intltool-extract.in \
                intltool-merge.in \
                intltool-update.in \
@@ -105,12 +122,11 @@ git-mk-install:
                stamp-h1 \
                libtool \
                config.lt \
-               gtk-doc.make \
-               git.mk \
                "; \
        for x in \
                .gitignore \
                $$GTKDOCGITIGNOREFILES \
+               $$GNOMEDOCUTILSGITIGNOREFILES \
                $$INTLTOOLGITIGNOREFILES \
                $$AUTOCONFGITIGNOREFILES \
                $(GITIGNOREFILES) \
@@ -137,6 +153,7 @@ git-mk-install:
                "*.rej" \
                "*.bak" \
                "*~" \
+               ".*.swp" \
        ; do echo /$$x; done | \
        grep -v '/[.][.]/' | \
        sed 's@/[.]/@/@g' | \