diff --git a/Makefile b/Makefile index 3e765aec1..6902c37c0 100644 --- a/Makefile +++ b/Makefile @@ -1031,13 +1031,13 @@ dev/hpack/%: dev/hpack/%.o $(cmd_LD) $(LDFLAGS) -o $@ $^ $(LDOPTS) dev/poll/poll: - $(Q)$(MAKE) -C dev/poll poll CC='$(cmd_CC)' OPTIMIZE='$(COPTS)' + $(Q)$(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='$(cmd_CC)' OPTIMIZE='$(COPTS)' + $(Q)$(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) diff --git a/dev/poll/Makefile b/dev/poll/Makefile index fdee514c6..9a493bb71 100644 --- a/dev/poll/Makefile +++ b/dev/poll/Makefile @@ -4,8 +4,26 @@ DEFINE = INCLUDE = OBJS = poll +V = 0 +Q = @ +ifeq ($V,1) +Q= +endif + +ifeq ($V,1) +cmd_CC = $(CC) +else +ifeq (3.81,$(firstword $(sort $(MAKE_VERSION) 3.81))) +# 3.81 or above +cmd_CC = $(info $ CC $@) $(Q)$(CC) +else +# 3.80 or older +cmd_CC = $(Q)echo " CC $@";$(CC) +endif +endif + poll: poll.c - $(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^ + $(cmd_CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^ clean: rm -f $(OBJS) *.[oas] *~ diff --git a/dev/tcploop/Makefile b/dev/tcploop/Makefile index 42a6259c2..fd80af9b9 100644 --- a/dev/tcploop/Makefile +++ b/dev/tcploop/Makefile @@ -4,8 +4,26 @@ DEFINE = INCLUDE = OBJS = tcploop +V = 0 +Q = @ +ifeq ($V,1) +Q= +endif + +ifeq ($V,1) +cmd_CC = $(CC) +else +ifeq (3.81,$(firstword $(sort $(MAKE_VERSION) 3.81))) +# 3.81 or above +cmd_CC = $(info $ CC $@) $(Q)$(CC) +else +# 3.80 or older +cmd_CC = $(Q)echo " CC $@";$(CC) +endif +endif + tcploop: tcploop.c - $(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^ + $(cmd_CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^ clean: rm -f $(OBJS) *.[oas] *~