--- MITgcm/tools/genmake	2001/09/10 02:28:20	1.51
+++ MITgcm/tools/genmake	2001/09/10 15:58:26	1.52
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.51 2001/09/10 02:28:20 adcroft Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.52 2001/09/10 15:58:26 cnh Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -280,6 +280,7 @@
 # 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' )
@@ -385,8 +386,9 @@
   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 -xtypemap=real:64,double:64,integer:32 -fsimple=0' )
+    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' )
@@ -395,10 +397,11 @@
   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 LIBS       = ( '-L/usr/local/mpi/lib/solaris/ch_shmem -lmpi -lthread' \
-    set FFLAGS     = ( '-stackvar -explicitpar -vpara -e -u -noautopar -xtypemap=real:64,double:64,integer:32 -fsimple=0' )
+    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' )
@@ -640,7 +643,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