From: Jim Meyering Date: Thu, 20 Jan 2011 10:50:53 +0000 (+0100) Subject: maint.mk: improve the public-submodule-commit rule X-Git-Tag: v0.1~3330 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=10a2340451a5dc1ff5972183fafd81de246c6931;p=gnulib.git maint.mk: improve the public-submodule-commit rule * top/maint.mk (public-submodule-commit): Prefix with $(AM_V_GEN), to suppress printing of its commands... unless V=1. Add git submodule's --quiet option to suppress printing of e.g., "Entering gnulib" output. "cd" into $(srcdir) before running git submodule. --- diff --git a/ChangeLog b/ChangeLog index 32dc93c1d..9c125c9eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-01-20 Jim Meyering + + maint.mk: improve the public-submodule-commit rule + * top/maint.mk (public-submodule-commit): Prefix with $(AM_V_GEN), + to suppress printing of its commands... unless V=1. + Add git submodule's --quiet option to suppress printing of e.g., + "Entering gnulib" output. + "cd" into $(srcdir) before running git submodule. + 2011-01-20 Bruno Haible include_next: Fix bug introduced on 2011-01-18. diff --git a/top/maint.mk b/top/maint.mk index ae280f648..25f4736a3 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1125,8 +1125,9 @@ submodule-checks ?= no-submodule-changes public-submodule-commit # cannot be built from a fresh clone. .PHONY: public-submodule-commit public-submodule-commit: - if test -d $(srcdir)/.git; then \ - git submodule foreach 'test $$(git rev-parse origin)' \ + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + cd $(srcdir) && \ + git submodule --quiet foreach 'test $$(git rev-parse origin)' \ = '"$$(git merge-base --independent origin $$sha1)"' \ || { echo '$(ME): found non-public submodule commit' >&2; \ exit 1; }; \