Skip to content

Commit a9fda01

Browse files
avargitster
avar
authored and
gitster
committed
Makefile: add "$(QUIET)" boilerplate to shared.mak
The $(QUIET) variables we define are largely duplicated between our various Makefiles, let's define them in the new "shared.mak" instead. Since we're not using the environment to pass these around we don't need to export the "QUIET_GEN" and "QUIET_BUILT_IN" variables anymore. The "QUIET_GEN" variable is used in "git-gui/Makefile" and "gitweb/Makefile", but they've got their own definition for those. The "QUIET_BUILT_IN" variable is only used in the top-level "Makefile". We still need to export the "V" variable. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent fd15f8a commit a9fda01

File tree

6 files changed

+53
-85
lines changed

6 files changed

+53
-85
lines changed

‎Documentation/Makefile‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -218,38 +218,6 @@ DEFAULT_EDITOR_SQ = $(subst ','\'',$(DEFAULT_EDITOR))
218218
ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
219219
endif
220220

221-
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
222-
QUIET_SUBDIR1 =
223-
224-
ifneq ($(findstring $(MAKEFLAGS),w),w)
225-
PRINT_DIR = --no-print-directory
226-
else # "make -w"
227-
NO_SUBDIR = :
228-
endif
229-
230-
ifneq ($(findstring $(MAKEFLAGS),s),s)
231-
ifndef V
232-
QUIET = @
233-
QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@;
234-
QUIET_XMLTO = @echo ' ' XMLTO $@;
235-
QUIET_DB2TEXI = @echo ' ' DB2TEXI $@;
236-
QUIET_MAKEINFO = @echo ' ' MAKEINFO $@;
237-
QUIET_DBLATEX = @echo ' ' DBLATEX $@;
238-
QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
239-
QUIET_GEN = @echo ' ' GEN $@;
240-
QUIET_STDERR = 2> /dev/null
241-
QUIET_SUBDIR0 = +@subdir=
242-
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
243-
$(MAKE) $(PRINT_DIR) -C $$subdir
244-
245-
QUIET_LINT_GITLINK = @echo ' ' LINT GITLINK $<;
246-
QUIET_LINT_MANSEC = @echo ' ' LINT MAN SEC $<;
247-
QUIET_LINT_MANEND = @echo ' ' LINT MAN END $<;
248-
249-
export V
250-
endif
251-
endif
252-
253221
all: html man
254222

255223
html: $(DOC_HTML)

‎Makefile‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,39 +2001,6 @@ ifndef PAGER_ENV
20012001
PAGER_ENV = LESS=FRX LV=-c
20022002
endif
20032003

2004-
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
2005-
QUIET_SUBDIR1 =
2006-
2007-
ifneq ($(findstring w,$(MAKEFLAGS)),w)
2008-
PRINT_DIR = --no-print-directory
2009-
else # "make -w"
2010-
NO_SUBDIR = :
2011-
endif
2012-
2013-
ifneq ($(findstring s,$(MAKEFLAGS)),s)
2014-
ifndef V
2015-
QUIET_CC = @echo ' ' CC $@;
2016-
QUIET_AR = @echo ' ' AR $@;
2017-
QUIET_LINK = @echo ' ' LINK $@;
2018-
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
2019-
QUIET_GEN = @echo ' ' GEN $@;
2020-
QUIET_LNCP = @echo ' ' LN/CP $@;
2021-
QUIET_XGETTEXT = @echo ' ' XGETTEXT $@;
2022-
QUIET_MSGFMT = @echo ' ' MSGFMT $@;
2023-
QUIET_GCOV = @echo ' ' GCOV $@;
2024-
QUIET_SP = @echo ' ' SP $<;
2025-
QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
2026-
QUIET_RC = @echo ' ' RC $@;
2027-
QUIET_SPATCH = @echo ' ' SPATCH $<;
2028-
QUIET_SUBDIR0 = +@subdir=
2029-
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
2030-
$(MAKE) $(PRINT_DIR) -C $$subdir
2031-
export V
2032-
export QUIET_GEN
2033-
export QUIET_BUILT_IN
2034-
endif
2035-
endif
2036-
20372004
ifdef NO_INSTALL_HARDLINKS
20382005
export NO_INSTALL_HARDLINKS
20392006
endif

‎config.mak.uname‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,6 @@ vcxproj:
727727
git diff-index --cached --quiet HEAD --
728728

729729
# Make .vcxproj files and add them
730-
unset QUIET_GEN QUIET_BUILT_IN; \
731730
perl contrib/buildsystems/generate -g Vcxproj
732731
git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
733732

‎contrib/scalar/Makefile‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,6 @@ include ../../config.mak.uname
88
-include ../../config.mak.autogen
99
-include ../../config.mak
1010

11-
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
12-
QUIET_SUBDIR1 =
13-
14-
ifneq ($(findstring s,$(MAKEFLAGS)),s)
15-
ifndef V
16-
QUIET_GEN = @echo ' ' GEN $@;
17-
QUIET_SUBDIR0 = +@subdir=
18-
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
19-
$(MAKE) $(PRINT_DIR) -C $$subdir
20-
else
21-
export V
22-
endif
23-
endif
24-
2511
TARGETS = scalar$(X) scalar.o
2612
GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a
2713

‎shared.mak‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,56 @@
3131
comma := ,
3232
empty :=
3333
space := $(empty) $(empty)
34+
35+
### Quieting
36+
## common
37+
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
38+
QUIET_SUBDIR1 =
39+
40+
ifneq ($(findstring w,$(MAKEFLAGS)),w)
41+
PRINT_DIR = --no-print-directory
42+
else # "make -w"
43+
NO_SUBDIR = :
44+
endif
45+
46+
ifneq ($(findstring s,$(MAKEFLAGS)),s)
47+
ifndef V
48+
## common
49+
QUIET_SUBDIR0 = +@subdir=
50+
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
51+
$(MAKE) $(PRINT_DIR) -C $$subdir
52+
53+
QUIET = @
54+
QUIET_GEN = @echo ' ' GEN $@;
55+
56+
## Used in "Makefile"
57+
QUIET_CC = @echo ' ' CC $@;
58+
QUIET_AR = @echo ' ' AR $@;
59+
QUIET_LINK = @echo ' ' LINK $@;
60+
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
61+
QUIET_LNCP = @echo ' ' LN/CP $@;
62+
QUIET_XGETTEXT = @echo ' ' XGETTEXT $@;
63+
QUIET_MSGFMT = @echo ' ' MSGFMT $@;
64+
QUIET_GCOV = @echo ' ' GCOV $@;
65+
QUIET_SP = @echo ' ' SP $<;
66+
QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
67+
QUIET_RC = @echo ' ' RC $@;
68+
QUIET_SPATCH = @echo ' ' SPATCH $<;
69+
70+
## Used in "Documentation/Makefile"
71+
QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@;
72+
QUIET_XMLTO = @echo ' ' XMLTO $@;
73+
QUIET_DB2TEXI = @echo ' ' DB2TEXI $@;
74+
QUIET_MAKEINFO = @echo ' ' MAKEINFO $@;
75+
QUIET_DBLATEX = @echo ' ' DBLATEX $@;
76+
QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
77+
QUIET_GEN = @echo ' ' GEN $@;
78+
QUIET_STDERR = 2> /dev/null
79+
80+
QUIET_LINT_GITLINK = @echo ' ' LINT GITLINK $<;
81+
QUIET_LINT_MANSEC = @echo ' ' LINT MAN SEC $<;
82+
QUIET_LINT_MANEND = @echo ' ' LINT MAN END $<;
83+
84+
export V
85+
endif
86+
endif

‎templates/Makefile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
include ../shared.mak
33

44
# make and install sample templates
5-
6-
ifndef V
7-
QUIET = @
8-
endif
9-
105
INSTALL ?= install
116
TAR ?= tar
127
RM ?= rm -f

0 commit comments

Comments
 (0)