--- MITgcm/tools/genmake2 2010/05/23 18:34:43 1.206 +++ MITgcm/tools/genmake2 2010/11/02 22:45:07 1.211 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.206 2010/05/23 18:34:43 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.211 2010/11/02 22:45:07 jmc Exp $ # # Makefile generator for MITgcm UV codes # created by cnh 03/98 @@ -56,7 +56,6 @@ # 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 @@ -67,7 +66,7 @@ if test "x$RETVAL" = x0 ; then matched=1 replace=`echo $line | $AWK '{ $1=""; $2=""; print $0 }'` - echo " replacing \"$i\" with: $replace" + echo " replacing \"$i\" with:$replace" new_packages="$new_packages $replace" else new_packages="$new_packages $i" @@ -484,7 +483,7 @@ > ./.pd_tmp RETVAL=$? if test ! "x${RETVAL}" = x0 ; then - echo "Error: unable to parse package dependencies -- please check PDEPEND=\"$1\"" + echo "Error: unable to parse package dependencies -- please check PKG_DEPEND=\"$1\"" exit 1 fi . ./.pd_tmp @@ -519,9 +518,9 @@ -pdepend=NAME | --pdepend=NAME Get package dependency information from "NAME". - -pdefault NAME | --pdefault NAME - -pdefault=NAME | --pdefault=NAME - Get the default package list from "NAME". + -pgroups NAME | --pgroups NAME + -pgroups=NAME | --pgroups=NAME + Get the package groups information from "NAME". -bash NAME Explicitly specify the Bourne or BASH shell to use @@ -657,17 +656,18 @@ if test ! "x$FC_NAMEMANGLE" = x ; then return 0 fi + echo "running: get_fortran_c_namemangling()" >> $LOGFILE default_nm="#define FC_NAMEMANGLE(X) X ## _" cat > genmake_test.c <> genmake_warnings 2>&1 + $MAKE genmake_test.o >> $LOGFILE 2>&1 RETVAL=$? if test "x$RETVAL" != x0 ; then FC_NAMEMANGLE=$default_nm - cat <> genmake_errors + cat <> $LOGFILE WARNING: C test compile fails WARNING: We'll try to use: FC_NAMEMANGLE='$FC_NAMEMANGLE' @@ -679,7 +679,7 @@ RETVAL=$? if test "x$RETVAL" != x0 ; then FC_NAMEMANGLE=$default_nm - cat <> genmake_warnings + cat <> $LOGFILE WARNING: The "nm" command failed. WARNING: We'll try to use: FC_NAMEMANGLE='$FC_NAMEMANGLE' @@ -693,13 +693,13 @@ call tsub( string ) end EOF - $FC $FFLAGS -c genmake_tcomp.$FS >> genmake_warnings 2>&1 + $FC $FFLAGS -c genmake_tcomp.$FS >> $LOGFILE 2>&1 RETVAL=$? if test "x$RETVAL" != x0 ; then FC_NAMEMANGLE=$default_nm - cat <> genmake_warnings + cat <> $LOGFILE -WARNING: FORTRAN test compile fails -- please see "genmake_errors" +WARNING: FORTRAN test compile fails -- please see '$LOGFILE' WARNING: We'll try to use: FC_NAMEMANGLE='$FC_NAMEMANGLE' WARNING: Please contact if you need help here. EOF @@ -709,7 +709,7 @@ RETVAL=$? if test "x$RETVAL" != x0 ; then FC_NAMEMANGLE=$default_nm - cat <> genmake_warnings + cat <> $LOGFILE WARNING: The "nm" command failed. WARNING: We'll try to use: FC_NAMEMANGLE='$FC_NAMEMANGLE' @@ -743,6 +743,8 @@ check_HAVE_CLOC() { + echo >> $LOGFILE + echo "running: check_HAVE_CLOC()" >> $LOGFILE get_fortran_c_namemangling cat < genmake_tc_1.c $FC_NAMEMANGLE @@ -760,8 +762,8 @@ } EOF COMM="$CC $CFLAGS -c genmake_tc_1.c" - echo $COMM >> genmake_warnings - $COMM >> genmake_warnings 2>&1 + echo $COMM >> $LOGFILE + $COMM >> $LOGFILE 2>&1 RET_C=$? cat < genmake_tc_2.$FS program hello @@ -772,10 +774,10 @@ end EOF COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o" - echo $COMM >> genmake_warnings - $COMM >> genmake_warnings 2>&1 + echo $COMM >> $LOGFILE + $COMM >> $LOGFILE 2>&1 RET_F=$? - test -x ./genmake_tc && ./genmake_tc >> genmake_warnings 2>&1 + test -x ./genmake_tc && ./genmake_tc >> $LOGFILE 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_CLOC=t @@ -789,6 +791,8 @@ if test ! "x$HAVE_SIGREG" = x ; then return fi + echo >> $LOGFILE + echo "running: check_HAVE_SIGREG()" >> $LOGFILE get_fortran_c_namemangling cat < genmake_tc_1.c $FC_NAMEMANGLE @@ -821,8 +825,8 @@ } EOF COMM="$CC $CFLAGS -c genmake_tc_1.c" - echo $COMM >> genmake_warnings - $COMM >> genmake_warnings 2>&1 + echo $COMM >> $LOGFILE + $COMM >> $LOGFILE 2>&1 RET_C=$? cat < genmake_tc_2.$FS program hello @@ -832,12 +836,10 @@ call sigreg(anint) end EOF - echo >> genmake_warnings - echo "running: check_HAVE_SIGREG()" >> genmake_warnings - cat genmake_tc_2.$FS >> genmake_warnings + cat genmake_tc_2.$FS >> $LOGFILE COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o" - echo $COMM >> genmake_warnings - $COMM >> genmake_warnings 2>&1 + echo $COMM >> $LOGFILE + $COMM >> $LOGFILE 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_SIGREG=t @@ -855,6 +857,8 @@ if test ! "x$HAVE_SETRLSTK" = x ; then return fi + echo >> $LOGFILE + echo "running: check_HAVE_SETRLSTK()" >> $LOGFILE get_fortran_c_namemangling cat < genmake_tc_1.c $FC_NAMEMANGLE @@ -871,8 +875,8 @@ } EOF COMM="$CC $CFLAGS -c genmake_tc_1.c" - echo $COMM >> genmake_warnings - $COMM >> genmake_warnings 2>&1 + echo $COMM >> $LOGFILE + $COMM >> $LOGFILE 2>&1 RET_C=$? cat < genmake_tc_2.$FS program hello @@ -880,12 +884,10 @@ call setrlstk() end EOF - echo >> genmake_warnings - echo "running: check_HAVE_SETRLSTK()" >> genmake_warnings - cat genmake_tc_2.$FS >> genmake_warnings + cat genmake_tc_2.$FS >> $LOGFILE COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o" - echo $COMM >> genmake_warnings - $COMM >> genmake_warnings 2>&1 + echo $COMM >> $LOGFILE + $COMM >> $LOGFILE 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_SETRLSTK=t @@ -896,6 +898,8 @@ check_HAVE_STAT() { + echo >> $LOGFILE + echo "running: check_HAVE_STAT()" >> $LOGFILE get_fortran_c_namemangling cat < genmake_tc_1.c $FC_NAMEMANGLE @@ -917,7 +921,7 @@ } EOF COMM="$CC $CFLAGS -c genmake_tc_1.c" - echo $COMM >> genmake_warnings + echo $COMM >> $LOGFILE $COMM >> genmake_tc.log 2>&1 RET_C=$? cat < genmake_tc_2.$FS @@ -927,11 +931,9 @@ print *," HELLO WORLD", nbyte end EOF - echo >> genmake_warnings - echo "running: check_HAVE_STAT()" >> genmake_warnings - cat genmake_tc_2.$FS >> genmake_warnings + cat genmake_tc_2.$FS >> $LOGFILE COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o" - echo $COMM >> genmake_warnings + echo $COMM >> $LOGFILE $COMM >> genmake_tc.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then @@ -946,8 +948,8 @@ if test ! "x$SKIP_NETCDF_CHECK" = x ; then return fi - echo >> genmake_warnings - echo "running: check_netcdf_libs()" >> genmake_warnings + echo >> $LOGFILE + echo "running: check_netcdf_libs()" >> $LOGFILE cat < genmake_tnc.F program fgennc #include "netcdf.inc" @@ -965,9 +967,9 @@ IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret) end EOF - echo "=== genmake_tnc.F ===" > genmake_tnc.log + echo "=== genmake_tnc.F >>>" > genmake_tnc.log cat genmake_tnc.F >> genmake_tnc.log - echo "=== genmake_tnc.F ===" >> genmake_tnc.log + echo "<<< genmake_tnc.F ===" >> genmake_tnc.log RET_CPP=f COMM="cat genmake_tnc.F | $CPP $DEFINES $INCLUDES" echo "$COMM" >> genmake_tnc.log @@ -983,7 +985,7 @@ $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> 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 + cat genmake_tnc.log >> $LOGFILE #EH3 Remove test program execution for machines that either disallow #EH3 execution or cannot support it (eg. cross-compilers) @@ -994,9 +996,10 @@ if test "x$RET_COMPILE" = x0 ; then HAVE_NETCDF=t + echo "check_netcdf: successful" >> $LOGFILE else # try again with "-lnetcdf" added to the libs - echo "try again with added '-lnetcdf'" > genmake_tnc.log + 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 @@ -1004,13 +1007,15 @@ && $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> 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 + echo >> $LOGFILE + cat genmake_tnc.log >> $LOGFILE if test "x$RET_COMPILE" = x0 ; then LIBS="$LIBS -lnetcdf" HAVE_NETCDF=t + echo "check_netcdf: successful" >> $LOGFILE else # try again with "-lnetcdff" added to the libs - echo "try again with added '-lnetcdff -lnetcdf'" > genmake_tnc.log + 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 @@ -1018,10 +1023,12 @@ && $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 + echo >> $LOGFILE + cat genmake_tnc.log >> $LOGFILE if test "x$RET_COMPILE" = x0 ; then LIBS="$LIBS -lnetcdff -lnetcdf" HAVE_NETCDF=t + echo "check_netcdf: successful" >> $LOGFILE fi fi fi @@ -1051,9 +1058,9 @@ DISABLE= # MAKEFILE= # MAKEDEPEND= -PDEPEND= -DUMPSTATE=t -PDEFAULT= +PKG_DEPEND= +PKG_GROUPS= +DUMPSTATE=f OPTFILE= INCLUDES="-I. $INCLUDES" FFLAGS= @@ -1138,17 +1145,16 @@ SVD_TAMC_FLAGS= 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_s1="OPTFILE PKG_DEPEND PKG_GROUPS MAKEFILE MAKEDEPEND PLATFORM ROOTDIR MODS DISABLE ENABLE" gm_s2="FC IEEE USE_R4 TS PAPIS PCLS PAPI PCL HPMT GSL DEVEL MPI OMP 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 FEXTRAFLAGS" -gm_s4="CFLAGS KFLAGS1 KFLAGS2 LIBS KPPFILES NOOPTFILES NOOPTFLAGS" -gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD MAKE THISHOST THISUSER THISDATE THISVER MACHINE" +gm_s3="LN S64 LINK MAKE PACKAGES INCLUDES FFLAGS FOPTIM FEXTRAFLAGS" +gm_s4="CFLAGS LIBS KPP KFLAGS1 KFLAGS2 KPPFILES NOOPTFILES NOOPTFLAGS" +gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD THISHOST THISUSER THISDATE THISVER MACHINE" gm_s6="EXECUTABLE EXEHOOK EXEDIR PACKAGES_CONF" -gm_s7="HAVE_SYSTEM HAVE_FDATE FC_NAMEMANGLE HAVE_ETIME" +gm_s7="FC_NAMEMANGLE HAVE_NETCDF HAVE_SYSTEM HAVE_FDATE HAVE_ETIME" # The following are all related to adjoint/tangent-linear stuff gm_s10="AUTODIFF_PKG_USED AD_OPTFILE TAMC TAF AD_TAMC_FLAGS AD_TAF_FLAGS" @@ -1162,13 +1168,17 @@ GENMAKE : -A program for GENerating MAKEfiles for the MITgcm project. For a -quick list of options, use "genmake -h" or for more detail see: - - http://mitgcm.org/devel_HOWTO/ +A program for GENerating MAKEfiles for the MITgcm project. + For a quick list of options, use "genmake2 -h" +or for more detail see the Developer's HOWTO manual at: + http://mitgcm.org/public/docs.html EOF +LOGFILE="genmake.log" +#- clean-up previous genmake logfiles: +rm -f genmake_state genmake_*optfile $LOGFILE + echo "=== Processing options files and arguments ===" gm_local="genmake_local" printf " getting local config information: " @@ -1215,14 +1225,14 @@ AD_OPTFILE=$ac_optarg ;; -pdepend | --pdepend) - ac_prev=PDEPEND ;; + ac_prev=PKG_DEPEND ;; -pdepend=* | --pdepend=*) - PDEPEND=$ac_optarg ;; + PKG_DEPEND=$ac_optarg ;; - -pdefault | --pdefault) - ac_prev=PDEFAULT ;; - -pdefault=* | --pdefault=*) - PDEFAULT=$ac_optarg ;; + -pgroups | --pgroups) + ac_prev=PKG_GROUPS ;; + -pgroups=* | --pgroups=*) + PKG_GROUPS=$ac_optarg ;; -make | --make | -m | --m) ac_prev=MAKE ;; @@ -1449,7 +1459,7 @@ echo "--please check that variable syntax is bash-compatible" exit 1 fi - if test "x$DUMPSTATE" != xf ; then + if test "x$DUMPSTATE" = xt ; then cp -f $OPTFILE "genmake_optfile" fi else @@ -1476,7 +1486,7 @@ echo "--please check that variable syntax is bash-compatible" exit 1 fi - if test "x$DUMPSTATE" != xf ; then + if test "x$DUMPSTATE" = xt ; then cp -f $AD_OPTFILE "genmake_ad_optfile" fi else @@ -1883,7 +1893,8 @@ # they appear as regular source code if test -r $ROOTDIR"/eesupp/src/Makefile" ; then echo " Making source files in eesupp from templates" - ( cd $ROOTDIR"/eesupp/src/" && $MAKE ) > make_eesupp.errors 2>&1 + ( cd $ROOTDIR"/eesupp/src/" && $MAKE clean_old && $MAKE \ + ) > make_eesupp.errors 2>&1 RETVAL=$? if test "x${RETVAL}" = x0 ; then rm -f make_eesupp.errors @@ -1898,7 +1909,8 @@ for pdir in exch2 regrid ; do if test -r $ROOTDIR"/pkg/${pdir}/Makefile" ; then echo " Making source files in pkg/${pdir} from templates" - ( cd $ROOTDIR"/pkg/"${pdir} && $MAKE ) > make_${pdir}.errors 2>&1 + ( cd $ROOTDIR"/pkg/"${pdir} && $MAKE clean_old && $MAKE \ + ) > make_${pdir}.errors 2>&1 RETVAL=$? if test "x${RETVAL}" = x0 ; then rm -f make_${pdir}.errors @@ -1911,64 +1923,83 @@ done printf "\n=== Determining package settings ===\n" -if test "x${PDEPEND}" = x ; then +if test "x${PKG_DEPEND}" = x ; then tmp=$ROOTDIR"/pkg/pkg_depend" - if test -r $tmp ; then - PDEPEND=$tmp - else + if test -r $tmp ; then PKG_DEPEND=$tmp ; fi +fi +if test "x${PKG_DEPEND}" = x ; then echo "Warning: No package dependency information was specified." echo " Please check that ROOTDIR/pkg/pkg_depend exists." +else + if test ! -r ${PKG_DEPEND} ; then + echo "Error: can't read package dependency info from PKG_DEPEND=\"$PKG_DEPEND\"" + exit 1 fi + echo " getting package dependency info from $PKG_DEPEND" +# Strip the comments and then convert the dependency file into arrays: PNAME, DNAME + get_pdepend_list $PKG_DEPEND +fi + +# A default package groups file "$ROOTDIR/pkg/pkg_groups" is provided +# to define the "default_pkg_list" and package groups (for convenience, one +# can specify a group of packages using names like "ocean" and "atmosphere"). +if test "x${PKG_GROUPS}" = x ; then + tmp=$ROOTDIR"/pkg/pkg_groups" + if test -r $tmp ; then PKG_GROUPS=$tmp ; fi +fi +if test "x${PKG_GROUPS}" = x ; then + echo "Warning: No package groups information was specified." + echo " Please check that ROOTDIR/pkg/pkg_groups exists." else - if test ! -r ${PDEPEND} ; then - echo "Error: can't read package dependency info from PDEPEND=\"$PDEPEND\"" + if test ! -r ${PKG_GROUPS} ; then + echo "Error: can't read package groups info from PKG_GROUPS=\"$PKG_GROUPS\"" exit 1 fi + echo " getting package groups info from $PKG_GROUPS" fi -echo " getting package dependency info from $PDEPEND" -# Strip the comments and then convert the dependency file into -# two arrays: PNAME, DNAME -get_pdepend_list $PDEPEND - -# Search for default packages. Note that a "$ROOTDIR/pkg/pkg_groups" -# file has been added so that, for convenience, one can specify -# groups of packages using names like "ocean" and "atmosphere". -echo " checking default package list: " -if test "x${PDEFAULT}" = x ; then + +# Search for packages to compile. +echo " checking list of packages to compile:" +PKG_LIST= +if test "x${PKG_LIST}" = x ; then for i in "." $MODS ; do if test -r $i"/packages.conf" ; then - PDEFAULT=$i"/packages.conf" + PKG_LIST=$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 - echo " default packages file disabled" +if test "x${PKG_LIST}" = x ; then + pkg_list='default_pkg_list' + if test "x${PKG_GROUPS}" = x ; then + echo "Error: need package groups info to expand pkg_list=\"$pkg_list\"" + exit 1 + fi else - if test ! -r $PDEFAULT ; then - echo "Warning: can't read default packages from PDEFAULT=\"$PDEFAULT\"" + if test ! -r $PKG_LIST ; then + echo "Error: can't read package list from PKG_LIST=\"$PKG_LIST\"" + exit 1 else - echo " using PDEFAULT=\"$PDEFAULT\"" + echo " using PKG_LIST=\"$PKG_LIST\"" # Strip the comments and add all the names - def=`cat $PDEFAULT | sed -e 's/#.*$//g' | $AWK '(NF>0){print $0}'` + pkg_list=`cat $PKG_LIST | sed -e 's/#.*$//g' | $AWK '(NF>0){print $0}'` RETVAL=$? if test "x${RETVAL}" != x0 ; then - printf "Error: can't parse default package list " - echo "-- please check PDEFAULT=\"$PDEFAULT\"" + printf "Error: can't parse package list " + echo "-- please check PKG_LIST=\"$PKG_LIST\"" exit 1 fi - for i in $def ; do - PACKAGES="$PACKAGES $i" - done - echo " before group expansion packages are:$PACKAGES" - RET=1 - while test $RET = 1 ; do expand_pkg_groups; RET=$?; done - echo " after group expansion packages are: $PACKAGES" fi fi +for i in $pkg_list ; do + PACKAGES="$PACKAGES $i" +done +echo " before group expansion packages are:$PACKAGES" +if test "x${PKG_GROUPS}" != x ; then + RET=1 + while test $RET = 1 ; do expand_pkg_groups; RET=$?; done + echo " after group expansion packages are: $PACKAGES" +fi echo " applying DISABLE settings" echo "" > ./.tmp_pack @@ -1999,7 +2030,7 @@ for i in $PACKAGES ; do j=`echo $i | sed 's/[-+]//'` if test ! -d "$ROOTDIR/pkg/$j" ; then - echo "Error: can't find package $i at \"$ROOTDIR/pkg/$i\"" + echo "Error: dir '$ROOTDIR/pkg/$i' missing for package '$i'" exit 1 fi echo $i >> ./.tmp_pack @@ -2018,7 +2049,6 @@ if test "x$HAVE_NETCDF" != xt ; then if test "x$mnc_in" = x0 ; then cat </dev/null )` for j in $list_files ; do @@ -2668,28 +2698,34 @@ @printf 'running ... ' @\$(EXECUTABLE) > \$@ +# remove most of the files that "make" generates clean: -rm -rf *.p *.$FS90 *.mod ${RMFILES} work.{pc,pcl} *.template -rm -rf *.o -rm -rf *.$FS *.flowdir -rm -rf *.f$FS90 \$(AD_CLEAN) ad_input* + +# remove most of the files that "make" and "make depend" generate Clean: @make clean @make cleanlinks - -rm -f \$(SPECIAL_FILES) - -rm -f genmake_state genmake_*optfile genmake_warnings genmake_errors - -rm -f make.log run.log f90mkdepend.log *.bak "$MAKEFILE.old" + -rm -f \$(SPECIAL_FILES) f90mkdepend.log -rm -f taf_command taf_output taf_ad.log taf_ad_flow.log + -rm -f genmake_warnings genmake_errors make.log + +# remove also the executable, files that "genmake2" generates (except Makefile) +# and output from a run (plus log files from testreport) CLEAN: @make Clean + -rm -f \$(EXECUTABLE) \$(EXE_AD) *.bak $MAKEFILE.old + -rm -f $LOGFILE genmake_state genmake_*optfile genmake.tr_log make.tr_log -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 *.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: @@ -3205,7 +3241,7 @@ # Write the "state" for future records -if test "x$DUMPSTATE" != xf ; then +if test "x$DUMPSTATE" = xt ; then printf "" > genmake_state for i in $gm_state ; do t1="t2=\$$i"