guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

10/11: build: Use 'GEN' and 'at' silent rules.


From: Mathieu Lirzin
Subject: 10/11: build: Use 'GEN' and 'at' silent rules.
Date: Thu, 28 Jan 2016 15:32:43 +0000

mthl pushed a commit to branch master
in repository guix.

commit e71ad29ddbb4ad8f3e986681fbe746847c4ca723
Author: Mathieu Lirzin <address@hidden>
Date:   Sun Jan 24 19:04:53 2016 +0100

    build: Use 'GEN' and 'at' silent rules.
    
    * 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(-)

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 <address@hidden>
+# Copyright © 2016 Mathieu Lirzin <address@hidden>
 #
 # 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 \"address@hidden"                     \
             (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 address@hidden";                        
        \
        $(SED) -e 's|@''bindir''@|$(bindir)|' <                         \
-              "$(srcdir)/etc/guix-daemon.service.in" > "address@hidden"
+              "$(srcdir)/etc/guix-daemon.service.in" > "address@hidden";       
\
        mv "address@hidden" "$@"
 
 # 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 address@hidden";                        
        \
        $(SED) -e 's|@''bindir''@|$(bindir)|' <                         \
-              "$(srcdir)/etc/guix-daemon.conf.in" > "address@hidden"
+              "$(srcdir)/etc/guix-daemon.conf.in" > "address@hidden";          
\
        mv "address@hidden" "$@"
 
 EXTRA_DIST +=                                  \
diff --git a/doc.am b/doc.am
index 8b8ecc7..ad59aa5 100644
--- a/doc.am
+++ b/doc.am
@@ -52,7 +52,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 address@hidden";        \
        cp "$<" "$@"
 
 infoimagedir = $(infodir)/images
@@ -79,7 +79,7 @@ DOT_OPTIONS =                                 \
        mv "$(srcdir)/address@hidden" "$(srcdir)/$@"
 
 .png.eps:
-       convert "$<" "address@hidden"
+       $(AM_V_GEN)convert "$<" "address@hidden"; \
        mv "address@hidden" "$@"
 
 # We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]