X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f254076b4fbb5c0dc8eb15d4834135566b9893bc..2114c044f7a785c1c53c0f69d0203fd50c2175d5:/src/smpi/smpiff.in

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 38276ad50e..1c6308dfc6 100644
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -22,10 +22,13 @@ main_name=main
 
 cleanup () {
     eval $(list_get TMPFILES)
-   # rm -f "$@"
+    rm -f "$@"
 }
 trap 'cleanup' EXIT
 
+
+NEEDS_OUTPUT=1
+
 list_set CMDLINE "${F77}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
@@ -42,20 +45,31 @@ while [ $# -gt 0 ]; do
             list_add TMPFILES "${TMPFILE}"
       #replace "program main_name by subroutine user\_main (and the end clause as well)"
             sed 's/[[:space:]]\{6\}[[:space:]]*\(end \)\{0,1\}program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"
+            ORIGFILE="${ARG}"
             SRCFILE="${TMPFILE}"
             list_add CMDLINE "${SRCFILE}"
             ;;
-        '-version' | '--version' | '-v')
-            # -e is not recognised by MS-DOS...
-            echo -e $SIMGRID_VERSION
+        '-version' | '--version')
+            printf '%b\n' "$SIMGRID_VERSION"
             exit 0
-            ;;           
+            ;;
+        '-compiler-version' | '--compiler-version')
+            ${F77} --version
+            ;;
+        -o)
+            NEEDS_OUTPUT=0
+            list_add CMDLINE "-o"   
+            ;;        
         *)
             list_add CMDLINE "${ARG}"
             ;;
     esac
 done
 
+if [ $NEEDS_OUTPUT -ne 0 ]; then
+   list_add CMDLINE "-o${ORIGFILE%.f}.o"     
+fi
+
 list_add_not_empty CMDLINE ${INCLUDEARGS}
 list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
 list_add_not_empty CMDLINE "${LINKARGS}"