makefile: make checksrc and hugefile commands "silent"

... to match the style already used for compiling, linking
etc. Acknowledges 'make V=1' to enable verbose.

Closes #3681

diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index e3845e0289be8ee0fb3ebfc6f70f8368e7ce4261..53867cb229cf5fa7c7a7ca2575fa4a3975ff9287 100644 (file)
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -61,5 +61,10 @@ include Makefile.inc
 
 all: $(check_PROGRAMS)
 
+CHECKSRC = $(CS_$(V))
+CS_0 = @echo "  RUN     " $@;
+CS_1 =
+CS_ = $(CS_0)
+
 checksrc:
-       @PERL@ $(top_srcdir)/lib/checksrc.pl -ASNPRINTF $(srcdir)/*.c
+       $(CHECKSRC)(@PERL@ $(top_srcdir)/lib/checksrc.pl -ASNPRINTF $(srcdir)/*.c)

diff --git a/include/curl/Makefile.am b/include/curl/Makefile.am
index 16d97e1c4046857f0af97584f8743786c64dc4d0..a31f61b10102006c0759973057a49984398fb394 100644 (file)
--- a/include/curl/Makefile.am
+++ b/include/curl/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -25,8 +25,13 @@ pkginclude_HEADERS = \
 
 pkgincludedir= $(includedir)/curl
 
+CHECKSRC = $(CS_$(V))
+CS_0 = @echo "  RUN     " $@;
+CS_1 =
+CS_ = $(CS_0)
+
 checksrc:
-       @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/include/curl $(pkginclude_HEADERS)
+       $(CHECKSRC)@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/include/curl $(pkginclude_HEADERS)
 
 if CURLDEBUG
 # for debug builds, we scan the sources on all regular make invokes

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f2034a2f24ebabec8feef2051ec82535590a7a51..7c258b3fa7da7699fd20aeb745d449edaac5f29f 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -131,9 +131,14 @@ include Makefile.inc
 libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS)
 libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS)
 
+CHECKSRC = $(CS_$(V))
+CS_0 = @echo "  RUN     " $@;
+CS_1 =
+CS_ = $(CS_0)
+
 checksrc:
-       @PERL@ $(srcdir)/checksrc.pl -D$(srcdir) -W$(srcdir)/curl_config.h      \
-       $(srcdir)/*.[ch] $(srcdir)/vauth/*.[ch] $(srcdir)/vtls/*.[ch]
+       $(CHECKSRC)(@PERL@ $(srcdir)/checksrc.pl -D$(srcdir) -W$(srcdir)/curl_config.h \
+       $(srcdir)/*.[ch] $(srcdir)/vauth/*.[ch] $(srcdir)/vtls/*.[ch])
 
 if CURLDEBUG
 # for debug builds, we scan the sources on all regular make invokes

diff --git a/src/Makefile.am b/src/Makefile.am
index d1baf1c79b3fd7a914af8df635adc0ed0cace022..a26a57076e6e787c8725ee9eeed8506636164191 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,6 +94,16 @@ MANPAGE=$(abs_top_builddir)/docs/curl.1
 MKHELP=$(top_srcdir)/src/mkhelp.pl
 HUGE=tool_hugehelp.c
 
+HUGECMD = $(HUGEIT_$(V))
+HUGEIT_0 = @echo "  HUGE    " $@;
+HUGEIT_1 =
+HUGEIT_ = $(HUGEIT_0)
+
+CHECKSRC = $(CS_$(V))
+CS_0 = @echo "  RUN     " $@;
+CS_1 =
+CS_ = $(CS_0)
+
 if USE_MANUAL
 # Here are the stuff to create a built-in manual
 
@@ -104,32 +114,32 @@ if HAVE_LIBZ
 # This generates the tool_hugehelp.c file in both uncompressed and
 # compressed formats.
 $(HUGE): $(MANPAGE) $(MKHELP)
-       echo '#include "tool_setup.h"' > $(HUGE)
-       echo '#ifndef HAVE_LIBZ' >> $(HUGE)
-       $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) >> $(HUGE)
-       echo '#else' >> $(HUGE)
-       $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c >> $(HUGE)
-       echo '#endif /* HAVE_LIBZ */' >> $(HUGE)
+       $(HUGECMD) (echo '#include "tool_setup.h"' > $(HUGE);   \
+       echo '#ifndef HAVE_LIBZ' >> $(HUGE);                    \
+       $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) >> $(HUGE);     \
+       echo '#else' >> $(HUGE);                                \
+       $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c >> $(HUGE);  \
+       echo '#endif /* HAVE_LIBZ */' >> $(HUGE) )
 else # HAVE_LIBZ
 # This generates the tool_hugehelp.c file uncompressed only
 $(HUGE): $(MANPAGE) $(MKHELP)
-       echo '#include "tool_setup.h"' > $(HUGE)
-       $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) >> $(HUGE)
+       $(HUGECMD)(echo '#include "tool_setup.h"' > $(HUGE):    \
+       $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) >> $(HUGE) )
 endif
 
 else # USE_MANUAL
 # built-in manual has been disabled, make a blank file
 $(HUGE):
-       echo "/* built-in manual is disabled, blank function */" > $(HUGE)
-       echo '#include "tool_hugehelp.h"' >> $(HUGE)
-       echo "void hugehelp(void) {}" >>$(HUGE)
+       $(HUGECMD)(echo "/* built-in manual is disabled, blank function */" > $(HUGE); \
+       echo '#include "tool_hugehelp.h"' >> $(HUGE); \
+       echo "void hugehelp(void) {}" >>$(HUGE) )
 endif
 
 # ignore tool_hugehelp.c since it is generated source code and it plays
 # by slightly different rules!
 checksrc:
-       @PERL@ $(top_srcdir)/lib/checksrc.pl -D$(srcdir)        \
-       -W$(srcdir)/tool_hugehelp.c $(srcdir)/*.[ch]
+       $(CHECKSRC)(@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(srcdir)        \
+       -W$(srcdir)/tool_hugehelp.c $(srcdir)/*.[ch])
 
 if CURLDEBUG
 # for debug builds, we scan the sources on all regular make invokes

diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 56c84a7658f16dcf9d477824c59c7ab58dc24f31..29ab0a9c4bd1a7c6629c6690ba252b0f610feab4 100644 (file)
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -131,8 +131,13 @@ endif
 lib1521.c: $(top_srcdir)/tests/libtest/mk-lib1521.pl $(top_srcdir)/include/curl/curl.h
        @PERL@ $(top_srcdir)/tests/libtest/mk-lib1521.pl < $(top_srcdir)/include/curl/curl.h > lib1521.c
 
+CHECKSRC = $(CS_$(V))
+CS_0 = @echo "  RUN     " $@;
+CS_1 =
+CS_ = $(CS_0)
+
 checksrc:
-       @PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c
+       $(CHECKSRC)@PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c
 
 if CURLDEBUG
 # for debug builds, we scan the sources on all regular make invokes

diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index f2067f2e2e0aa227e0be1c572736d8f5edeb4616..ef3303ec138ccd496942d7d322cbe79e8304fe78 100644 (file)
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -56,8 +56,13 @@ include Makefile.inc
 
 EXTRA_DIST = base64.pl Makefile.inc CMakeLists.txt
 
+CHECKSRC = $(CS_$(V))
+CS_0 = @echo "  RUN     " $@;
+CS_1 =
+CS_ = $(CS_0)
+
 checksrc:
-       @PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c
+       $(CHECKSRC)@PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c
 
 if CURLDEBUG
 # for debug builds, we scan the sources on all regular make invokes

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index fab82d2b06f3ee1b647e35d5b3cca4833be0f35e..6996cad6ad3316c845931fbdb50643b254cd51dc 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -64,8 +64,13 @@ AM_CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS
 # Makefile.inc provides neat definitions
 include Makefile.inc
 
+CHECKSRC = $(CS_$(V))
+CS_0 = @echo "  RUN     " $@;
+CS_1 =
+CS_ = $(CS_0)
+
 checksrc:
-       @PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c
+       $(CHECKSRC)@PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c
 
 if BUILD_UNITTESTS
 noinst_PROGRAMS = $(UNITPROGS)