/[MITgcm]/MITgcm/tools/genmake2
ViewVC logotype

Diff of /MITgcm/tools/genmake2

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

revision 1.50 by edhill, Sat Nov 29 19:58:36 2003 UTC revision 1.72 by edhill, Fri Mar 12 15:50:06 2004 UTC
# Line 13  Line 13 
13  test_for_package_in_cpp_options() {  test_for_package_in_cpp_options() {
14      cpp_options=$1      cpp_options=$1
15      pkg=$2      pkg=$2
16      grep -i "#define.*ALLOW_$pkg" $cpp_options > /dev/null 2>&1      test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg" || exit 99
17      RETVAL=$?      test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg" || exit 99
18      if test "x${RETVAL}" = x0 ; then      test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg" || exit 99
19          echo "Error: In $cpp_options there is an illegal line: #define ALLOW_$pkg"      test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg" || exit 99
20          exit 99  }
21      fi  
22      grep -i "#undef.*ALLOW_$pkg" $cpp_options > /dev/null 2>&1  # Search for particular CPP #cmds associated with MPI
23      RETVAL=$?  # usage: test_for_mpi_in_cpp_eeoptions CPP_file
24      if test "x${RETVAL}" = x0 ; then  test_for_mpi_in_cpp_eeoptions() {
25          echo "Error: In $cpp_options there is an illegal line: #undef ALLOW_$pkg"      cpp_options=$1
26          exit 99      test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_USE_MPI" || exit 99
27      fi      test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_USE_MPI" || exit 99
28      grep -i "#define.*DISABLE_$pkg" $cpp_options > /dev/null 2>&1      test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI" || exit 99
29        test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI" || exit 99
30    }
31    
32    # Search for particular string in a file. Return 1 if detected, 0 if not
33    # usage: test_for_string_in_file file string
34    test_for_string_in_file() {
35        file=$1
36        strng=$2
37        grep -i "$strng" $file > /dev/null 2>&1
38      RETVAL=$?      RETVAL=$?
39      if test "x${RETVAL}" = x0 ; then      if test "x${RETVAL}" = x0 ; then
40          echo "Error: In $cpp_options there is an illegal line: #define DISABLE_$pkg"          printf "Error: In $file there is an illegal line: "
41          exit 99          grep -i "$strng" $file
42            return 1
43      fi      fi
44      grep -i "#undef.*DISABLE_$pkg" $cpp_options > /dev/null 2>&1      return 0
     RETVAL=$?  
     if test "x${RETVAL}" = x0 ; then  
         echo "Error: In $cpp_options there is an illegal line: #undef DISABLE_$pkg"  
         exit 99  
    fi  
45  }  }
46    
47  # Read the $ROOTDIR/pkg/pkg_groups file and expand any references to  # Read the $ROOTDIR/pkg/pkg_groups file and expand any references to
# Line 73  find_possible_configs()  { Line 78  find_possible_configs()  {
78      tmp1=`uname`"_"`uname -m`      tmp1=`uname`"_"`uname -m`
79      tmp2=`echo $tmp1 | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`      tmp2=`echo $tmp1 | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
80      tmp3=`echo $tmp2 | sed -e 's/power macintosh/ppc/'`      tmp3=`echo $tmp2 | sed -e 's/power macintosh/ppc/'`
81      PLATFORM=`echo $tmp3 | sed -e 's/i[3-6]86/ia32/' | sed -e 's/athlon/ia32/'`      tmp1=`echo $tmp3 | sed -e 's|x86_64|amd64|'`
82        tmp2=`echo $tmp1 | sed -e 's/i[3-6]86/ia32/' | sed -e 's/athlon/ia32/'`
83        tmp3=`echo $tmp2 | sed -e 's/cray sv1/craysv1/'`
84        PLATFORM=$tmp3
85      OFLIST=`(cd $ROOTDIR/tools/build_options; ls | grep "^$PLATFORM")`      OFLIST=`(cd $ROOTDIR/tools/build_options; ls | grep "^$PLATFORM")`
86      echo "  The platform appears to be:  $PLATFORM"      echo "  The platform appears to be:  $PLATFORM"
87            
# Line 93  find_possible_configs()  { Line 101  find_possible_configs()  {
101          CPP="cpp -traditional -P"          CPP="cpp -traditional -P"
102      fi      fi
103    
104      # makedepend is not always available      #  The "original" makedepend is part of the Imake system that is
105        #  most often distributed with XFree86 or with an XFree86 source
106        #  package.  As a result, many machines (eg. generic Linux) do not
107        #  have a system-default "makedepend" available.  For those
108        #  systems, we have two fall-back options:
109        #
110        #    1) a makedepend implementation shipped with the cyrus-imapd
111        #       package:  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
112        #
113        #    2) a known-buggy xmakedpend shell script
114        #
115        #  So the choices are, in order:
116        #
117        #    1) use the user-specified program
118        #    2) use a system-wide default
119        #    3) locally build and use the cyrus implementation
120        #    4) fall back to the buggy local xmakedpend script
121        #
122      if test "x${MAKEDEPEND}" = x ; then      if test "x${MAKEDEPEND}" = x ; then
123        which makedepend >& /dev/null        which makedepend > /dev/null 2>&1
124        RETVAL=$?        RETVAL=$?
125        if test "x${RETVAL}" = x1 ; then        if test ! "x${RETVAL}" = x0 ; then
126           echo "    makedepend was not found. Using xmakedpend instead."           echo "    a system-default makedepend was not found."
127           MAKEDEPEND='$(TOOLSDIR)/xmakedepend'  
128             #  Try to build the cyrus impl
129             rm -f ./genmake_cy_md
130             (
131                 cd $ROOTDIR/tools/cyrus-imapd-makedepend  \
132                     &&  ./configure > /dev/null 2>&1  \
133                     &&  make > /dev/null 2>&1  \
134                     &&  ./makedepend ifparser.c > /dev/null 2>&1  \
135                     &&  echo "true"
136             ) > ./genmake_cy_md
137             grep true ./genmake_cy_md > /dev/null 2>&1
138             RETVAL=$?
139             if test "x$RETVAL" = x0 ; then
140                 MAKEDEPEND='$(TOOLSDIR)/cyrus-imapd-makedepend/makedepend'
141             else
142                 MAKEDEPEND='$(TOOLSDIR)/xmakedepend'
143             fi
144             rm -f ./genmake_cy_md
145        fi        fi
146      fi      fi
147    
# Line 138  EOF Line 180  EOF
180          echo "   "$p_FC          echo "   "$p_FC
181          if test "x$FC" = x ; then          if test "x$FC" = x ; then
182              FC=`echo $p_FC | $AWK '{print $1}'`              FC=`echo $p_FC | $AWK '{print $1}'`
183                echo "  Setting FORTRAN compiler to: "$FC
184          fi          fi
185      fi      fi
186    
187      for i in $p_FC ; do      if test "x$OPTFILE" = x ; then
188          p_OF=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i          OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$FC
189          if test -r $p_OF ; then          if test ! -r $OPTFILE ; then
190              OPTFILE=$p_OF               echo "  I looked for the file "$OPTFILE" but did not find it"
191              echo "  The options file:  $p_OF"          fi
192              echo "    appears to match so we'll use it."      fi
193              break  #    echo "  The options file:  $p_OF"
194          fi  #    echo "    appears to match so we'll use it."
195      done  #   for i in $p_FC ; do
196    #p_OF=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i
197    #if test -r $p_OF ; then
198    #    OPTFILE=$p_OF
199    #    echo "  The options file:  $p_OF"
200    #    echo "    appears to match so we'll use it."
201    #    break
202    #fi
203    #   done
204      if test "x$OPTFILE" = x ; then      if test "x$OPTFILE" = x ; then
205          cat 1>&2 <<EOF          cat 1>&2 <<EOF
206    
# Line 208  get_pdepend_list()  { Line 259  get_pdepend_list()  {
259      . ./.pd_tmp      . ./.pd_tmp
260      rm -f ./.pd_tmp      rm -f ./.pd_tmp
261    
262      echo -n "PNAME = "${}      printf "PNAME = "${}
263  }  }
264    
265    
# Line 246  Usage: "$0" [OPTIONS] Line 297  Usage: "$0" [OPTIONS]
297        --makefile=NAME | -mf=NAME        --makefile=NAME | -mf=NAME
298            Call the makefile "NAME".  The default is "Makefile".            Call the makefile "NAME".  The default is "Makefile".
299    
300        -makedepend NAME | -md NAME
301          --makedepend=NAME | -md=NAME
302              Use "NAME" for the MAKEDEPEND program.
303    
304      -rootdir NAME | --rootdir NAME | -rd NAME | --rd NAME      -rootdir NAME | --rootdir NAME | -rd NAME | --rd NAME
305        -rootdir=NAME | --rootdir=NAME | -rd=NAME | --rd=NAME        -rootdir=NAME | --rootdir=NAME | -rd=NAME | --rd=NAME
306            Specify the location of the MITgcm ROOTDIR as "NAME".            Specify the location of the MITgcm ROOTDIR as "NAME".
# Line 287  Usage: "$0" [OPTIONS] Line 342  Usage: "$0" [OPTIONS]
342            *only* works if it is supported by the OPTFILE that            *only* works if it is supported by the OPTFILE that
343            is being used.            is being used.
344    
345        -mpi | --mpi
346              Include MPI header files and link to MPI libraries
347        -mpi=PATH | --mpi=PATH
348              Include MPI header files and link to MPI libraries using MPI_ROOT
349              set to PATH. i.e. Include files from $PATH/include, link to libraries
350              from $PATH/lib and use binaries from $PATH/bin.
351    
352        -bash NAME
353              Explicitly specify the Bourne or BASH shell to use
354    
355    While it is most often a single word, the "NAME" variables specified    While it is most often a single word, the "NAME" variables specified
356    above can in many cases be a space-delimited string such as:    above can in many cases be a space-delimited string such as:
357    
# Line 430  EOF Line 495  EOF
495  }  }
496    
497    
498    check_netcdf_libs()  {
499        cat <<EOF > genmake_tnc.F
500          program fgennc
501    #include "netcdf.inc"
502          integer iret, ncid, xid
503          iret = nf_create('genmake_tnc.nc', NF_CLOBBER, ncid)
504          IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
505          iret = nf_def_dim(ncid, 'X', 11, xid)
506          IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
507          iret = nf_close(ncid)
508          IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
509          end
510    EOF
511        $CPP genmake_tnc.F > genmake_tnc.f  \
512            &&  $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f $LIBS >> genmake_tnc.log 2>&1
513        RET_COMPILE=$?
514        test -x ./genmake_tnc  &&  ./genmake_tnc >> genmake_tnc.log 2>&1
515        RETVAL=$?
516        if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
517            HAVE_NETCDF=t
518        else
519            # try again with "-lnetcdf" added to the libs
520            $CPP genmake_tnc.F > genmake_tnc.f  \
521                &&  $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f \
522                $LIBS -lnetcdf >> genmake_tnc_2.log 2>&1
523            RET_COMPILE=$?
524            test -x ./genmake_tnc  &&  ./genmake_tnc >> genmake_tnc.log 2>&1
525            RETVAL=$?
526            if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
527                LIBS="$LIBS -lnetcdf"
528                HAVE_NETCDF=t
529            else
530                cat genmake_tnc.log >> genmake_warnings
531            fi
532        fi
533        rm -f genmake_tnc*
534    }
535    
536    
537    
538    ###############################################################################
539    #   Sequential part of script starts here
540    ###############################################################################
541    
542  #  Set defaults here  #  Set defaults here
543  COMMANDL="$0 $@"  COMMANDL="$0 $@"
544    
# Line 438  LN= Line 547  LN=
547  S64=  S64=
548  KPP=  KPP=
549  FC=  FC=
550    CPP=
551  LINK=  LINK=
 # DEFINES="-DWORDLENGTH=4"  
552  DEFINES=  DEFINES=
553  PACKAGES=  PACKAGES=
554  ENABLE=  ENABLE=
# Line 456  FOPTIM= Line 565  FOPTIM=
565  CFLAGS=  CFLAGS=
566  KFLAGS1=  KFLAGS1=
567  KFLAGS2=  KFLAGS2=
568    #LDADD=
569  LIBS=  LIBS=
570  KPPFILES=  KPPFILES=
571  NOOPTFILES=  NOOPTFILES=
572  NOOPTFLAGS=  NOOPTFLAGS=
573    MPI=
574    MPIPATH=
575    
576  # DEFINES checked by test compilation  # DEFINES checked by test compilation
577  HAVE_SYSTEM=  HAVE_SYSTEM=
578  HAVE_FDATE=  HAVE_FDATE=
579  FC_NAMEMANGLE=  FC_NAMEMANGLE=
580  HAVE_CLOC=  HAVE_CLOC=
581    HAVE_NETCDF=
582    
583  MODS=  MODS=
584  TOOLSDIR=  TOOLSDIR=
585  SOURCEDIRS=  SOURCEDIRS=
586  INCLUDEDIRS=  INCLUDEDIRS=
587  STANDARDDIRS=  STANDARDDIRS="USE_THE_DEFAULT"
588    
589    BASH=
590  PWD=`pwd`  PWD=`pwd`
591  MAKE=make  MAKE=make
592  AWK=awk  AWK=awk
# Line 505  TAMC_EXTRA= Line 619  TAMC_EXTRA=
619    
620  #  The following state can be set directly by command-line switches  #  The following state can be set directly by command-line switches
621  gm_s1="OPTFILE PDEPEND PDEFAULT MAKEFILE PLATFORM ROOTDIR MODS DISABLE ENABLE"  gm_s1="OPTFILE PDEPEND PDEFAULT MAKEFILE PLATFORM ROOTDIR MODS DISABLE ENABLE"
622  gm_s2="FC IEEE MPI JAM DUMPSTATE STANDARDDIRS"  gm_s2="FC CPP IEEE MPI JAM DUMPSTATE STANDARDDIRS"
623    
624  #  The following state is not directly set by command-line switches  #  The following state is not directly set by command-line switches
625  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 "
# Line 541  for i in . $MODS ; do Line 655  for i in . $MODS ; do
655          break          break
656      fi      fi
657  done  done
658  echo -n "  getting local config information:  "  printf "  getting local config information:  "
659  if test -e $gm_local ; then  if test -e $gm_local ; then
660      echo "using $gm_local"      echo "using $gm_local"
661      . $gm_local      . $gm_local
# Line 606  for ac_option ; do Line 720  for ac_option ; do
720          -make=* | --make=* | -m=* | --m=*)          -make=* | --make=* | -m=* | --m=*)
721              MAKE=$ac_optarg ;;              MAKE=$ac_optarg ;;
722                    
723            -bash | --bash)
724                ac_prev=BASH ;;
725            -bash=* | --bash=*)
726                BASH=$ac_optarg ;;
727            
728            -makedepend | --makedepend | -md | --md)
729                ac_prev=MAKEDEPEND ;;
730            -makedepend=* | --makedepend=* | -md=* | --md=*)
731                MAKEDEPEND=$ac_optarg ;;
732            
733          -makefile | --makefile | -ma | --ma)          -makefile | --makefile | -ma | --ma)
734              ac_prev=MAKEFILE ;;              ac_prev=MAKEFILE ;;
735          -makefile=* | --makefile=* | -ma=* | --ma=*)          -makefile=* | --makefile=* | -ma=* | --ma=*)
# Line 657  for ac_option ; do Line 781  for ac_option ; do
781              IEEE=true ;;              IEEE=true ;;
782          -noieee | --noieee)          -noieee | --noieee)
783              IEEE= ;;              IEEE= ;;
784    
785            -mpi | --mpi)
786                MPI=true ;;
787            -mpi=* | --mpi=*)
788                MPIPATH=$ac_optarg
789                MPI=true ;;
790                    
791  #       -jam | --jam)  #       -jam | --jam)
792  #           JAM=1 ;;  #           JAM=1 ;;
# Line 709  if test "x${ROOTDIR}" = x ; then Line 839  if test "x${ROOTDIR}" = x ; then
839          for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do          for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do
840              if [ -d "$d/model" -a -d "$d/eesupp" -a -d "$d/pkg" ]; then              if [ -d "$d/model" -a -d "$d/eesupp" -a -d "$d/pkg" ]; then
841                  ROOTDIR=$d                  ROOTDIR=$d
842                  echo -n "Warning:  ROOTDIR was not specified but there appears to be"                  printf "Warning:  ROOTDIR was not specified but there appears to be"
843                  echo " a copy of MITgcm at \"$ROOTDIR\" so we'll try it."                  echo " a copy of MITgcm at \"$ROOTDIR\" so we'll try it."
844                  break                  break
845              fi              fi
# Line 743  if test "x$OPTFILE" != xNONE ; then Line 873  if test "x$OPTFILE" != xNONE ; then
873          . "$OPTFILE"          . "$OPTFILE"
874          RETVAL=$?          RETVAL=$?
875          if test "x$RETVAL" != x0 ; then          if test "x$RETVAL" != x0 ; then
876              echo -n "Error: failed to source OPTFILE \"$OPTFILE\""              printf "Error: failed to source OPTFILE \"$OPTFILE\""
877              echo "--please check that variable syntax is bash-compatible"              echo "--please check that variable syntax is bash-compatible"
878              exit 1              exit 1
879          fi          fi
# Line 770  if test "x${AD_OPTFILE}" != xNONE ; then Line 900  if test "x${AD_OPTFILE}" != xNONE ; then
900          . "$AD_OPTFILE"          . "$AD_OPTFILE"
901          RETVAL=$?          RETVAL=$?
902          if test "x$RETVAL" != x0 ; then          if test "x$RETVAL" != x0 ; then
903              echo -n "Error: failed to source AD_OPTFILE \"$AD_OPTFILE\""              printf "Error: failed to source AD_OPTFILE \"$AD_OPTFILE\""
904              echo "--please check that variable syntax is bash-compatible"              echo "--please check that variable syntax is bash-compatible"
905              exit 1              exit 1
906          fi          fi
# Line 785  fi Line 915  fi
915    
916  #  Check that FC, LINK, CPP, S64, LN, and MAKE are defined.  If not,  #  Check that FC, LINK, CPP, S64, LN, and MAKE are defined.  If not,
917  #  either set defaults or complain and abort!  #  either set defaults or complain and abort!
918    if test ! "x$BASH" = x ; then
919        # add a trailing space so that it works within the Makefile syntax (see below)
920        BASH="$BASH "
921    fi
922  if test "x$FC" = x ; then  if test "x$FC" = x ; then
923      cat <<EOF 1>&2      cat <<EOF 1>&2
924    
# Line 798  fi Line 932  fi
932  if test "x$LINK" = x ; then  if test "x$LINK" = x ; then
933      LINK=$FC      LINK=$FC
934  fi  fi
 if test "x$CPP" = x ; then  
     CPP="cpp"  
 fi  
935  if test "x$MAKE" = x ; then  if test "x$MAKE" = x ; then
936      MAKE="make"      MAKE="make"
937  fi  fi
938    if test "x$CPP" = x ; then
939        CPP=cpp
940    fi
941    #EH3 === UGLY ===
942    #  The following an ugly little hack to check for $CPP in /lib/ and it
943    #  should eventually be replaced with a more general function that
944    #  searches a combo of the user's path and a list of "usual suspects"
945    #  to find the correct location for binaries such as $CPP.
946    for i in " " "/lib/" ; do
947        echo "#define A a" | $i$CPP > test_cpp 2>&1 && CPP=$i$CPP
948    done
949    #EH3 === UGLY ===
950  echo "#define A a" | $CPP > test_cpp 2>&1  echo "#define A a" | $CPP > test_cpp 2>&1
951  RETVAL=$?  RETVAL=$?
952  if test "x$RETVAL" != x0 ; then  if test "x$RETVAL" != x0 ; then
# Line 840  EOF Line 983  EOF
983  fi  fi
984  rm -f genmake_test_ln genmake_tlink  rm -f genmake_test_ln genmake_tlink
985    
986    if test ! "x$MPI" = x ; then
987          echo "  Turning on MPI cpp macros"
988          DEFINES="$DEFINES -DALLOW_USE_MPI -DALWAYS_USE_MPI"
989    fi
990    
991  printf "\n===  Checking system libraries  ===\n"  printf "\n===  Checking system libraries  ===\n"
992  echo -n "  Do we have the system() command using $FC...  "  printf "  Do we have the system() command using $FC...  "
993  cat > genmake_tcomp.f <<EOF  cat > genmake_tcomp.f <<EOF
994        program hello        program hello
995        call system('echo hi')        call system('echo hi')
# Line 860  else Line 1007  else
1007  fi  fi
1008  rm -f genmake_tcomp*  rm -f genmake_tcomp*
1009    
1010  echo -n "  Do we have the fdate() command using $FC...  "  printf "  Do we have the fdate() command using $FC...  "
1011  cat > genmake_tcomp.f <<EOF  cat > genmake_tcomp.f <<EOF
1012        program hello        program hello
1013        CHARACTER(128) string        CHARACTER(128) string
# Line 881  else Line 1028  else
1028  fi  fi
1029  rm -f genmake_tcomp*  rm -f genmake_tcomp*
1030    
1031  echo -n "  Can we call simple C routines (here, \"cloc()\") using $FC...  "  printf "  Can we call simple C routines (here, \"cloc()\") using $FC...  "
1032  check_HAVE_CLOC  check_HAVE_CLOC
1033  if test "x$HAVE_CLOC" != x ; then  if test "x$HAVE_CLOC" != x ; then
1034      echo "yes"      echo "yes"
1035  else  else
1036      echo "no"      echo "no"
1037  fi  fi
 echo "$FC_NAMEMANGLE" > FC_NAMEMANGLE.h.template  
 cmp FC_NAMEMANGLE.h FC_NAMEMANGLE.h.template > /dev/null 2>&1  
 RETVAL=$?  
 if test "x$RETVAL" != x0 ; then  
     mv -f FC_NAMEMANGLE.h.template FC_NAMEMANGLE.h  
 fi  
1038  rm -f genmake_t*  rm -f genmake_t*
1039    
1040    printf "  Can we create NetCDF-enabled binaries...  "
1041    check_netcdf_libs
1042    if test "x$HAVE_NETCDF" != x ; then
1043        echo "yes"
1044    else
1045        echo "no"
1046    fi
1047    
1048    
1049  printf "\n===  Setting defaults  ===\n"  printf "\n===  Setting defaults  ===\n"
1050  echo -n "  Adding MODS directories:  "  printf "  Adding MODS directories:  "
1051  for d in $MODS ; do  for d in $MODS ; do
1052      if test ! -d $d ; then      if test ! -d $d ; then
1053          echo          echo
1054          echo "Error: MODS directory \"$d\" not found!"          echo "Error: MODS directory \"$d\" not found!"
1055          exit 1          exit 1
1056      else      else
1057          echo -n " $d"          printf " $d"
1058          SOURCEDIRS="$SOURCEDIRS $d"          SOURCEDIRS="$SOURCEDIRS $d"
1059          INCLUDEDIRS="$INCLUDEDIRS $d"          INCLUDEDIRS="$INCLUDEDIRS $d"
1060      fi      fi
# Line 935  if test "x${TOOLSDIR}" = x ; then Line 1084  if test "x${TOOLSDIR}" = x ; then
1084      TOOLSDIR="$ROOTDIR/tools"      TOOLSDIR="$ROOTDIR/tools"
1085  fi  fi
1086  if test ! -d ${TOOLSDIR} ; then  if test ! -d ${TOOLSDIR} ; then
1087      echo "Error: the specified $TOOLSDIR (\"$TOOLSDIR\") does not exist!"      echo "Error: the specified TOOLSDIR (\"$TOOLSDIR\") does not exist!"
1088      exit 1      exit 1
1089  fi  fi
1090  if test "x$S64" = x ; then  if test "x$S64" = x ; then
# Line 956  if test -r $ROOTDIR"/eesupp/src/Makefile Line 1105  if test -r $ROOTDIR"/eesupp/src/Makefile
1105          rm -f make_eesupp.errors          rm -f make_eesupp.errors
1106      else      else
1107          echo "Error: problem encountered while building source files in eesupp:"          echo "Error: problem encountered while building source files in eesupp:"
1108          cat make_eesupp.errors          cat make_eesupp.errors 1>&2
1109          exit 1          exit 1
1110      fi      fi
1111  fi  fi
1112    
1113    #same for exch2
1114    if test -r $ROOTDIR"/pkg/exch2/Makefile" ; then
1115        echo "  Making source files in exch2 from  templates"
1116        ( cd $ROOTDIR"/pkg/exch2/" && $MAKE ) > make_exch2.errors 2>&1
1117        RETVAL=$?
1118        if test "x${RETVAL}" = x0 ; then
1119            rm -f make_exch2.errors
1120        else
1121            echo "Error: problem encountered while building source files in exch2:"
1122            cat make_exch2.errors 1>&2
1123            exit 1
1124        fi
1125    fi
1126    
1127  printf "\n===  Determining package settings  ===\n"  printf "\n===  Determining package settings  ===\n"
1128  if  test "x${PDEPEND}" = x ; then  if  test "x${PDEPEND}" = x ; then
1129      tmp=$ROOTDIR"/pkg/pkg_depend"      tmp=$ROOTDIR"/pkg/pkg_depend"
# Line 1016  else Line 1179  else
1179          def=`cat $PDEFAULT | sed -e 's/#.*$//g' | $AWK '(NF>0){print $0}'`          def=`cat $PDEFAULT | sed -e 's/#.*$//g' | $AWK '(NF>0){print $0}'`
1180          RETVAL=$?          RETVAL=$?
1181          if test "x${RETVAL}" != x0 ; then          if test "x${RETVAL}" != x0 ; then
1182              echo -n "Error: can't parse default package list "              printf "Error: can't parse default package list "
1183              echo "-- please check PDEFAULT=\"$PDEFAULT\""              echo "-- please check PDEFAULT=\"$PDEFAULT\""
1184              exit 1              exit 1
1185          fi          fi
# Line 1144  for i in $PACKAGES ; do Line 1307  for i in $PACKAGES ; do
1307      fi      fi
1308  done  done
1309    
1310    #  Build MNC templates and check for ability to build and use NetCDF
1311    echo $PACKAGES | grep ' mnc ' > /dev/null 2>&1
1312    RETVAL=$?
1313    if test "x$RETVAL" = x0 ; then
1314        ( cd $ROOTDIR"/pkg/mnc" && $MAKE templates ) > make_mnc.errors 2>&1
1315        RETVAL=$?
1316        if test "x${RETVAL}" = x0 ; then
1317            rm -f make_mnc.errors
1318        else
1319            echo "Error: problem encountered while building source files in pkg/mnc:"
1320            cat make_mnc.errors 1>&2
1321            exit 1
1322        fi
1323        if test "x$HAVE_NETCDF" != xt ; then
1324            cat <<EOF
1325    
1326    WARNING: the "mnc" package has been enabled but tests failed to
1327      compile and/or execute NetCDF applications.  Please check that:
1328    
1329      1) NetCDF is installed for your compiler and
1330      2) the LIBS variable (within the 'optfile") specifies the correct
1331           NetCDF library to link against.
1332      
1333    EOF
1334        fi
1335    fi
1336    
1337  # Create a list of #define and #undef to enable/disable packages  # Create a list of #define and #undef to enable/disable packages
1338  PACKAGES_DOT_H=PACKAGES_CONFIG.h  PACKAGES_DOT_H=PACKAGES_CONFIG.h
# Line 1178  for i in $PACKAGES ; do Line 1367  for i in $PACKAGES ; do
1367  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
1368      case $i in      case $i in
1369          aim_v23)          aim_v23)
             DEFINES="$DEFINES -DALLOW_AIM"  
1370              ENABLED_PACKAGES="$ENABLED_PACKAGES -DALLOW_AIM"              ENABLED_PACKAGES="$ENABLED_PACKAGES -DALLOW_AIM"
1371              echo "Warning: ALLOW_AIM is set to enable aim_v23. This is REALLY ugly Jean-Michel :-)"              echo "Warning: ALLOW_AIM is set to enable aim_v23."
1372              ;;              ;;
1373      esac      esac
1374  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
# Line 1189  done Line 1377  done
1377    
1378  echo "  Adding STANDARDDIRS"  echo "  Adding STANDARDDIRS"
1379  BUILDDIR=${BUILDDIR:-.}  BUILDDIR=${BUILDDIR:-.}
1380  if test "x$STANDARDDIRS" = x ; then  if test "x$STANDARDDIRS" = xUSE_THE_DEFAULT ; then
1381      STANDARDDIRS="eesupp model"      STANDARDDIRS="eesupp model"
1382  fi  fi
1383  for d in $STANDARDDIRS ; do  if test "x$STANDARDDIRS" != x ; then
1384      adr="$ROOTDIR/$d/src"      for d in $STANDARDDIRS ; do
1385      if test ! -d $adr ; then          adr="$ROOTDIR/$d/src"
1386          echo "Error:  directory $adr not found -- please check that ROOTDIR=\"$ROOTDIR\""          if test ! -d $adr ; then
1387          echo "  is correct and that you correctly specified the STANDARDDIRS option"              echo "Error:  directory $adr not found -- please check that ROOTDIR=\"$ROOTDIR\""
1388          exit 1              echo "  is correct and that you correctly specified the STANDARDDIRS option"
1389      else              exit 1
1390          SOURCEDIRS="$SOURCEDIRS $adr"          else
1391      fi              SOURCEDIRS="$SOURCEDIRS $adr"
1392      adr="$ROOTDIR/$d/inc"          fi
1393      if test ! -d $adr ; then          adr="$ROOTDIR/$d/inc"
1394          echo "Error:  directory $adr not found -- please check that ROOTDIR=\"$ROOTDIR\""          if test ! -d $adr ; then
1395          echo "  is correct and that you correctly specified the STANDARDDIRS option"              echo "Error:  directory $adr not found -- please check that ROOTDIR=\"$ROOTDIR\""
1396          exit 1              echo "  is correct and that you correctly specified the STANDARDDIRS option"
1397      else              exit 1
1398          INCLUDEDIRS="$INCLUDEDIRS $adr"          else
1399      fi              INCLUDEDIRS="$INCLUDEDIRS $adr"
1400  done          fi
1401        done
1402    fi
1403    
1404  echo "  Searching for CPP_OPTIONS.h in order to warn about the presence"  echo "  Searching for *OPTIONS.h files in order to warn about the presence"
1405  echo "    of \"#define ALLOW_PKGNAME\"-type statements:"  echo "    of \"#define \"-type statements that are no longer allowed:"
1406  CPP_OPTIONS=  CPP_OPTIONS=
1407    CPP_EEOPTIONS=
1408  spaths=". $INCLUDEDIRS"  spaths=". $INCLUDEDIRS"
1409    names=`ls -1 "$ROOTDIR/pkg"`
1410  for i in $spaths ; do  for i in $spaths ; do
1411      try="$i/CPP_OPTIONS.h"      try="$i/CPP_OPTIONS.h"
1412      #  echo -n "    trying $try : "      if test -f $try -a -r $try -a "x$CPP_OPTIONS" = x ; then
     if test -f $try -a -r $try ; then  
1413          echo "    found CPP_OPTIONS=\"$try\""          echo "    found CPP_OPTIONS=\"$try\""
1414          CPP_OPTIONS="$try"          CPP_OPTIONS="$try"
1415          break          # New safety test: make sure packages are not mentioned in CPP_OPTIONS.h
1416            for n in $names ; do
1417                test_for_package_in_cpp_options $CPP_OPTIONS $n
1418            done
1419        fi
1420        try="$i/CPP_EEOPTIONS.h"
1421        if test -f $try -a -r $try -a "x$CPP_EEOPTIONS" = x ; then
1422            echo "    found CPP_EEOPTIONS=\"$try\""
1423            # New safety test: make sure MPI is not determined by CPP_EEOPTIONS.h
1424    #**** not yet enabled ****
1425    #        test_for_mpi_in_cpp_eeoptions $try
1426    #**** not yet enabled ****
1427            CPP_EEOPTIONS="$try"
1428      fi      fi
1429  done  done
1430  if test "x$CPP_OPTIONS" = x ; then  if test "x$CPP_OPTIONS" = x ; then
1431      echo "Error: can't find \"CPP_OPTIONS.h\" in the path list: $spaths"      echo "Error: can't find \"CPP_OPTIONS.h\" in the path list: $spaths"
1432      exit 1      exit 1
1433  fi  fi
 # New safety test: make sure packages are not mentioned in CPP_OPTIONS.h  
 names=`ls -1 "$ROOTDIR/pkg"`  
 for n in $names ; do  
     test_for_package_in_cpp_options $CPP_OPTIONS $n  
 done  
   
1434    
1435  #  Here, we build the list of files to be "run through" the adjoint  #  Here, we build the list of files to be "run through" the adjoint
1436  #  compiler.  #  compiler.
# Line 1248  for i in $SOURCEDIRS ; do Line 1445  for i in $SOURCEDIRS ; do
1445      done      done
1446  done  done
1447    
1448    
1449  echo  echo
1450  echo "===  Creating the Makefile  ==="  echo "===  Creating the Makefile  ==="
1451  echo "  setting INCLUDES"  echo "  setting INCLUDES"
# Line 1264  rm -rf .links.tmp Line 1462  rm -rf .links.tmp
1462  mkdir .links.tmp  mkdir .links.tmp
1463  echo "# This section creates symbolic links" > srclinks.tmp  echo "# This section creates symbolic links" > srclinks.tmp
1464  echo "" >> srclinks.tmp  echo "" >> srclinks.tmp
1465  echo -n 'SRCFILES = '    > srclist.inc  printf 'SRCFILES = '    > srclist.inc
1466  echo -n 'CSRCFILES = '   > csrclist.inc  printf 'CSRCFILES = '   > csrclist.inc
1467  echo -n 'F90SRCFILES = ' > f90srclist.inc  printf 'F90SRCFILES = ' > f90srclist.inc
1468  echo -n 'HEADERFILES = ' > hlist.inc  printf 'HEADERFILES = ' > hlist.inc
1469  echo -n 'AD_FLOW_FILES = ' > ad_flow_files.inc  printf 'AD_FLOW_FILES = ' > ad_flow_files.inc
1470  alldirs="$SOURCEDIRS $INCLUDEDIRS ."  alldirs="$SOURCEDIRS $INCLUDEDIRS ."
1471  for d in $alldirs ; do  for d in $alldirs ; do
1472      deplist=      deplist=
# Line 1293  for d in $alldirs ; do Line 1491  for d in $alldirs ; do
1491                  case $extn in                  case $extn in
1492                      F)                      F)
1493                          echo    " \\"  >> srclist.inc                          echo    " \\"  >> srclist.inc
1494                          echo -n " $sf" >> srclist.inc                          printf " $sf" >> srclist.inc
1495                          ;;                          ;;
1496                      F90)                      F90)
1497                          echo    " \\"  >> f90srclist.inc                          echo    " \\"  >> f90srclist.inc
1498                          echo -n " $sf" >> f90srclist.inc                          printf " $sf" >> f90srclist.inc
1499                          ;;                          ;;
1500                      c)                      c)
1501                          echo    " \\"  >> csrclist.inc                          echo    " \\"  >> csrclist.inc
1502                          echo -n " $sf" >> csrclist.inc                          printf " $sf" >> csrclist.inc
1503                          ;;                          ;;
1504                      h)                      h)
1505                          echo    " \\"  >> hlist.inc                          echo    " \\"  >> hlist.inc
1506                          echo -n " $sf" >> hlist.inc                          printf " $sf" >> hlist.inc
1507                          ;;                          ;;
1508                      flow)                      flow)
1509                          echo    " \\"  >> ad_flow_files.inc                          echo    " \\"  >> ad_flow_files.inc
1510                          echo -n " $sf" >> ad_flow_files.inc                          printf " $sf" >> ad_flow_files.inc
1511                          ;;                          ;;
1512                  esac                  esac
1513              fi              fi
# Line 1347  EXE_FTL=$EXECUTABLE"_ftl" Line 1545  EXE_FTL=$EXECUTABLE"_ftl"
1545  EXE_SVD=$EXECUTABLE"_svd"  EXE_SVD=$EXECUTABLE"_svd"
1546    
1547  cat >>$MAKEFILE <<EOF  cat >>$MAKEFILE <<EOF
1548    #
1549    # OPTFILE="$OPTFILE"
1550  #  #
1551  # BUILDDIR     : Directory where object files are written  # BUILDDIR     : Directory where object files are written
1552  # SOURCEDIRS   : Directories containing the source (.F) files  # SOURCEDIRS   : Directories containing the source (.F) files
# Line 1383  EXE_SVD     = ${EXE_SVD} Line 1583  EXE_SVD     = ${EXE_SVD}
1583  ENABLED_PACKAGES = ${ENABLED_PACKAGES}  ENABLED_PACKAGES = ${ENABLED_PACKAGES}
1584  DISABLED_PACKAGES = ${DISABLED_PACKAGES}  DISABLED_PACKAGES = ${DISABLED_PACKAGES}
1585    
1586    # These files are created by Makefile
1587    SPECIAL_FILES = ${PACKAGES_DOT_H} AD_CONFIG.h FC_NAMEMANGLE.h
1588    
1589  EOF  EOF
1590    
1591  #  Note: figure out some way to add Hyades JAM libraries here  #  Note: figure out some way to add Hyades JAM libraries here
# Line 1401  FC = ${FC} Line 1604  FC = ${FC}
1604  # Fortran compiler  # Fortran compiler
1605  F90C = ${F90C}  F90C = ${F90C}
1606  # Link editor  # Link editor
1607  LINK = ${LINK}  LINK = ${LINK} ${LDADD}
1608    
1609  # Defines for CPP  # Defines for CPP
1610  DEFINES = ${DEFINES}  DEFINES = ${DEFINES}
# Line 1447  cat >>$MAKEFILE <<EOF Line 1650  cat >>$MAKEFILE <<EOF
1650  .SUFFIXES: .o .f .p .F .c .F90 .f90  .SUFFIXES: .o .f .p .F .c .F90 .f90
1651    
1652  all: \$(EXECUTABLE)  all: \$(EXECUTABLE)
1653  \$(EXECUTABLE): links \$(OBJFILES)  \$(EXECUTABLE): \$(SPECIAL_FILES) \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(OBJFILES)
1654          @echo Creating \$@ ...          @echo Creating \$@ ...
1655          \$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) \$(LIBS)          \$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) \$(LIBS)
1656  depend:  depend:
1657          @make links          @make links
1658          \$(MAKEDEPEND) -o .f \$(DEFINES) \$(INCLUDES) \$(SRCFILES)          \$(MAKEDEPEND) -o .f \$(DEFINES) \$(INCLUDES) \$(SRCFILES)
1659          \$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)          \$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
1660            -rm -f makedepend.out
1661    
1662  links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) ${PACKAGES_DOT_H} AD_CONFIG.h  links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES)
1663    
1664  small_f: \$(F77FILES) \$(F90FILES)  small_f: \$(F77FILES) \$(F90FILES)
1665    
# Line 1468  clean: Line 1672  clean:
1672  Clean:  Clean:
1673          @make clean          @make clean
1674          @make cleanlinks          @make cleanlinks
1675          -rm -f ${PACKAGES_DOT_H} AD_CONFIG.h          -rm -f \$(SPECIAL_FILES)
1676          -rm -f Makefile.bak genmake_state genmake_*optfile genmake_warnings make.log          -rm -f genmake_state genmake_*optfile genmake_warnings make.log run.log *.bak
1677  CLEAN:  CLEAN:
1678          @make Clean          @make Clean
1679          -find \$(EXEDIR) -name "*.meta" -exec rm {} \;          -find \$(EXEDIR) -name "*.meta" -exec rm {} \;
# Line 1483  makefile: Line 1687  makefile:
1687  cleanlinks:  cleanlinks:
1688          -find . -type l -exec rm {} \;          -find . -type l -exec rm {} \;
1689    
1690  # Special targets  # Special targets ($SPECIAL_FILES) which are create by make
1691  ${PACKAGES_DOT_H}:  ${PACKAGES_DOT_H}:
1692          @echo Creating \$@ ...          @echo Creating \$@ ...
1693          @\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" \$(DISABLED_PACKAGES) " " "Enabled packages:" \$(ENABLED_PACKAGES) > \$@          @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" \$(DISABLED_PACKAGES) " " "Enabled packages:" \$(ENABLED_PACKAGES) > \$@
1694  AD_CONFIG.h:  AD_CONFIG.h:
1695          @echo Creating \$@ ...          @echo Creating \$@ ...
1696          @\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > \$@          @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > \$@
1697    FC_NAMEMANGLE.h:
1698            @echo Creating \$@ ...
1699            echo "$FC_NAMEMANGLE" > \$@
1700    
1701  # The normal chain of rules is (  .F - .f - .o  )  # The normal chain of rules is (  .F - .f - .o  )
1702  .F.f:  .F.f:
# Line 1533  done Line 1740  done
1740    
1741  echo "  Add the source list for AD code generation"  echo "  Add the source list for AD code generation"
1742  echo >> $MAKEFILE  echo >> $MAKEFILE
1743  echo -n "AD_FILES = " >> $MAKEFILE  printf "AD_FILES = " >> $MAKEFILE
1744  AD_FILES=`cat ad_files`  AD_FILES=`cat ad_files`
1745  for i in $AD_FILES ; do  for i in $AD_FILES ; do
1746      echo    " \\" >> $MAKEFILE      echo    " \\" >> $MAKEFILE
1747      echo -n " $i" >> $MAKEFILE      printf " $i" >> $MAKEFILE
1748  done  done
1749  echo >> $MAKEFILE  echo >> $MAKEFILE
1750  rm -f ad_files  rm -f ad_files
# Line 1550  adtaf: ad_taf_output.f Line 1757  adtaf: ad_taf_output.f
1757  adtamc: ad_tamc_output.f  adtamc: ad_tamc_output.f
1758    
1759  ad_input_code.f: \$(AD_FILES) \$(HEADERFILES)  ad_input_code.f: \$(AD_FILES) \$(HEADERFILES)
1760          @\$(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          @$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
1761          cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h          cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
1762          -rm -f ad_config.template          -rm -f ad_config.template
1763          @make \$(F77FILES)          @make \$(F77FILES)
# Line 1582  ftltaf: ftl_taf_output.f Line 1789  ftltaf: ftl_taf_output.f
1789  ftltamc: ftl_tamc_output.f  ftltamc: ftl_tamc_output.f
1790    
1791  ftl_input_code.f: \$(AD_FILES) \$(HEADERFILES)  ftl_input_code.f: \$(AD_FILES) \$(HEADERFILES)
1792          @\$(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          @$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
1793          cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h          cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
1794          -rm -f ftl_config.template          -rm -f ftl_config.template
1795          @make \$(F77FILES)          @make \$(F77FILES)
# Line 1655  printf "\n\n# DO NOT DELETE\n" >> $MAKEF Line 1862  printf "\n\n# DO NOT DELETE\n" >> $MAKEF
1862  printf "\n===  Done  ===\n"  printf "\n===  Done  ===\n"
1863    
1864  # Create special header files  # Create special header files
1865  $TOOLSDIR/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" $DISABLED_PACKAGES " " "Enabled packages:" $ENABLED_PACKAGES > $PACKAGES_DOT_H".tmp"  $BASH $TOOLSDIR/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" $DISABLED_PACKAGES " " "Enabled packages:" $ENABLED_PACKAGES > $PACKAGES_DOT_H".tmp"
1866  if test ! -f $PACKAGES_DOT_H ; then  if test ! -f $PACKAGES_DOT_H ; then
1867      mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H      mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
1868  else  else
1869      cmp $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H      cmp $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H > /dev/null 2>&1
1870      RETVAL=$?      RETVAL=$?
1871      if test "x$RETVAL" = x0 ; then      if test "x$RETVAL" = x0 ; then
1872          rm -f $PACKAGES_DOT_H".tmp"          rm -f $PACKAGES_DOT_H".tmp"
# Line 1669  else Line 1876  else
1876      fi      fi
1877  fi  fi
1878  if test ! -f AD_CONFIG.h ; then  if test ! -f AD_CONFIG.h ; then
1879      $TOOLSDIR/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > AD_CONFIG.h      $BASH $TOOLSDIR/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > AD_CONFIG.h
1880  fi  fi
1881    
1882    
1883  #  Write the "state" for future records  #  Write the "state" for future records
1884  if test "x$DUMPSTATE" != xf ; then  if test "x$DUMPSTATE" != xf ; then
1885      echo -n "" > genmake_state      printf "" > genmake_state
1886      for i in $gm_state ; do      for i in $gm_state ; do
1887          t1="t2=\$$i"          t1="t2=\$$i"
1888          eval $t1          eval $t1

Legend:
Removed from v.1.50  
changed lines
  Added in v.1.72

  ViewVC Help
Powered by ViewVC 1.1.22