--- MITgcm/tools/genmake2	2007/05/05 20:18:52	1.162
+++ MITgcm/tools/genmake2	2007/10/08 07:33:28	1.165
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.162 2007/05/05 20:18:52 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.165 2007/10/08 07:33:28 mlosch Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -756,7 +756,9 @@
       print *," HELLO WORLD", wtime
       end
 EOF
-    $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_warnings 2>&1
+    COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_warnings 2>&1
     RET_F=$?
     test -x ./genmake_tc  &&  ./genmake_tc >> genmake_warnings 2>&1
     RETVAL=$?
@@ -1035,6 +1037,7 @@
 INCLUDES="-I. $INCLUDES"
 FFLAGS=
 FOPTIM=
+FEXTRAFLAGS=
 CFLAGS=
 KFLAGS1=
 KFLAGS2=
@@ -1115,7 +1118,7 @@
 gm_s2="FC CPP IEEE TS PAPIS PCLS PAPI PCL HPMT GSL DEVEL 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 "
+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_s6="EXECUTABLE EXEHOOK EXEDIR PACKAGES_CONF"
@@ -1562,6 +1565,7 @@
       else
 	    DEFINES="$DEFINES -DTIME_PER_TIMESTEP"
       fi
+      PACKAGES="$PACKAGES showflops"
 fi
 if test ! "x$PAPIS" = x ; then
       echo "  Turning on PAPI flop summary per timestep"
@@ -1573,6 +1577,7 @@
       fi
       INCLUDES="$INCLUDES $PAPIINC"
       LIBS="$LIBS $PAPILIB"
+      PACKAGES="$PACKAGES showflops"
 fi
 if test ! "x$PCLS" = x ; then
       echo "  Turning on PCL counter summary per timestep"
@@ -1584,6 +1589,7 @@
       fi
       INCLUDES="$INCLUDES $PCLINC"
       LIBS="$LIBS $PCLLIB"
+      PACKAGES="$PACKAGES showflops"
 fi
 if test ! "x$PAPI" = x ; then
       if test ! "x$PAPIS" = x ; then
@@ -2456,7 +2462,7 @@
 KFLAGS1 = ${KFLAGS1}
 KFLAGS2 = ${KFLAGS2}
 # Optim./debug for FC
-FFLAGS = ${FFLAGS}
+FFLAGS = ${FFLAGS} ${FEXTRAFLAGS}
 FOPTIM = ${FOPTIM}
 # Optim./debug for FC
 F90FLAGS = ${F90FLAGS}