build: add silent rules, but default to off

This extends the silent build to all make commands, e.g.

old make output:
```
( \
	(gcc -v >/dev/null 2>&1 && gcc -v) || \
	(gcc --version >/dev/null 2>&1 && gcc --version) || \
	(gcc -V >/dev/null 2>&1 && gcc -V) || \
	echo "unknown compiler"; \
) 2>&1 | ./txt2c.sh cc_version >conststrings_c
echo "-Wall -pedantic -Wno-long-long -g -Wall -O0 -Werror=format-security -fno-delete-null-pointer-checks  -fno-delete-null-pointer-checks" | ./txt2c.sh cc_cflags >>conststrings_c
grep ac_cs_config= config.status | \
cut -d= -f2- | \
sed -e 's/^"//' -e 's/"$//' | ./txt2c.sh configure_options >>conststrings_c
mv -f conststrings_c conststrings.c
```

new make output:
```
  GEN      conststrings.c
```

diff --git a/Makefile.am b/Makefile.am
index a02135797ddc6b68ac50d8f2214218ddf30fd385..b19cf4e80971f95c37e4474c37e7fec84f0422df 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,11 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-flock --enable-gpgme \
        --with-gdbm --with-gnutls --with-gss --with-kyotocabinet --with-lmdb \
        --with-mixmaster --with-qdbm --with-sasl --with-tokyocabinet
 
+AM_V_COPY = $(am__v_COPY_$(V))
+am__v_COPY_ = $(am__v_COPY_$(AM_DEFAULT_VERBOSITY))
+am__v_COPY_0 = @echo "  COPY    " $@;
+am__v_COPY_1 = 
+
 SUBDIRS = m4 contrib imap
 
 if BUILD_HCACHE
@@ -111,21 +116,22 @@ txt2c_LDADD =
 
 noinst_PROGRAMS = $(MUTT_MD5) txt2c
 
-mutt_dotlock.c: dotlock.c
-       cp $(srcdir)/dotlock.c mutt_dotlock.c
+mutt_dotlock.c: $(srcdir)/dotlock.c
+       $(AM_V_COPY)cp $(srcdir)/dotlock.c mutt_dotlock.c
 
 conststrings.c: txt2c config.status
-       ( \
+       $(AM_V_GEN)( \
                ($(CC) -v >/dev/null 2>&1 && $(CC) -v) || \
                ($(CC) --version >/dev/null 2>&1 && $(CC) --version) || \
                ($(CC) -V >/dev/null 2>&1 && $(CC) -V) || \
                echo "unknown compiler"; \
-       ) 2>&1 | ${srcdir}/txt2c.sh cc_version >conststrings_c
-       echo "$(CFLAGS)" | ${srcdir}/txt2c.sh cc_cflags >>conststrings_c
-       grep ac_cs_config= config.status | \
-       cut -d= -f2- | \
-       sed -e 's/^"//' -e 's/"$$//' | ${srcdir}/txt2c.sh configure_options >>conststrings_c
-       mv -f conststrings_c conststrings.c
+       ) 2>&1 | ${srcdir}/txt2c.sh cc_version >conststrings_c;
+       $(AM_V_at)echo "$(CFLAGS)" | ${srcdir}/txt2c.sh cc_cflags >>conststrings_c
+       $(AM_V_at)grep ac_cs_config= config.status | \
+               cut -d= -f2- | \
+               sed -e 's/^"//' -e 's/"$$//' | \
+               ${srcdir}/txt2c.sh configure_options >> conststrings_c
+       $(AM_V_at)mv -f conststrings_c conststrings.c
 
 CLEANFILES = mutt_dotlock.c keymap_alldefs.h $(BUILT_SOURCES)
 
@@ -139,23 +145,25 @@ dist-hook:
        echo $(VERSION) > $(distdir)/.tarball-version
 
 smime_keys: $(srcdir)/smime_keys.pl
-       cp $(srcdir)/smime_keys.pl smime_keys
-       chmod +x smime_keys
+       $(AM_V_COPY)cp $(srcdir)/smime_keys.pl smime_keys
+       $(AM_V_at)chmod +x smime_keys
 
 keymap_defs.h: $(OPS) $(srcdir)/gen_defs
-       $(srcdir)/gen_defs $(OPS) > keymap_defs.h
+       $(AM_V_GEN)$(srcdir)/gen_defs $(OPS) > $@
 
 keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.NOTMUCH $(srcdir)/OPS.MIX $(srcdir)/OPS.PGP $(srcdir)/OPS.SMIME $(srcdir)/OPS.CRYPT $(srcdir)/gen_defs config.h
-       rm -f $@
-       $(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.NOTMUCH \
+       $(AM_V_GEN)$(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.NOTMUCH \
                $(srcdir)/OPS.MIX $(srcdir)/OPS.PGP $(srcdir)/OPS.SMIME $(srcdir)/OPS.CRYPT \
-               > keymap_alldefs.h
+               > $@
 
 git_ver.h: $(mutt_SOURCES) $(SUBDIRS)
-       @version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | sed -e 's/^neomutt-[0-9]\{8\}//' -e 's/g//'`; \
-       echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp; \
-       if ! cmp -s git_ver.h.tmp git_ver.h; then echo "  GEN      git_ver.h"; mv git_ver.h.tmp git_ver.h; fi; \
-       rm -f git_ver.h.tmp
+       $(AM_V_at)version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | sed -e 's/^neomutt-[0-9]\{8\}//' -e 's/g//'`
+       $(AM_V_at)echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp
+       $(AM_V_at)if ! cmp -s git_ver.h.tmp git_ver.h; then \
+               mv git_ver.h.tmp git_ver.h; \
+               echo "  GEN      git_ver.h"; \
+       fi
+       $(AM_V_at)rm -f git_ver.h.tmp
 
 install-exec-hook:
        if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then  \

diff --git a/configure.ac b/configure.ac
index a339877f04637f18a62da9668e41b8f868767836..ebf9ea46c35be403b867f120d42dd9326c94158e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,9 +44,6 @@ if test "x$U" != "x"; then
        AC_MSG_ERROR(Compiler not ANSI compliant)
 fi
 
-# Non-verbose make
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
 AC_PROG_CPP
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a01e63606058f5249980f0eada03be039ee494d0..6a9d1034729b7275286caf4ee8f9c0a82ea5ffed 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,6 +8,16 @@ subdir = doc
 DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\"
 AM_CPPFLAGS = -I. -I.. -I$(includedir) -I$(top_srcdir)
 
+AM_V_COPY = $(am__v_COPY_$(V))
+am__v_COPY_ = $(am__v_COPY_$(AM_DEFAULT_VERBOSITY))
+am__v_COPY_0 = @echo "  COPY    " $< "->" $@;
+am__v_COPY_1 = 
+
+AM_V_XSLT = $(am__v_XSLT_$(V))
+am__v_XSLT_ = $(am__v_XSLT_$(AM_DEFAULT_VERBOSITY))
+am__v_XSLT_0 = @echo "  XSLT    " $@;
+am__v_XSLT_1 = 
+
 MAKEDOC_CPP = $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C
 
 noinst_PROGRAMS = makedoc
@@ -106,21 +116,21 @@ uninstall-local:
 
 check:
 manual.txt: manual.html
-       -LC_ALL=C w3m -dump -O UTF8 manual.html > $@ || \
+       $(AM_V_GEN)LC_ALL=C w3m -dump -O UTF8 manual.html > $@ || \
        LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
        LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
 
 Muttrc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head
-       sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc
-       $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc
+       $(AM_V_GEN)sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc
+       $(AM_V_at)$(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc
 
 manual.html: manual.xml $(srcdir)/html.xsl $(srcdir)/mutt.xsl $(srcdir)/mutt.css
-       -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
+       $(AM_V_XSLT)xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
 
 $(CHUNKED_DOCFILES): index.html
 
 index.html: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl manual.xml $(srcdir)/mutt.css
-       xsltproc --nonet $(srcdir)/chunk.xsl manual.xml > /dev/null 2>&1
+       $(AM_V_XSLT)xsltproc --nonet $(srcdir)/chunk.xsl manual.xml > /dev/null 2>&1
 
 validate: manual.xml
        xmllint --noout --noblanks --postvalid $<
@@ -144,11 +154,11 @@ DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \
               instdoc Muttrc
 
 instdoc: instdoc.sh
-       cp instdoc.sh instdoc
-       chmod a+x instdoc
+       $(AM_V_COPY)cp instdoc.sh instdoc
+       $(AM_V_at)chmod a+x instdoc
 
 muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
-       $(MAKEDOC_CPP) $(top_srcdir)/init.h | \
+       $(AM_V_GEN)$(MAKEDOC_CPP) $(top_srcdir)/init.h | \
                ./makedoc$(EXEEXT) -m | \
                cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail > $@
 
@@ -157,21 +167,21 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
        -e 's,@docdir\@,$(docdir),g'
 
 mutt.1: $(srcdir)/mutt.man
-       $(EDIT) $(srcdir)/mutt.man > $@
+       $(AM_V_GEN)$(EDIT) $(srcdir)/mutt.man > $@
 
 pgpewrap.1: $(srcdir)/pgpewrap.man
-       $(EDIT) $(srcdir)/pgpewrap.man > $@
+       $(AM_V_GEN)$(EDIT) $(srcdir)/pgpewrap.man > $@
 
 pgpring.1: $(srcdir)/pgpring.man
-       $(EDIT) $(srcdir)/pgpring.man > $@
+       $(AM_V_GEN)$(EDIT) $(srcdir)/pgpring.man > $@
 
 smime_keys.1: $(srcdir)/smime_keys.man
-       $(EDIT) $(srcdir)/smime_keys.man > $@
+       $(AM_V_GEN)$(EDIT) $(srcdir)/smime_keys.man > $@
 
 manual.xml: makedoc$(EXEEXT) ../config.h $(top_srcdir)/init.h \
                manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
                $(srcdir)/gen-map-doc
-       ( mutt_ver=`sed -n -e '/MUTT_VERSION/s/.*"\(.*\)".*/\1/p' ../config.h` && \
+       $(AM_V_GEN)( mutt_ver=`sed -n -e '/MUTT_VERSION/s/.*"\(.*\)".*/\1/p' ../config.h` && \
                sed -e "s/@VERSION\@/$(PACKAGE_VERSION) ($$mutt_ver)/" $(srcdir)/manual.xml.head && \
                $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -s && \
                $(MAKEDOC_CPP) $(top_srcdir)/functions.h | \

diff --git a/hcache/Makefile.am b/hcache/Makefile.am
index 8d0c95840eda18ebdc2d241df3fce4891becedab..345b6cd80bc1d28bf58500f37c5a11d4e6c6e83a 100644 (file)
--- a/hcache/Makefile.am
+++ b/hcache/Makefile.am
@@ -45,6 +45,6 @@ $(top_srcdir)/keymap_defs.h:
        +$(MAKE) -C $(top_srcdir) keymap_defs.h
 
 hcversion.h: $(top_srcdir)/mutt.h $(top_srcdir)/rfc822.h $(srcdir)/hcachever.sh ../$(MUTT_MD5)
-       ( echo '#include "config.h"'; echo '#include "mutt.h"'; ) \
+       $(AM_V_GEN)( echo '#include "config.h"'; echo '#include "mutt.h"'; ) \
        | $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - | sh $(srcdir)/hcachever.sh hcversion.h