--- MITgcm/tools/genmake2 2003/11/25 17:22:47 1.49 +++ MITgcm/tools/genmake2 2004/03/24 17:12:51 1.74 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.49 2003/11/25 17:22:47 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.74 2004/03/24 17:12:51 adcroft Exp $ # # Makefile generator for MITgcm UV codes # created by cnh 03/98 @@ -13,30 +13,35 @@ 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 + test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg" || exit 99 + test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg" || exit 99 + test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg" || exit 99 + test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg" || exit 99 +} + +# 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 "^[ ]*#undef.*ALLOW_USE_MPI" || exit 99 + test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI" || exit 99 + test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI" || exit 99 +} + +# Search for particular string in a file. Return 1 if detected, 0 if not +# usage: test_for_string_in_file file string +test_for_string_in_file() { + file=$1 + strng=$2 + grep -i "$strng" $file > /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 + printf "Error: In $file there is an illegal line: " + grep -i "$strng" $file + return 1 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 + return 0 } # Read the $ROOTDIR/pkg/pkg_groups file and expand any references to @@ -62,6 +67,7 @@ done PACKAGES=$new_packages rm -f ./p[1,2].tmp + return $matched else echo "Warning: can't read package groups definition file: $PKG_GROUPS" fi @@ -73,7 +79,10 @@ tmp1=`uname`"_"`uname -m` tmp2=`echo $tmp1 | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` tmp3=`echo $tmp2 | sed -e 's/power macintosh/ppc/'` - 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|'` + tmp2=`echo $tmp1 | sed -e 's/i[3-6]86/ia32/' | sed -e 's/athlon/ia32/'` + tmp3=`echo $tmp2 | sed -e 's/cray sv1/craysv1/'` + PLATFORM=$tmp3 OFLIST=`(cd $ROOTDIR/tools/build_options; ls | grep "^$PLATFORM")` echo " The platform appears to be: $PLATFORM" @@ -93,13 +102,47 @@ CPP="cpp -traditional -P" fi - # makedepend is not always available + # The "original" makedepend is part of the Imake system that is + # most often distributed with XFree86 or with an XFree86 source + # package. As a result, many machines (eg. generic Linux) do not + # have a system-default "makedepend" available. For those + # systems, we have two fall-back options: + # + # 1) a makedepend implementation shipped with the cyrus-imapd + # package: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ + # + # 2) a known-buggy xmakedpend shell script + # + # So the choices are, in order: + # + # 1) use the user-specified program + # 2) use a system-wide default + # 3) locally build and use the cyrus implementation + # 4) fall back to the buggy local xmakedpend script + # if test "x${MAKEDEPEND}" = x ; then - which makedepend >& /dev/null + which makedepend > /dev/null 2>&1 RETVAL=$? - if test "x${RETVAL}" = x1 ; then - echo " makedepend was not found. Using xmakedpend instead." - MAKEDEPEND='$(TOOLSDIR)/xmakedepend' + if test ! "x${RETVAL}" = x0 ; then + echo " a system-default makedepend was not found." + + # Try to build the cyrus impl + rm -f ./genmake_cy_md + ( + cd $ROOTDIR/tools/cyrus-imapd-makedepend \ + && ./configure > /dev/null 2>&1 \ + && make > /dev/null 2>&1 \ + && ./makedepend ifparser.c > /dev/null 2>&1 \ + && echo "true" + ) > ./genmake_cy_md + grep true ./genmake_cy_md > /dev/null 2>&1 + RETVAL=$? + if test "x$RETVAL" = x0 ; then + MAKEDEPEND='$(TOOLSDIR)/cyrus-imapd-makedepend/makedepend' + else + MAKEDEPEND='$(TOOLSDIR)/xmakedepend' + fi + rm -f ./genmake_cy_md fi fi @@ -138,18 +181,27 @@ echo " "$p_FC if test "x$FC" = x ; then FC=`echo $p_FC | $AWK '{print $1}'` + echo " Setting FORTRAN compiler to: "$FC fi fi - for i in $p_FC ; do - p_OF=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i - if test -r $p_OF ; then - OPTFILE=$p_OF - echo " The options file: $p_OF" - echo " appears to match so we'll use it." - break - fi - done + if test "x$OPTFILE" = x ; then + OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$FC + if test ! -r $OPTFILE ; then + echo " I looked for the file "$OPTFILE" but did not find it" + fi + fi +# echo " The options file: $p_OF" +# echo " appears to match so we'll use it." +# for i in $p_FC ; do +#p_OF=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i +#if test -r $p_OF ; then +# OPTFILE=$p_OF +# echo " The options file: $p_OF" +# echo " appears to match so we'll use it." +# break +#fi +# done if test "x$OPTFILE" = x ; then cat 1>&2 < genmake_tnc.F + program fgennc +#include "netcdf.inc" + integer iret, ncid, xid + iret = nf_create('genmake_tnc.nc', NF_CLOBBER, ncid) + IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret) + iret = nf_def_dim(ncid, 'X', 11, xid) + IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret) + iret = nf_close(ncid) + IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret) + end +EOF + $CPP genmake_tnc.F > genmake_tnc.f \ + && $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f $LIBS >> genmake_tnc.log 2>&1 + RET_COMPILE=$? + test -x ./genmake_tnc && ./genmake_tnc >> genmake_tnc.log 2>&1 + RETVAL=$? + if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then + HAVE_NETCDF=t + else + # try again with "-lnetcdf" added to the libs + $CPP genmake_tnc.F > genmake_tnc.f \ + && $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f \ + $LIBS -lnetcdf >> genmake_tnc_2.log 2>&1 + RET_COMPILE=$? + test -x ./genmake_tnc && ./genmake_tnc >> genmake_tnc.log 2>&1 + RETVAL=$? + if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then + LIBS="$LIBS -lnetcdf" + HAVE_NETCDF=t + else + cat genmake_tnc.log >> genmake_warnings + fi + fi + rm -f genmake_tnc* +} + + + +############################################################################### +# Sequential part of script starts here +############################################################################### + # Set defaults here COMMANDL="$0 $@" @@ -438,8 +548,8 @@ S64= KPP= FC= +CPP= LINK= -# DEFINES="-DWORDLENGTH=4" DEFINES= PACKAGES= ENABLE= @@ -456,23 +566,29 @@ CFLAGS= KFLAGS1= KFLAGS2= +#LDADD= LIBS= KPPFILES= NOOPTFILES= NOOPTFLAGS= +MPI= +MPIPATH= # DEFINES checked by test compilation HAVE_SYSTEM= HAVE_FDATE= FC_NAMEMANGLE= HAVE_CLOC= +HAVE_NETCDF= MODS= TOOLSDIR= SOURCEDIRS= INCLUDEDIRS= -STANDARDDIRS= +STANDARDDIRS="USE_THE_DEFAULT" +G2ARGS= +BASH= PWD=`pwd` MAKE=make AWK=awk @@ -505,7 +621,7 @@ # 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 IEEE MPI JAM DUMPSTATE STANDARDDIRS" +gm_s2="FC CPP IEEE 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 " @@ -541,7 +657,7 @@ break fi done -echo -n " getting local config information: " +printf " getting local config information: " if test -e $gm_local ; then echo "using $gm_local" . $gm_local @@ -565,6 +681,8 @@ ac_prev= for ac_option ; do + G2ARGS="$G2ARGS \"$ac_option\"" + # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then eval "$ac_prev=\$ac_option" @@ -586,7 +704,7 @@ -optfile=* | --optfile=* | -of=* | --of=*) OPTFILE=$ac_optarg ;; - -adoptfile | --adoptfile | -ad | --ad) + -adoptfile | --adoptfile | -adof | --adof) ac_prev=AD_OPTFILE ;; -adoptfile=* | --adoptfile=* | -adof=* | --adof=*) AD_OPTFILE=$ac_optarg ;; @@ -606,6 +724,16 @@ -make=* | --make=* | -m=* | --m=*) MAKE=$ac_optarg ;; + -bash | --bash) + ac_prev=BASH ;; + -bash=* | --bash=*) + BASH=$ac_optarg ;; + + -makedepend | --makedepend | -md | --md) + ac_prev=MAKEDEPEND ;; + -makedepend=* | --makedepend=* | -md=* | --md=*) + MAKEDEPEND=$ac_optarg ;; + -makefile | --makefile | -ma | --ma) ac_prev=MAKEFILE ;; -makefile=* | --makefile=* | -ma=* | --ma=*) @@ -657,6 +785,12 @@ IEEE=true ;; -noieee | --noieee) IEEE= ;; + + -mpi | --mpi) + MPI=true ;; + -mpi=* | --mpi=*) + MPIPATH=$ac_optarg + MPI=true ;; # -jam | --jam) # JAM=1 ;; @@ -709,7 +843,7 @@ 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" + printf "Warning: ROOTDIR was not specified but there appears to be" echo " a copy of MITgcm at \"$ROOTDIR\" so we'll try it." break fi @@ -743,7 +877,7 @@ . "$OPTFILE" RETVAL=$? if test "x$RETVAL" != x0 ; then - echo -n "Error: failed to source OPTFILE \"$OPTFILE\"" + printf "Error: failed to source OPTFILE \"$OPTFILE\"" echo "--please check that variable syntax is bash-compatible" exit 1 fi @@ -770,7 +904,7 @@ . "$AD_OPTFILE" RETVAL=$? if test "x$RETVAL" != x0 ; then - echo -n "Error: failed to source AD_OPTFILE \"$AD_OPTFILE\"" + printf "Error: failed to source AD_OPTFILE \"$AD_OPTFILE\"" echo "--please check that variable syntax is bash-compatible" exit 1 fi @@ -785,6 +919,10 @@ # Check that FC, LINK, CPP, S64, LN, and MAKE are defined. If not, # either set defaults or complain and abort! +if test ! "x$BASH" = x ; then + # add a trailing space so that it works within the Makefile syntax (see below) + BASH="$BASH " +fi if test "x$FC" = x ; then cat <&2 @@ -798,12 +936,21 @@ if test "x$LINK" = x ; then LINK=$FC fi -if test "x$CPP" = x ; then - CPP="cpp" -fi if test "x$MAKE" = x ; then MAKE="make" fi +if test "x$CPP" = x ; then + CPP=cpp +fi +#EH3 === UGLY === +# The following an ugly little hack to check for $CPP in /lib/ and it +# should eventually be replaced with a more general function that +# searches a combo of the user's path and a list of "usual suspects" +# to find the correct location for binaries such as $CPP. +for i in " " "/lib/" ; do + echo "#define A a" | $i$CPP > test_cpp 2>&1 && CPP=$i$CPP +done +#EH3 === UGLY === echo "#define A a" | $CPP > test_cpp 2>&1 RETVAL=$? if test "x$RETVAL" != x0 ; then @@ -840,9 +987,13 @@ fi rm -f genmake_test_ln genmake_tlink +if test ! "x$MPI" = x ; then + echo " Turning on MPI cpp macros" + DEFINES="$DEFINES -DALLOW_USE_MPI -DALWAYS_USE_MPI" +fi printf "\n=== Checking system libraries ===\n" -echo -n " Do we have the system() command using $FC... " +printf " Do we have the system() command using $FC... " cat > genmake_tcomp.f < genmake_tcomp.f < 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 rm -f genmake_t* +printf " Can we create NetCDF-enabled binaries... " +check_netcdf_libs +if test "x$HAVE_NETCDF" != x ; then + echo "yes" +else + echo "no" +fi + printf "\n=== Setting defaults ===\n" -echo -n " Adding MODS directories: " +printf " Adding MODS directories: " for d in $MODS ; do if test ! -d $d ; then echo echo "Error: MODS directory \"$d\" not found!" exit 1 else - echo -n " $d" + printf " $d" SOURCEDIRS="$SOURCEDIRS $d" INCLUDEDIRS="$INCLUDEDIRS $d" fi @@ -935,7 +1088,7 @@ TOOLSDIR="$ROOTDIR/tools" fi if test ! -d ${TOOLSDIR} ; then - echo "Error: the specified $TOOLSDIR (\"$TOOLSDIR\") does not exist!" + echo "Error: the specified TOOLSDIR (\"$TOOLSDIR\") does not exist!" exit 1 fi if test "x$S64" = x ; then @@ -956,11 +1109,25 @@ rm -f make_eesupp.errors else echo "Error: problem encountered while building source files in eesupp:" - cat make_eesupp.errors + cat make_eesupp.errors 1>&2 exit 1 fi fi +#same for exch2 +if test -r $ROOTDIR"/pkg/exch2/Makefile" ; then + echo " Making source files in exch2 from templates" + ( cd $ROOTDIR"/pkg/exch2/" && $MAKE ) > make_exch2.errors 2>&1 + RETVAL=$? + if test "x${RETVAL}" = x0 ; then + rm -f make_exch2.errors + else + echo "Error: problem encountered while building source files in exch2:" + cat make_exch2.errors 1>&2 + exit 1 + fi +fi + printf "\n=== Determining package settings ===\n" if test "x${PDEPEND}" = x ; then tmp=$ROOTDIR"/pkg/pkg_depend" @@ -1016,7 +1183,7 @@ def=`cat $PDEFAULT | sed -e 's/#.*$//g' | $AWK '(NF>0){print $0}'` RETVAL=$? if test "x${RETVAL}" != x0 ; then - echo -n "Error: can't parse default package list " + printf "Error: can't parse default package list " echo "-- please check PDEFAULT=\"$PDEFAULT\"" exit 1 fi @@ -1024,12 +1191,19 @@ PACKAGES="$PACKAGES $i" done echo " before group expansion packages are: $PACKAGES" - expand_pkg_groups + while ! expand_pkg_groups; do echo > /dev/null; done echo " after group expansion packages are: $PACKAGES" fi fi echo " applying DISABLE settings" +for i in $PACKAGES ; do + echo $i >> ./.tmp_pack +done +for i in `grep "-" ./.tmp_pack` ; do + j=`echo $i | sed 's/[-]//'` + DISABLE="$DISABLE $j" +done pack= for p in $PACKAGES ; do addit="t" @@ -1046,19 +1220,20 @@ echo " applying ENABLE settings" echo "" > ./.tmp_pack PACKAGES="$PACKAGES $ENABLE" +# Test if each explicitly referenced package exists for i in $PACKAGES ; do - if test ! -d "$ROOTDIR/pkg/$i" ; then + j=`echo $i | sed 's/[-+]//'` + if test ! -d "$ROOTDIR/pkg/$j" ; then echo "Error: can't find package $i at \"$ROOTDIR/pkg/$i\"" - exit 1 + exit 1 fi echo $i >> ./.tmp_pack done -pack=`cat ./.tmp_pack | sort | uniq` -rm -f ./.tmp_pack PACKAGES= -for i in $pack ; do +for i in `grep -v "-" ./.tmp_pack | sort | uniq` ; do PACKAGES="$PACKAGES $i" done +rm -f ./.tmp_pack echo " packages are: $PACKAGES" echo " applying package dependency rules" @@ -1144,6 +1319,32 @@ fi done +# Build MNC templates and check for ability to build and use NetCDF +echo $PACKAGES | grep ' mnc ' > /dev/null 2>&1 +RETVAL=$? +if test "x$RETVAL" = x0 ; then + ( cd $ROOTDIR"/pkg/mnc" && $MAKE templates ) > make_mnc.errors 2>&1 + RETVAL=$? + if test "x${RETVAL}" = x0 ; then + rm -f make_mnc.errors + else + echo "Error: problem encountered while building source files in pkg/mnc:" + cat make_mnc.errors 1>&2 + exit 1 + fi + if test "x$HAVE_NETCDF" != xt ; then + cat < srclinks.tmp echo "" >> srclinks.tmp -echo -n 'SRCFILES = ' > srclist.inc -echo -n 'CSRCFILES = ' > csrclist.inc -echo -n 'F90SRCFILES = ' > f90srclist.inc -echo -n 'HEADERFILES = ' > hlist.inc -echo -n 'AD_FLOW_FILES = ' > ad_flow_files.inc +printf 'SRCFILES = ' > srclist.inc +printf 'CSRCFILES = ' > csrclist.inc +printf 'F90SRCFILES = ' > f90srclist.inc +printf 'HEADERFILES = ' > hlist.inc +printf 'AD_FLOW_FILES = ' > ad_flow_files.inc alldirs="$SOURCEDIRS $INCLUDEDIRS ." for d in $alldirs ; do deplist= @@ -1293,23 +1503,23 @@ case $extn in F) echo " \\" >> srclist.inc - echo -n " $sf" >> srclist.inc + printf " $sf" >> srclist.inc ;; F90) echo " \\" >> f90srclist.inc - echo -n " $sf" >> f90srclist.inc + printf " $sf" >> f90srclist.inc ;; c) echo " \\" >> csrclist.inc - echo -n " $sf" >> csrclist.inc + printf " $sf" >> csrclist.inc ;; h) echo " \\" >> hlist.inc - echo -n " $sf" >> hlist.inc + printf " $sf" >> hlist.inc ;; flow) echo " \\" >> ad_flow_files.inc - echo -n " $sf" >> ad_flow_files.inc + printf " $sf" >> ad_flow_files.inc ;; esac fi @@ -1338,7 +1548,7 @@ echo "# This makefile was generated automatically on" >> $MAKEFILE echo "# $THISDATE" >> $MAKEFILE echo "# by the command:" >> $MAKEFILE -echo "# $0 $@" >> $MAKEFILE +echo "# $0 $G2ARGS" >> $MAKEFILE echo "# executed by:" >> $MAKEFILE echo "# $USER@${THISHOSTNAME}:${THISCWD}" >> $MAKEFILE @@ -1347,6 +1557,8 @@ EXE_SVD=$EXECUTABLE"_svd" cat >>$MAKEFILE <> \$(MAKEFILE) + -rm -f makedepend.out -links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) ${PACKAGES_DOT_H} AD_CONFIG.h +links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES) small_f: \$(F77FILES) \$(F90FILES) @@ -1468,8 +1684,8 @@ Clean: @make clean @make cleanlinks - -rm -f ${PACKAGES_DOT_H} AD_CONFIG.h - -rm -f Makefile.bak genmake_state genmake_*optfile genmake_warnings make.log + -rm -f \$(SPECIAL_FILES) + -rm -f genmake_state genmake_*optfile genmake_warnings make.log run.log *.bak CLEAN: @make Clean -find \$(EXEDIR) -name "*.meta" -exec rm {} \; @@ -1479,17 +1695,20 @@ #eh3 Makefile: makefile makefile: - $THIS_SCRIPT $@ + $THIS_SCRIPT $G2ARGS cleanlinks: -find . -type l -exec rm {} \; -# Special targets +# Special targets ($SPECIAL_FILES) which are create by make ${PACKAGES_DOT_H}: @echo Creating \$@ ... - @\$(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) > \$@ AD_CONFIG.h: @echo Creating \$@ ... - @\$(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 > \$@ +FC_NAMEMANGLE.h: + @echo Creating \$@ ... + echo "$FC_NAMEMANGLE" > \$@ # The normal chain of rules is ( .F - .f - .o ) .F.f: @@ -1533,11 +1752,11 @@ echo " Add the source list for AD code generation" echo >> $MAKEFILE -echo -n "AD_FILES = " >> $MAKEFILE +printf "AD_FILES = " >> $MAKEFILE AD_FILES=`cat ad_files` for i in $AD_FILES ; do echo " \\" >> $MAKEFILE - echo -n " $i" >> $MAKEFILE + printf " $i" >> $MAKEFILE done echo >> $MAKEFILE rm -f ad_files @@ -1550,7 +1769,7 @@ adtamc: ad_tamc_output.f ad_input_code.f: \$(AD_FILES) \$(HEADERFILES) - @\$(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 cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h -rm -f ad_config.template @make \$(F77FILES) @@ -1582,7 +1801,7 @@ ftltamc: ftl_tamc_output.f ftl_input_code.f: \$(AD_FILES) \$(HEADERFILES) - @\$(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 cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h -rm -f ftl_config.template @make \$(F77FILES) @@ -1655,11 +1874,11 @@ printf "\n=== Done ===\n" # Create special header files -$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" 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 + cmp $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H > /dev/null 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then rm -f $PACKAGES_DOT_H".tmp" @@ -1669,13 +1888,13 @@ fi fi if test ! -f AD_CONFIG.h ; then - $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 fi # Write the "state" for future records if test "x$DUMPSTATE" != xf ; then - echo -n "" > genmake_state + printf "" > genmake_state for i in $gm_state ; do t1="t2=\$$i" eval $t1