X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8138044ce3ba946c574a0c3f9e7b7f61e52beb6e..f58c9bcd23aa191e8071a41450d00dda0d182e34:/src/smpi/smpif2c.in

diff --git a/src/smpi/smpif2c.in b/src/smpi/smpif2c.in
index bdcbe867e2..4b99f2b946 100755
--- a/src/smpi/smpif2c.in
+++ b/src/smpi/smpif2c.in
@@ -5,16 +5,25 @@ use strict;
 use File::Temp;
 use File::Copy;
 
-my $include="-I@top_srcdir@/include -I@top_srcdir@/include/smpi -I@includedir@ -I@includedir@/smpi";
+my $include="@includeflag@@f2cflags@";
 
 foreach my $fortran (@ARGV) {
    my $output = $fortran;
    $output =~ s/.f$/.c/;
+
+   #print "F2C INPUT : ".$fortran."\n";
+   #print "F2C OUTPUT: ".$output."\n";
+
+   my$outputdir = $output;
+   $outputdir=~s/[^\/]*\.c$//g;
+   #print "F2C DIR   : ".$outputdir."\n";
+
    my $tmp = new File::Temp;
    $tmp->autoflush(1);
-   `f2c $include -w -a $fortran`;
+   #print "f2c -d$outputdir $include -w -a $fortran\n";
+   `f2c -d$outputdir $include -w -a $fortran`;
    die "F2C failed\n" if $?;
-   open F2C,"<$output";
+   open F2C,"<$output" or die "Unable to open file $output";
    my $started = 0;
    my $cutext = 0;
    print $tmp "#ifndef INTEGER_STAR_8\n";
@@ -46,6 +55,7 @@ foreach my $fortran (@ARGV) {
       if(/extern \/\* Subroutine \*\//) {
          $cutext = 1;
       }
+      $_ =~ s/(mpi_[\w]*_)_/$1/g;
       if($cutext) {
          if(/;$/) {
             $cutext = 0;
@@ -53,7 +63,7 @@ foreach my $fortran (@ARGV) {
          next;
       }
       if(/\/* Main program alias \*\/\s*int\s+.*\s*\(\s*\)\s*{(.*)}/) {
-         $_ = "int smpi_simulated_main(int argc, char** argv) { smpi_process_init(&argc, &argv); $1 }\n";
+         $_ = "int smpi_simulated_main_(int argc, char** argv) { smpi_process_init(&argc, &argv); $1 }\n";
       }
       print $tmp "$_\n";
    }