On 16/02/10 00:09, Pádraig Brady wrote:

+sc_option_desc_uppercase:
+ @$(MAKE) -C src $@
+ @$(MAKE) -C man $@

I've pushed with the above changed to:

@$(MAKE) -s -C src all_programs
@$(MAKE) -s -C man $@

The -s is defined by POSIX and is available
on linux/BSD/solaris at least, and makes
the output from `make syntax-check` much cleaner.
I might add it to all syntax-check sub makes.

With the following, `make syntax-check` now just
outputs the name of each rule unless there is an issue:

commit 7dd4725bd682523792bb28ee9e71dfe778922e39
Author: Pádraig Brady <[email protected]>
Date:   Thu Feb 18 08:38:30 2010 +0000

    maint: clean up the output from syntax-check rules

    * cfg.mk (sc_tight_scope): Pass the -s (silent) flag to `make`
    so that it doesn't report about calling sub makes.
    (sc_check-AUTHORS): Likewise.
    (sc_strftime_check): Don't display stderr from info.
    * src/Makefile.am (sc_tight_scope): Don't annotate with "GEN".
    (sc_check-AUTHORS): Likewise.

diff --git a/cfg.mk b/cfg.mk
index 3f2e6d3..71f3d85 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -165,11 +165,11 @@ sc_sun_os_names:

 ALL_RECURSIVE_TARGETS += sc_tight_scope
 sc_tight_scope:
-       @$(MAKE) -C src $@
+       @$(MAKE) -s -C src $@

 ALL_RECURSIVE_TARGETS += sc_check-AUTHORS
 sc_check-AUTHORS:
-       @$(MAKE) -C src $@
+       @$(MAKE) -s -C src $@

 # Option descriptions should not start with a capital letter
 # One could grep source directly as follows:
@@ -218,7 +218,7 @@ sc_strftime_check:
          grep '^  %.  ' $(srcdir)/src/date.c | sort                    \
            | $(extract_char) > $...@-src;                                 \
          { echo N;                                                     \
-           info libc date calendar format | grep '^    `%.'\'          \
+           info libc date calendar format 2>/dev/null|grep '^    `%.'\'\
              | $(extract_char); } | sort > $...@-info;                    \
          diff -u $...@-src $...@-info || exit 1;                             \
          rm -f $...@-src $...@-info;                                         \
diff --git a/src/Makefile.am b/src/Makefile.am
index feb6c22..ecb42a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -678,7 +678,7 @@ au_dotdot = authors-dotdot
 au_actual = authors-actual
 .PHONY: sc_check-AUTHORS
 sc_check-AUTHORS: $(all_programs)
-       $(AM_V_GEN)locale=en_US.UTF-8;                  \
+       @locale=en_US.UTF-8;                            \
        LC_ALL="$$locale" ./cat --version               \
            | grep ' Torbjorn ' > /dev/null             \
          && { echo "$@: skipping this check"; exit 0; }; \
@@ -714,7 +714,7 @@ sc_check-AUTHORS: $(all_programs)
 # The second nm|grep checks for file-scope variables with `extern' scope.
 .PHONY: sc_tight_scope
 sc_tight_scope: $(bin_PROGRAMS)
-       $(AM_V_GEN)t=exceptions-$$$$;                                   \
+       @t=exceptions-$$$$;                                             \
        trap "s=$$?; rm -f $$t; exit $$s" 0 1 2 13 15;                  \
        src=`for f in $(SOURCES); do                                    \
               test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`;   \


Reply via email to