From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Lirzin Subject: [PATCH 12/13] build: Use 'GEN' and 'at' silent rules. Date: Sun, 24 Jan 2016 21:19:30 +0100 Message-ID: <1453666771-16869-13-git-send-email-mthl@gnu.org> References: <1453666771-16869-1-git-send-email-mthl@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.7.0.rc3" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNR9A-0003dW-DM for guix-devel@gnu.org; Sun, 24 Jan 2016 15:20:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNR98-0005ep-LO for guix-devel@gnu.org; Sun, 24 Jan 2016 15:20:28 -0500 In-Reply-To: <1453666771-16869-1-git-send-email-mthl@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------2.7.0.rc3 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable * daemon.am (nix/libstore/schema.sql.hh, etc/guix-daemon.service) (etc/guix-daemon.conf): Use $(AM_V_GEN). * doc.am (doc/os-config-%.texi, .png.eps): Likewise. * Makefile.am (guix-binary.%.tar.xz, gen-ChangeLog, gen-AUTHORS): Likewise. (assert-binaries-available, assert-final-inputs-self-contained) (assert-no-store-file-names, sync-descriptions): Use $(AM_V_at). --- Makefile.am | 14 +++++++------- daemon.am | 11 ++++++----- doc.am | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) --------------2.7.0.rc3 Content-Type: text/x-patch; name="0012-build-Use-GEN-and-at-silent-rules.patch" Content-Disposition: inline; filename="0012-build-Use-GEN-and-at-silent-rules.patch" Content-Transfer-Encoding: quoted-printable diff --git a/Makefile.am b/Makefile.am index bc015e2..6784da0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -420,7 +420,7 @@ include emacs.am =20 # The self-contained tarball. guix-binary.%.tar.xz: - -GUIX_PACKAGE_PATH=3D \ + $(AM_V_GEN)GUIX_PACKAGE_PATH=3D \ $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/make-binary-tarball.scm" "$*" "$@" =20 @@ -431,11 +431,11 @@ dist-hook: assert-no-store-file-names distcheck-hook: assert-binaries-available assert-final-inputs-self-conta= ined =20 sync-descriptions: - -GUIX_PACKAGE_PATH=3D \ + $(AM_V_at)GUIX_PACKAGE_PATH=3D \ $(top_builddir)/pre-inst-env guix lint --checkers=3Dgnu-description =20 gen-ChangeLog: - if test -d .git; then \ + $(AM_V_GEN)if test -d .git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ > $(distdir)/cl-t; \ rm -f $(distdir)/ChangeLog; \ @@ -443,7 +443,7 @@ gen-ChangeLog: fi =20 gen-AUTHORS: - if test -d .git; then \ + $(AM_V_GEN)if test -d .git; then \ rm -f "$(distdir)/AUTHORS"; \ $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/generate-authors.scm" \ @@ -452,7 +452,7 @@ gen-AUTHORS: =20 # Make sure we're not shipping a file that embeds a local /gnu/store fil= e name. assert-no-store-file-names: - if grep -r --exclude=3D*.texi --exclude=3D*.info \ + $(AM_V_at)if grep -r --exclude=3D*.texi --exclude=3D*.info \ "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ then \ echo "error: store file names embedded in the distribution" >&2 ; \ @@ -461,12 +461,12 @@ assert-no-store-file-names: =20 # Make sure hydra.gnu.org has the important binaries. assert-binaries-available: - $(top_builddir)/pre-inst-env "$(GUILE)" \ + $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/check-available-binaries.scm" =20 # Make sure the final inputs don't refer to bootstrap tools. assert-final-inputs-self-contained: - $(top_builddir)/pre-inst-env "$(GUILE)" \ + $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm" =20 .PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go diff --git a/daemon.am b/daemon.am index ba4be50..3c15531 100644 --- a/daemon.am +++ b/daemon.am @@ -1,5 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright =C2=A9 2012, 2013, 2014, 2015, 2016 Ludovic Court=C3=A8s +# Copyright =C2=A9 2016 Mathieu Lirzin # # This file is part of GNU Guix. # @@ -155,7 +156,7 @@ noinst_HEADERS =3D \ $(guix_daemon_headers) =20 nix/libstore/schema.sql.hh: nix/libstore/schema.sql - $(GUILE) --no-auto-compile -c \ + $(AM_V_GEN)$(GUILE) --no-auto-compile -c \ "(use-modules (rnrs io ports)) \ (call-with-output-file \"$@\" \ (lambda (out) \ @@ -185,9 +186,9 @@ nodist_systemdservice_DATA =3D etc/guix-daemon.servic= e =20 etc/guix-daemon.service: etc/guix-daemon.service.in \ $(top_builddir)/config.status - $(MKDIR_P) "`dirname "$@"`" + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ $(SED) -e 's|@''bindir''@|$(bindir)|' < \ - "$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp" + "$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp"; \ mv "$@.tmp" "$@" =20 # The '.conf' job for Upstart. @@ -196,9 +197,9 @@ nodist_upstartjob_DATA =3D etc/guix-daemon.conf =20 etc/guix-daemon.conf: etc/guix-daemon.conf.in \ $(top_builddir)/config.status - $(MKDIR_P) "`dirname "$@"`" + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ $(SED) -e 's|@''bindir''@|$(bindir)|' < \ - "$(srcdir)/etc/guix-daemon.conf.in" > "$@.tmp" + "$(srcdir)/etc/guix-daemon.conf.in" > "$@.tmp"; \ mv "$@.tmp" "$@" =20 EXTRA_DIST +=3D \ diff --git a/doc.am b/doc.am index 73db930..6706682 100644 --- a/doc.am +++ b/doc.am @@ -53,7 +53,7 @@ EXTRA_DIST +=3D $(OS_CONFIG_EXAMPLES_TEXI) MAINTAINERCLEANFILES =3D $(OS_CONFIG_EXAMPLES_TEXI) =20 doc/os-config-%.texi: gnu/system/examples/%.tmpl - $(MKDIR_P) "`dirname "$@"`" + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ cp "$<" "$@" =20 infoimagedir =3D $(infodir)/images @@ -80,7 +80,7 @@ DOT_OPTIONS =3D \ mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" =20 .png.eps: - convert "$<" "$@-tmp.eps" + $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \ mv "$@-tmp.eps" "$@" =20 # We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automak= e) --------------2.7.0.rc3--