[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / git.mk

diff --git a/git.mk b/git.mk
index 088ef0b54e28954186d7e01dd5421f2f34f5b9ef..abd6c0a28ce8715fb0e228afabec01cc9fbfe77a 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,10 @@
 #   And add those files to git.  See vte/gnome-pty-helper/git.mk for
 #   example.
 #
+# ChangeLog
+#
+# - 2010-12-06 Add support for Mallard docs
+# - 2010-12-06 Start this change log
 
 git-all: git-mk-install
 
@@ -93,18 +97,26 @@ $(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) \
+                               $(_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 +171,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'`/@/@" | \
@@ -172,8 +185,11 @@ gitignore-recurse-maybe:
                $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
        fi;
 gitignore-recurse:
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir"); \
+       @for subdir in $(DIST_SUBDIRS); do \
+         case " $(SUBDIRS) " in \
+           *" $$subdir "*) :;; \
+           *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
+         esac; \
        done
 gitignore: $(srcdir)/.gitignore gitignore-recurse