moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-25 17:48:48 -05:00
Code Issues Releases Wiki Activity

makefile: make checksrc and hugefile commands "silent"

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

Closes #3681
This commit is contained in:
Daniel Stenberg 2019-03-14 10:40:38 +01:00
parent 2af732f364
commit 5cf5d57ab9
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
7 changed files with 65 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/examples/Makefile.am
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -61,5 +61,10 @@ include Makefile.inc
all: $(check_PROGRAMS) all: $(check_PROGRAMS)
CHECKSRC = $(CS_$(V))
CS_0 = @echo " RUN " $@;
CS_1 =
CS_ = $(CS_0)
checksrc: checksrc:
@PERL@ $(top_srcdir)/lib/checksrc.pl -ASNPRINTF $(srcdir)/*.c $(CHECKSRC)(@PERL@ $(top_srcdir)/lib/checksrc.pl -ASNPRINTF $(srcdir)/*.c)

9
include/curl/Makefile.am
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -25,8 +25,13 @@ pkginclude_HEADERS = \
pkgincludedir= $(includedir)/curl pkgincludedir= $(includedir)/curl
CHECKSRC = $(CS_$(V))
CS_0 = @echo " RUN " $@;
CS_1 =
CS_ = $(CS_0)
checksrc: 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 if CURLDEBUG
# for debug builds, we scan the sources on all regular make invokes # for debug builds, we scan the sources on all regular make invokes

9
lib/Makefile.am
View File

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

36
src/Makefile.am
View File

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

9
tests/libtest/Makefile.am
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # 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 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 @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: checksrc:
@PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c $(CHECKSRC)@PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c
if CURLDEBUG if CURLDEBUG
# for debug builds, we scan the sources on all regular make invokes # for debug builds, we scan the sources on all regular make invokes

9
tests/server/Makefile.am
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # 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 EXTRA_DIST = base64.pl Makefile.inc CMakeLists.txt
CHECKSRC = $(CS_$(V))
CS_0 = @echo " RUN " $@;
CS_1 =
CS_ = $(CS_0)
checksrc: checksrc:
@PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c $(CHECKSRC)@PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c
if CURLDEBUG if CURLDEBUG
# for debug builds, we scan the sources on all regular make invokes # for debug builds, we scan the sources on all regular make invokes

9
tests/unit/Makefile.am
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # 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 # Makefile.inc provides neat definitions
include Makefile.inc include Makefile.inc
CHECKSRC = $(CS_$(V))
CS_0 = @echo " RUN " $@;
CS_1 =
CS_ = $(CS_0)
checksrc: checksrc:
@PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c $(CHECKSRC)@PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c
if BUILD_UNITTESTS if BUILD_UNITTESTS
noinst_PROGRAMS = $(UNITPROGS) noinst_PROGRAMS = $(UNITPROGS)