aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-07-28 22:14:35 +0000
committervapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-07-28 22:14:35 +0000
commit3f06b5d8a3dbb45cb760dd2beca33291f281cf30 (patch)
tree5858479da70b23eab882658b26bbb47dc11056e4
parentc7444d704193ba89f522d4e0ce8e5933beec793d (diff)
downloadbusybox-w32-3f06b5d8a3dbb45cb760dd2beca33291f281cf30.tar.gz
busybox-w32-3f06b5d8a3dbb45cb760dd2beca33291f281cf30.tar.bz2
busybox-w32-3f06b5d8a3dbb45cb760dd2beca33291f281cf30.zip
dont output anything when running in silent mode
git-svn-id: svn://busybox.net/trunk/busybox@10946 69ca8d6d-28ef-0310-b511-8ec308f3f277
-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
163 cat $(top_srcdir)/docs/busybox_footer.pod ) > docs/busybox.pod 163 cat $(top_srcdir)/docs/busybox_footer.pod ) > docs/busybox.pod
164 164
165docs/BusyBox.txt: docs/busybox.pod 165docs/BusyBox.txt: docs/busybox.pod
166 @echo 166 $(SECHO)
167 @echo BusyBox Documentation 167 $(SECHO) BusyBox Documentation
168 @echo 168 $(SECHO)
169 -mkdir -p docs 169 -mkdir -p docs
170 -pod2text $< > $@ 170 -pod2text $< > $@
171 171
@@ -220,9 +220,9 @@ include/bb_config.h: include/config.h
220 echo "#endif" >> $@ 220 echo "#endif" >> $@
221 221
222finished2: 222finished2:
223 @echo 223 $(SECHO)
224 @echo Finished installing... 224 $(SECHO) Finished installing...
225 @echo 225 $(SECHO)
226 226
227else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y) 227else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
228 228
diff --git a/Rules.mak b/Rules.mak
index ec03ce011..f247439cb 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -109,6 +109,15 @@ endif
109check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ 109check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
110 then echo "$(1)"; else echo "$(2)"; fi) 110 then echo "$(1)"; else echo "$(2)"; fi)
111 111
112# Setup some shortcuts so that silent mode is silent like it should be
113ifeq ($(subst s,,$(MAKEFLAGS)),$(MAKEFLAGS))
114export MAKE_IS_SILENT=n
115SECHO=@echo
116else
117export MAKE_IS_SILENT=y
118SECHO=-@false
119endif
120
112#-------------------------------------------------------- 121#--------------------------------------------------------
113# Arch specific compiler optimization stuff should go here. 122# Arch specific compiler optimization stuff should go here.
114# Unless you want to override the defaults, do not set anything 123# Unless you want to override the defaults, do not set anything