/[MITgcm]/MITgcm/tools/genmake2
ViewVC logotype

Diff of /MITgcm/tools/genmake2

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.244 by jmc, Wed Oct 10 22:24:59 2012 UTC revision 1.248 by jmc, Thu Jan 24 19:07:04 2013 UTC
# Line 907  check_netcdf_libs()  { Line 907  check_netcdf_libs()  {
907        program fgennc        program fgennc
908  #include "netcdf.inc"  #include "netcdf.inc"
909  EOF  EOF
910      if test ! "x$MPI" = x ; then     #if test ! "x$MPI" = x ; then
911          echo '#include "mpif.h"' >> genmake_tnc.F     #    echo '#include "mpif.h"' >> genmake_tnc.F
912      fi     #fi
913      cat <<EOF >> genmake_tnc.F      cat <<EOF >> genmake_tnc.F
914        integer iret, ncid, xid        integer iret, ncid, xid
915        iret = nf_create('genmake_tnc.nc', NF_CLOBBER, ncid)        iret = nf_create('genmake_tnc.nc', NF_CLOBBER, ncid)
# Line 1188  GSL= Line 1188  GSL=
1188  DEVEL=  DEVEL=
1189  HAVE_TEST_L=  HAVE_TEST_L=
1190    
1191    # comment this line out to enable lapack test
1192    SKIP_LAPACK_CHECK=t
1193    
1194  # DEFINES checked by test compilation or command-line  # DEFINES checked by test compilation or command-line
1195  HAVE_SYSTEM=  HAVE_SYSTEM=
1196  HAVE_FDATE=  HAVE_FDATE=
# Line 1699  check_for_broken_Ff Line 1702  check_for_broken_Ff
1702  if test ! "x$MPI" = x ; then  if test ! "x$MPI" = x ; then
1703        echo "  Turning on MPI cpp macros"        echo "  Turning on MPI cpp macros"
1704        DEFINES="$DEFINES -DALLOW_USE_MPI"        DEFINES="$DEFINES -DALLOW_USE_MPI"
1705    #- To compile code older than checkpoint63s (2012/09/05), un-comment the following line:
1706    #     DEFINES="$DEFINES -DALWAYS_USE_MPI"
1707  fi  fi
1708  if test ! "x$OMP" = x ; then  if test ! "x$OMP" = x ; then
1709        echo "  Add OMPFLAG and turn on OpenMP cpp macros"        echo "  Add OMPFLAG and turn on OpenMP cpp macros"
# Line 2764  else Line 2769  else
2769      echo "EMBEDDED_FILES = " >>$MAKEFILE      echo "EMBEDDED_FILES = " >>$MAKEFILE
2770  fi  fi
2771    
2772    # extract default cpp search path so we can pass it to makedepend
2773    CPPINCLUDES=`cat /dev/null | $CPP -v 2>&1 | awk '/^End of search/{f=0}!/^\#/{if(f){printf " -I%s", $1;}}/^\#include "..." search start/{f=1}'`
2774    
2775  cat >>$MAKEFILE <<EOF  cat >>$MAKEFILE <<EOF
2776  # Unix ln (link)  # Unix ln (link)
2777  LN = ${LN}  LN = ${LN}
# Line 2784  LINK = ${LINK} ${LDADD} Line 2792  LINK = ${LINK} ${LDADD}
2792  DEFINES = ${DEFINES}  DEFINES = ${DEFINES}
2793  # Includes for CPP  # Includes for CPP
2794  INCLUDES = ${INCLUDES}  INCLUDES = ${INCLUDES}
2795    # default CPP includes for makedepend
2796    CPPINCLUDES = ${CPPINCLUDES}
2797  # Flags for KPP  # Flags for KPP
2798  KFLAGS1 = ${KFLAGS1}  KFLAGS1 = ${KFLAGS1}
2799  KFLAGS2 = ${KFLAGS2}  KFLAGS2 = ${KFLAGS2}
# Line 2849  fwd_exe_target: Line 2859  fwd_exe_target:
2859    
2860  depend:  depend:
2861          @\$(MAKE) -f \$(MAKEFILE) links          @\$(MAKE) -f \$(MAKEFILE) links
2862          \$(MAKEDEPEND) -f \$(MAKEFILE) -o .$FS \$(DEFINES) \$(INCLUDES) \$(F77_SRC_FILES)          \$(MAKEDEPEND) -f \$(MAKEFILE) -o .$FS \$(DEFINES) \$(INCLUDES) \$(CPPINCLUDES) \$(F77_SRC_FILES)
2863          \$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)          \$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
2864          -rm -f makedepend.out          -rm -f makedepend.out
2865    

Legend:
Removed from v.1.244  
changed lines
  Added in v.1.248

  ViewVC Help
Powered by ViewVC 1.1.22