Skip to content

Commit

Permalink
Merge pull request #5225 from OTAkeys/fix_make_prints
Browse files Browse the repository at this point in the history
make: fix make output when QUIET=0
  • Loading branch information
cgundogan committed Apr 1, 2016
2 parents 9f764cf + f3ccc3b commit a74a61b
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions Makefile.include
Expand Up @@ -263,9 +263,9 @@ endif
endif # BUILD_IN_DOCKER

..compiler-check:
$(AD)command -v $(CC) >/dev/null 2>&1 || \
@command -v $(CC) >/dev/null 2>&1 || \
{ $(COLOR_ECHO) \
'${COLOR_RED} Compiler $(CC) is required but not found in PATH. Aborting.${COLOR_RESET}'; \
'${COLOR_RED}Compiler $(CC) is required but not found in PATH. Aborting.${COLOR_RESET}'; \
exit 1; }

..build-message:
Expand Down Expand Up @@ -317,16 +317,16 @@ distclean:
-@rm -rf $(BINDIRBASE)

flash: all
$(AD)command -v $(FLASHER) >/dev/null 2>&1 || \
@command -v $(FLASHER) >/dev/null 2>&1 || \
{ $(COLOR_ECHO) \
'${COLOR_RED} Flash program $(FLASHER) not found. Aborting.${COLOR_RESET}'; \
'${COLOR_RED}Flash program $(FLASHER) not found. Aborting.${COLOR_RESET}'; \
exit 1; }
$(FLASHER) $(FFLAGS)

term: $(filter flash, $(MAKECMDGOALS))
$(AD)command -v $(TERMPROG) >/dev/null 2>&1 || \
@command -v $(TERMPROG) >/dev/null 2>&1 || \
{ $(COLOR_ECHO) \
'${COLOR_RED} Terminal program $(TERMPROG) not found. Aborting.${COLOR_RESET}'; \
'${COLOR_RED}Terminal program $(TERMPROG) not found. Aborting.${COLOR_RESET}'; \
exit 1; }
$(TERMPROG) $(TERMFLAGS)

Expand All @@ -337,33 +337,33 @@ doc:
make -BC $(RIOTBASE) doc

debug:
$(AD)command -v $(DEBUGGER) >/dev/null 2>&1 || \
@command -v $(DEBUGGER) >/dev/null 2>&1 || \
{ $(COLOR_ECHO) \
'${COLOR_RED} Debug program $(DEBUGGER) not found. Aborting.${COLOR_RESET}'; \
'${COLOR_RED}Debug program $(DEBUGGER) not found. Aborting.${COLOR_RESET}'; \
exit 1; }
$(DEBUGGER) $(DEBUGGER_FLAGS)

debug-server:
$(AD)command -v $(DEBUGSERVER) >/dev/null 2>&1 || \
@command -v $(DEBUGSERVER) >/dev/null 2>&1 || \
{ $(COLOR_ECHO) \
'${COLOR_RED} Debug server program $(DEBUGSERVER) not found. Aborting.${COLOR_RESET}'; \
'${COLOR_RED}Debug server program $(DEBUGSERVER) not found. Aborting.${COLOR_RESET}'; \
exit 1; }
$(DEBUGSERVER) $(DEBUGSERVER_FLAGS)

reset:
$(AD)command -v $(RESET) >/dev/null 2>&1 || \
@command -v $(RESET) >/dev/null 2>&1 || \
{ $(COLOR_ECHO) \
'${COLOR_RED} Reset program $(RESET) not found. Aborting.${COLOR_RESET}'; \
'${COLOR_RED}Reset program $(RESET) not found. Aborting.${COLOR_RESET}'; \
exit 1; }
$(RESET) $(RESET_FLAGS)

# Default OBJDUMPFLAGS for platforms which do not specify it:
OBJDUMPFLAGS ?= -S -D -h

objdump:
$(AD)command -v $(OBJDUMP) >/dev/null 2>&1 || \
@command -v $(OBJDUMP) >/dev/null 2>&1 || \
{ $(COLOR_ECHO) \
'${COLOR_RED} Objdump program $(OBJDUMP) not found. Aborting.${COLOR_RESET}'; \
'${COLOR_RED}Objdump program $(OBJDUMP) not found. Aborting.${COLOR_RESET}'; \
exit 1; }
$(OBJDUMP) $(OBJDUMPFLAGS) $(ELFFILE) | less

Expand Down

0 comments on commit a74a61b

Please sign in to comment.