Put @s in front of all ehos in the makefile.

Added a few more comments, like to ignore the error message at the end of new-setup !

Added new last resort target -

make <unknown-configuration>

will run setup on the configuration

Fixed bug in setup.

Make cheese now works ! 8-)

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@64 17b73243-c579-4c4c-a9d2-2d5706c11dac

2 files changed, 52 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index 794027f6..5790e83b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 #
 #   
 #   @enddesc 
-#   @version $Id: Makefile,v 1.4 1999-01-17 21:53:10 goodale Exp $
+#   @version $Id: Makefile,v 1.5 1999-01-18 13:00:59 goodale Exp $
 # @@*/
 
 # Comment this out if you want to see what's going on.
@@ -41,24 +41,29 @@ CONFIGURATIONS = $(patsubst build/%,%,$(wildcard build/*))
 .PHONY:default 
 
 default: new_setup
-	echo $(DIVIDER)
+	@echo $(DIVIDER)
 ifeq ($(words $(CONFIGURATIONS)), 1)
-	echo Please use $(MAKE) $(CONFIGURATIONS) 
+	@echo Please use $(MAKE) $(CONFIGURATIONS) 
 else
-	echo Known configurations are: $(CONFIGURATIONS)
-	echo Please use $(MAKE) \<configuration\>
+	@echo Known configurations are: $(CONFIGURATIONS)
+	@echo Please use $(MAKE) \<configuration\>
 endif
-	echo $(DIVIDER)
+	@echo $(DIVIDER)
 
 # If there are no configurations, call the setup program.
 .PHONY: new_setup
 
 new_setup:
 ifeq ($(strip $(CONFIGURATIONS)),)
-	echo $(DIVIDER)
-	echo Setting up cctk
+	@echo $(DIVIDER)
+	@echo Setting up cctk
 	$(PERL) $(SETUP)
-	echo $(DIVIDER)
+	@echo $(DIVIDER)
+	@echo You are now ready to build the CCTK.
+	@echo This is done by $(MAKE) \<configuration\>
+	@echo
+	@echo Please ignore the error below !
+	@echo $(DIVIDER)
 	exit 2
 endif
 
@@ -73,56 +78,66 @@ $(CONFIGURATIONS):
 .PHONY: distclean
 
 distclean:
-	echo $(DIVIDER)
-	echo Deleting all your configurations !
+	@echo $(DIVIDER)
+	@echo Deleting all your configurations !
 	rm -rf build
-	echo $(DIVIDER)
+	@echo $(DIVIDER)
 
 # Targets to make tags files
 TAGS:
-	echo $(DIVIDER)
-	echo Updating the Emacs TAGS file
+	@echo $(DIVIDER)
+	@echo Updating the Emacs TAGS file
 	find src toolkits \( -name '*.[chF]' -o -name '*.F77' \) \
           -exec etags --append --regex '/[a-z A-Z \t]*FORTRAN_NAME[^)]*/' {} \;
 	perl -pi -e 's/(subroutine\s*)([a-zA-Z0-9_]+)/\1\L\2/g;' TAGS
-	echo $(DIVIDER)
+	@echo $(DIVIDER)
 
 tags:
-	echo $(DIVIDER)
-	echo Updating the vi tags file
+	@echo $(DIVIDER)
+	@echo Updating the vi tags file
 	find src toolkits \( -name '*.[chF]' -o -name '*.F77' \) \
           -exec ctags --append {} \;
 	perl -pi -e 's/(subroutine\s*)([a-zA-Z0-9_]+)/\1\L\2/g;' tags
-	echo $(DIVIDER)
+	@echo $(DIVIDER)
 
 # Make a new configuration
 .PHONY: config
 
 config:
-	echo $(DIVIDER)
-	echo Running the configuration program
+	@echo $(DIVIDER)
+	@echo Running the configuration program
 	$(PERL) $(SETUP)
-	echo $(DIVIDER)
+	@echo $(DIVIDER)
 
 # The help system.
 .PHONY: help
 
 help:
-	echo $(DIVIDER)
-	echo This is the main makefile for the Cactus Computational Toolkit
+	@echo $(DIVIDER)
+	@echo This is the main makefile for the Cactus Computational Toolkit
 ifeq ($(strip $(CONFIGURATIONS)),)
-	echo There are no configurations currently specified.
-	echo $(MAKE) with no arguments will run a setup script.
+	@echo There are no configurations currently specified.
+	@echo $(MAKE) with no arguments will run a setup script.
 else
-	echo The following configurations are currently specified
-	echo $(CONFIGURATIONS)
-	echo To build a configuration run $(make) followed by the name of a configuration.
+	@echo The following configurations are currently specified
+	@echo $(CONFIGURATIONS)
+	@echo To build a configuration run $(make) followed by the name of a configuration.
 endif
-	echo $(DIVIDER)
-	echo $(MAKE) also knows the following targets
-	echo
-	echo       TAGS      - creates an Emacs TAGS file
-	echo       tags      - creates a Vi TAGS file
-	echo       config    - creates a new configuration
-	echo       distclean - deletes all existing configurations
-	echo $(DIVIDER)
+	@echo $(DIVIDER)
+	@echo $(MAKE) also knows the following targets
+	@echo
+	@echo       TAGS      - creates an Emacs TAGS file
+	@echo       tags      - creates a Vi TAGS file
+	@echo       config    - creates a new configuration
+	@echo       distclean - deletes all existing configurations
+	@echo $(DIVIDER)
+
+# Last resort rule.  Assume it is the name of a configuration
+
+%::
+	@echo $(DIVIDER)
+	@echo Setting up new configuration $@
+	$(PERL) $(SETUP) $@
+	@echo $(DIVIDER)
+	@echo Use $(MAKE) $@ to build the configuration.
+	@echo $(DIVIDER)
diff --git a/setup b/setup
index acd83067..9569e682 100644
--- a/setup
+++ b/setup
@@ -21,7 +21,7 @@ $uname =~ s/(sn\d\d\d\d|jsimpson)/UNICOS\/mk/;
 
 chop $uname;
 
-if($#ARGV > 0)
+if($#ARGV > -1)
 {
   $config = shift(@ARGV);
 }