--- MITgcm/tools/genmake2 2011/08/10 19:39:35 1.223 +++ MITgcm/tools/genmake2 2011/11/03 22:46:47 1.227 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.223 2011/08/10 19:39:35 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.227 2011/11/03 22:46:47 utke Exp $ # $Name: $ # # Makefile generator for MITgcm UV codes @@ -1522,8 +1522,16 @@ fi if test "x$GET_FC_VERSION" != x ; then echo "Get compiler version using: $FC $GET_FC_VERSION" >> $LOGFILE - $FC $GET_FC_VERSION >> $LOGFILE 2> /dev/null + ff=`echo $FC | sed 's/ .*//'` ; xx=`echo $ff | sed 's/^./& /' | sed 's/ .*//'` + if test $xx != '/' ; then which $ff >> $LOGFILE ; fi + $FC $GET_FC_VERSION > genmake_fc_vers1 2> genmake_fc_vers2 + if test -s genmake_fc_vers1 ; then + cat genmake_fc_vers1 >> $LOGFILE + else + cat genmake_fc_vers2 >> $LOGFILE + fi echo "<-- compiler version ----" >> $LOGFILE + rm -f genmake_fc_vers1 genmake_fc_vers2 fi if test "x$CC" = x ; then @@ -2896,6 +2904,8 @@ adtrick: patch < \$(TOOLSDIR)/ad_taf_output.f.adtrick.diff +adobj: ad_taf_output.o \$(OBJFILES) + # ... FTL ... ftlall: ftl_taf ftltaf: ftl_taf_output.$FS @@ -3165,7 +3175,7 @@ # this step also creates the file postProcess.make but we cannot # name it as the target or else make will try to remake it for # the include directive above for any rule, e.g. make clean - ./postProcess.py --progress --timing --outputFormat=fixed -m r -i ../OAD_support/ad_inline.f --width 4 \$< + ./postProcess.py --progress --timing --infoUnitFile w2f__types.f90 --outputFormat=fixed -m r -i ../OAD_support/ad_inline.f --width 4 \$< # setup some links %.xsd: