[evince] build: Update git.mk from master copy
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] build: Update git.mk from master copy
- Date: Sat, 4 Dec 2010 13:43:23 +0000 (UTC)
commit 0150c0ba0b405fde29edd989c86e6040e7eb970c
Author: Christian Persch <chpe gnome org>
Date: Sat Dec 4 14:43:03 2010 +0100
build: Update git.mk from master copy
git.mk | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/git.mk b/git.mk
index 088ef0b..894adb4 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'`/@/@" | \
@@ -172,8 +181,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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]