--- MITgcm/tools/genmake	2001/09/04 17:17:47	1.48
+++ MITgcm/tools/genmake	2001/09/19 02:43:27	1.54
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.48 2001/09/04 17:17:47 adcroft Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.54 2001/09/19 02:43:27 adcroft Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -258,7 +258,9 @@
       case mom_fluxform:
         set DEFINES = ($DEFINES '-DDISABLE_MOM_FLUXFORM'); breaksw
       case mom_vecinv:
-        set DEFINES = ($DEFINES '-DDISABLE_MOM_MOMVECINV'); breaksw
+        set DEFINES = ($DEFINES '-DDISABLE_MOM_VECINV'); breaksw
+      case generic_advdiff:
+        set DEFINES = ($DEFINES '-DDISABLE_GENERIC_ADVDIFF'); breaksw
       default:
         breaksw
     endsw
@@ -280,12 +282,14 @@
 # Platform specific options are chosen below
 set LN         = ( 'ln -s' )
 set CPP        = ( '/lib/cpp -P' )
+set S64        = ( '$(TOOLSDIR)/set64bitConst.sh' )
 set KPP        = (  )
 set FC         = ( 'f77' )
 set LINK       = ( 'f77' )
 set INCLUDES   = ( -I. )
 set FFLAGS     = (  )
 set FOPTIM     = (  )
+set CFLAGS     = (  )
 set KFLAGS1    = (  )
 set KFLAGS2    = (  )
 set LIBS       = (  )
@@ -384,21 +388,24 @@
   case SunOS:
     set LN         = ( '/usr/bin/ln -s' )
     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 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 mon_printstats_rl.F mon_printstats_rs.F')
+    set S64        = ( cat )
+    set DEFINES    = ( ${DEFINES} '-DTARGET_SUN -DWORDLENGTH=4 -D_d=E' )
+    set FFLAGS     = ( '-stackvar -explicitpar -vpara -e -u -noautopar -r8 -i4 -fsimple=0' )
+    set FOPTIM     = ( '-dalign -O3 -xarch=v9' )
+    set CFLAGS     = ( '-dalign -O3 -xarch=v9' )
+    set NOOPTFLAGS = ( '-dalign -O0 -xarch=v9' )
+    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 aim_aim2dyn.F aim_dyn2aim.F aim_aim2dyn_exchanges.F aim_external_fields_load.F aim_calc_diags.F aim_external_forcing.F aim_do_atmos_physics.F aim_write_diags.F aim_do_inphys.F ')
     breaksw
   case SunOS+mpi:
     set LN         = ( '/usr/bin/ln -s' )
     set CPP        = ( '/usr/ccs/lib/cpp -P' )
-    set DEFINES    = ( ${DEFINES} '-DTARGET_SUN -DWORDLENGTH=4' )
+    set S64        = ( cat )
+    set DEFINES    = ( ${DEFINES} '-DTARGET_SUN -DWORDLENGTH=4 -D_d=E' )
     set INCLUDES   = ( '-I/usr/local/mpi/include' )
-    set FFLAGS     = ( '-stackvar -explicitpar -vpara -e -u -noautopar')
-    set FOPTIM     = ( '-fast -O3' )
-    set NOOPTFLAGS = ( '-O0' )
     set LIBS       = ( '-L/usr/local/mpi/lib/solaris/ch_shmem -lmpi -lthread' \
+    set FFLAGS     = ( '-stackvar -explicitpar -vpara -e -u -noautopar -r8 -i4 -fsimple=0' )
+    set FOPTIM     = ( '-dalign -O3 -xarch=v9' )
+    set NOOPTFLAGS = ( '-dalign -O0 -xarch=v9' )
                        '-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 mon_printstats_rl.F mon_printstats_rs.F')
     breaksw
@@ -638,7 +645,7 @@
 # Unix ln (link)
 LN = ${LN}
 # C preprocessor
-CPP = cat \$< | \$(TOOLSDIR)/set64bitConst.sh | ${CPP}
+CPP = cat \$< | ${S64} | ${CPP}
 # Special preprocessor (KAP on DECs, FPP on Crays)
 KPP = ${KPP}
 # Fortran compiler
@@ -656,6 +663,8 @@
 # Optim./debug for FC
 FFLAGS = ${FFLAGS}
 FOPTIM = ${FOPTIM}
+# Flags for CC
+CFLAGS = ${CFLAGS}
 # Files that should not be optimized
 NOOPTFILES = ${NOOPTFILES}
 NOOPTFLAGS = ${NOOPTFLAGS}
@@ -682,7 +691,7 @@
 	\$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) \$(LIBS)
 depend:
 	@make links
-	makedepend -o .f \$(INCLUDES) \$(SRCFILES)
+	makedepend -o .f \$(DEFINES) \$(INCLUDES) \$(SRCFILES)
 
 links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES)
 
@@ -714,6 +723,8 @@
 	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
 .f.o:
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
+.c.o:
+	\$(CC) \$(CFLAGS) -c \$<
 
 # Special exceptions that use the ( .F - .p - .f - .o ) rule-chain
 .F.p: