--- MITgcm/tools/genmake	2000/03/24 18:29:29	1.14
+++ MITgcm/tools/genmake	2000/06/21 19:57:55	1.17
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.14 2000/03/24 18:29:29 adcroft Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.17 2000/06/21 19:57:55 adcroft Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created by cnh 03/98
@@ -60,8 +60,8 @@
 #   copy everything in ../eesupp/src, ../model/src,
 #   ../eesupp/inc and ../model/inc into a directory and then
 #   edit the paths below to ./
-set SOURCEDIRS  = ( ../eesupp/src/ ../model/src/ ../diags/src/)
-set INCLUDEDIRS = ( ../eesupp/inc/ ../model/inc/ ../diags/inc/)
+set SOURCEDIRS  = ( ../eesupp/src/ ../model/src/ ../diags/src/ ../pkg/*/)
+set INCLUDEDIRS = ( ./ ../eesupp/inc/ ../model/inc/ ../diags/inc/ ../pkg/*/)
 set BUILDDIR    = ( ../bin/ )
 set EXEDIR      = ( ../exe/ )
 set EXECUTABLE  = ( mitgcmuv )
@@ -193,8 +193,13 @@
     set LINK       = ( 'g77' )
     breaksw
   case Linux+pgi+mpi:
-    set LIBS       = ( '-L/usr/local/lib/LINUX/ch_p4/ -lfmpich -lmpich' )
-    set INCLUDES   = ( '-I/usr/local/include' )
+    if ($?include_jam_libs) then
+     set INCLUDES   = ( '-I/usr/local//mpich-cnh-install/include' )
+     set LIBS       = ( '-L/usr/local/mpich-cnh-install/lib/LINUX/ch_p4/ -lfmpich -lmpich' )
+    else
+     set INCLUDES   = ( '-I/usr/local/include' )
+     set LIBS       = ( '-L/usr/local/lib/LINUX/ch_p4/ -lfmpich -lmpich' )
+    endif
   case Linux+pgi:
     set LN         = ( '/bin/ln -fs' )
     set CPP        = ( '/lib/cpp -traditional -P' )
@@ -312,6 +317,7 @@
 cat >> ${mfile} <<EOF
 # extra stuff for Hyades ............................................
 HYADES_DIR = /u/u0/cnh/jam-lib/software
+HYADES_DIR = /u/u0/cnh/jam-lib-twoproc
 WORK_DIR   = \$(HYADES_DIR)
 DEPOSIT_DIR = linux_bin
 
@@ -365,7 +371,7 @@
 NOOPTFILES = ${NOOPTFILES}
 NOOPTFLAGS = ${NOOPTFLAGS}
 # Flags and libraries needed for linking
-LIBS = ${LIBS}
+LIBS = ${LIBS} \$(XLIBS)
 
 EOF