/[MITgcm]/MITgcm_contrib/heimbach/OpenAD/code_regress/genmake2

Diff of /MITgcm_contrib/heimbach/OpenAD/code_regress/genmake2

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.2 by utke,
Mon Nov 26 15:05:52 2007 UTC
+revision 1.14 by utke,
Fri Aug 29 14:58:22 2008 UTC
 Line 1
  #! /usr/bin/env bash
  #
  # $Header$
-Line 14
+Line 13
  test_for_package_in_cpp_options() {
      cpp_options=$1
      pkg=$2
-     test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg" || exit 99
+     test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg[ ]"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg" || exit 99
+     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg[ ]"
-     test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg" || exit 99
+     test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg[ ]"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg" || exit 99
+     test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg[ ]"
+     test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg$"
+     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg$"
+     test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg$"
+     test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg$"
  }
  # Search for particular CPP #cmds associated with MPI
  # usage: test_for_mpi_in_cpp_eeoptions CPP_file
  test_for_mpi_in_cpp_eeoptions() {
      cpp_options=$1
-     test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_USE_MPI" || exit 99
+     test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_USE_MPI[ ]"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_USE_MPI" || exit 99
+     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_USE_MPI[ ]"
-     test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI" || exit 99
+     test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI[ ]"
-     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI" || exit 99
+     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI[ ]"
+     test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_USE_MPI$"
+     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_USE_MPI$"
+     test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI$"
+     test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI$"
  }
  # Search for particular string in a file. Return 1 if detected, 0 if not
-Line 40 
 test_for_string_in_file() {
+Line 47 
 test_for_string_in_file() {
      if test "x${RETVAL}" = x0 ; then
          printf "Error: In $file there is an illegal line: "
          grep -i "$strng" $file
-         return 1
+         exit 99
      fi
      return 0
  }
-Line 249 
 build_cyrus_makedepend()  {
+Line 256 
 build_cyrus_makedepend()  {
      fi
  }
+ build_embed_encode()
+ {
+     printf "  building the embed-encode utility...  "
+     if test ! -e "$ROOTDIR/tools/embed_encode/encode_files" ; then
+         if test ! -d "$ROOTDIR/tools/embed_encode" ; then
+             echo
+             echo "    Error: can't locate \"$ROOTDIR/tools/embed_encode\""
+             echo
+             EMBED_SRC=f
+             return 1
+         fi
+         clist="cc gcc c89 $CC"
+         for ic in $clist ; do
+             comm="$ic -o encode_files encode_files.c"
+             ( cd $ROOTDIR/tools/embed_encode && $comm ) > /dev/null 2>&1
+             RETVAL=$?
+             if test "x$RETVAL" = x0 ; then
+                 echo "OK"
+                 DEFINES="$DEFINES -DHAVE_EMBED_SRC"
+                 return 0
+             fi
+         done
+         echo
+         echo "    Error: unable to build $ROOTDIR/embed_encode/encode_files"
+         echo "      so it has been disabled"
+         echo
+         EMBED_SRC=f
+         return 1
+     fi
+     echo "OK"
+     DEFINES="$DEFINES -DHAVE_EMBED_SRC"
+ }
  # Guess possible config options for this host
  find_possible_configs()  {
-Line 283 
 find_possible_configs()  {
+Line 325 
 find_possible_configs()  {
      #================================================================
      #  look for possible C compilers
-     tmp="$MITGCM_CC $CC gcc c89 cc c99 mpicc"
+     tmp="$MITGCM_CC $CC gcc c89 cc c99 mpicc icc"
      p_CC=
      for c in $tmp ; do
          rm -f ./genmake_hello.c  ./genmake_hello
-Line 322 
 EOF
+Line 364 
 EOF
      #================================================================
      #  look for possible FORTRAN compilers
-     tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95 gfortran"
+     tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc ifort f90 f95 mpif77 mpf77 mpxlf95 gfortran g95"
      p_FC=
      for c in $tmp ; do
          rm -f ./hello.f ./hello
-Line 354 
 EOF
+Line 396 
 EOF
      else
          echo "  The possible FORTRAN compilers found in your path are:"
          echo "   "$p_FC
-         if test "x$FC" = x ; then
+     fi
-             FC=`echo $p_FC | $AWK '{print $1}'`
-             echo "  Setting FORTRAN compiler to: "$FC
+     #  Use the first of the compilers found in the current PATH
-         fi
+     #  that has a correctly-named optfile
+     if test "x$OPTFILE" = x  -a  "x$FC" = x ; then
+         for i in $p_FC ; do
+             OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i
+             if test -r $OPTFILE ; then
+                 echo "  Setting OPTFILE to: "$OPTFILE
+                 break
+             fi
+         done
      fi
      if test "x$OPTFILE" = x ; then
-Line 528 
 Usage: "$0" [OPTIONS]
+Line 578 
 Usage: "$0" [OPTIONS]
            *only* works if it is supported by the OPTFILE that
            is being used.
+     -ignoretime | -ignore_time | --ignoretime | --ignore_time
+           Ignore all the "wall clock" routines entirely.  This will
+           not in any way hurt the model results -- it simply means
+           that the code that checks how long the model spends in
+           various routines will give junk values.
      -ts | --ts
            Produce timing information per timestep
+     -papis | --papis
+           Produce summary MFlop/s (and IPC) with PAPI per timestep
+     -pcls | --pcls
+           Produce summary MFlop/s etc. with PCL per timestep
+     -foolad | --foolad
+           Fool the AD code generator
+     -papi | --papi
+           Performance analysis with PAPI
+     -pcl | --pcl
+           Performance analysis with PCL
+     -hpmt | --hpmt
+           Performance analysis with the HPM Toolkit
+     -gsl | --gsl
+           Use GSL to control floating point rounding and precision
+     -devel | --devel
+           Add additional warning and debugging flags for development
      -mpi | --mpi
            Include MPI header files and link to MPI libraries
-Line 538 
 Usage: "$0" [OPTIONS]
+Line 611 
 Usage: "$0" [OPTIONS]
            set to PATH. i.e. Include files from \$PATH/include, link to libraries
            from \$PATH/lib and use binaries from \$PATH/bin.
+     -es | --es | -embed-source | --embed-source
+           Embed a tarball containing the full source code
+           (including the Makefile, etc.) used to build the
+           executable [off by default]
      -bash NAME
            Explicitly specify the Bourne or BASH shell to use
-Line 602 
 EOF
+Line 680 
 EOF
        call tsub( string )
        end
  EOF
-     $FC $FFLAGS $DEFINES -c genmake_tcomp.$FS >> genmake_warnings 2>&1
+     $FC $FFLAGS -c genmake_tcomp.$FS >> genmake_warnings 2>&1
      RETVAL=$?
      if test "x$RETVAL" != x0 ; then
          FC_NAMEMANGLE=$default_nm
-Line 668 
 void FC_NAMEMANGLE(cloc) ( double *curti
+Line 746 
 void FC_NAMEMANGLE(cloc) ( double *curti
   *curtim = *curtim/1.E6;
  }
  EOF
-     make genmake_tc_1.o >> genmake_warnings 2>&1
+     COMM="$CC $CFLAGS -c genmake_tc_1.c"
+     echo $COMM >> genmake_warnings
+     $COMM >> genmake_warnings 2>&1
      RET_C=$?
      cat <<EOF > genmake_tc_2.$FS
        program hello
-       Real*8 wtime
+       REAL*8 wtime
        external cloc
        call cloc(wtime)
        print *," HELLO WORLD", wtime
-       end program hello
+       end
  EOF
-     $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_warnings 2>&1
+     COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+     echo $COMM >> genmake_warnings
+     $COMM >> genmake_warnings 2>&1
      RET_F=$?
      test -x ./genmake_tc  &&  ./genmake_tc >> genmake_warnings 2>&1
      RETVAL=$?
-Line 690 
 EOF
+Line 772 
 EOF
  }
+ check_HAVE_SIGREG()  {
+     if test ! "x$HAVE_SIGREG" = x ; then
+         return
+     fi
+     get_fortran_c_namemangling
+     cat <<EOF > genmake_tc_1.c
+ $FC_NAMEMANGLE
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <signal.h>
+ #include <errno.h>
+ #include <ucontext.h>
+ int * ip;
+ static void killhandler(
+     unsigned int sn, siginfo_t  si, struct ucontext *sc )
+ {
+     *ip = *ip + 1;
+     return;
+ }
+ void FC_NAMEMANGLE(sigreg) (int * aip)
+ {
+     struct sigaction s;
+     ip = aip;
+     s.sa_flags = SA_SIGINFO;
+     s.sa_sigaction = (void *)killhandler;
+     if(sigaction (SIGTERM,&s,(struct sigaction *)NULL)) {
+         printf("Sigaction returned error = %d\n", errno);
+         exit(0);
+     }
+     return;
+ }
+ EOF
+     COMM="$CC $CFLAGS -c genmake_tc_1.c"
+     echo $COMM >> genmake_warnings
+     $COMM >> genmake_warnings 2>&1
+     RET_C=$?
+     cat <<EOF > genmake_tc_2.$FS
+       program hello
+       integer anint
+       common /iv/ anint
+       external sigreg
+       call sigreg(anint)
+       end
+ EOF
+     echo >> genmake_warnings
+     echo "running: check_HAVE_SIGREG()" >> genmake_warnings
+     cat genmake_tc_2.$FS >> genmake_warnings
+     COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+     echo $COMM >> genmake_warnings
+     $COMM >> genmake_warnings 2>&1
+     RETVAL=$?
+     if test "x$RETVAL" = x0 ; then
+         HAVE_SIGREG=t
+         DEFINES="$DEFINES -DHAVE_SIGREG"
+     fi
+     rm -f genmake_tc*
+ }
+ check_HAVE_SETRLSTK()  {
+     if test "x$HAVE_SETRLSTK" = xt ; then
+         DEFINES="$DEFINES -DHAVE_SETRLSTK"
+         return
+     fi
+     if test ! "x$HAVE_SETRLSTK" = x ; then
+         return
+     fi
+     get_fortran_c_namemangling
+     cat <<EOF > genmake_tc_1.c
+ $FC_NAMEMANGLE
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <unistd.h>
+ void FC_NAMEMANGLE(setrlstk) ()
+ {
+     struct rlimit rls;
+     rls.rlim_cur = RLIM_INFINITY;
+     rls.rlim_max = RLIM_INFINITY;
+     setrlimit(RLIMIT_STACK, &rls);
+     return;
+ }
+ EOF
+     COMM="$CC $CFLAGS -c genmake_tc_1.c"
+     echo $COMM >> genmake_warnings
+     $COMM >> genmake_warnings 2>&1
+     RET_C=$?
+     cat <<EOF > genmake_tc_2.$FS
+       program hello
+       external setrlstk
+       call setrlstk()
+       end
+ EOF
+     echo >> genmake_warnings
+     echo "running: check_HAVE_SETRLSTK()" >> genmake_warnings
+     cat genmake_tc_2.$FS >> genmake_warnings
+     COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+     echo $COMM >> genmake_warnings
+     $COMM >> genmake_warnings 2>&1
+     RETVAL=$?
+     if test "x$RETVAL" = x0 ; then
+         HAVE_SETRLSTK=t
+         DEFINES="$DEFINES -DHAVE_SETRLSTK"
+     fi
+     rm -f genmake_tc*
+ }
  check_HAVE_STAT()  {
      get_fortran_c_namemangling
      cat <<EOF > genmake_tc_1.c
-Line 711 
 void FC_NAMEMANGLE(tfsize) ( int *nbyte
+Line 903 
 void FC_NAMEMANGLE(tfsize) ( int *nbyte
          *nbyte = -1;
  }
  EOF
-     make genmake_tc_1.o >> genmake_tc.log 2>&1
+     COMM="$CC $CFLAGS -c genmake_tc_1.c"
+     echo $COMM >> genmake_warnings
+     $COMM >> genmake_tc.log 2>&1
      RET_C=$?
      cat <<EOF > genmake_tc_2.$FS
        program hello
        integer nbyte
        call tfsize(nbyte)
        print *," HELLO WORLD", nbyte
-       end program hello
+       end
  EOF
-     $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_tc.log 2>&1
+     echo >> genmake_warnings
-     RET_F=$?
+     echo "running: check_HAVE_STAT()" >> genmake_warnings
-     test -x ./genmake_tc  &&  ./genmake_tc >> genmake_tc.log 2>&1
+     cat genmake_tc_2.$FS >> genmake_warnings
+     COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+     echo $COMM >> genmake_warnings
+     $COMM >> genmake_tc.log 2>&1
      RETVAL=$?
      if test "x$RETVAL" = x0 ; then
          HAVE_STAT=t
-Line 736 
 check_netcdf_libs()  {
+Line 933 
 check_netcdf_libs()  {
      if test ! "x$SKIP_NETCDF_CHECK" = x ; then
          return
      fi
-     echo "" > genmake_tnc.log
+     echo >> genmake_warnings
+     echo "running: check_netcdf_libs()" >> genmake_warnings
      cat <<EOF > genmake_tnc.F
        program fgennc
  #include "netcdf.inc"
-Line 754 
 EOF
+Line 952 
 EOF
        IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
        end
  EOF
-     echo "Executing:" > genmake_tnc.log
+     echo "===  genmake_tnc.F  ===" > genmake_tnc.log
-     echo "  $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS" \
+     cat genmake_tnc.F >> genmake_tnc.log
-         > genmake_tnc.log
+     echo "===  genmake_tnc.F  ===" >> genmake_tnc.log
      RET_CPP=f
-     $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null  \
+     COMM="cat genmake_tnc.F | $CPP $DEFINES $INCLUDES"
-         &&  RET_CPP=t
+     echo "$COMM" >> genmake_tnc.log
+     eval $COMM > genmake_tnc.$FS 2>/dev/null  &&  RET_CPP=t
      if test "x$RET_CPP" = xf ; then
          echo "  WARNING: CPP failed to pre-process the netcdf test." \
-             > genmake_tnc.log
+             >> genmake_tnc.log
          echo "    Please check that \$INCLUDES is properly set." \
-             > genmake_tnc.log
+             >> genmake_tnc.log
      fi
-     echo "Executing:" > genmake_tnc.log
+     echo "$FC $FFLAGS $FOPTIM -c genmake_tnc.$FS  \ " >> genmake_tnc.log
-     echo "  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS" > genmake_tnc.log
+     echo "  &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc.o $LIBS" >> genmake_tnc.log
-     echo "  $LINK -o genmake_tnc.o $LIBS" > genmake_tnc.log
      $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
-         &&  $LINK -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1
+         &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1
      RET_COMPILE=$?
+     cat genmake_tnc.log >> genmake_warnings
      #EH3  Remove test program execution for machines that either disallow
      #EH3  execution or cannot support it (eg. cross-compilers)
-Line 784 
 EOF
+Line 983 
 EOF
          HAVE_NETCDF=t
      else
          # try again with "-lnetcdf" added to the libs
-         $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null  \
+         echo "try again with added '-lnetcdf'" > genmake_tnc.log
+         echo "cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS \ " >> genmake_tnc.log
+         echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log
+         echo " &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf" >> genmake_tnc.log
+         cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS 2>/dev/null  \
              &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
-             &&  $LINK -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf >> genmake_tnc.log 2>&1
+             &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf >> genmake_tnc.log 2>&1
          RET_COMPILE=$?
+         cat genmake_tnc.log >> genmake_warnings
          if test "x$RET_COMPILE" = x0 ; then
              LIBS="$LIBS -lnetcdf"
              HAVE_NETCDF=t
          else
+         # try again with "-lnetcdff" added to the libs
+             echo "try again with added '-lnetcdff -lnetcdf'" > genmake_tnc.log
+             echo "cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS \ " >> genmake_tnc.log
+             echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log
+             echo " &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf" >> genmake_tnc.log
+             cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS 2>/dev/null  \
+                 &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
+                 &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdff -lnetcdf >> genmake_tnc.log 2>&1
+             RET_COMPILE=$?
              cat genmake_tnc.log >> genmake_warnings
+             if test "x$RET_COMPILE" = x0 ; then
+                 LIBS="$LIBS -lnetcdff -lnetcdf"
+                 HAVE_NETCDF=t
+             fi
          fi
      fi
      rm -f genmake_tnc*
-Line 828 
 OPTFILE=
+Line 1045 
 OPTFILE=
  INCLUDES="-I. $INCLUDES"
  FFLAGS=
  FOPTIM=
+ FEXTRAFLAGS=
  CFLAGS=
  KFLAGS1=
  KFLAGS2=
-Line 839 
 NOOPTFLAGS=
+Line 1057 
 NOOPTFLAGS=
  MPI=
  MPIPATH=
  TS=
+ PAPIS=
+ PCLS=
+ FOOLAD=
+ PAPI=
+ PCL=
+ HPMT=
+ GSL=
+ DEVEL=
+ HAVE_TEST_L=
  # DEFINES checked by test compilation or command-line
  HAVE_SYSTEM=
  HAVE_FDATE=
  FC_NAMEMANGLE=
  HAVE_CLOC=
+ # HAVE_SETRLSTK=
  HAVE_STAT=
  HAVE_NETCDF=
  HAVE_ETIME=
-Line 861 
 BASH=
+Line 1089 
 BASH=
  PWD=`pwd`
  test "x$MAKE" = x  &&  MAKE=make
  test "x$AWK" = x   &&  AWK=awk
+ EMBED_SRC=
  THISHOST=`hostname`
  THISCWD=`pwd`
  THISDATE=`date`
-Line 894 
 TAMC_EXTRA=
+Line 1123 
 TAMC_EXTRA=
  #  The following state can be set directly by command-line switches
  gm_s1="OPTFILE PDEPEND PDEFAULT MAKEFILE PLATFORM ROOTDIR MODS DISABLE ENABLE"
- gm_s2="FC CPP IEEE TS MPI JAM DUMPSTATE STANDARDDIRS"
+ gm_s2="FC CPP IEEE TS PAPIS PCLS PAPI PCL HPMT GSL DEVEL MPI JAM DUMPSTATE STANDARDDIRS"
  #  The following state is not directly set by command-line switches
- gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM "
+ gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM FEXTRAFLAGS"
  gm_s4="CFLAGS KFLAGS1 KFLAGS2 LIBS KPPFILES NOOPTFILES NOOPTFLAGS"
  gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD MAKE THISHOST THISUSER THISDATE THISVER MACHINE"
  gm_s6="EXECUTABLE EXEHOOK EXEDIR PACKAGES_CONF"
-Line 924 
 EOF
+Line 1153 
 EOF
  echo "===  Processing options files and arguments  ==="
  gm_local="genmake_local"
- modsCount=0
- for i in . $MODS ; do
-     if test -r $i/$gm_local ; then
-         . $i/$gm_local
-         break
-     fi
-     let modsCount=modsCount+1
- done
- if test $modsCount -gt 1 ; then
-   echo "ERROR: some uses of MODS break with more than one directory specified"
-   exit -1;
- fi
  printf "  getting local config information:  "
  if test -f $gm_local ; then
      echo "using $gm_local"
-Line 1082 
 for ac_option in "$@" ; do
+Line 1299 
 for ac_option in "$@" ; do
          -ts | --ts)
              TS=true ;;
+         -papis | --papis)
+             PAPIS=true ;;
+         -pcls | --pcls)
+             PCLS=true ;;
+         -foolad | --foolad)
+             FOOLAD=true ;;
+         -papi | --papi)
+             PAPI=true ;;
+         -pcl | --pcl)
+             PCL=true ;;
+         -hpmt | --hpmt)
+             HPMT=true ;;
+         -gsl | --gsl)
+             GSL=true ;;
+         -devel | --devel)
+             DEVEL=true ;;
          -mpi | --mpi)
              MPI=true ;;
-Line 1110 
 for ac_option in "$@" ; do
+Line 1345 
 for ac_option in "$@" ; do
          -ignoretime | -ignore_time | --ignoretime | --ignore_time)
              IGNORE_TIME="-DIGNORE_TIME" ;;
+         -es | --es | -embed-source | --embed-source)
+             EMBED_SRC=t ;;
          -*)
              echo "Error: unrecognized option: "$ac_option
              usage
-Line 1128 
 done
+Line 1366 
 done
  if test -f ./.genmakerc ; then
      echo
      echo "WARNING: genmake2 has detected a copy of the old-style \"./.genmakerc\""
-     echo "  file.  This file format is no longer supported.  Please see:"
+     echo "  file.  This file format is no longer supported.  For directions on"
-     echo
+     echo "  how to setup and use the new \"genmake2\" script, please see:"
      echo "    http://mitgcm.org/devel_HOWTO/"
-     echo
+     echo "  and send an email to MITgcm-support@mitgcm.org if you need help."
-     echo "  for directions on how to setup and use the new \"genmake2\" input"
+     echo "WARNING: ignore \"./.genmakerc\" and continue."
-     echo "  files and send an email to MITgcm-support@mitgcm.org if you want help."
      echo
  fi
  #  Find the MITgcm ${ROOTDIR}
  if test "x${ROOTDIR}" = x ; then
      tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'`
-     if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
+     if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesupp -a -d ../pkg ; then
          ROOTDIR=".."
      else
          for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do
-Line 1308 
 Error: The command "ln -s" failed -- ple
+Line 1545 
 Error: The command "ln -s" failed -- ple
  EOF
      exit 1
  fi
+ test -L genmake_tlink > /dev/null 2>&1
+ RETVAL=$?
+ if test "x$RETVAL" = x0 ; then
+     HAVE_TEST_L=t
+ fi
  rm -f genmake_test_ln genmake_tlink
  #  Check for broken *.F/*.f handling and fix if possible
-Line 1320 
 fi
+Line 1562 
 fi
  if test ! "x$TS" = x ; then
        echo "  Turning on timing per timestep"
-       DEFINES="$DEFINES -DTIME_PER_TIMESTEP"
+       if test ! "x$FOOLAD" = x ; then
+             DEFINES="$DEFINES -DTIME_PER_TIMESTEP_SFP"
+       else
+             DEFINES="$DEFINES -DTIME_PER_TIMESTEP"
+       fi
+       PACKAGES="$PACKAGES showflops"
+ fi
+ if test ! "x$PAPIS" = x ; then
+       echo "  Turning on PAPI flop summary per timestep"
+       echo "  Please make sure PAPIINC, PAPILIB are defined"
+       if test ! "x$FOOLAD" = x ; then
+             DEFINES="$DEFINES -DUSE_PAPI_FLOPS_SFP"
+       else
+             DEFINES="$DEFINES -DUSE_PAPI_FLOPS"
+       fi
+       INCLUDES="$INCLUDES $PAPIINC"
+       LIBS="$LIBS $PAPILIB"
+       PACKAGES="$PACKAGES showflops"
+ fi
+ if test ! "x$PCLS" = x ; then
+       echo "  Turning on PCL counter summary per timestep"
+       echo "  Please make sure PCLINC, PCLLIB are defined"
+       if test ! "x$FOOLAD" = x ; then
+             DEFINES="$DEFINES -DUSE_PCL_FLOPS_SFP"
+       else
+             DEFINES="$DEFINES -DUSE_PCL_FLOPS"
+       fi
+       INCLUDES="$INCLUDES $PCLINC"
+       LIBS="$LIBS $PCLLIB"
+       PACKAGES="$PACKAGES showflops"
+ fi
+ if test ! "x$PAPI" = x ; then
+       if test ! "x$PAPIS" = x ; then
+           echo "  PAPI performance analysis and flop summary per timestep cannot co-exist!"
+           echo "  Sticking with PAPI flop summary per timestep!"
+       else
+           echo "  Turning on performance analysis with PAPI"
+           echo "  Please make sure PAPIINC, PAPILIB are defined"
+           DEFINES="$DEFINES -DUSE_PAPI"
+           INCLUDES="$INCLUDES $PAPIINC"
+           LIBS="$LIBS $PAPILIB"
+       fi
+ fi
+ if test ! "x$PCL" = x ; then
+       if test ! "x$PCLS" = x ; then
+           echo "  PCL performance analysis and flop summary per timestep cannot co-exist!"
+           echo "  Sticking with PCL flop summary per timestep!"
+       else
+           echo "  Turning on performance analysis with PCL"
+           echo "  Please make sure PCLINC, PCLLIB are defined"
+           DEFINES="$DEFINES -DUSE_PCL"
+           INCLUDES="$INCLUDES $PCLINC"
+           LIBS="$LIBS $PCLLIB"
+       fi
+ fi
+ if test ! "x$HPMT" = x ; then
+       if test ! "x$PAPI" = x ; then
+           echo "  PAPI and the HPM Toolkit cannot co-exist!"
+           echo "  Sticking with PAPI!"
+       else if test ! "x$PCL" = x ; then
+           echo "  PCL and the HPM Toolkit cannot co-exist!"
+           echo "  Sticking with PCL!"
+       else
+           echo "  Turning on performance analysis with the HPM Toolkit"
+           echo "  Please make sure HPMTINC, HPMTLIB are defined"
+           DEFINES="$DEFINES -DUSE_LIBHPM"
+           INCLUDES="$INCLUDES $HPMTINC"
+           LIBS="$LIBS $HPMTLIB"
+       fi
+       fi
+ fi
+ if test ! "x$GSL" = x ; then
+       echo "  Turning on use of GSL to control floating point calculations"
+       echo "  Please make sure GSLINC, GSLLIB are defined"
+       DEFINES="$DEFINES -DUSE_GSL_IEEE"
+       INCLUDES="$INCLUDES $GSLINC"
+       LIBS="$LIBS $GSLLIB"
  fi
  printf "\n===  Checking system libraries  ===\n"
-Line 1330 
 cat > genmake_tcomp.$FS <<EOF
+Line 1648 
 cat > genmake_tcomp.$FS <<EOF
        call system('echo hi')
        end
  EOF
- $FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+ $FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
  RETVAL=$?
  if test "x$RETVAL" = x0 ; then
      HAVE_SYSTEM=t
-Line 1345 
 rm -f genmake_tcomp*
+Line 1663 
 rm -f genmake_tcomp*
  printf "  Do we have the fdate() command using $FC...  "
  cat > genmake_tcomp.$FS <<EOF
        program hello
-       CHARACTER(128) string
+       CHARACTER*(128) string
        string = ' '
        call fdate( string )
        print *, string
        end
  EOF
- $FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+ $FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
  RETVAL=$?
  if test "x$RETVAL" = x0 ; then
      HAVE_FDATE=t
-Line 1373 
 cat > genmake_tcomp.$FS <<EOF
+Line 1691 
 cat > genmake_tcomp.$FS <<EOF
        print *, tarray
        end
  EOF
- $FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+ $FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
  RETVAL=$?
  if test "x$RETVAL" = x0 ; then
      HAVE_ETIME=t
-Line 1391 
 if test "x$HAVE_CLOC" != x ; then
+Line 1709 
 if test "x$HAVE_CLOC" != x ; then
      echo "yes"
  else
      echo "no"
+     if test "x$EMBED_SRC" = xt ; then
+         echo "    WARNING: you requested file embedding but it has"
+         echo "      been disabled since C code cannot be called"
+         EMBED_SRC=
+     fi
+ fi
+ rm -f genmake_t*
+ printf "  Can we unlimit the stack size using $FC...  "
+ check_HAVE_SETRLSTK
+ if test "x$HAVE_SETRLSTK" = xt ; then
+     echo "yes"
+ else
+     echo "no"
+ fi
+ rm -f genmake_t*
+ printf "  Can we register a signal handler using $FC...  "
+ check_HAVE_SIGREG
+ if test "x$HAVE_SIGREG" = xt ; then
+     echo "yes"
+ else
+     echo "no"
  fi
  rm -f genmake_t*
-Line 1412 
 else
+Line 1753 
 else
  fi
  DEFINES="$DEFINES $IGNORE_TIME"
+ if test "x$EMBED_SRC" = xt ; then
+     build_embed_encode
+ fi
+ if test "x$EMBED_SRC" = xt ; then
+     ENABLE="$ENABLE embed_files"
+ fi
  printf "\n===  Setting defaults  ===\n"
  printf "  Adding MODS directories:  "
  for d in $MODS ; do
-Line 1497 
 if test -r $ROOTDIR"/eesupp/src/Makefile
+Line 1846 
 if test -r $ROOTDIR"/eesupp/src/Makefile
      fi
  fi
- #same for exch2
+ #same for pkg/exch2 and pkg/regrid
- if test -r $ROOTDIR"/pkg/exch2/Makefile" ; then
+ for pdir in exch2 regrid ; do
-     echo "  Making source files in exch2 from  templates"
+     if test -r $ROOTDIR"/pkg/${pdir}/Makefile" ; then
-     ( cd $ROOTDIR"/pkg/exch2/" && $MAKE ) > make_exch2.errors 2>&1
+         echo "  Making source files in pkg/${pdir} from templates"
-     RETVAL=$?
+         ( cd $ROOTDIR"/pkg/"${pdir} && $MAKE ) > make_${pdir}.errors 2>&1
-     if test "x${RETVAL}" = x0 ; then
+         RETVAL=$?
-         rm -f make_exch2.errors
+         if test "x${RETVAL}" = x0 ; then
-     else
+             rm -f make_${pdir}.errors
-         echo "Error: problem encountered while building source files in exch2:"
+         else
-         cat make_exch2.errors 1>&2
+             echo "Error: problem encountered while building source files in pkg/${pdir}:"
-         exit 1
+             cat make_${pdir}.errors 1>&2
+             exit 1
+         fi
      fi
- fi
+ done
  printf "\n===  Determining package settings  ===\n"
  if  test "x${PDEPEND}" = x ; then
-Line 1620 
 done
+Line 1971 
 done
  rm -f ./.tmp_pack
  echo "    packages are:  $PACKAGES"
- #  Check availability of NetCDF and then either build the MNC template
+ #  Check for package MNC: if NetCDF is available, then build the MNC
- #  files or delete mnc from the list of available packages.
+ #  template files ; otherwise, delete mnc from the list of packages.
  echo $PACKAGES | grep ' mnc ' > /dev/null 2>&1
  RETVAL=$?
  if test "x$RETVAL" = x0 ; then
-Line 1655 
 EOF
+Line 2006 
 EOF
      fi
  fi
+ #  Check for package PROFILES: if NetCDF is not available,
+ #  then delete profiles from the list of available packages.
+ echo $PACKAGES | grep ' profiles ' > /dev/null 2>&1
+ RETVAL=$?
+ if test "x$RETVAL" = x0 ; then
+     if test "x$HAVE_NETCDF" != xt ; then
+         cat <<EOF
+ *********************************************************************
+ WARNING: the "profiles" package was enabled but tests failed to
+   compile NetCDF applications.  Please check that:
+) NetCDF is correctly installed for this compiler and
+) the LIBS variable (within the "optfile") specifies the correct
+        NetCDF library to link against.
+   Due to this failure, the "profiles" package is now DISABLED.
+ *********************************************************************
+ EOF
+         PACKAGES=`echo $PACKAGES | sed -e 's/profiles//g'`
+         DISABLE="$DISABLE profiles"
+     fi
+ fi
  echo "  applying package dependency rules"
  ck=
  while test "x$ck" != xtt ; do
      i=0
      # rtot=${#PNAME[@]}
      rtot=$nname
-     while test $i -lt $rtot ; do
+     while test $i -le $rtot ; do
          #  Is $pname in the current $PACKAGES list?
          #  pname=${PNAME[$i]}
-Line 1695 
 while test "x$ck" != xtt ; do
+Line 2071 
 while test "x$ck" != xtt ; do
          #  Do we need to add $dname according to the dependency rules?
          if test "x$pin" = xt -a "x$plus" = "x+" -a "x$din" = xf ; then
+             #echo "   " $pname ": need to add :" $dname
              in_dis="f"
              for dis in $DISABLE ; do
                  if test "x$dis" = "x$dname" ; then
-Line 1849 
 for i in $SOURCEDIRS ; do
+Line 2226 
 for i in $SOURCEDIRS ; do
          cat $i/$j >> adSrcFiles.tmp
      done
  done
  if test ! "x"$FS = "x.f" ; then
      cat adSrcFiles.tmp | sed -e "s/\.f/.$FS/g" > adSrcFiles.tmp_f
      mv -f adSrcFiles.tmp_f adSrcFiles.tmp
-Line 1864 
 for i in $INCLUDEDIRS ; do
+Line 2240 
 for i in $INCLUDEDIRS ; do
      fi
  done
+ if test ! "x$DIVA" = x ; then
+     echo "  Creating the pseudo-MPI include directory"
+     INCLUDES="-I./mpi_headers $INCLUDES"
+     rm -rf ./mpi_headers
+     mkdir -p ./mpi_headers
+     if test "x$MPIINCLUDEDIR" = x ; then
+         if test "x$MPIHOME" = x ; then
+             MPIHOME='/usr'
+         fi
+         MPIINCLUDEDIR='$MPIHOME/include'
+     fi
+     if test -r $MPIINCLUDEDIR/mpif.h ; then
+         for i in $MPI_HEADER_FILES; do
+             cp -p $MPIINCLUDEDIR/$i ./mpi_headers
+         done
+         perl -i -pe 's/MPI_DISPLACEMENT_CURRENT=-1_8/MPI_DISPLACEMENT_CURRENT=-1/g' mpi_headers/mpif.h
+     else
+         echo " We cannot create a copy of mpif.h!"
+ #       exit -1
+     fi
+ fi
  echo "  Determining the list of source and include files"
  rm -rf .links.tmp
  mkdir .links.tmp
+ touch .links.tmp/foo
+ if test ! -r ".links.tmp/foo" ; then
+     echo
+     echo "ERROR : something is wrong with your directory permissions or"
+     echo "   your user file-creation mask (\"umask\") since creating a"
+     echo "   sub-dir, touch-ing a file within it, and then reading it is"
+     echo "   not working.  Please try setting your umask to something"
+     echo "   sane such as:"
+     echo
+     echo "      umask 0002"
+     echo
+     echo "   and please verify that you have the proper permissions for"
+     echo "   creating sub-directories and then reading files created"
+     echo "   within them."
+     echo
+     exit 1
+ fi
+ rm -f .links.tmp/foo
  echo "# This section creates symbolic links" > srclinks.tmp
  echo "" >> srclinks.tmp
  printf 'F77_SRC_FILES = ' > F77srclist.tmp
-Line 1874 
 printf 'NON_AD_F77_SRC_FILES = ' > nonAD
+Line 2293 
 printf 'NON_AD_F77_SRC_FILES = ' > nonAD
  printf 'C_SRC_FILES = '   > csrclist.tmp
  printf 'F90_SRC_FILES = ' > F90srclist.tmp
  printf 'H_SRC_FILES = '   > hsrclist.tmp
+ printf 'AD_FLOW_FILES = ' > ad_flow_files.tmp
  alldirs="$SOURCEDIRS $INCLUDEDIRS ."
  for d in $alldirs ; do
      deplist=
-     sfiles=`( cd $d; echo *.[h,c,F] | grep -v _cb2m)`
+     sfiles=`( cd $d; echo *.[h,c,F] *.flow )`
-     sfiles=`( echo $sfiles; cd $d; echo *.F90 | grep -v _cb2m)`
+     sfiles=`( echo $sfiles; cd $d; echo *.F90 )`
+     if test "x$OPENAD" != x ; then
+         sfiles=`( echo $sfiles | grep -v _cb2m\. )`
+     fi
      for sf in $sfiles ; do
          if test ! -r ".links.tmp/$sf" ; then
              if test -f "$d/$sf" ; then
+                 ignore_f=f
                  case $d/$sf in
                    ./$PACKAGES_DOT_H)
+                         ignore_f=t
                          ;;
                    ./AD_CONFIG.h)
+                         ignore_f=t
                          ;;
                    ./FC_NAMEMANGLE.h)
+                         ignore_f=t
                          ;;
                    ./BUILD_INFO.h)
+                         ignore_f=t
+                         ;;
+                   ./EMBEDDED_FILES.h)
+                         ignore_f=t
                          ;;
                    *)
-                         touch .links.tmp/$sf
+                         #  For the local directory *ONLY*,
-                         deplist="$deplist $sf"
+                         #  ignore all soft-links
+                         if test "x$HAVE_TEST_L" = xt -a "x$d" = x. -a -L $sf ; then
+                             ignore_f=t
+                         else
+                             touch .links.tmp/$sf
+                             deplist="$deplist $sf"
+                         fi
                          ;;
                  esac
-                 extn=`echo $sf | $AWK -F. '{print $NF}'`
+                 if test "x$ignore_f" = xf ; then
-                 case $extn in
+                     extn=`echo $sf | $AWK -F. '{print $NF}'`
-                     F)
+                     case $extn in
+                         F)
                          echo    " \\"  >> F77srclist.tmp
                          printf " $sf" >> F77srclist.tmp
                          basename=${sf%%.F}
-Line 1918 
 for d in $alldirs ; do
+Line 2356 
 for d in $alldirs ; do
                              printf " $sf" >> nonADF77srclist.tmp
                            fi
                          fi
-                         ;;
+                             ;;
-                     F90)
+                         F90)
                          echo    " \\"  >> F90srclist.tmp
                          printf " $sf" >> F90srclist.tmp
                          ;;
-Line 1931 
 for d in $alldirs ; do
+Line 2369 
 for d in $alldirs ; do
                          echo    " \\"  >> hsrclist.tmp
                          printf " $sf" >> hsrclist.tmp
                          ;;
-                 esac
+                     flow)
+                         echo    " \\"  >> ad_flow_files.tmp
+                         printf " $sf" >> ad_flow_files.tmp
+                         ;;
+                    esac
+                 fi
              fi
          fi
      done
-Line 1940 
 for d in $alldirs ; do
+Line 2383 
 for d in $alldirs ; do
          echo "" >> srclinks.tmp
          echo "#  These files are linked from $d" >> srclinks.tmp
          echo "$deplist :" >> srclinks.tmp
-         printf "\t\$(LN) %s/\$@ \$@\n" $d >> srclinks.tmp
+ # We need to make sure that the link isn't already there.
+ # This may happen when make thinks that a header file has to be "remade"
+ # because a module it depends on has changed.  In this case we do nothing.
+         printf "\tif [ ! -L \$@ ]; then \$(LN) %s/\$@ \$@; fi\n" $d >> srclinks.tmp
        fi
      fi
  done
-Line 1955 
 echo "" >> nonADF77srclist.tmp
+Line 2401 
 echo "" >> nonADF77srclist.tmp
  echo "" >> csrclist.tmp
  echo "" >> F90srclist.tmp
  echo "" >> hsrclist.tmp
+ echo "" >> ad_flow_files.tmp
  if test -f $MAKEFILE ; then
      mv -f $MAKEFILE "$MAKEFILE.bak"
  fi
  echo "  Writing makefile: $MAKEFILE"
  echo "# Multithreaded + multi-processing makefile for:" > $MAKEFILE
  echo "#    $MACHINE" >> $MAKEFILE
  echo "# This makefile was generated automatically on" >> $MAKEFILE
-Line 2011 
 EXE_AD      = ${EXE_AD}
+Line 2456 
 EXE_AD      = ${EXE_AD}
  EXE_FTL     = ${EXE_FTL}
  EXE_SVD     = ${EXE_SVD}
- ENABLED_PACKAGES  = ${ENABLED_PACKAGES}
+ ENABLED_PACKAGES = ${ENABLED_PACKAGES}
  DISABLED_PACKAGES = ${DISABLED_PACKAGES}
  # These files are created by Makefile
  SPECIAL_FILES = ${PACKAGES_DOT_H} AD_CONFIG.h FC_NAMEMANGLE.h BUILD_INFO.h
  EOF
- #  Note: figure out some way to add Hyades JAM libraries here
+ if test "x$EMBED_SRC" = xt ; then
+     echo "EMBEDDED_FILES = EMBEDDED_FILES.h" >>$MAKEFILE
+ else
+     echo "EMBEDDED_FILES = " >>$MAKEFILE
+ fi
+ #  Note: figure out some way to add Hyades JAM libraries here
  cat >>$MAKEFILE <<EOF
  # Unix ln (link)
  LN = ${LN}
-Line 2047 
 INCLUDES = ${INCLUDES}
+Line 2496 
 INCLUDES = ${INCLUDES}
  KFLAGS1 = ${KFLAGS1}
  KFLAGS2 = ${KFLAGS2}
  # Optim./debug for FC
- FFLAGS = ${FFLAGS}
+ FFLAGS = ${FFLAGS} ${FEXTRAFLAGS}
  FOPTIM = ${FOPTIM}
- # Optim./debug/format for FC
+ # Optim./debug for FC
  F90FLAGS = ${F90FLAGS}
  F90OPTIM = ${F90OPTIM}
  F90FIXEDFORMAT = ${F90FIXEDFORMAT}
-Line 2070 
 cat nonADF77srclist.tmp >> $MAKEFILE
+Line 2519 
 cat nonADF77srclist.tmp >> $MAKEFILE
  cat csrclist.tmp        >> $MAKEFILE
  cat F90srclist.tmp      >> $MAKEFILE
  cat hsrclist.tmp        >> $MAKEFILE
+ cat ad_flow_files.tmp   >> $MAKEFILE
- rm -f F77srclist.tmp nonADF77srclist.tmp csrclist.tmp hsrclist.tmp flist.tmp clist.tmp F90srclist.tmp
+ rm -f F77srclist.tmp nonADF77srclist.tmp csrclist.tmp F90srclist.tmp hsrclist.tmp ad_flow_files.tmp
  echo >> $MAKEFILE
-Line 2083 
 echo >> $MAKEFILE
+Line 2533 
 echo >> $MAKEFILE
  echo 'F77_PP_SRC_FILES = $(F77_SRC_FILES:.F=.'$FS')'      >> $MAKEFILE
  echo 'F90_PP_SRC_FILES = $(F90_SRC_FILES:.F90=.'$FS90')' >> $MAKEFILE
+ echo 'OBJFILES= $(F77_SRC_FILES:.F=.o) $(C_SRC_FILES:.c=.o) $(F90_SRC_FILES:.F90=.o)' >> $MAKEFILE
+ echo 'FLOFILES =  $(AD_FLOW_FILES:.flow=.flowdir)' >> $MAKEFILE
  echo >> $MAKEFILE
  echo '.SUFFIXES:' >> $MAKEFILE
- echo '.SUFFIXES: .o .'$FS' .p .F .c .f'$FS90' .'$FS90' .FF90 .F90' >> $MAKEFILE
+ echo '.SUFFIXES: .o .'$FS' .p .F .c .f'$FS90' .'$FS90' .FF90 .F90 .flowdir .flow' >> $MAKEFILE
  cat >>$MAKEFILE <<EOF
- # all the source files linked from the various locations:
+ all: \$(EXECUTABLE)
- ALL_LINKED_FILES= \
+ \$(EXECUTABLE): \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) \$(OBJFILES) \$(EMBEDDED_FILES)
- \$(F77_SRC_FILES) \
+         @echo Creating \$@ ...
- \$(C_SRC_FILES) \
+         \$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) \$(LIBS)
- \$(H_SRC_FILES) \
+ depend:
- \$(F90_SRC_FILES) \
+         @make links
- \$(SPECIAL_FILES)
- all: depend \$(EXECUTABLE)
- depend: \$(ALL_LINKED_FILES)
          \$(MAKEDEPEND) -o .$FS \$(DEFINES) \$(INCLUDES) \$(F77_SRC_FILES)
          \$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
          -rm -f makedepend.out
- .PHONY: depend
+ lib: libmitgcmuv.a
- OBJFILES= \$(F77_SRC_FILES:.F=.o) \$(C_SRC_FILES:.c=.o) \$(F90_SRC_FILES:.F90=.o)
+ libmitgcmuv.a: \$(OBJFILES)
+         ar rcv libmitgcmuv.a \$(OBJFILES)
+         ar d   libmitgcmuv.a main.o
- \$(EXECUTABLE): \$(OBJFILES)
+ links: \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) \$(SPECIAL_FILES)
-         @echo Creating \$@ ...
-         \$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) \$(LIBS)
+ small_f: \$(F77_PP_SRC_FILES) \$(F90_PP_SRC_FILES)
  output.txt: \$(EXECUTABLE)
          @printf 'running ... '
          @\$(EXECUTABLE) > \$@
+ clean:
+         -rm -rf *.p *.$FS90 *.mod ${RMFILES} work.{pc,pcl} *.template
+         -rm -rf *.o
+         -rm -rf *.$FS *.flowdir
+         -rm -rf *.f$FS90 *_mod.h *_mod.F90 *.FF90 *.mod-whirl ad_input*
+         -rm -rf temp.sed reslice.dat
+ Clean:
+         @make clean
+         @make cleanlinks
+         -rm -f \$(SPECIAL_FILES)
+         -rm -f genmake_state genmake_*optfile genmake_warnings make.log run.log f90mkdepend.log *.bak
+         -rm -f taf_command taf_output taf_ad.log taf_ad_flow.log
+ CLEAN:
+         @make Clean
+         -find \$(EXEDIR) -name "*.meta" -exec rm {} \;
+         -find \$(EXEDIR) -name "*.data" -exec rm {} \;
+         -find \$(EXEDIR) -name "fort.*" -exec rm {} \;
+         -rm -f \$(EXECUTABLE) \$(EXE_AD) *.txt STD* *diagnostics.log datetime
+         -rm -f *_MIT_CE_000.opt0000 costfunction*0000
+         -rm -rf mnc_test_*
+ #eh3 Makefile: makefile
+ makefile:
+         $THIS_SCRIPT $G2ARGS
+ cleanlinks:
+         -find . -type l -exec rm {} \;
  # Special targets (SPECIAL_FILES) which are created by make
  ${PACKAGES_DOT_H}:
          @echo Creating \$@ ...
-Line 2136 
 test ! "x$THISUSER" = x && echo "      -echo
+Line 2612 
 test ! "x$THISUSER" = x && echo "      -echo
  test ! "x$THISDATE" = x && echo "       -echo \"#define THISDATE '$THISDATE'\" >> \$@" >> $MAKEFILE
  test ! "x$THISHOST" = x && echo "       -echo \"#define THISHOST '$THISHOST'\" >> \$@" >> $MAKEFILE
+ if test "x$EMBED_SRC" = xt ; then
+     cat >>$MAKEFILE <<EOF
+ decode_files.o : EMBEDDED_FILES.h
+ ##  \$(F77_PP_SRC_FILES)
+ all_fF.tar.gz : \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) \$(F77_PP_SRC_FILES) Makefile
+         @echo Creating \$@ ...
+         -tar -hcf all_fF.tar \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) \$(F77_PP_SRC_FILES) Makefile
+         -rm -f all_fF.tar.gz
+         -gzip all_fF.tar
+ EMBEDDED_FILES.h : all_fF.tar.gz
+         @echo Creating \$@ ...
+         -\${ROOTDIR}/tools/embed_encode/encode_files EMBEDDED_FILES.h all_fF.tar.gz
+ EOF
+ fi
  cat >>$MAKEFILE <<EOF
  # The normal chain of rules is (  .F - .$FS - .o  )
-Line 2154 
 cat >>$MAKEFILE <<EOF
+Line 2649 
 cat >>$MAKEFILE <<EOF
  .$FS90.o:
          \$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$<
  .f$FS90.o:
-         \$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$(F90FIXEDFORMAT) \$<
+         cp \$< \$(basename  \$<).f90
+         \$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$(F90FIXEDFORMAT) \$(basename  \$<).f90
  .c.o:
-         \$(CC) \$(CFLAGS) -c \$<
+         \$(CC) \$(CFLAGS) \$(DEFINES) \$(INCLUDES) -c \$<
+ .flow.flowdir:
+         \$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
  # Special exceptions that use the ( .F - .p - .$FS - .o ) rule-chain
  .F.p:
-Line 2164 
 cat >>$MAKEFILE <<EOF
+Line 2662 
 cat >>$MAKEFILE <<EOF
  .p.$FS:
          \$(KPP) \$(KFLAGS1)\$@ \$(KFLAGS2) \$<
+ EOF
  #=========================================
- #===  Cleanup Rules  ===
+ #===  Automatic Differentiation Rules  ===
+ #===  for TAMC/TAF  ======================
- CLEAN: Clean
+ if test "x$OPENAD" == x ; then
-         -find \$(EXEDIR) -name "*.meta" -exec rm {} \;
-         -find \$(EXEDIR) -name "*.data" -exec rm {} \;
-         -find \$(EXEDIR) -name "fort.*" -exec rm {} \;
-         -rm -f \$(EXECUTABLE) output.txt ad_output.txt STD*
- Clean: clean cleanlinks
+ cat >>$MAKEFILE <<EOF
-         -rm -f *.F
-         -rm -f \$(SPECIAL_FILES)
-         -rm -f genmake_state genmake_*optfile genmake_warnings make.log run.log *.bak
- clean:
+ TAMC           = ${TAMC}
-         -rm -rf *.o *.$FS *.p *.f$FS90 *.$FS90 *.mod ${RMFILES} work.{pc,pcl} *.template *_mod.h *_mod.F90 *.FF90 *.mod-whirl ad_input*
+ TAF            = ${TAF}
-         -rm -rf temp.sed reslice.dat
- cleanlinks:
+ TAF_EXTRA      = ${TAF_EXTRA}
-         -find . -type l -exec rm {} \;
+ TAMC_EXTRA     = ${TAMC_EXTRA}
- .PHONY: clean Clean CLEAN
+ EOF
+ ad_vars="AD_TAMC_FLAGS AD_TAF_FLAGS"
+ ad_vars="$ad_vars FTL_TAMC_FLAGS FTL_TAF_FLAGS"
+ ad_vars="$ad_vars SVD_TAMC_FLAGS SVD_TAF_FLAGS"
+ for i in $ad_vars ; do
+     name=$i
+     t1="t2=\$"`echo "$i"`
+     eval $t1
+     printf "%-20s = " $name >> $MAKEFILE
+     echo "$t2" | sed -e 's| \+| |g' >> $MAKEFILE
+ done
- #=========================================
+ echo "  Add the source list for AD code generation"
- #===  self regeneration  ===
+ echo >> $MAKEFILE
- # can't call this target  "Makefile"
+ printf "AD_FILES = " >> $MAKEFILE
- # because unfortunately the genmake script
+ AD_FILES=`cat ad_files`
- # invoked here uses
+ for i in $AD_FILES ; do
- # make itself for checking things and we
+     echo    " \\" >> $MAKEFILE
- # end up in a recursion.
+     printf " $i" >> $MAKEFILE
+ done
+ echo >> $MAKEFILE
+ rm -f ad_files
- makefile:
+ cat >>$MAKEFILE <<EOF
-         $THIS_SCRIPT $G2ARGS
+ # ... AD ...
+ adall: \$(EXE_AD)
+ adtaf: ad_taf_output.$FS
+ adtamc: ad_tamc_output.$FS
+ ad_input_code.$FS: \$(AD_FILES) \$(H_SRC_FILES)
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > ad_config.template
+         cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+         -rm -f ad_config.template
+         @make \$(F77_PP_SRC_FILES)
+         @make \$(FLOFILES)
+         cat \$(FLOFILES) \$(AD_FILES) > ad_input_code.$FS
+ ad_taf_output.$FS: ad_input_code.$FS
+         \$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.$FS
+         ls -l ad_input_code_ad.$FS
+         cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
+ adtafonly:
+         \$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.$FS
+         ls -l ad_input_code_ad.$FS
+         cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
+ \${EXE_AD}: ad_taf_output.o \$(OBJFILES)
+         \$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o \$(LIBS)
+ ad_tamc_output.$FS: ad_input_code.$FS
+         \$(TAMC) \$(AD_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.$FS
+         cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_tamc_output.$FS
+ ad_tamc: ad_tamc_output.o \$(OBJFILES)
+         \$(LINK) -o ${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_tamc_output.o \$(LIBS)
+ adonlyfwd:
+         patch < \$(TOOLSDIR)/ad_taf_output.f.onlyfwd.diff
+ adtrick:
+         patch < \$(TOOLSDIR)/ad_taf_output.f.adtrick.diff
+ # ... FTL ...
+ ftlall: ftl_taf
+ ftltaf: ftl_taf_output.$FS
+ ftltamc: ftl_tamc_output.$FS
+ ftl_input_code.$FS: \$(AD_FILES) \$(H_SRC_FILES)
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > ftl_config.template
+         cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
+         -rm -f ftl_config.template
+         @make \$(F77_PP_SRC_FILES)
+         @make \$(AD_FLOW_FILES)
+         cat \$(AD_FLOW_FILES) \$(AD_FILES) > ftl_input_code.$FS
+ ftl_taf_output.$FS: ftl_input_code.$FS
+         \$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
+         ls -l ftl_input_code_ftl.$FS
+         cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
+ ftltafonly:
+         \$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
+         ls -l ftl_input_code_ftl.$FS
+         cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
+ ftl_taf: ftl_taf_output.o \$(OBJFILES)
+         \$(LINK) -o ${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_taf_output.o \$(LIBS)
+ ftl_tamc_output.$FS: ftl_input_code.$FS
+         \$(TAMC) \$(FTL_TAMC_FLAGS) \$(TAMC_EXTRA) ftl_input_code.$FS
+         cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_tamc_output.$FS
+ ftl_tamc: ftl_tamc_output.o \$(OBJFILES)
+         \$(LINK) -o ${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_tamc_output.o \$(LIBS)
- # because the file is called Makefile
- .PHONY: makefile
- #====================================
+ # ... SVD ...
- #===  Automatic Differentiation   ===
+ svdtaf: ad_taf_output.$FS ftl_taf_output.$FS
+         @echo "--->>> Only ran TAF to generate SVD code!    <<<---"
+         @echo "--->>> Do make svdall afterwards to compile. <<<---"
+ svdall: svd_touch svd_taf
+ svd_taf: \$(OBJFILES)
+         \$(LINK) -o mitgcmuv_svd \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o ftl_taf_output.o \$(LIBS)
+         @echo "--->>> Only COMPILE svd code! <<<---"
+         @echo "--->>> Assumes you previously <<<---"
+         @echo "--->>> did make svdtaf        <<<---"
+ svd_touch:
+         @echo "--->>> Only COMPILE svd code! <<<---"
+         @echo "--->>> Assumes you previously <<<---"
+         @echo "--->>> did make svdtaf        <<<---"
+         touch ad_taf_output.$FS ftl_taf_output.$FS
+         \$(FC) \$(FFLAGS) \$(FOPTIM) -c ad_taf_output.$FS
+         \$(FC) \$(FFLAGS) \$(FOPTIM) -c ftl_taf_output.$FS
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > ftl_config.template
+         cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
+         -rm -f ftl_config.template
+ EOF
+ fi
+ #===  for OpenAD  ========================
+ if test "x$OPENAD" != x ; then
+ # ============ begin OpenAD specific section ==============
+ cat >>$MAKEFILE <<EOF
+ # all the source files linked from the various locations:
+ ALL_LINKED_FILES= \
+ \$(F77_SRC_FILES) \
+ \$(C_SRC_FILES) \
+ \$(H_SRC_FILES) \
+ \$(F90_SRC_FILES) \
+ \$(SPECIAL_FILES)
  ifndef OPENADROOT
    \$(error "Error:  environment variable OPENADROOT not defined!")
-Line 2219 
 endif
+Line 2835 
 endif
  EOF
+ echo "  Add the source list for common block to module conversion "
+ echo >> $MAKEFILE
+ printf "CB2M_F90_SRC_NAMES = " >> $MAKEFILE
+ for i in `cat ${MODS}/cb2mFiles` ; do
+   echo    " \\" >> $MAKEFILE
+   printf " $i" >> $MAKEFILE
+ done
+ echo >> $MAKEFILE
  echo "  Add the source list for AD code generation"
  echo >> $MAKEFILE
  printf "AD_FILES = " >> $MAKEFILE
+ for i in `cat ${MODS}/cb2mFiles` ; do
+   echo    " \\" >> $MAKEFILE
+   printf " ${i}_mod.f$FS90" >> $MAKEFILE
+ done
  AD_FILES=`cat adSrcFiles.tmp`
  for i in $AD_FILES ; do
    basename=${i%%.f}
-Line 2238 
 rm -f adSrcFiles.tmp
+Line 2867 
 rm -f adSrcFiles.tmp
  cat >>$MAKEFILE <<EOF
- # files to be converted:
- # right now there is no quick hack
- # to pick these out automatically
- # but we will be using the
- # canonicalizer anyway
- CB2M_F90_SRC_NAMES = \
- SIZE \
- EEPARAMS \
- PARAMS \
- BAR2 \
- BARRIER \
- CD_CODE_VARS \
- CG2D \
- CG3D \
- DFILE \
- DYNVARS \
- EEIO \
- EESUPPORT \
- EOS \
- EXCH_JAM \
- EXCH \
- FC_NAMEMANGLE \
- FFIELDS \
- GAD \
- GLOBAL_MAX \
- GLOBAL_SUM \
- GMREDI \
- GMREDI_TAVE \
- GRID \
- MPI_INFO \
- RESTART \
- SOLVE_FOR_PRESSURE3D \
- SOLVE_FOR_PRESSURE \
- SURFACE \
- tamc \
- tamc_keys \
- cost \
- g_cost \
- ctrl \
- ctrl_dummy \
- ctrl_weights \
- optim \
- grdchk
- .PHONY: adAll
  adAll: \$(EXE_AD) ncheckLev.conf
+ .PHONY: adAll
  CB2M_F90_PP_SRC_FILES=\$(addsuffix _mod.f$FS90, \$(CB2M_F90_SRC_NAMES))
-Line 2297 
 adDepend: \$(ALL_LINKED_FILES) \$(addsuf
+Line 2881 
 adDepend: \$(ALL_LINKED_FILES) \$(addsuf
          -rm -f makedepend.out
  OPENAD_SUPPORT_F90_SRC_FILES = \
- w2f__types.f90 \
+ w2f__types.F90 \
- active_module.f90 \
+ OAD_active.F90 \
- OAD_cp.f90 \
+ OAD_cp.F90 \
- OAD_rev.f90 \
+ OAD_rev.F90 \
- OAD_tape.f90
+ OAD_tape.F90
  OPENAD_SUPPORT_C_SRC_FILES = \
  iaddr.c \
  timeRatio.c
- f95_test_mods.f90: \$(OPENAD_SUPPORT_F90_SRC_FILES)
+ f95_test_mods.f90: \$(OPENAD_SUPPORT_F90_SRC_FILES:F90=$FS90)
          cat \$^ > \$@
  f95_test.f90: all_mods.xb.x2w.w2f.pp.f$FS90 \$(NON_AD_F77_SRC_FILES:.F=_cb2m.f$FS90) ad_input_code.w2f.canon.xb.x2w.w2f.rs.pp.f$FS90
-Line 2317 
 f95_test.out: f95_test_mods.f90 f95_test
+Line 2901 
 f95_test.out: f95_test_mods.f90 f95_test
          f95 -fixed -w=unused -maxcontin=132 -c f95_test_mods.f90 > \$@ 2>&1
          f95 -fixed -w=unused -maxcontin=132 -c -fixed f95_test.f90 >> \$@ 2>&1
- AD_OBJ_FILES=\$(OPENAD_SUPPORT_F90_SRC_FILES:.f90=.o) \$(OPENAD_SUPPORT_C_SRC_FILES:.c=.o) all_mods.xb.x2w.w2f.pp.o  ad_input_code.w2f.canon.xb.x2w.w2f.rs.pp.o \$(NON_AD_F77_SRC_FILES:.F=_cb2m.o) \$(C_SRC_FILES:.c=.o) \$(F90_SRC_FILES:.F90=.o)
+ AD_OBJ_FILES=\$(OPENAD_SUPPORT_F90_SRC_FILES:.F90=.o) \$(OPENAD_SUPPORT_C_SRC_FILES:.c=.o) all_mods.xb.x2w.w2f.pp.o  ad_input_code.w2f.canon.xb.x2w.w2f.rs.pp.o \$(NON_AD_F77_SRC_FILES:.F=_cb2m.o) \$(C_SRC_FILES:.c=.o) \$(F90_SRC_FILES:.F90=.o)
  \$(EXE_AD): \$(ALL_LINKED_FILES) \$(addsuffix _mod.h, \$(CB2M_F90_SRC_NAMES)) \$(AD_OBJ_FILES)
          @echo Creating \$@ ...
-Line 2333 
 openad: ad_input_code.w2f.canon.xb.x2w.w
+Line 2917 
 openad: ad_input_code.w2f.canon.xb.x2w.w
  # create the header files
  %_mod.h : %.h ${MODS}/cb2mGetHeaders.csh ${MODS}/cb2mGetHeaders.awk
-         ${MODS}/cb2mGetHeaders.csh $< ${MODS}/cb2mGetHeaders.awk
+         ${MODS}/cb2mGetHeaders.csh $< ${MODS}/cb2mGetHeaders.awk \$(CB2M_F90_SRC_NAMES)
  # change everybody else to use the new module files:
  %_cb2m.FF90 : %.F ${MODS}/cb2mUseModules.bash
-         ${MODS}/cb2mUseModules.bash $<
+         ${MODS}/cb2mUseModules.bash $< ${MPI}
  # makefile debug rule
  small_f: \$(CB2M_F90_PP_SRC_FILES)
-Line 2366 
 ad_input_code_sf.f$FS90 : ad_input_code.
+Line 2950 
 ad_input_code_sf.f$FS90 : ad_input_code.
  ad_input_code_sf.w2f.f$FS90: ad_input_code_sf.f$FS90 mfef90 whirl2f whirl2f_be w2f__types.f90
          ./mfef90 -z -F -N132 \$<
          mv \$<.B \$(basename \$<).B
-         ./whirl2f \$(basename \$<).B
+         ./whirl2f -openad \$(basename \$<).B
          cat w2f__types.f90 \$(basename \$<).w2f.f > \$@
  # canonicalizer
-Line 2429 
 ad_input_code.w2f.canon.xb.x2w.w2f.rs.pp
+Line 3013 
 ad_input_code.w2f.canon.xb.x2w.w2f.rs.pp
          \$(LN) \${XAIFSCHEMAROOT}/schema/\$@ .
  mfef90:
-         \$(LN) \${OPENADROOT}/Open64/osprey1.0/targ_ia32_ia64_linux/crayf90/sgi/mfef90 .
+         \$(LN) \${OPEN64ROOT}/crayf90/sgi/mfef90 .
  # link the support files:
  \$(OPENAD_SUPPORT_F90_SRC_FILES) \$(OPENAD_SUPPORT_C_SRC_FILES):
-Line 2440 
 ncheckLev.conf :
+Line 3024 
 ncheckLev.conf :
  whirl2xaif xaif2whirl:
-         \$(LN) \${OPENADROOT}/OpenADFortTk/OpenADFortTk-x86-Linux/bin/\$@ .
+         \$(LN) \${OPENADFORTTK}/bin/\$@ .
  %.pl:
-         \$(LN) \${OPENADROOT}/OpenADFortTk/OpenADFortTk-x86-Linux/bin/\$@ .
+         \$(LN) \${OPENADFORTTK}/bin/\$@ .
  %.py:
          \$(LN) \${OPENADROOT}/OpenADFortTk/tools/canonicalize/\$@ .
  whirl2f whirl2f_be:
-         \$(LN) \${OPENADROOT}/Open64/osprey1.0/targ_ia32_ia64_linux/whirl2f/\$@ .
+         \$(LN) \${OPEN64ROOT}/whirl2f/\$@ .
  openad_adm:
          \$(LN) \${XAIFBOOSTERROOT}/xaifBooster/algorithms/BasicBlockPreaccumulationReverse/test/t \$@
+ # ============ end OpenAD specific section ==============
  EOF
+ fi
+ #=========================================
  if test "x$EXEHOOK" != x ; then
      printf "\nexehook:\n\t%s\n" $EXEHOOK >> $MAKEFILE
  fi
-Line 2485 
 echo "  Add rules for links"
+Line 3075 
 echo "  Add rules for links"
  cat srclinks.tmp >> $MAKEFILE
  rm -f srclinks.tmp
+ echo "  Adding makedepend marker"
+ printf "\n\n# DO NOT DELETE\n" >> $MAKEFILE
  printf "\n===  Done  ===\n"
  # Create special header files

 Legend:



Removed from v.1.2
 


changed lines


 
Added in v.1.14
 Legend:



Removed from v.1.2
 


changed lines


 
Added in v.1.14
-Removed from v.1.2
+Added in v.1.14

	ViewVC Help
Powered by ViewVC 1.1.22