From 5cf5d57ab9f9d0878c2116d8407bf060616f9950 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 14 Mar 2019 10:40:38 +0100 Subject: [PATCH] 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 --- docs/examples/Makefile.am | 9 +++++++-- include/curl/Makefile.am | 9 +++++++-- lib/Makefile.am | 9 +++++++-- src/Makefile.am | 36 +++++++++++++++++++++++------------- tests/libtest/Makefile.am | 9 +++++++-- tests/server/Makefile.am | 9 +++++++-- tests/unit/Makefile.am | 9 +++++++-- 7 files changed, 65 insertions(+), 25 deletions(-) diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index e3845e028..53867cb22 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2019, Daniel Stenberg, , 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 16d97e1c4..a31f61b10 100644 --- a/include/curl/Makefile.am +++ b/include/curl/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2019, Daniel Stenberg, , 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 f2034a2f2..7c258b3fa 100644 --- 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 d1baf1c79..a26a57076 100644 --- 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 56c84a765..29ab0a9c4 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2019, Daniel Stenberg, , 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 f2067f2e2..ef3303ec1 100644 --- a/tests/server/Makefile.am +++ b/tests/server/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2019, Daniel Stenberg, , 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 fab82d2b0..6996cad6a 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2019, Daniel Stenberg, , 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)