From: Mathieu Lirzin <mthl@gnu.org>
To: guix-devel@gnu.org
Subject: [PATCH 12/13] build: Use 'GEN' and 'at' silent rules.
Date: Sun, 24 Jan 2016 21:19:30 +0100 [thread overview]
Message-ID: <1453666771-16869-13-git-send-email-mthl@gnu.org> (raw)
In-Reply-To: <1453666771-16869-1-git-send-email-mthl@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
* 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(-)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0012-build-Use-GEN-and-at-silent-rules.patch --]
[-- Type: text/x-patch; name="0012-build-Use-GEN-and-at-silent-rules.patch", Size: 4469 bytes --]
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
# The self-contained tarball.
guix-binary.%.tar.xz:
- -GUIX_PACKAGE_PATH= \
+ $(AM_V_GEN)GUIX_PACKAGE_PATH= \
$(top_builddir)/pre-inst-env "$(GUILE)" \
"$(top_srcdir)/build-aux/make-binary-tarball.scm" "$*" "$@"
@@ -431,11 +431,11 @@ dist-hook: assert-no-store-file-names
distcheck-hook: assert-binaries-available assert-final-inputs-self-contained
sync-descriptions:
- -GUIX_PACKAGE_PATH= \
+ $(AM_V_at)GUIX_PACKAGE_PATH= \
$(top_builddir)/pre-inst-env guix lint --checkers=gnu-description
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
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:
# Make sure we're not shipping a file that embeds a local /gnu/store file name.
assert-no-store-file-names:
- if grep -r --exclude=*.texi --exclude=*.info \
+ $(AM_V_at)if grep -r --exclude=*.texi --exclude=*.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:
# 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"
# 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"
.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 © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
#
# This file is part of GNU Guix.
#
@@ -155,7 +156,7 @@ noinst_HEADERS = \
$(guix_daemon_headers)
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 = etc/guix-daemon.service
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" "$@"
# The '.conf' job for Upstart.
@@ -196,9 +197,9 @@ nodist_upstartjob_DATA = etc/guix-daemon.conf
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" "$@"
EXTRA_DIST += \
diff --git a/doc.am b/doc.am
index 73db930..6706682 100644
--- a/doc.am
+++ b/doc.am
@@ -53,7 +53,7 @@ EXTRA_DIST += $(OS_CONFIG_EXAMPLES_TEXI)
MAINTAINERCLEANFILES = $(OS_CONFIG_EXAMPLES_TEXI)
doc/os-config-%.texi: gnu/system/examples/%.tmpl
- $(MKDIR_P) "`dirname "$@"`"
+ $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
cp "$<" "$@"
infoimagedir = $(infodir)/images
@@ -80,7 +80,7 @@ DOT_OPTIONS = \
mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
.png.eps:
- convert "$<" "$@-tmp.eps"
+ $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
mv "$@-tmp.eps" "$@"
# We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake)
next prev parent reply other threads:[~2016-01-24 20:20 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-24 20:19 [PATCH 00/13] New syntax 'package@version' and compilation improvements Mathieu Lirzin
2016-01-24 20:19 ` [PATCH 01/13] tests: Use 'dummy-origin' for lint tests when possible Mathieu Lirzin
2016-01-26 15:58 ` Ludovic Courtès
2016-01-24 20:19 ` [PATCH 02/13] lint: Remove an unneeded clause in 'check-patch-file-names' Mathieu Lirzin
2016-01-26 16:00 ` Ludovic Courtès
2016-01-24 20:19 ` [PATCH 03/13] lint: Rewrite 'check-patch-file-names' Mathieu Lirzin
2016-01-26 16:01 ` Ludovic Courtès
2016-01-24 20:19 ` [PATCH 04/13] utils: Use '@' for separating package names and version numbers Mathieu Lirzin
2016-01-25 11:37 ` Alex Kost
2016-01-25 20:56 ` Mathieu Lirzin
2016-01-26 16:22 ` Ludovic Courtès
2016-01-26 20:52 ` Mathieu Lirzin
2016-01-26 21:08 ` Ludovic Courtès
2016-02-19 20:49 ` Mathieu Lirzin
2016-02-23 11:11 ` Ludovic Courtès
2016-02-29 0:28 ` Mathieu Lirzin
2016-02-29 16:00 ` Ludovic Courtès
2016-03-02 21:35 ` Mathieu Lirzin
2016-03-05 1:28 ` Nils Gillmann
2016-03-05 9:24 ` Alex Kost
2016-03-05 9:36 ` Mathieu Lirzin
2016-03-03 10:29 ` Alex Kost
2016-03-03 16:55 ` Ludovic Courtès
2016-03-04 10:19 ` Alex Kost
2016-03-04 23:03 ` Mathieu Lirzin
2016-03-04 23:25 ` Ludovic Courtès
2016-03-05 1:08 ` Mathieu Lirzin
2016-03-05 9:16 ` Alex Kost
2016-01-25 14:04 ` Thompson, David
2016-01-25 21:41 ` Mathieu Lirzin
2016-01-25 23:33 ` Alex Kost
2016-01-26 17:57 ` Mathieu Lirzin
2016-01-24 20:19 ` [PATCH 05/13] packages: Use '@' in package record printers Mathieu Lirzin
2016-01-26 16:22 ` Ludovic Courtès
2016-01-24 20:19 ` [PATCH 06/13] build: Generate man pages after compiling guile objects Mathieu Lirzin
2016-01-26 16:52 ` Ludovic Courtès
2016-01-26 20:08 ` Mathieu Lirzin
2016-01-28 2:37 ` Eric Bavier
2016-01-28 15:44 ` Mathieu Lirzin
2016-01-28 15:59 ` Eric Bavier
2016-01-28 17:00 ` Mathieu Lirzin
2016-01-29 0:27 ` Eric Bavier
2016-01-29 16:17 ` Mathieu Lirzin
2016-01-29 16:46 ` Eric Bavier
2016-01-29 22:56 ` Mathieu Lirzin
2016-01-31 9:17 ` Ludovic Courtès
2016-01-24 20:19 ` [PATCH 07/13] build: Add 'DL' silent rule Mathieu Lirzin
2016-01-26 16:28 ` Ludovic Courtès
2016-01-26 17:44 ` Mathieu Lirzin
2016-01-26 19:22 ` Taylan Ulrich Bayırlı/Kammer
2016-01-26 21:06 ` Ludovic Courtès
2016-01-26 21:14 ` Mathieu Lirzin
2016-01-24 20:19 ` [PATCH 08/13] build: Add 'DOT' " Mathieu Lirzin
2016-01-26 16:28 ` Ludovic Courtès
2016-01-24 20:19 ` [PATCH 09/13] build: Add 'EMACS' " Mathieu Lirzin
2016-01-26 16:28 ` Ludovic Courtès
2016-01-24 20:19 ` [PATCH 10/13] build: Add 'HELP2MAN' " Mathieu Lirzin
2016-01-26 16:29 ` Ludovic Courtès
2016-01-24 20:19 ` [PATCH 11/13] build: Delete emacs/guix-autoloads.el when 'make clean' Mathieu Lirzin
2016-01-26 16:33 ` Ludovic Courtès
2016-01-26 22:55 ` Mathieu Lirzin
2016-01-24 20:19 ` Mathieu Lirzin [this message]
2016-01-26 16:34 ` [PATCH 12/13] build: Use 'GEN' and 'at' silent rules Ludovic Courtès
2016-01-24 20:19 ` [PATCH 13/13] Update .gitignore Mathieu Lirzin
2016-01-26 16:34 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453666771-16869-13-git-send-email-mthl@gnu.org \
--to=mthl@gnu.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.