RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUILD: makefile: use $(cmd_MAKE) in quiet mode 

It's better to see "make" entering a subdir than seeing nothing, so
let's use a command name for make. Since make 3.81, "+" needs to be
prepended in front of the command to pass the job server to the subdir.
This commit is contained in:
Willy Tarreau 2022-11-17 08:34:37 +01:00
parent 8dd672523f
commit 8b5a998c9c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1008,13 +1008,13 @@ dev/hpack/%: dev/hpack/%.o
$(cmd_LD) $(LDFLAGS) -o $@ $^ $(LDOPTS)
dev/poll/poll:
$(Q)$(MAKE) -C dev/poll poll CC='$(CC)' OPTIMIZE='$(COPTS)' V='$(V)'
$(cmd_MAKE) -C dev/poll poll CC='$(CC)' OPTIMIZE='$(COPTS)' V='$(V)'
dev/qpack/decode: dev/qpack/decode.o
$(cmd_LD) $(LDFLAGS) -o $@ $^ $(LDOPTS)
dev/tcploop/tcploop:
$(Q)$(MAKE) -C dev/tcploop tcploop CC='$(CC)' OPTIMIZE='$(COPTS)' V='$(V)'
$(cmd_MAKE) -C dev/tcploop tcploop CC='$(CC)' OPTIMIZE='$(COPTS)' V='$(V)'
dev/udp/udp-perturb: dev/udp/udp-perturb.o
$(cmd_LD) $(LDFLAGS) -o $@ $^ $(LDOPTS)

3
include/make/verbose.mk
View File

@ -12,16 +12,19 @@ ifeq ($V,1)
cmd_CC = $(CC)
cmd_LD = $(LD)
cmd_AR = $(AR)
cmd_MAKE = +$(MAKE)
else
ifeq (3.81,$(firstword $(sort $(MAKE_VERSION) 3.81)))
# 3.81 or above
cmd_CC = $(info $ CC $@) $(Q)$(CC)
cmd_LD = $(info $ LD $@) $(Q)$(LD)
cmd_AR = $(info $ AR $@) $(Q)$(AR)
cmd_MAKE = $(info $ MAKE $@) $(Q)+$(MAKE)
else
# 3.80 or older
cmd_CC = $(Q)echo " CC $@";$(CC)
cmd_LD = $(Q)echo " LD $@";$(LD)
cmd_AR = $(Q)echo " AR $@";$(AR)
cmd_MAKE = $(Q)echo " MAKE $@";$(MAKE)
endif
endif