--- MITgcm/tools/genmake	2001/08/14 14:27:10	1.42
+++ MITgcm/tools/genmake	2001/09/10 00:25:45	1.50
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.42 2001/08/14 14:27:10 adcroft Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.50 2001/09/10 00:25:45 adcroft Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -10,6 +10,7 @@
 
 # Default lists
 set DISABLE = ( aim autodiff cal cost ctrl ecco exf grdchk )
+set DEFINES = ( )
 set ENABLE  = ( )
 set MODS  = ( )
 
@@ -253,6 +254,14 @@
     set INCLUDEDIRS = ($INCLUDEDIRS $adr)
   else
     echo "                                      *" Package \"$dr\" NOT enabled.
+    switch ($dr)
+      case mom_fluxform:
+        set DEFINES = ($DEFINES '-DDISABLE_MOM_FLUXFORM'); breaksw
+      case mom_vecinv:
+        set DEFINES = ($DEFINES '-DDISABLE_MOM_VECINV'); breaksw
+      default:
+        breaksw
+    endsw
   endif
 end
 if (! $?STANDARDDIRS) set STANDARDDIRS=(eesupp model)
@@ -274,7 +283,6 @@
 set KPP        = (  )
 set FC         = ( 'f77' )
 set LINK       = ( 'f77' )
-set DEFINES    = (  )
 set INCLUDES   = ( -I. )
 set FFLAGS     = (  )
 set FOPTIM     = (  )
@@ -378,9 +386,9 @@
     set CPP        = ( '/usr/ccs/lib/cpp -P' )
     set DEFINES    = ( ${DEFINES} '-DTARGET_SUN -DWORDLENGTH=4' )
     set FFLAGS     = ( '-stackvar -explicitpar -vpara -e -u -noautopar')
-    set FOPTIM     = ( '-fast -O3' )
+    set FOPTIM     = ( '-dalign -O3' )
     set NOOPTFLAGS = ( '-O0' )
-    set NOOPTFILES = ( 'barrier.F different_multiple.F external_fields_load.F ini_vertical_grid.F ini_spherical_polar_grid.F ini_cori.F')
+    set NOOPTFILES = ( 'barrier.F different_multiple.F external_fields_load.F ini_vertical_grid.F ini_spherical_polar_grid.F ini_cori.F mon_printstats_rl.F mon_printstats_rs.F')
     breaksw
   case SunOS+mpi:
     set LN         = ( '/usr/bin/ln -s' )
@@ -388,11 +396,11 @@
     set DEFINES    = ( ${DEFINES} '-DTARGET_SUN -DWORDLENGTH=4' )
     set INCLUDES   = ( '-I/usr/local/mpi/include' )
     set FFLAGS     = ( '-stackvar -explicitpar -vpara -e -u -noautopar')
-    set FOPTIM     = ( '-fast -O3' )
+    set FOPTIM     = ( '-dalign -O3' )
     set NOOPTFLAGS = ( '-O0' )
     set LIBS       = ( '-L/usr/local/mpi/lib/solaris/ch_shmem -lmpi -lthread' \
                        '-lsocket -lnsl' )
-    set NOOPTFILES = ( 'barrier.F different_multiple.F external_fields_load.F ini_vertical_grid.F ini_spherical_polar_grid.F ini_cori.F')
+    set NOOPTFILES = ( 'barrier.F different_multiple.F external_fields_load.F ini_vertical_grid.F ini_spherical_polar_grid.F ini_cori.F mon_printstats_rl.F mon_printstats_rs.F')
     breaksw
   case IRIX32:
     echo "Configuring for SGI ONYX running IRIX64"
@@ -662,7 +670,7 @@
 echo 'F77FILES =  $(SRCFILES:.F=.f)'                    >> ${mfile}
 echo 'OBJFILES =  $(SRCFILES:.F=.o) $(CSRCFILES:.c=.o)' >> ${mfile}
 
-rm -f srclist.inc csrclist.inc flist.tmp clist.tmp
+rm -f srclist.inc csrclist.inc hlist.inc flist.tmp clist.tmp
 
 cat >> ${mfile} <<EOF
 
@@ -680,6 +688,10 @@
 
 small_f: \$(F77FILES)
 
+output.txt: \$(EXECUTABLE)
+	@printf 'running ... '
+	@\$(EXECUTABLE) > \$@
+
 clean:
 	-rm -rf *.o *.f *.p ${RMFILES}
 Clean: