/[MITgcm]/MITgcm/tools/genmake2

Diff of /MITgcm/tools/genmake2

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

-revision 1.8 by edhill,
Tue Sep 23 15:53:02 2003 UTC
+revision 1.11.2.6 by edhill,
Thu Oct  2 14:42:04 2003 UTC
 Line 8
  #   modified by aja 01/00
  #   rewritten in bash by eh3 08/03
+ # Search for particular CPP #cmds associated with packages
+ # usage: test_for_package_in_cpp_options CPP_file package_name
+ test_for_package_in_cpp_options() {
+     cpp_options=$1
+     pkg=$2
+     grep -i "#define.*ALLOW_$pkg" $cpp_options > /dev/null 2>&1
+     RETVAL=$?
+     if test "x${RETVAL}" = x0 ; then
+         echo "Error: In $cpp_options there is an illegal line: #define ALLOW_$pkg"
+         exit 99
+     fi
+     grep -i "#undef.*ALLOW_$pkg" $cpp_options > /dev/null 2>&1
+     RETVAL=$?
+     if test "x${RETVAL}" = x0 ; then
+         echo "Error: In $cpp_options there is an illegal line: #undef ALLOW_$pkg"
+         exit 99
+     fi
+     grep -i "#define.*DISABLE_$pkg" $cpp_options > /dev/null 2>&1
+     RETVAL=$?
+     if test "x${RETVAL}" = x0 ; then
+         echo "Error: In $cpp_options there is an illegal line: #define DISABLE_$pkg"
+         exit 99
+     fi
+     grep -i "#undef.*DISABLE_$pkg" $cpp_options > /dev/null 2>&1
+     RETVAL=$?
+     if test "x${RETVAL}" = x0 ; then
+         echo "Error: In $cpp_options there is an illegal line: #undef DISABLE_$pkg"
+         exit 99
+    fi
+ }
+ # Read the $ROOTDIR/pkg/pkg_groups file and expand any references to
+ # the package list.
+ expand_pkg_groups() {
+     new_packages=
+     PKG_GROUPS=$ROOTDIR"/pkg/pkg_groups"
+     if test -r $PKG_GROUPS ; then
+         cat $PKG_GROUPS | sed -e 's/#.*$//g' | sed -e 's/:/ : /g' > ./p1.tmp
+         cat ./p1.tmp | awk '(NF>2 && $2==":"){ print $0 }' > ./p2.tmp
+         matched=0
+         for i in $PACKAGES ; do
+             line=`grep $i ./p2.tmp`
+             RETVAL=$?
+             if test "x$RETVAL" = x0 ; then
+                 matched=1
+                 replace=`echo $line | awk '{ $1=""; $2=""; print $0 }'`
+                 echo "    replacing \"$i\" with: $replace"
+                 new_packages="$new_packages $replace"
+             else
+                 new_packages="$new_packages $i"
+             fi
+         done
+         PACKAGES=$new_packages
+         rm -f ./p[1,2].tmp
+     else
+         echo "Warning: can't read package groups definition file: $PKG_GROUPS"
+     fi
+ }
  # Guess possible config options for this host
  find_possible_configs()  {
-     p_PLATFORM=`uname`"-"`uname -m`
+     tmp1=`uname`"_"`uname -m`
-     echo "The platform appears to be:"
+     tmp2=`echo $tmp1 | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-     echo "  "$p_PLATFORM
+     PLATFORM=`echo $tmp2 | sed -e 's/i[3-6]86/ia32/'`
+     OFLIST=`(cd $ROOTDIR/tools/build_options; ls | grep "^$PLATFORM")`
-     p_LN=
+     echo "  The platform appears to be:  $PLATFORM"
+ #     if test "x$OFLIST" = x ; then
+ #       echo "  No pre-defined options files were found matching this platform"
+ #       echo "  but examples for other platforms can be found in:"
+ #       echo "    $ROOTDIR/tools/build_options"
+ #     else
+ #       echo "  Options files (located in $ROOTDIR/tools/build_options) that"
+ #       echo "  may work with this machine are:"
+ #       for i in $OFLIST ; do
+ #           echo "    $i"
+ #       done
+ #     fi
      echo "test" > test
      ln -s ./test link
      RETVAL=$?
      if test "x${RETVAL}" = x0 ; then
-         p_LN="ln -s"
+         LN="ln -s"
+     else
+         echo "Error: \"ln -s\" does not appear to work on this system!"
+         echo "  For help, please contact <MITgcm-support@mitgcm.org>."
+         exit 1
      fi
      rm -f test link
-     p_CPP=`which cpp`
+     if test "x$CPP" = x ; then
+         CPP="cpp -traditional -P"
-     RETVAL=$?
-     if test "x${RETVAL}" = x0 ; then
-         p_LN="ln -s"
      fi
-     rm -f test link
      # look for possible fortran compilers
+     tmp="$MITGCM_FC $FC g77 f77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95"
      p_FC=
-     for c in f77 g77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95 ; do
+     for c in $tmp ; do
-         which $c > /dev/null 2>&1
+         rm -f ./hello.f ./hello
+         cat >> hello.f <<EOF
+       program hello
+       do i=1,3
+         print *, 'hello world : ', i
+       enddo
+       end
+ EOF
+         $c -o hello hello.f > /dev/null 2>&1
          RETVAL=$?
          if test "x${RETVAL}" = x0 ; then
              p_FC="$p_FC $c"
          fi
      done
-     echo "Possible FORTRAN compilers appear to be:  "
      if test "x${p_FC}" = x ; then
-         echo "  None found!!!"
+         cat 1>&2 <<EOF
+ Error: No Fortran compilers were found in your path.  Please specify one using:
+) an "optfile" on (eg. "-optfile=path/to/OPTFILE"),
+) a command-line option (eg. "-fc NAME"), or
+) the MITGCM_FC environment variable.
+ EOF
+         exit 1
      else
-         echo "  "$p_FC
+         echo "  The possible FORTRAN compilers found in your path are:"
+         echo "   "$p_FC
+         if test "x$FC" = x ; then
+             FC=`echo $p_FC | awk '{print $1}'`
+         fi
      fi
-     # look for possible MPI libraries
+     for i in $p_FC ; do
-     mpi_libs=
+         p_OF=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i
-     mpi_fort=`which mpif77 2>/dev/null`
+         if test -r $p_OF ; then
-     RETVAL=$?
+             OPTFILE=$p_OF
-     if test "x${RETVAL}" = x0 ; then
+             echo "  The options file:  $p_OF"
-         cat >>test.f <<EOF
+             echo "    appears to match so we'll use it."
-       PROGRAM HELLO
+             break
-       DO 10, I=1,10
-       PRINT *,'Hello World'
-CONTINUE
-       STOP
-       END
- EOF
-         eval "$mpi_fort -showme test.f > out"
-         RETVAL=$?
-         if test "x${RETVAL}" = x0 ; then
-             a=`cat out`
-             for i in $a ; do
-                 case $i in
-                     -*)
-                         mpi_libs="$mpi_libs $i" ;;
-                 esac
-             done
-             echo "The MPI libs appear to be:"
-             echo "  "$mpi_libs
          fi
-         rm -f test.f out
+     done
+     if test "x$OPTFILE" = x ; then
+         cat 1>&2 <<EOF
+ Error: No options file was found in:  $ROOTDIR/tools/build_options/
+   that matches this platform ("$PLATFORM") and the compilers found in
+   your path.  Please specify an "optfile" using:
+) the command line (eg. "-optfile=path/to/OPTFILE"), or
+) the MITGCM_OF environment variable.
+   If you need help, please contact the developers at <MITgcm-support@mitgcm.org>.
+ EOF
+         exit 1
      fi
+ #     # look for possible MPI libraries
+ #     mpi_libs=
+ #     mpi_fort=`which mpif77 2>/dev/null`
+ #     RETVAL=$?
+ #     if test "x${RETVAL}" = x0 ; then
+ #       cat >>test.f <<EOF
+ #       PROGRAM HELLO
+ #       DO 10, I=1,10
+ #       PRINT *,'Hello World'
+ #    10 CONTINUE
+ #       STOP
+ #       END
+ # EOF
+ #       eval "$mpi_fort -showme test.f > out"
+ #       RETVAL=$?
+ #       if test "x${RETVAL}" = x0 ; then
+ #           a=`cat out`
+ #           for i in $a ; do
+ #               case $i in
+ #                   -*)
+ #                       mpi_libs="$mpi_libs $i" ;;
+ #               esac
+ #           done
+ #           echo "The MPI libs appear to be:"
+ #           echo "  "$mpi_libs
+ #       fi
+ #       rm -f test.f out
+ #     fi
  }
-Line 172 
 S64=
+Line 288 
 S64=
  KPP=
  FC=
  LINK=
+ DEFINES="-DWORDLENGTH=4"
  PACKAGES=
  ENABLE=
  DISABLE=
  MAKEFILE=
  MAKEDEPEND=
  PDEPEND=
- DUMPSTATE=f
+ DUMPSTATE=t
  PDEFAULT=
  OPTFILE=
  INCLUDES="-I."
-Line 361 
 for ac_option ; do
+Line 478 
 for ac_option ; do
  done
+ if test "x${ROOTDIR}" = x ; then
+     if test "${PWD##/*/}" = "bin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
+         ROOTDIR=".."
+     else
+         for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do
+             if [ -d "$d/model" -a -d "$d/eesupp" -a -d "$d/pkg" ]; then
+                 ROOTDIR=$d
+                 echo -n "Warning:  ROOTDIR was not specified but there appears to be"
+                 echo " a copy of MITgcm at \"$ROOTDIR\" so we'll try it."
+                 break
+             fi
+         done
+     fi
+ fi
+ if test "x${ROOTDIR}" = x ; then
+     echo "Error: Cannot determine ROOTDIR for MITgcm code."
+     echo "  Please specify a ROOTDIR using either an options "
+     echo "  file or a command-line option."
+     exit 1
+ fi
+ if test ! -d ${ROOTDIR} ; then
+     echo "Error: the specified ROOTDIR (\"$ROOTDIR\") does not exist!"
+     exit 1
+ fi
  echo "  getting OPTFILE information:  "
  if test "x${OPTFILE}" = x ; then
-     echo "Warning: no OPTFILE specified so we'll look for possible settings"
+     if test "x$MITGCM_OF" = x ; then
-     printf "\n===  Searching for possible settings for OPTFILE  ===\n"
+         echo "Warning: no OPTFILE specified so we'll look for possible settings"
-     find_possible_configs
+         printf "\n===  Searching for possible settings for OPTFILE  ===\n"
- else
+         find_possible_configs
-     if test "x$OPTFILE" = xNONE ; then
-         echo "    OPTFILE=NONE so we'll try to use default settings"
      else
-         if test -f "$OPTFILE" -a -r "$OPTFILE" ; then
+         OPTFILE=$MITGCM_OF
-             echo "    using OPTFILE=\"$OPTFILE\""
+     fi
-             source "$OPTFILE"
+ fi
-             RETVAL=$?
+ if test "x$OPTFILE" != xNONE ; then
-             if test "x$RETVAL" != x0 ; then
+     if test -f "$OPTFILE" -a -r "$OPTFILE" ; then
-                 echo -n "Error: failed to source OPTFILE \"$OPTFILE\""
+         echo "    using OPTFILE=\"$OPTFILE\""
-                 echo "--please check that variable syntax is bash-compatible"
+         source "$OPTFILE"
-                 exit 1
+         RETVAL=$?
-             fi
+         if test "x$RETVAL" != x0 ; then
-             if test "x$DUMPSTATE" != xf ; then
+             echo -n "Error: failed to source OPTFILE \"$OPTFILE\""
-                 cp -f $OPTFILE "gm_optfile"
+             echo "--please check that variable syntax is bash-compatible"
-             fi
-         else
-             echo "Error: can't read OPTFILE=\"$OPTFILE\""
              exit 1
          fi
+         if test "x$DUMPSTATE" != xf ; then
+             cp -f $OPTFILE "gm_optfile"
+         fi
+     else
+         echo "Error: can't read OPTFILE=\"$OPTFILE\""
+         exit 1
      fi
  fi
-Line 405 
 if test "x$LINK" = x ; then
+Line 548 
 if test "x$LINK" = x ; then
      LINK=$FC
  fi
  if test "x$CPP" = x ; then
+     CPP="cpp"
+ fi
+ echo "#define A a" | cpp > test_cpp 2>&1
+ RETVAL=$?
+ if test "x$RETVAL" != x0 ; then
      cat <<EOF 1>&2
- Error: no C pre-processor: please specify using one of the following:
+ Error: C pre-processor "$CPP" failed the test case: please specify using:
 ) within the options file ("CPP=...") as specified by "-of=OPTFILE"
 ) the "./gm_local" file
- EOF
-     exit 1
- fi
- if test "x$S64" = x ; then
-     cat <<EOF 1>&2
- Error: no C pre-processor: please specify using one of the following:
-) within the options file ("S64=...") as specified by "-of=OPTFILE"
-) the "./gm_local" file
  EOF
      exit 1
+ else
+     rm -f test_cpp
+ fi
+ if test "x$MAKEDEPEND" = x ; then
+     MAKEDEPEND=makedepend
  fi
  printf "\n===  Setting defaults  ===\n"
  echo -n "  Adding MODS directories:  "
-Line 446 
 if test "x${PLATFORM}" = x ; then
+Line 591 
 if test "x${PLATFORM}" = x ; then
      PLATFORM=$p_PLATFORM
  fi
- if test "x${ROOTDIR}" = x ; then
-     if test "${PWD##/*/}" = "bin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
-         ROOTDIR=".."
-     else
-         for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do
-             if [ -d "$d/model" -a -d "$d/eesupp" -a -d "$d/pkg" ]; then
-                 ROOTDIR=$d
-                 echo -n "Warning:  ROOTDIR was not specified but there appears to be"
-                 echo " a copy of MITgcm at \"$ROOTDIR\" so we'll try it."
-                 break
-             fi
-         done
-     fi
- fi
- if test "x${ROOTDIR}" = x ; then
-     echo "Error: Cannot determine ROOTDIR for MITgcm code."
-     echo "  Please specify a ROOTDIR using either an options "
-     echo "  file or a command-line option."
-     exit 1
- fi
- if test ! -d ${ROOTDIR} ; then
-     echo "Error: the specified ROOTDIR (\"$ROOTDIR\") does not exist!"
-     exit 1
- fi
  if test "x${EXEDIR}" = x ; then
      if test "${PWD##/*/}" = "bin" -a -d ../exe -a $ROOTDIR = .. ; then
          EXEDIR=../exe
-Line 490 
 if test ! -d ${TOOLSDIR} ; then
+Line 610 
 if test ! -d ${TOOLSDIR} ; then
      echo "Error: the specified $TOOLSDIR (\"$TOOLSDIR\") does not exist!"
      exit 1
  fi
+ if test "x$S64" = x ; then
+     S64='$(TOOLSDIR)/set64bitConst.sh'
+ fi
  EXECUTABLE=${EXECUTABLE:-mitgcmuv}
-Line 538 
 fi
+Line 661 
 fi
  source ./.pd_tmp
  rm -f ./.pd_tmp
+ #  Search for default packages.  Note that a "$ROOTDIR/pkg/pkg_groups"
+ #  file should eventually be added so that, for convenience, one can
+ #  specify groups of packages using names like "ocean" and "atmosphere".
  echo  -n "  checking default package list:  "
  if test "x${PDEFAULT}" = x ; then
+     for i in "." $MODS ; do
+         if test -r $i"/packages.conf" ; then
+                 PDEFAULT=$i"/packages.conf"
+                 break
+         fi
+     done
+ fi
+ if test "x${PDEFAULT}" = x ; then
      PDEFAULT="$ROOTDIR/pkg/pkg_default"
  fi
  if test "x${PDEFAULT}" = xNONE ; then
-Line 561 
 else
+Line 695 
 else
          for i in $def ; do
              PACKAGES="$PACKAGES $i"
          done
-         echo "    packages are:  $PACKAGES"
+         echo "    before group expansion packages are: $PACKAGES"
+         expand_pkg_groups
+         echo "    after group expansion packages are:  $PACKAGES"
      fi
  fi
-Line 580 
 for p in $PACKAGES ; do
+Line 716 
 for p in $PACKAGES ; do
  done
  PACKAGES="$pack"
  echo "  applying ENABLE settings"
- rm -f ./.tmp_pack
+ echo "" > ./.tmp_pack
  PACKAGES="$PACKAGES $ENABLE"
  for i in $PACKAGES ; do
      if test ! -d "$ROOTDIR/pkg/$i" ; then
-Line 696 
 done
+Line 832 
 done
  # done
  # echo
- echo "  Setting package-specific CPP flags in CPP_OPTIONS.h:"
+ # Create a list of #define and #undef to enable/disable packages
- CPP_OPTIONS=
+ PACKAGES_DOT_H=PACKAGES.h
- spaths="$SOURCEDIRS"
+ cat <<EOF >$PACKAGES_DOT_H".tmp"
- for i in $spaths ; do
-     try="$i/CPP_OPTIONS.h"
-     #  echo -n "    trying $try : "
-     if test -f $try -a -r $try ; then
-         echo "    found CPP_OPTIONS=\"$try\""
-         CPP_OPTIONS="$try"
-         if test "x$i" != "x." ; then
-             cp -f $CPP_OPTIONS .
-         fi
-         break
-     fi
- done
- if test "x$CPP_OPTIONS" = x ; then
-     echo "Error: can't find \"CPP_OPTIONS.h\" in the path list: $spaths"
-     exit 1
- fi
- if test -e CPP_OPTIONS.h ; then
-     if test ! -e CPP_OPTIONS.h.bak ; then
-         cp -f CPP_OPTIONS.h CPP_OPTIONS.h.bak
-     fi
-     cat CPP_OPTIONS.h \
-         | awk 'BEGIN{p=1;} ($1=="C===" && $2=="GENMAKE"){p=0;} {if (p==1) print $0}' \
-         > CPP_OPTIONS.h.tmp
- fi
- cat <<EOF >>CPP_OPTIONS.h.tmp
  C=== GENMAKE v2 ===
- C  The following defines have been set by GENMAKE, so please edit
+ C  The following defines have been set by GENMAKE, so please do not
- C  them only if you know what you're doing.  In general, you should
+ C  edit anything below these comments.  In general, you should
  C  add or remove packages by re-running genmake with different
  C  "-enable" and/or "-disable" options.
+ #ifndef PACKAGES_H
+ #define PACKAGES_H
  C  Packages disabled by genmake:
  EOF
  #  The following UGLY HACK sets multiple "#undef"s and it needs to go
-Line 749 
 for n in $names ; do
+Line 863 
 for n in $names ; do
          done
          if test "x$has_pack" = xf ; then
              undef=`echo "ALLOW_$n" | awk '{print toupper($0)}'`
-             echo "#undef $undef" >> CPP_OPTIONS.h.tmp
+             echo "#undef $undef" >> $PACKAGES_DOT_H".tmp"
+ #           DEFINES="$DEFINES -U$undef"
  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
              case $n in
-Line 759 
 for n in $names ; do
+Line 874 
 for n in $names ; do
                  mom_vecinv)
                      DEFINES="$DEFINES -DDISABLE_MOM_VECINV"
                      ;;
-                 generic_advdiff)
-                     DEFINES="$DEFINES -DDISABLE_GENERIC_ADVDIFF"
-                     ;;
                  debug)
                      DEFINES="$DEFINES -DDISABLE_DEBUGMODE"
                      ;;
-Line 771 
 for n in $names ; do
+Line 883 
 for n in $names ; do
          fi
      fi
  done
- cat <<EOF >>CPP_OPTIONS.h.tmp
+ cat <<EOF >>$PACKAGES_DOT_H".tmp"
  C  Packages enabled by genmake:
  EOF
  for i in $PACKAGES ; do
      def=`echo "ALLOW_$i" | awk '{print toupper($0)}'`
-     echo "#define $def" >> CPP_OPTIONS.h.tmp
+     echo "#define $def" >> $PACKAGES_DOT_H".tmp"
+ #eh3 DEFINES="$DEFINES -D$def"
  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
      case $i in
          aim_v23)
-             echo "#define   ALLOW_AIM" >> CPP_OPTIONS.h.tmp
+             echo "#define   ALLOW_AIM" >> $PACKAGES_DOT_H".tmp"
+             DEFINES="$DEFINES -DALLOW_AIM"
+             echo "Warning: ALLOW_AIM is set to enable aim_v23. This is REALLY ugly Jean-Michel :-)"
              ;;
      esac
  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
  done
- mv -f CPP_OPTIONS.h.tmp CPP_OPTIONS.h
+ cat <<EOF >>$PACKAGES_DOT_H".tmp"
+ #endif /* PACKAGES_H */
+ EOF
+ if test ! -f $PACKAGES_DOT_H ; then
+     mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
+ else
+     cmp $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
+     RETVAL=$?
+     if test "x$RETVAL" = x0 ; then
+         rm -f $PACKAGES_DOT_H".tmp"
+     else
+         mv -f $PACKAGES_DOT_H $PACKAGES_DOT_H".bak"
+         mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
+     fi
+ fi
  echo "  Adding STANDARDDIRS"
  BUILDDIR=${BUILDDIR:-.}
-Line 812 
 for d in $STANDARDDIRS ; do
+Line 943 
 for d in $STANDARDDIRS ; do
      fi
  done
+ echo " Searching for CPP_OPTIONS.h in order to warn about the presence"
+ echo " of \"#define ALLOW_PKGNAME\"-type statements:"
+ CPP_OPTIONS=
+ spaths=". $INCLUDEDIRS"
+ for i in $spaths ; do
+     try="$i/CPP_OPTIONS.h"
+     #  echo -n "    trying $try : "
+     if test -f $try -a -r $try ; then
+         echo "    found CPP_OPTIONS=\"$try\""
+         CPP_OPTIONS="$try"
+         break
+     fi
+ done
+ if test "x$CPP_OPTIONS" = x ; then
+     echo "Error: can't find \"CPP_OPTIONS.h\" in the path list: $spaths"
+     exit 1
+ 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
  echo
  echo "===  Creating the Makefile  ==="
  echo "  setting INCLUDES"
  for i in $INCLUDEDIRS ; do
-     if test -d $i ; then
+     if ! test -d $i ; then
-         INCLUDES="$INCLUDES -I$i"
+ #       INCLUDES="$INCLUDES -I$i"
-     else
+ #   else
          echo "Warning: can't find INCLUDEDIRS=\"$i\""
      fi
  done
-Line 833 
 echo -n 'SRCFILES = '    > srclist.inc
+Line 987 
 echo -n 'SRCFILES = '    > srclist.inc
  echo -n 'CSRCFILES = '   > csrclist.inc
  echo -n 'F90SRCFILES = ' > f90srclist.inc
  echo -n 'HEADERFILES = ' > hlist.inc
- alldirs=". $SOURCEDIRS $INCLUDEDIRS"
+ alldirs="$SOURCEDIRS $INCLUDEDIRS ."
  for d in $alldirs ; do
      deplist=
      sfiles=`( cd $d; echo *.[h,c,F] )`
-Line 999 
 clean:
+Line 1153 
 clean:
  Clean:
          @make clean
          @make cleanlinks
-         -rm -f Makefile.bak
+         -rm -f Makefile.bak gm_state gm_optfile make.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)
+         -rm -f \$(EXECUTABLE) output.txt
  makefile:
          ${0} $@

 Legend:



Removed from v.1.8
 


changed lines


 
Added in v.1.11.2.6
 Legend:



Removed from v.1.8
 


changed lines


 
Added in v.1.11.2.6
-Removed from v.1.8
+Added in v.1.11.2.6

	ViewVC Help
Powered by ViewVC 1.1.22