From aeebc07e94b8a96c9634b9fdf3a191bcab304a98 Mon Sep 17 00:00:00 2001
From: knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Tue, 27 Sep 2011 04:10:08 +0000
Subject: Replace the SILENT option with a VERBOSE option (of opposite
 meaning). Default is still VERBOSE=no, but this now actually produces a lot
 less output: almost no "cosmetic" lines (only ---), and no messages for pre-
 and postprocessing anymore. Add VERBOSE=yes to get the old beavior of
 SILENT=no.

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4737 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 Makefile | 293 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 148 insertions(+), 145 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9f66b0f4..ad346187 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ endif
 export PROMPT
 
 # Make quietly unless told not to
-ifneq ($(shell echo $(strip $(SILENT)) | tr '[:upper:]' '[:lower:]'),no)
+ifneq ($(shell echo $(strip $(VERBOSE)) | tr '[:upper:]' '[:lower:]'),yes)
 .SILENT:
 endif
 
@@ -191,6 +191,9 @@ BUILD_ACTIVETHORNS = lib/sbin/BuildActiveThorns.pl
 # Dividers to make the screen output slightly nicer
 DIVEL   =  __________________
 DIVIDER =  $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL)
+define NOTIFY_DIVIDER
+	{ if test "$(BRIEF)" != "yes"; then echo $(DIVIDER); fi }
+endef
 
 # Work out where we are
 export CCTK_HOME := $(shell pwd)
@@ -215,31 +218,31 @@ CONFIGINFOS = $(wildcard $(CONFIGS_DIR)/*/config-info)
 
 default-target:
 ifeq ($(strip $(CONFIGURATIONS)),)
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo No configurations defined.
 	@echo Please use \'$(MAKE) \<name\>\' to setup a configuration called \<name\>.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo \'$(MAKE) help\' lists all $(MAKE) options.
 else
 ifeq ($(words $(CONFIGURATIONS)), 1)
 	@echo Please use $(MAKE) $(CONFIGURATIONS)
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo \'$(MAKE) help\' lists all $(MAKE) options.
 else
 	@echo Known configurations are: $(CONFIGURATIONS)
 	@echo Please use $(MAKE) \<configuration\>
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo \'$(MAKE) help\' lists all $(MAKE) options.
 endif
 endif
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 # Target to build a configuration
 .PHONY: $(CONFIGURATIONS)
 
 $(CONFIGURATIONS):
 	if test ! -f "$(CONFIGS_DIR)/$@/config-data/cctk_Config.h" ; then \
-	  echo $(DIVIDER);\
+	  $(NOTIFY_DIVIDER);\
 	  echo "Cactus - version: $(CCTK_VERSION)";\
           if test "x$(PROMPT)" = 'xno'; then\
             if (! $(SETUP_ENV) $(PERL) -s $(SETUP) $(SETUP_OPTIONS) $@) ; then \
@@ -253,12 +256,12 @@ $(CONFIGURATIONS):
 	    echo "Please check the files in $(CONFIGS_DIR)/$@/config-data for error messages.";\
 	    echo "You can try again to configure using $(MAKE) $@-config";\
 	    echo "or delete this configuration with $(MAKE) $@-delete.";\
-	    echo $(DIVIDER);\
+	    $(NOTIFY_DIVIDER);\
 	    exit 1; \
           fi                                                                 \
 	fi
 	if ($(PERL) -e 'exit ((stat shift)[9] > (stat shift)[9])' $(CONFIGS_DIR)/$@/config-info $(CCTK_HOME)/lib/make/force-reconfigure); then    \
-	  echo $(DIVIDER);\
+	  $(NOTIFY_DIVIDER);\
 	  echo "Cactus - version: $(CCTK_VERSION)";\
 	  echo "Error: Configuration $@ is out of date.";\
 	  echo "  Please reconfigure your configuration by running the command"; \
@@ -266,14 +269,14 @@ $(CONFIGURATIONS):
           echo "    $(MAKE) $@-reconfig"; \
           echo ;\
 	  echo "  (It is likely that recent changes to the flesh require this.)";\
-	  echo $(DIVIDER);\
+	  $(NOTIFY_DIVIDER);\
 	  exit 1;\
 	fi
 	if test "x${MAKELEVEL}" = "x0" ; then \
-	  echo $(DIVIDER);\
+	  $(NOTIFY_DIVIDER);\
 	  echo "Cactus - version: $(CCTK_VERSION)"; \
 	  echo "Building configuration $@"; \
-	  echo $(DIVIDER);\
+	  $(NOTIFY_DIVIDER);\
 	fi
 	$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$@ CCTK_HOME=$(CCTK_HOME) $(TPARFLAGS) rebuild
 	$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$@ CCTK_HOME=$(CCTK_HOME) $(TPARFLAGS)
@@ -282,10 +285,10 @@ $(CONFIGURATIONS):
 .PHONY: distclean
 
 distclean:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Deleting all your configurations !
 	rm -rf $(CONFIGS_DIR)
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 # Targets to make tags files
 
@@ -293,7 +296,7 @@ distclean:
 .PHONY: TAGS tags
 
 TAGS:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Updating the Emacs TAGS file
 	rm -f TAGS ; touch TAGS
 	find src arrangements \( \
@@ -305,10 +308,10 @@ TAGS:
 #          -exec etags --append --regex '/[a-z A-Z \t]*FORTRAN_NAME[^)]*/' {} \;
 	$(PERL) -pi.bak -e 's/(subroutine\s*)([a-zA-Z0-9_]+)/\1\L\2/g;' TAGS
 	rm TAGS.bak
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 tags:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Updating the vi tags file
 	rm -f tags ; touch tags
 	find src arrangements \( \
@@ -319,25 +322,25 @@ tags:
 	$(PERL) -pi.bak -e 's/(subroutine\s*)([a-zA-Z0-9_]+)/\1\L\2/g;' tags
 	rm tags.bak
 	sort tags > sortedtags ; mv sortedtags tags
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 # Make a new configuration with a default name
 .PHONY: default
 
 default:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Running the configuration program
 	$(SETUP_ENV) $(PERL) -s $(SETUP) $(SETUP_OPTIONS)
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo You are now ready to build the CCTK.
 	@echo This is done by $(MAKE) \<configuration\>
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 # The help system.
 .PHONY: help
 
 help:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo "****************************** "
 	@echo "* Welcome to the Cactus Code *"
 	@echo "******************************"
@@ -348,10 +351,10 @@ else
 	@echo The following configurations are currently specified
 	@echo
 	@echo "  $(CONFIGURATIONS)"
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo "To build a configuration: "
 	@echo "  run $(MAKE) followed by the name of a configuration."
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo There is a range of options available to act on a configuration.
 	@echo These are activated by '$(MAKE) \<conf-name\>-\<option\>'
 	@echo Valid options are
@@ -379,7 +382,7 @@ else
 	@echo "  -update        : update the files for a specific configuration from CVS and/or SVN."
 	@echo "  -examples      : copy thorn parameter files to examples directory."
 endif
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo There are options available to act on thorns or arrangements.
 	@echo These are activated by \'$(MAKE) \<thorn-name\>-\<option\>\' or
 	@echo   \'$(MAKE) \<arrangement-name\>-\<option\>\' respectively.
@@ -392,7 +395,7 @@ endif
 	@echo "                        in doc/ArrangementDoc/<arrangement-name>/."
 	@echo "  -ArrangementDocHTML - produce documentation for the arrangement in HTML format"
 	@echo "                        in doc/ArrangementDoc/<arrangement-name>/."
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo $(MAKE) also knows the following targets
 	@echo
 	@echo "  checkout            - checkout public arrangements/thorns."
@@ -429,7 +432,7 @@ endif
 	@echo "  AllDoc              - build all documentation."
 	@echo "  AllDocHTML          - build all documentation in HTML format."
 	@echo "  <anything else>     - prompt to create a configuration with that name."
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 # Version information
@@ -443,7 +446,7 @@ version:
 .PHONY: int_version
 
 int_version:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo "Cactus - version: $(CCTK_VERSION)"
 
 
@@ -454,16 +457,16 @@ int_version:
 
 build: int_version
 	@echo Please specify a configuration to build.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -build, $(CONFIGURATIONS))
 
 $(addsuffix -build, $(CONFIGURATIONS)): int_version
 	if test "x$(BUILDLIST)" = "x"; then \
-	  echo $(DIVIDER); \
+	  $(NOTIFY_DIVIDER); \
 	  echo "Please specify the thorns to build with \"BUILDLIST=<list of thorns>\""; \
-	  echo $(DIVIDER); \
+	  $(NOTIFY_DIVIDER); \
 	else \
 	  echo Building thorns \'$(BUILDLIST)\' of configuration $(@:%-build=%); \
 	  cd $(CONFIGS_DIR)/$(@:%-build=%); \
@@ -472,7 +475,7 @@ $(addsuffix -build, $(CONFIGURATIONS)): int_version
 endif
 
 %-build:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-build=%) does not exist.
 	@echo Build aborted.
 
@@ -483,24 +486,24 @@ endif
 .PHONY: clean
 
 clean:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Please specify a configuration to clean.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -clean,$(CONFIGURATIONS))
 
 $(addsuffix -clean,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Cleaning configuration $(@:%-clean=%)
 	cd $(CONFIGS_DIR)/$(@:%-clean=%)
 	$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$(@:%-clean=%) CCTK_HOME=$(CCTK_HOME) clean
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 endif
 
 %-clean:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-clean=%) does not exist.
 	@echo Cleaning aborted.
 
@@ -511,24 +514,24 @@ endif
 .PHONY: cleandeps
 
 cleandeps:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Please specify a configuration to clean the dependencies of.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -cleandeps,$(CONFIGURATIONS))
 
 $(addsuffix -cleandeps,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Cleaning configuration $(@:%-cleandeps=%)
 	cd $(CONFIGS_DIR)/$(@:%-cleandeps=%)
 	$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$(@:%-cleandeps=%) CCTK_HOME=$(CCTK_HOME) cleandeps
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 endif
 
 %-cleandeps:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-cleandeps=%) does not exist.
 	@echo Cleaning dependencies aborted.
 
@@ -539,25 +542,25 @@ endif
 .PHONY: cleanobjs
 
 cleanobjs:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Please specify a configuration to clean the object files of.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -cleanobjs,$(CONFIGURATIONS))
 
 $(addsuffix -cleanobjs,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Cleaning configuration $(@:%-cleanobjs=%)
 	cd $(CONFIGS_DIR)/$(@:%-cleanobjs=%)
 	$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$(@:%-cleanobjs=%) CCTK_HOME=$(CCTK_HOME) cleanobjs
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 endif
 
 %-cleanobjs:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-cleanobjs=%) does not exist.
 	@echo Cleaning object files aborted.
 
@@ -568,25 +571,25 @@ endif
 .PHONY: realclean
 
 realclean:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Please specify a configuration to really clean.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -realclean,$(CONFIGURATIONS))
 
 $(addsuffix -realclean,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Cleaning configuration $(@:%-realclean=%)
 	cd $(CONFIGS_DIR)/$(@:%-realclean=%)
 	$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$(@:%-realclean=%) CCTK_HOME=$(CCTK_HOME) realclean
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 endif
 
 %-realclean:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-realclean=%) does not exist.
 	@echo Cleaning aborted.
 
@@ -597,16 +600,16 @@ endif
 .PHONY: delete
 
 delete:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Please specify a configuration to delete.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -delete,$(CONFIGURATIONS))
 
 $(addsuffix -delete,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	if test "x$(DELETE_CONFIRMATION)" = "xyes" ; then          \
 	  echo "Really delete configuration $(@:%-delete=%) (no)?";\
 	  read confirm rest;                                       \
@@ -620,11 +623,11 @@ $(addsuffix -delete,$(CONFIGURATIONS)):
 	  echo Deleting configuration $(@:%-delete=%);             \
 	  cd $(CONFIGS_DIR) ; rm -rf $(@:%-delete=%) ;             \
 	fi
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 endif
 
 %-delete:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-delete=%) does not exist.
 	@echo Deletion aborted.
 
@@ -636,7 +639,7 @@ endif
 
 rebuild: int_version
 	@echo Please specify a configuration to rebuild.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -rebuild,$(CONFIGURATIONS))
@@ -658,23 +661,23 @@ endif
 .PHONY: thornlist
 
 thornlist:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Please specify a configuration to regenerate the thornlist of.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -thornlist,$(CONFIGURATIONS))
 
 $(addsuffix -thornlist,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Regenerating compiled ThornList $(@:%-thornlist=%)
 	if [ -r $(CONFIGS_DIR)/$(@:%-thornlist=%)/ThornList ] ; then rm $(CONFIGS_DIR)/$(@:%-thornlist=%)/ThornList ; fi
 	$(MAKE) $(@:%-thornlist=%)
 endif
 
 %-thornlist:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-thornlist=%) does not exist.
 	@echo Regeneration of compiled ThornList aborted.
 
@@ -685,22 +688,22 @@ endif
 .PHONY: editthorn
 
 editthorns:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Please specify a configuration to edit the thornlist of.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -editthorns,$(CONFIGURATIONS))
 
 $(addsuffix -editthorns,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Editing compiled ThornList $(@:%-editthorn=%)
 	$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$(@:%-editthorns=%) CCTK_HOME=$(CCTK_HOME) editthorns
 endif
 
 %-editthorns:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-editthorns=%) does not exist.
 	@echo Editing of compiled ThornList aborted.
 
@@ -712,7 +715,7 @@ endif
 
 config: int_version
 	@echo Please specify a configuration to configure.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -config,$(CONFIGURATIONS))
@@ -734,7 +737,7 @@ $(addsuffix -config,$(CONFIGURATIONS)): int_version
           then \
             echo $(THORNS) >> $(CONFIGS_DIR)/$(@:%-config=%)/ThornList ; \
           fi ; \
-	  echo $(DIVIDER) ; \
+	  $(NOTIFY_DIVIDER) ; \
 	  if test "x$(PROMPT)" = "xno" ; then \
 	    $(MAKE) $(@:%-config=%) WARN=$(WARN); \
 	  else \
@@ -744,7 +747,7 @@ $(addsuffix -config,$(CONFIGURATIONS)): int_version
 	  echo "ThornList $(THORNLIST_DIR)/$(THORNLIST) does not exist" ; \
 	  exit 2; \
 	fi
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 endif
 
 %-config:
@@ -775,7 +778,7 @@ endif
 	    if test -n "$(THORNS)" ; then \
 	      echo $(THORNS) >> $(CONFIGS_DIR)/$(@:%-config=%)/ThornList ; \
 	    fi ; \
-	    echo $(DIVIDER)   ;  \
+	    $(NOTIFY_DIVIDER)   ;  \
 	    if test "x$(PROMPT)" = "xno" ; then \
 	      $(MAKE) $(@:%-config=%) WARN=$(WARN); \
 	    else \
@@ -786,7 +789,7 @@ endif
 	    exit 2; \
 	  fi ; \
 	fi
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 ################################################################
@@ -796,7 +799,7 @@ endif
 
 reconfig: int_version
 	@echo Please specify a configuration to reconfigure.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -reconfig,$(CONFIGURATIONS))
@@ -825,17 +828,17 @@ $(addsuffix -reconfig,$(CONFIGURATIONS)): int_version
           rm -f "$(CONFIGS_DIR)/$(@:%-reconfig=%)/config-data/cctk_Config.h";\
           exit 2                                 ;                       \
         fi ;                                                             \
-	echo $(DIVIDER) ; \
+	$(NOTIFY_DIVIDER) ; \
 	if test "x$(PROMPT)" = "xno" ; then \
 	  $(MAKE) $(@:%-reconfig=%) WARN=$(WARN); \
 	else \
 	  echo Use '$(MAKE) $(@:%-reconfig=%)' to build the configuration. ; \
 	fi
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 endif
 
 %-reconfig:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-reconfig=%) does not exist.;
 	@echo Reconfiguration aborted.
 
@@ -846,25 +849,25 @@ endif
 .PHONY: utils
 
 utils:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Please specify a configuration to build the utilities of.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -utils,$(CONFIGURATIONS))
 
 $(addsuffix -utils,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Building utilities for $(@:%-utils=%)
 	cd $(CONFIGS_DIR)/$(@:%-utils=%)
 	$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$(@:%-utils=%) CCTK_HOME=$(CCTK_HOME) utils UTILS=$(UTILS) CONFIG_NAME=$(@:%-utils=%)
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 endif
 
 %-utils:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-utils=%) does not exist.
 	@echo Building of utilities aborted.
 
@@ -874,10 +877,10 @@ endif
 ##################
 .PHONY: newthorn
 newthorn:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Creating a new thorn
 	$(PERL) -s $(NEWTHORN);
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 ###################
@@ -887,7 +890,7 @@ newthorn:
 
 testsuite: int_version
 	@echo Please specify a configuration to test.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 ifneq ($strip($(CONFIGURATIONS)),)
@@ -913,19 +916,19 @@ ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: examples
 
 examples:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Please specify a configuration.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 
 $(addsuffix -examples,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Copying parameter files $(@:%-examples=%)
 	if [ -r $(CONFIGS_DIR)/$(@:%-examples=%)/ThornList ] ; then $(PERL) lib/sbin/CopyParFiles.pl $(@:%-examples=%) ; fi
 endif
 
 %-examples:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-examples=%) does not exist.
 	@echo Parameter file copying aborted.
 
@@ -934,7 +937,7 @@ endif
 
 .PHONY: checkout
 checkout:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Running app/arrangement/thorn checkout script
 	$(PERL) ./lib/sbin/checkout.pl
 
@@ -944,25 +947,25 @@ checkout:
 
 configinfo:
 ifeq ($(strip $(CONFIGURATIONS)),)
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo No configurations defined.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 else
 	cat $(CONFIGINFOS)
 endif
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -configinfo,$(CONFIGURATIONS))
 
 $(addsuffix -configinfo,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Displaying configuration information
 	cat configs/$(@:%-configinfo=%)/config-info
 endif
 
 %-configinfo:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-configinfo=%) does not exist.
 	@echo Displaying configuration information aborted.
 
@@ -972,21 +975,21 @@ endif
 .PHONY: sysinfo
 
 sysinfo:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Please specify a configuration to run sysinfo with.
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -sysinfo,$(CONFIGURATIONS))
 
 $(addsuffix -sysinfo,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Running SystemInfo
 	$(PERL) ./lib/sbin/SystemInfo.pl $(@:%-sysinfo=%)
 endif
 
 %-sysinfo:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-sysinfo=%) does not exist.
 	@echo Getting system info aborted.
 
@@ -1007,7 +1010,7 @@ $(addsuffix -bugreport,$(CONFIGURATIONS)):
 endif
 
 %-bugreport:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-bugreport=%) does not exist.
 	@echo Bugreport creation aborted.
 
@@ -1030,7 +1033,7 @@ UsersGuide.pdf: UsersGuide
 
 .PHONY: UsersGuide
 UsersGuide:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Creating user documentation UsersGuide.pdf
 	cd doc/UsersGuide;                          \
 	echo "  Running pdflatex....";              \
@@ -1046,7 +1049,7 @@ UsersGuide:
 	mv UsersGuide.pdf $(CCTK_HOME)/doc/UsersGuide.pdf 
 	@echo "  UsersGuide.pdf created in doc directory."
 	@echo "  Done."
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 .PHONY: UsersGuideHTML
 
@@ -1054,7 +1057,7 @@ doc/UsersGuide/bincactus2.ps: doc/UsersGuide/bincactus2.pdf
 	pdf2ps doc/UsersGuide/bincactus2.pdf doc/UsersGuide/bincactus2.ps
 
 UsersGuideHTML: doc/UsersGuide/bincactus2.ps
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo "Creating user documentation (HTML)"
 	cd doc/UsersGuide;                         \
 	$(CCTK_HOME)/lib/sbin/ConvertFigures;      \
@@ -1076,7 +1079,7 @@ UsersGuideHTML: doc/UsersGuide/bincactus2.ps
 	cp UsersGuide.css $(CCTK_HOME)/doc/HTML/UsersGuide/
 	@echo "  Users Guide (HTML) created in doc/HTML/UsersGuide directory."
 	@echo "  Done."
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 # Make the Reference Manual
 
@@ -1085,7 +1088,7 @@ ReferenceManual.pdf: ReferenceManual
 
 .PHONY: ReferenceManual
 ReferenceManual:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Creating user reference manual ReferenceManual.pdf
 	cd doc/ReferenceManual;                     \
 	echo "  Running pdflatex....";              \
@@ -1101,11 +1104,11 @@ ReferenceManual:
 	mv ReferenceManual.pdf $(CCTK_HOME)/doc/ReferenceManual.pdf
 	@echo "  ReferenceManual.pdf created in doc directory."
 	@echo "  Done."
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 .PHONY: ReferenceManualHTML
 ReferenceManualHTML:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo "Creating user reference manual (HTML)"
 	cd doc/ReferenceManual;                    \
 	$(CCTK_HOME)/lib/sbin/ConvertFigures;      \
@@ -1127,7 +1130,7 @@ ReferenceManualHTML:
 	cp ReferenceManual.css  $(CCTK_HOME)/doc/HTML/ReferenceManual
 	@echo "  HTML ReferenceManual created in doc/HTML/ReferenceManual directory."
 	@echo "  Done."
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 # Make the Maintainers' Guide
 
@@ -1136,7 +1139,7 @@ MaintGuide.pdf: MaintGuide
 
 .PHONY: MaintGuide
 MaintGuide:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Creating maintainers documentation MaintGuide.pdf
 	cd doc/MaintGuide;                          \
 	echo "  Running pdflatex....";              \
@@ -1152,11 +1155,11 @@ MaintGuide:
 	mv MaintGuide.pdf $(CCTK_HOME)/doc/MaintGuide.pdf
 	@echo "  MaintGuide.pdf created in doc directory."
 	@echo "  Done."
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 .PHONY: MaintGuideHTML
 MaintGuideHTML:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo "Creating maintainers documentation (HTML)"
 	cd doc/MaintGuide;                          \
 	$(CCTK_HOME)/lib/sbin/ConvertFigures;             \
@@ -1178,7 +1181,7 @@ MaintGuideHTML:
 	cp MaintGuide.css  $(CCTK_HOME)/doc/HTML/MaintGuide
 	@echo "  Maintainers Guide (HTML) created in doc/HTML/MaintGuide directory."
 	@echo "  Done."
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 # Make the ThornGuide
 DOCDIR		= $(CCTK_HOME)/doc
@@ -1189,7 +1192,7 @@ ThornGuide.pdf: ThornGuide
 
 .PHONY: ThornGuide
 ThornGuide:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Creating thorn documentation ThornGuide.pdf
 	rm -rf $(THORNBUILD);
 	mkdir $(THORNBUILD);
@@ -1200,12 +1203,12 @@ ThornGuide:
 	  echo "  ThornGuide.pdf created in doc directory."; \
 	  echo "  Done."; \
 	fi
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 .PHONY: ThornGuideHTML
 
 ThornGuideHTML: doc/UsersGuide/bincactus2.ps
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo "Creating thorn documentation ThornGuide (HTML)"
 	rm -rf $(THORNBUILD);
 	mkdir $(THORNBUILD);
@@ -1220,7 +1223,7 @@ ThornGuideHTML: doc/UsersGuide/bincactus2.ps
 	  echo "  Thorn Guide (HTML) created in doc/HTML/ThornGuide directory."; \
 	  echo "  Done."; \
 	fi
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 # Run ThornGuide on a configuration
 
@@ -1234,7 +1237,7 @@ ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY: $(addsuffix -ThornGuide,$(CONFIGURATIONS))
 
 $(addsuffix -ThornGuide,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Creating ThornGuide for configuration $(CONFIGNAME)
 	cd $(CONFIGDIR); \
 	mkdir -p doc
@@ -1254,7 +1257,7 @@ $(addsuffix -ThornGuide,$(CONFIGURATIONS)):
 endif
 
 %-ThornGuide:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-ThornGuide=%) does not exist.
 	@echo Thorn Guide creation aborted.
 
@@ -1262,39 +1265,39 @@ endif
 
 .PHONY: ThornDoc
 %-ThornDoc:
-	@echo "$(DIVIDER)"
+	$(NOTIFY_DEVIDER)
 	@lib/sbin/ThornDoc $(@:%-ThornDoc=%)
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 ThornDoc:
-	@echo "$(DIVIDER)"
+	$(NOTIFY_DEVIDER)
 	@lib/sbin/ThornDoc
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 %-ArrangementDoc:
-	@echo "$(DIVIDER)"
+	$(NOTIFY_DEVIDER)
 	@lib/sbin/ArrangementDoc $(@:%-ArrangementDoc=%)
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 ArrangementDoc:
-	@echo "$(DIVIDER)"
+	$(NOTIFY_DEVIDER)
 	@lib/sbin/ArrangementDoc
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 .PHONY: ThornDocHTML
 %-ThornDocHTML: doc/UsersGuide/bincactus2.ps
-	@echo "$(DIVIDER)"
+	$(NOTIFY_DEVIDER)
 	@lib/sbin/ThornDocHTML $(@:%-ThornDocHTML=%)
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 ThornDocHTML: doc/UsersGuide/bincactus2.ps
-	@echo "$(DIVIDER)"
+	$(NOTIFY_DEVIDER)
 	@lib/sbin/ThornDocHTML
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 %-ArrangementDocHTML: doc/UsersGuide/bincactus2.ps
-	@echo "$(DIVIDER)"
+	$(NOTIFY_DEVIDER)
 	@lib/sbin/ArrangementDocHTML $(@:%-ArrangementDocHTML=%)
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 ArrangementDocHTML: doc/UsersGuide/bincactus2.ps
-	@echo "$(DIVIDER)"
+	$(NOTIFY_DEVIDER)
 	@lib/sbin/ArrangementDocHTML
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 ###############################################################################
 #                      End of documentation targets
@@ -1304,10 +1307,10 @@ ArrangementDocHTML: doc/UsersGuide/bincactus2.ps
 
 .PHONY: thorninfo
 thorninfo:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Displaying info for all thorns in the arrangements directory
 	$(PERL) -s $(BUILD_ACTIVETHORNS) $(CCTK_HOME)/arrangements | cat;
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 
 # Processed CVS information
 
@@ -1331,7 +1334,7 @@ ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY $(addsuffix -update,$(CONFIGURATIONS)):
 
 $(addsuffix -cvsupdate,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Updating files for configuration $(@:%-cvsupdate=%)
 	if test -r $(CONFIGS_DIR)/$(@:%-cvsupdate=%)/ThornList ; then \
           $(PERL) -s lib/sbin/CVSUpdate.pl arrangements $(CONFIGS_DIR)/$(@:%-cvsupdate=%)/ThornList; \
@@ -1339,7 +1342,7 @@ $(addsuffix -cvsupdate,$(CONFIGURATIONS)):
 	@echo Done.
 
 $(addsuffix -update,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Updating files for configuration $(@:%-update=%)
 	if test -r $(CONFIGS_DIR)/$(@:%-update=%)/ThornList ; then \
           $(PERL) -s lib/sbin/CVSUpdate.pl arrangements $(CONFIGS_DIR)/$(@:%-update=%)/ThornList; \
@@ -1348,12 +1351,12 @@ $(addsuffix -update,$(CONFIGURATIONS)):
 endif
 
 %-cvsupdate:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-cvsupdate=%) does not exist.
 	@echo CVS Update aborted.
 
 %-update:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Configuration $(@:%-update=%) does not exist.
 	@echo Update aborted.
 
@@ -1366,7 +1369,7 @@ cvsdiff:
 
 .PHONY: downsize
 downsize:
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo Remove flesh and thorn documentation \(\no\)?
 	read yesno rest; \
 	if test $$? -ne 0 ; then \
@@ -1375,7 +1378,7 @@ downsize:
 	if [ "x$$yesno" = "xyes" -o "x$$yesno" = "xy" -o "x$$yesno" = "xYES" -o "x$$yesno" = "xY" ] ;\
 	then  \
 	rm -rf doc; rm -rf arrangements/*/*/doc; \
-	echo $(DIVIDER)   ;  \
+	$(NOTIFY_DIVIDER)   ;  \
 	fi
 	@echo Remove thorn testsuites \(\no\)?
 	read yesno rest; \
@@ -1385,7 +1388,7 @@ downsize:
 	if [ "x$$yesno" = "xyes" -o "x$$yesno" = "xy" -o "x$$yesno" = "xYES" -o "x$$yesno" = "xY" ] ;\
 	then  \
 	rm -rf arrangements/*/*/test; \
-	echo $(DIVIDER)   ;  \
+	$(NOTIFY_DIVIDER)   ;  \
 	fi
 	@echo Remove all configurations \(\no\)?
 	read yesno rest; \
@@ -1395,13 +1398,13 @@ downsize:
 	if [ "x$$yesno" = "xyes" -o "x$$yesno" = "xy" -o "x$$yesno" = "xYES" -o "x$$yesno" = "xY" ] ;\
 	then  \
 	$(MAKE) distclean; \
-	echo $(DIVIDER)   ;  \
+	$(NOTIFY_DIVIDER)   ;  \
 	fi
 
 # Last resort rule.  Assume it is the name of a configuration
 
 %::
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
 	@echo "Cactus - version: $(CCTK_VERSION)"
 	if test "x$(PROMPT)" = "xyes" ; then \
 	  echo Setup configuration $@ \(yes\)?; \
@@ -1432,7 +1435,7 @@ downsize:
           then \
             echo $(THORNS) >> $(CONFIGS_DIR)/$@/ThornList ; \
           fi ; \
-	  echo $(DIVIDER) ;  \
+	  $(NOTIFY_DIVIDER) ;  \
 	  if test "x$(PROMPT)" = "xno" ; then \
 	    $(MAKE) $(@:%-config=%) WARN=$(WARN); \
 	  else \
@@ -1443,4 +1446,4 @@ downsize:
 	    exit 2; \
 	  fi ; \
 	fi
-	@echo $(DIVIDER)
+	$(NOTIFY_DIVIDER)
-- 
cgit v1.2.3