X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1af04af978a0d15f9e4e16db1270e42ff0fc6d11..5429075eed6f2471fb620fad4962e3aef86ba5f8:/src/smpi/smpif90.in

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 2d76ad20df..99bd88801a 100644
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -1,14 +1,17 @@
 #! /bin/bash
 
-CC=@CMAKE_Fortran_Compiler@
+CC=gfortran
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
 
-FFLAGS="-ff2c "
-LINKARGS="-lsimgrid -lsmpi -lm -lgfortran"
+FFLAGS="-ff2c  -fno-second-underscore"
+LINKARGS="-lsimgrid -lm -lgfortran"
 main_name=main
-TMPFILE=$(mktemp).f90
+
+declare -a TMPFILES
+trap 'rm -f "${TMPFILES[@]}"' EXIT
+
 CMDLINE=""
 while [ -n "$1" ]; do
   ARG="$1"
@@ -20,12 +23,10 @@ while [ -n "$1" ]; do
       CMDLINE="${CMDLINE} -c "
       ;;
    *.f90|*.F90)
-      SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
-      if [ -z $SRCFILE ] ; then
-         SRCFILE="$ARG"
-      fi
+      TMPFILE=$(mktemp "${ARG}_XXXXXX.f90")
+      TMPFILES+=( "${TMPFILE}" )
       #replace "program main_name by subroutine user\_main (and the end clause as well)"
-      sed 's/[[:space:]]*program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/subroutine user\_main /gI'  ${ARG} > ${TMPFILE}
+      sed 's/[[:space:]]*program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/subroutine user\_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI'  ${ARG} > ${TMPFILE}
       SRCFILE="${TMPFILE}"
       CMDLINE="${CMDLINE} ${SRCFILE} "
       ;;
@@ -37,9 +38,5 @@ done
 
 CMDLINE="${CC} ${FFLAGS} ${CMDLINE} ${INCLUDEARGS} ${CMAKE_LINKARGS} ${LINKARGS}"
 
-echo "${CMDLINE}"
+#echo "${CMDLINE}"
 ${CMDLINE}
-
-if [ -f ${TMPFILE} ];then
-  rm ${TMPFILE}
-fi