[Gsrc-commit] /srv/bzr/gsrc/trunk r2249: remove silencing commands

[Brandon Invergo]

------------------------------------------------------------
revno: 2249
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2013-04-01 22:47:05 +0200
message:
  remove silencing commands
modified:
  gar.mk

=== modified file 'gar.mk'
--- a/gar.mk    2013-04-01 20:43:25 +0000
+++ b/gar.mk    2013-04-01 20:47:05 +0000
@@ -73,12 +73,12 @@
 
 # This is to make dirs as needed by the base rules
 $(sort $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR) 
$(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR)):
-       @if test -d $@; then : ; else \
+       if test -d $@; then : ; else \
                mkdir -p $@; \
        fi
 
 $(COOKIEDIR)/%:
-       @if test -d $@; then : ; else \
+       if test -d $@; then : ; else \
                mkdir -p $@; \
        fi
 
@@ -100,13 +100,13 @@
 # to set a "pre-everything" rule, which runs before the first
 # actual target.
 pre-%:
-       @true
+       true
 
 post-%:
-       @true
+       true
 
 custom-%:
-       @true
+       true
 
 # ========================= MAIN RULES ========================= 
 # The main rules are the ones that the user can specify as a
@@ -183,7 +183,7 @@
 # returns true if fetch has completed successfully, false
 # otherwise
 fetch-p:
-       @$(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/dep-$(GARDIR)/,$(FETCHDEPS)), test -e $(COOKIEFILE) ;)
+       $(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/dep-$(GARDIR)/,$(FETCHDEPS)), test -e $(COOKIEFILE) ;)
 
 # checksum             - Use $(CHECKSUMFILE) to ensure that your
 #                                distfiles are valid.
@@ -193,11 +193,11 @@
 # returns true if checksum has completed successfully, false
 # otherwise
 checksum-p:
-       @$(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/checksum-,$(filter-out 
$(NOCHECKSUM),$(ALLFILES))), test -e $(COOKIEFILE) ;)
+       $(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/checksum-,$(filter-out 
$(NOCHECKSUM),$(ALLFILES))), test -e $(COOKIEFILE) ;)
 
 # makesum              - Generate distinfo (only do this for your own ports!).
 makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(filter-out 
$(NOCHECKSUM),$(ALLFILES))) checksig
-       @if test "x$(addprefix $(DOWNLOADDIR)/,$(filter-out 
$(NOCHECKSUM),$(ALLFILES)))" != "x"; then \
+       if test "x$(addprefix $(DOWNLOADDIR)/,$(filter-out 
$(NOCHECKSUM),$(ALLFILES)))" != "x"; then \
                $(CHECKSUM_CMD) $(addprefix $(DOWNLOADDIR)/,$(filter-out 
$(NOCHECKSUM),$(ALLFILES))) > $(CHECKSUM_FILE); \
        fi
 
@@ -209,7 +209,7 @@
        $(DONADA)
 
 checksig-p:
-       @$(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/checksig-,$(SIGFILES)), 
test -e $(COOKIEFILE) ;)
+       $(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/checksig-,$(SIGFILES)), 
test -e $(COOKIEFILE) ;)
 
 # garchive      - Copy downloaded files to $(GARCHIVEDIR)
 garchive: checksum $(COOKIEDIR) pre-garchive custom-pre-garchive $(addprefix 
garchive-,$(ALLFILES))  post-garchive custom-post-garchive
@@ -222,7 +222,7 @@
 # returns true if extract has completed successfully, false
 # otherwise
 extract-p:
-       @$(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/extract-,$(filter-out 
$(NOEXTRACT),$(DISTFILES))), test -e $(COOKIEFILE) ;)
+       $(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/extract-,$(filter-out 
$(NOEXTRACT),$(DISTFILES))), test -e $(COOKIEFILE) ;)
 
 # patch                        - Apply any provided patches to the source.
 patch: extract $(WORKSRC) pre-patch custom-pre-patch $(addprefix 
patch-,$(PATCHFILES)) post-patch custom-post-patch
@@ -231,7 +231,7 @@
 # returns true if patch has completed successfully, false
 # otherwise
 patch-p:
-       @$(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/patch-,$(PATCHFILES)), 
test -e $(COOKIEFILE) ;)
+       $(foreach COOKIEFILE,$(addprefix $(COOKIEDIR)/patch-,$(PATCHFILES)), 
test -e $(COOKIEFILE) ;)
 
 # makepatch            - Grab the upstream source and diff against $(WORKSRC). 
 Since
 #                                diff returns 1 if there are differences, we 
remove the patch
@@ -270,7 +270,7 @@
 # returns true if configure has completed successfully, false
 # otherwise
 configure-p:
-       @$(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/configure-,$(ALL_CONFIGURE_SCRIPTS)), test -e $(COOKIEFILE) ;)
+       $(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/configure-,$(ALL_CONFIGURE_SCRIPTS)), test -e $(COOKIEFILE) ;)
 
 # build                        - Actually compile the sources.
 build: configure pre-build custom-pre-build $(addprefix 
build-,$(ALL_BUILD_SCRIPTS)) post-build custom-post-build
@@ -279,7 +279,7 @@
 # returns true if build has completed successfully, false
 # otherwise
 build-p:
-       @$(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/build-,$(ALL_BUILD_SCRIPTS)), test -e $(COOKIEFILE) ;)
+       $(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/build-,$(ALL_BUILD_SCRIPTS)), test -e $(COOKIEFILE) ;)
 
 # test          - Run a package's self-tests
 test: build pre-test custom-pre-test $(addprefix test-,$(ALL_TEST_SCRIPTS)) 
post-test custom-post-test
@@ -291,7 +291,7 @@
 # returns true if test has completed successfully, false
 # otherwise
 test-p:
-       @$(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/test-,$(ALL_TEST_SCRIPTS)), test -e $(COOKIEFILE) ;)
+       $(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/test-,$(ALL_TEST_SCRIPTS)), test -e $(COOKIEFILE) ;)
 
 # install              - Install the results of a build.
 install: $(if $(USE_TESTS),test,build) $(addprefix 
dep-$(GARDIR)/,$(INSTALLDEPS)) prepare-install pre-install custom-pre-install 
$(addprefix install-,$(ALL_INSTALL_SCRIPTS)) finish-install pre-stow 
custom-pre-stow $(addprefix sysinstall-,$(filter-out 
$(SYSINSTALL_IGNORE),$(SYSINSTALL_TARGETS))) post-install custom-post-install
@@ -300,12 +300,12 @@
 # returns true if install has completed successfully, false
 # otherwise
 install-p:
-       @test -h $(dotgardir)/VERSION && \
+       test -h $(dotgardir)/VERSION && \
                test "`readlink $(dotgardir)/VERSION`" = $(PACKAGENAME) && \
                printf "[$(OK)install-p$(OFF)] $(MSG)$(PACKAGENAME) is 
installed$(OFF)\n" 
 
 reinstall-p:
-       @test -d $(packagesdir)/$(PACKAGENAME) && \
+       test -d $(packagesdir)/$(PACKAGENAME) && \
                printf "[$(OK)reinstall-p$(OFF)] $(MSG)$(PACKAGENAME) is 
available to be reinstalled$(OFF)\n"
 
 reinstall: $(addprefix dep-$(GARDIR)/,$(LIBDEPS)) $(addprefix 
sysinstall-,$(filter-out $(SYSINSTALL_IGNORE),$(SYSINSTALL_TARGETS)))
@@ -327,18 +327,18 @@
 # Install a package only if the source version is not the currently-installed
 # version.
 maybe-install:
-       @$(MAKE) install-p >/dev/null 2>&1 || $(MAKE) install
+       $(MAKE) install-p >/dev/null 2>&1 || $(MAKE) install
 
 # Check in a trivially-updated package.
 ci:
-       @bzr commit . -m 'update $(GARNAME) to $(GARVERSION)' 
+       bzr commit . -m 'update $(GARNAME) to $(GARVERSION)' 
 
 # Automatically find dependencies (after a configure).
 find-deps:
-       @$(PKG_CONFIG) --fpc-dump
+       $(PKG_CONFIG) --fpc-dump
 
 check-deps:
-       @$(PKG_CONFIG) --fpc-check $(GARNAME)
+       $(PKG_CONFIG) --fpc-check $(GARNAME)
 
 # Some extra dependency rules
 DEPS=$(LIBDEPS) $(BUILDDEPS) $(if $(USE_TESTS),$(TESTDEPS),)
@@ -361,7 +361,7 @@
 # cookie, but that would be lame and unportable).
 clean:
        @printf "[$(OK)clean$(OFF)] $(MSG)Removing working files and 
directories$(OFF)\n"
-       @rm -rf $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR) 
$(EXTRACTDIR) $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) *~
+       rm -rf $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR) 
$(EXTRACTDIR) $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) *~
 
 # these targets do not have actual corresponding files
 .PHONY: all info fetch-list fetch checksum makesum garchive extract patch 
makepatch configure build test install clean beaujolais update help
@@ -371,7 +371,7 @@
        $(MAKE) $*-p || $(MAKE) $* >$(LOGDIR)/$*.log 2>&1
 
 test-logs:
-       @for f in `find . -name 'test*.log'` ; do \
+       for f in `find . -name 'test*.log'` ; do \
                printf "$(MSG)===> test log start: $$f <===$(OFF)\n" ; \
                cat $$f ; \
                printf "$(MSG)===> test log end: $$f <===\n$(OFF)\n" ;  \