--- MITgcm/tools/genmake	2001/08/13 19:34:57	1.41
+++ MITgcm/tools/genmake	2001/08/21 15:54:36	1.46
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.41 2001/08/13 19:34:57 adcroft Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.46 2001/08/21 15:54:36 heimbach 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  = ( )
 
@@ -171,10 +172,10 @@
 # source code in the standard directories
 if (! $?MODS) then
  set SOURCEDIRS  = ( )
- set INCLUDEDIRS = ( . )
+ set INCLUDEDIRS = ( )
 else
  set SOURCEDIRS  = ( $MODS )
- set INCLUDEDIRS = ( . $MODS )
+ set INCLUDEDIRS = ( $MODS )
 endif
 if (! $?BUILDDIR) set BUILDDIR = ( . )
 if (! -d $BUILDDIR) then
@@ -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_MOMVECINV'); breaksw
+      default:
+        breaksw
+    endsw
   endif
 end
 if (! $?STANDARDDIRS) set STANDARDDIRS=(eesupp model)
@@ -274,8 +283,7 @@
 set KPP        = (  )
 set FC         = ( 'f77' )
 set LINK       = ( 'f77' )
-set DEFINES    = (  )
-set INCLUDES   = (  )
+set INCLUDES   = ( -I. )
 set FFLAGS     = (  )
 set FOPTIM     = (  )
 set KFLAGS1    = (  )
@@ -507,7 +515,7 @@
 echo -n 'SRCFILES = ' > srclist.inc
 echo -n 'CSRCFILES = ' > csrclist.inc
 echo -n 'HEADERFILES = ' > hlist.inc
-foreach dr ($SOURCEDIRS $INCLUDEDIRS)
+foreach dr ($SOURCEDIRS $INCLUDEDIRS .)
  set deplist=( )
  foreach srcfile (`cd $dr; ls *.[hcF]`)
   if (! -r .links.tmp/$srcfile) then
@@ -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)
+	@echo -n "running ... "
+	@\$(EXECUTABLE) > \$@
+
 clean:
 	-rm -rf *.o *.f *.p ${RMFILES}
 Clean: