Makefile: don't hide what we're doing, user can use -s.

diff --git a/Makefile b/Makefile
index 4bdbf89c7fbb10422a1a2fb9b12d6a9fac58237e..28ea503bfe7641e8ff77311c0951eeee947becdc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -71,21 +71,21 @@ distclean: clean
        rm -f $(ALL_DEPENDS)
 
 $(ALL_DEPENDS): %/.depends: %/_info tools/ccan_depends
-       @tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
+       tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
 
 # Actual dependencies are created in inter-depends
 check-%: tools/ccanlint/ccanlint
-       @tools/ccanlint/ccanlint -d ccan/$*
+       tools/ccanlint/ccanlint -d ccan/$*
 
 fastcheck-%: tools/ccanlint/ccanlint
-       @tools/ccanlint/ccanlint -t $(FASTTIMEOUT) -d ccan/$*
+       tools/ccanlint/ccanlint -t $(FASTTIMEOUT) -d ccan/$*
 
 # Doesn't test dependencies, doesn't print verbose fail results.
 summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
-       @tools/ccanlint/ccanlint -s -d ccan/$*
+       tools/ccanlint/ccanlint -s -d ccan/$*
 
 summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES)
-       @tools/ccanlint/ccanlint -t $(FASTTIMEOUT) -s -d ccan/$*
+       tools/ccanlint/ccanlint -t $(FASTTIMEOUT) -s -d ccan/$*
 
 ccan/%/info: ccan/%/_info
        $(CC) $(CFLAGS) -o $@ -x c $<
@@ -99,12 +99,12 @@ clean: tools-clean
 
 # Creates a dependency from the tests to the object files which it needs.
 inter-depends: $(ALL_DEPENDS) Makefile
-       @for f in $(ALL_DEPENDS); do echo check-$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f) $$(dirname $$f); do [ "$$(echo $$dir/*.c)" = "$$dir/*.c" ] || echo ccan/"$$(basename $$dir)".o; done); done > $@
+       for f in $(ALL_DEPENDS); do echo check-$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f) $$(dirname $$f); do [ "$$(echo $$dir/*.c)" = "$$dir/*.c" ] || echo ccan/"$$(basename $$dir)".o; done); done > $@
 
 # Creates dependencies between tests, so if foo depends on bar, bar is tested
 # first 
 test-depends: $(ALL_DEPENDS) Makefile
-       @for f in $(ALL_DEPENDS); do echo check-`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),check-\1,p' < $$f`; done > $@
+       for f in $(ALL_DEPENDS); do echo check-`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),check-\1,p' < $$f`; done > $@
 
 include tools/Makefile
 -include inter-depends

diff --git a/Makefile-web b/Makefile-web
index b1bf415f96a5ae259462132cdd8ee4f50e52ffb0..b4bcb36fc12a46cfc104999a118b6501e57c9074 100644 (file)
--- a/Makefile-web
+++ b/Makefile-web
@@ -42,10 +42,10 @@ $(WEBDIR)/upload.html: web/staticupload.php
 
 # cpp inserts gratuitous linebreaks at start of file, makes for php problems.
 $(WEBDIR)/uploader.php: web/uploader.php.cpp
-       @cpp -w -C -P $< | grep . > $@
+       cpp -w -C -P $< | grep . > $@
 
 $(WEBDIR)/index.html: web/staticindex.php
-       @php5 web/staticindex.php > $@
+       php5 web/staticindex.php > $@
 
 $(WEBDIR)/example-config.h: config.h
        cp $< $@
@@ -60,7 +60,7 @@ $(BZRBROWSE): $(WEBDIR)/%: web/bzrbrowse/%
        cp $< $@
 
 $(WEBDIR)/info/%.html: $(WEBDIR)/tarballs/%.tar.bz2 $(WEBDIR)/tarballs/with-deps/%.tar.bz2
-       @URLPREFIX=../ php5 web/staticmoduleinfo.php `pwd`/ccan/$* > $@
+       URLPREFIX=../ php5 web/staticmoduleinfo.php `pwd`/ccan/$* > $@
 
 $(WEBDIR)/tarballs/%.tar.bz2: ccan/%/_info
        tar -c -j -f $@ `bzr ls --recursive --versioned --kind=file ccan/$*` `bzr ls --recursive --versioned --kind=symlink ccan/$*`