The current mechanism for the quiet commands, what's hiding the true command and emitting instead things like: CC target.o is, IMO, somehow unneedlessly sophisticated and this doesn't help to understand what's happening and to adapt things when needed. Change this by using simple 'echo' commands and make's '@' to display the short command and hiding the long one. Warning: There is a small change in behaviour with this: previously, when displaying the non-quiet commands with 'make V=1' the quiet ones were not emitted. Now, with this patch, the short/quiet command is emitted in both case. Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@xxxxxxxxx> --- Makefile | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index dc9ba9cde..c861ca090 100644 --- a/Makefile +++ b/Makefile @@ -158,13 +158,6 @@ LIBS := libsparse.a # V = @ Q = $(V:1=) -QUIET_CC = $(Q:@=@echo " CC $@";) -QUIET_CHECK = $(Q:@=@echo " CHECK $<";) -QUIET_AR = $(Q:@=@echo " AR $@";) -QUIET_GEN = $(Q:@=@echo " GEN $@";) -QUIET_LINK = $(Q:@=@echo " LINK $@";) -# We rely on the -v switch of install to print 'file -> $install_dir/file' -QUIET_INST = $(Q:@=@echo -n " INSTALL ";) compile_OBJS := compile-i386.o @@ -175,10 +168,12 @@ ldflags += $($(@)_LDFLAGS) $(LDFLAGS) ldlibs += $($(@)_LDLIBS) $(LDLIBS) $(foreach p,$(PROGRAMS),$(eval $(p): $($(p)_OBJS))) $(PROGRAMS): % : %.o $(LIBS) - $(QUIET_LINK)$(LD) $(ldflags) $^ $(ldlibs) -o $@ + @echo " LD $@" + $(Q)$(LD) $(ldflags) $^ $(ldlibs) -o $@ libsparse.a: $(LIB_OBJS) - $(QUIET_AR)$(AR) rcs $@ $^ + @echo " AR $@" + $(Q)$(AR) rcs $@ $^ OBJS := $(LIB_OBJS) $(PROGRAMS:%=%.o) $(foreach p,$(PROGRAMS),$($(p)_OBJS)) DEPS := $(OBJS:%.o=.%.o.d) @@ -188,10 +183,12 @@ DEPS := $(OBJS:%.o=.%.o.d) cflags += $($(*)_CFLAGS) $(CPPFLAGS) $(CFLAGS) %.o: %.c - $(QUIET_CC)$(CC) $(cflags) -c -o $@ $< + @echo " CC $@" + $(Q)$(CC) $(cflags) -c -o $@ $< %.sc: %.c sparse - $(QUIET_CHECK) $(CHECKER) $(CHECKER_FLAGS) $(cflags) -c $< + @echo " CHECK $<" + $(Q) $(CHECKER) $(CHECKER_FLAGS) $(cflags) -c $< selfcheck: $(OBJS:.o=.sc) @@ -233,8 +230,10 @@ install-bin: $(INST_PROGRAMS:%=$(DESTDIR)$(BINDIR)/%) install-man: $(INST_MAN1:%=$(DESTDIR)$(MAN1DIR)/%) $(DESTDIR)$(BINDIR)/%: % - $(QUIET_INST)install -v $< $@ || exit 1; + @echo " INSTALL $@" + $(Q)install $< $@ || exit 1; $(DESTDIR)$(MAN1DIR)/%: % - $(QUIET_INST)install -v -m 644 $< $@ || exit 1; + @echo " INSTALL $@" + $(Q)install -m 644 $< $@ || exit 1; .PHONY: FORCE -- 2.14.0 -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
