[BusyBox-cvs] svn commit: trunk/busybox

[vapier at busybox.net]

Author: vapier
Date: 2005-07-28 16:14:35 -0600 (Thu, 28 Jul 2005)
New Revision: 10946

Log:
dont output anything when running in silent mode

Modified:
   trunk/busybox/Makefile
   trunk/busybox/Rules.mak


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2005-07-28 19:38:52 UTC (rev 10945)
+++ trunk/busybox/Makefile	2005-07-28 22:14:35 UTC (rev 10946)
@@ -163,9 +163,9 @@
 	    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 @@
 	echo "#endif" >> $@
 
 finished2:
-	@echo
-	@echo Finished installing...
-	@echo
+	$(SECHO)
+	$(SECHO) Finished installing...
+	$(SECHO)
 
 else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 

Modified: trunk/busybox/Rules.mak
===================================================================
--- trunk/busybox/Rules.mak	2005-07-28 19:38:52 UTC (rev 10945)
+++ trunk/busybox/Rules.mak	2005-07-28 22:14:35 UTC (rev 10946)
@@ -109,6 +109,15 @@
 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=- at false
+endif
+
 #--------------------------------------------------------
 # Arch specific compiler optimization stuff should go here.
 # Unless you want to override the defaults, do not set anything