aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile12
-rw-r--r--Rules.mak9
2 files changed, 15 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 33954db05..aea89628f 100644
--- a/Makefile
+++ b/Makefile
@@ -163,9 +163,9 @@ docs/busybox.pod : $(top_srcdir)/docs/busybox_header.pod $(top_srcdir)/include/u
cat $(top_srcdir)/docs/busybox_footer.pod ) > docs/busybox.pod
docs/BusyBox.txt: docs/busybox.pod
- @echo
- @echo BusyBox Documentation
- @echo
+ $(SECHO)
+ $(SECHO) BusyBox Documentation
+ $(SECHO)
-mkdir -p docs
-pod2text $< > $@
@@ -220,9 +220,9 @@ include/bb_config.h: include/config.h
echo "#endif" >> $@
finished2:
- @echo
- @echo Finished installing...
- @echo
+ $(SECHO)
+ $(SECHO) Finished installing...
+ $(SECHO)
else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
diff --git a/Rules.mak b/Rules.mak
index ec03ce011..f247439cb 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -109,6 +109,15 @@ endif
check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
then echo "$(1)"; else echo "$(2)"; fi)
+# Setup some shortcuts so that silent mode is silent like it should be
+ifeq ($(subst s,,$(MAKEFLAGS)),$(MAKEFLAGS))
+export MAKE_IS_SILENT=n
+SECHO=@echo
+else
+export MAKE_IS_SILENT=y
+SECHO=-@false
+endif
+
#--------------------------------------------------------
# Arch specific compiler optimization stuff should go here.
# Unless you want to override the defaults, do not set anything