Makefile: Use `silent-rules'-style output by default.

To override, set V=1 in the usual way.

diff --git a/Makefile b/Makefile
index 084eacb..3ab34fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,12 @@
 
 all::
 
+V                       = 0
+v_tag                   = $(call v_tag_$V,$1)
+v_tag_0                         = @printf "  %-8s %s\n" "$1" "$@";
+V_AT                    = $(V_AT_$V)
+V_AT_0                  = @
+
 misc128_K0              = 000102030405060708090a0b0c0d0e0f
 misc128_K1              = 0f0e0d0c0b0a09080706050403020100
 
@@ -90,7 +96,7 @@ $(eval $(call def-lraes,256,256))
 BLKSZS                  = $(sort $(foreach c,$(BLKC),$($c_BLKSZ)))
 
 auto.mk: Makefile
-       set -e; exec >$@.new; \
+       $(call v_tag,GEN)set -e; exec >$@.new; \
        echo '### -*-makefile-*- AUTOMATICALLY GENERATED: DO NOT EDIT'; \
        $(foreach b,$(BLKSZS),b$b_N0=$(b$b_N0); ) \
        \
@@ -140,31 +146,31 @@ blkc-nsz0          = $(b$(call blkc-blksz,$1)_NSZ0)
 TARGETS                        += $(OCBKAT0)
 OCBKAT0                         = $(foreach b,$(BLKC), ocb3-$b-t$(b$($b_BLKSZ)_TSZ0)-n$(b$($b_BLKSZ)_NSZ0).kat)
 $(OCBKAT0): ocb3-%: ocbgen Makefile
-       ./ocbgen >$@.new ocb3 $(call blkc-name,$*) kat \
+       $(call v_tag,KAT)./ocbgen >$@.new ocb3 $(call blkc-name,$*) kat \
                $(call blkc-k0,$*) $(call blkc-n0,$*)+ \
                $$(( $(call blkc-tsz0,$*)/8 )) $(call blkc-hmszs,$*)
-                       mv $@.new $@
+       $(V_AT)mv $@.new $@
 
 TARGETS                        += $(OCBKAT1)
 OCBKAT1                         = $(foreach b,$(BLKC), ocb3-$b-t$(b$($b_BLKSZ)_TSZ1)-n$(b$($b_BLKSZ)_NSZ0).kat)
 $(OCBKAT1): ocb3-%: ocbgen Makefile
-       ./ocbgen >$@.new ocb3 $(call blkc-name,$*) kat \
+       $(call v_tag,KAT)./ocbgen >$@.new ocb3 $(call blkc-name,$*) kat \
                $(call blkc-k1,$*) $(call blkc-n0,$*)+ \
                $$(( $(call blkc-tsz1,$*)/8 )) $(call blkc-hmszs,$*)
-                       mv $@.new $@
+       $(V_AT)mv $@.new $@
 
 TARGETS                        += $(OCBVERBOSE)
 OCBVERBOSE              = $(foreach b,$(BLKC), ocb3-$b-t$(b$($b_BLKSZ)_TSZ0)-n$(b$($b_BLKSZ)_NSZ0).verbose)
 $(OCBVERBOSE): ocb3-%: ocbgen Makefile
-       ./ocbgen >$@.new -v ocb3 $(call blkc-name,$*) kat \
+       $(call v_tag,VERBOSE)./ocbgen >$@.new -v ocb3 $(call blkc-name,$*) kat \
                $(call blkc-k0,$*) $(call blkc-n1,$*) \
                $$(( $(call blkc-tsz0,$*)/8 )) $(call blkc-hmszv,$*)
-                       mv $@.new $@
+       $(V_AT)mv $@.new $@
 
 TARGETS                        += $(OCBMCT)
 OCBMCT                  = $(foreach b,$(BLKC), ocb3-$b-n$(b$($b_BLKSZ)_NSZ0).mct)
 $(OCBMCT): ocb3-%: ocbgen Makefile
-       set -e; \
+       $(call v_tag,MCT)set -e; \
        for t in \
                $(call blkc-tsz0,$*) \
                $(call blkc-tsz1,$*) \
@@ -176,8 +182,8 @@ $(OCBMCT): ocb3-%: ocbgen Makefile
            ./ocbgen ocb3 $(call blkc-name,$*) mct \
                $$(( $$k/8 )) $$(( $(call blkc-nsz0,$*)/8 )) $$(( $$t/8 )); \
          done; \
-       done >$@.new; \
-       mv $@.new $@
+       done >$@.new
+       $(V_AT)mv $@.new $@
 
 lraes64_M0              = 0011223344556677
 lraes96_M0              = 00112233445566778899aabb
@@ -188,9 +194,9 @@ lraes256_M0          = 00112233445566778899aabbccddeeff0112233445566778899aabbccddeeff0
 TARGETS                        += $(LRAESVERBOSE)
 LRAESVERBOSE            = $(foreach k,$(LRAES), lraes$k.verbose)
 $(LRAESVERBOSE): lraes%.verbose: ocbgen Makefile
-       ./ocbgen >$@.new ocb3 rijndael lraes $$(( $*/8 )) \
-               $(lraes$*_K0) $(lraes$*_M0) && \
-               mv $@.new $@
+       $(call v_tag,LRAES)./ocbgen >$@.new ocb3 rijndael lraes $$(( $*/8 )) \
+               $(lraes$*_K0) $(lraes$*_M0)
+       $(V_AT)mv $@.new $@
 
 all:: $(TARGETS)