--- MITgcm/tools/genmake2 2005/09/14 17:57:54 1.131 +++ MITgcm/tools/genmake2 2005/11/24 17:52:15 1.136 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.131 2005/09/14 17:57:54 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.136 2005/11/24 17:52:15 edhill Exp $ # # Makefile generator for MITgcm UV codes # created by cnh 03/98 @@ -353,10 +353,18 @@ else 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}'` - echo " Setting FORTRAN compiler to: "$FC - fi + fi + + # Use the first of the compilers found in the current PATH + # that has a correctly-named optfile + if test "x$OPTFILE" = x -a "x$FC" = x ; then + for i in $p_FC ; do + OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i + if test -r $OPTFILE ; then + echo " Setting OPTFILE to: "$OPTFILE + break + fi + done fi if test "x$OPTFILE" = x ; then @@ -601,7 +609,7 @@ call tsub( string ) end EOF - $FC $FFLAGS $DEFINES -c genmake_tcomp.$FS >> genmake_warnings 2>&1 + $FC $FFLAGS -c genmake_tcomp.$FS >> genmake_warnings 2>&1 RETVAL=$? if test "x$RETVAL" != x0 ; then FC_NAMEMANGLE=$default_nm @@ -713,9 +721,12 @@ call setrlstk() end EOF - $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_warnings 2>&1 - RET_F=$? - test -x ./genmake_tc && ./genmake_tc >> genmake_warnings 2>&1 + echo >> genmake_warnings + echo "running: check_HAVE_SETRLSTK()" >> genmake_warnings + cat genmake_tc_2.$FS >> genmake_warnings + COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o" + echo $COMM >> genmake_warnings + $COMM >> genmake_warnings 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_SETRLSTK=t @@ -755,9 +766,12 @@ print *," HELLO WORLD", nbyte end EOF - $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_tc.log 2>&1 - RET_F=$? - test -x ./genmake_tc && ./genmake_tc >> genmake_tc.log 2>&1 + echo >> genmake_warnings + echo "running: check_HAVE_STAT()" >> genmake_warnings + cat genmake_tc_2.$FS >> genmake_warnings + COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o" + echo $COMM >> genmake_warnings + $COMM >> genmake_tc.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_STAT=t @@ -771,7 +785,8 @@ if test ! "x$SKIP_NETCDF_CHECK" = x ; then return fi - echo "" > genmake_tnc.log + echo >> genmake_warnings + echo "running: check_netcdf_libs()" >> genmake_warnings cat < genmake_tnc.F program fgennc #include "netcdf.inc" @@ -789,24 +804,25 @@ IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret) end EOF - echo "Executing:" > genmake_tnc.log - echo " $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS" \ - > genmake_tnc.log + echo "=== genmake_tnc.F ===" > genmake_tnc.log + cat genmake_tnc.F >> genmake_tnc.log + echo "=== genmake_tnc.F ===" >> genmake_tnc.log RET_CPP=f - $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null \ - && RET_CPP=t + COMM="$CPP $DEFINES $INCLUDES genmake_tnc.F" + echo "$COMM" >> genmake_tnc.log + $COMM > genmake_tnc.$FS 2>/dev/null && RET_CPP=t if test "x$RET_CPP" = xf ; then echo " WARNING: CPP failed to pre-process the netcdf test." \ - > genmake_tnc.log + >> genmake_tnc.log echo " Please check that \$INCLUDES is properly set." \ - > genmake_tnc.log + >> genmake_tnc.log fi - echo "Executing:" > genmake_tnc.log - echo " $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS" > genmake_tnc.log - echo " $LINK -o genmake_tnc.o $LIBS" > genmake_tnc.log + echo "$FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log + echo " && $LINK -o genmake_tnc.o $LIBS" >> genmake_tnc.log $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1 \ && $LINK -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1 RET_COMPILE=$? + cat genmake_tnc.log >> genmake_warnings #EH3 Remove test program execution for machines that either disallow #EH3 execution or cannot support it (eg. cross-compilers) @@ -819,15 +835,18 @@ HAVE_NETCDF=t else # try again with "-lnetcdf" added to the libs + echo "try again with added '-lnetcdf'" > genmake_tnc.log + echo "$CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS \ " >> genmake_tnc.log + echo " && $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log + echo " && $LINK -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf" >> genmake_tnc.log $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null \ && $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1 \ && $LINK -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf >> genmake_tnc.log 2>&1 RET_COMPILE=$? + cat genmake_tnc.log >> genmake_warnings if test "x$RET_COMPILE" = x0 ; then LIBS="$LIBS -lnetcdf" HAVE_NETCDF=t - else - cat genmake_tnc.log >> genmake_warnings fi fi rm -f genmake_tnc* @@ -1366,7 +1385,7 @@ call system('echo hi') end EOF -$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 +$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_SYSTEM=t @@ -1387,7 +1406,7 @@ print *, string end EOF -$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 +$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_FDATE=t @@ -1409,7 +1428,7 @@ print *, tarray end EOF -$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 +$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_ETIME=t @@ -2122,6 +2141,11 @@ \$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE) -rm -f makedepend.out +lib: libmitgcmuv.a + +libmitgcmuv.a: \$(OBJFILES) + ar rcv libmitgcmuv.a \$(OBJFILES) + links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES) small_f: \$(F77FILES) \$(F90FILES)