--- MITgcm/tools/genmake	1998/10/28 03:11:38	1.6
+++ MITgcm/tools/genmake	1999/03/22 16:27:13	1.9
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.6 1998/10/28 03:11:38 cnh Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.9 1999/03/22 16:27:13 adcroft Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created by cnh 03/98
@@ -11,12 +11,11 @@
 while ($#allargs)
  set arg = $allargs[1]
  switch ($arg)
- case -makefile*:
-   if ($arg == "-makefile") then
-     set mfile = ( Makefile )
-   else
-     set mfile = ( `echo $arg | sed 's/-makefile=//' `)
-   endif
+ case -makefile:
+   set mfile = ( Makefile )
+   breaksw
+ case -makefile=*:
+   set mfile = ( `echo $arg | sed 's/-makefile=//' `)
    breaksw
  case -platform:
  case -platform=:
@@ -177,15 +176,16 @@
     set NOOPTFILES = ( 'barrier.F different_multiple.F' \
                        'load_external_fields.F' )
     breaksw
+  case Linux+mpi:
+    set LIBS       = ( '-L/usr/local/lib/LINUX/ch_p4/ -lfmpich -lmpich' )
   case Linux:
     set LN         = ( '/bin/ln -fs' )
-    set CPP        = ( '/usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/cpp -P' )
+    set CPP        = ( '/usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/cpp  -traditional -P' )
     set INCLUDES   = ( '-I/usr/local/include' )
     set FC         = ( 'g77' )
     set FFLAGS     = ( ' ' )
-    set FOPTIM     = ( '  -O3 -funroll-loops ' )
+    set FOPTIM     = ( '-O3 -funroll-loops ' )
     set LINK       = ( 'g77' )
-    set LIBS       = ( '-L/usr/local/lib/LINUX/ch_p4/ -lfmpich -lmpich' )
     breaksw
   case Linux+pgi:
     set LN         = ( '/bin/ln -fs' )
@@ -340,7 +340,8 @@
 	-rm -rf *.o *.f *.p ${RMFILES}
 Clean:
 	@make clean
-	-rm -rf *.[Fc]
+	-find . -type l -exec rm {} \;
+	-rm Makefile.bak
 
 # The normal chain of rules is (  .F - .f - .o  )
 .F.f: