X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b0d7da249c3fd6b9ab682bdcdabdf6a26705140..6760cb07d6b57be16928d95339d71e57c4e24f36:/src/smpi/smpicc.in

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index 999c1d8ce4..be6e8ad594 100755
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -1,45 +1,14 @@
-#!/bin/bash
+#! /bin/bash
 #FIXME: .. paths...
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 
 CC="gcc"
+CFLAGS="-O2 -Dmain=smpi_simulated_main"
 
-SEED="221238"
-
-TMPDIR="$(mktemp -d tmpXXXXXXX)"
-
-function modsource {
-  SOURCE="$1"
-  SOURCEFILE="$(basename ${SOURCE})"
-  SOURCEDIR="${SOURCE%${SOURCEFILE}}"
-  if [ -n "${SOURCEDIR}" ]; then
-    mkdir -p ${TMPDIR}${SOURCEDIR}
-  fi
-  TMPSOURCE="${TMPDIR}${SOURCE}"
-  cat > ${TMPSOURCE} <<HEADER
-#define SEED ${SEED}
-#include "smpi/smpi.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/asserts.h"
-#define sleep(x) smpi_sleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x, y)
-HEADER
-  # very simplistic transform, will probably want full parser for next version
-  grep -v "mpi.h" < ${SOURCE} | perl -pe 's/main/smpi_simulated_main/;' >> ${TMPSOURCE}
-  grep -q "smpi_simulated_main" ${TMPSOURCE}
-  if [ $? -eq 0 ]; then
-    cat >> ${TMPSOURCE} <<FOOTER
-int main(int argc, char **argv) {
-    return smpi_run_simulation(&argc, argv);
-}
-FOOTER
-  fi
-}
-
-INCLUDEARGS=""
-LINKARGS="-L@libdir@ -lsimgrid -lsmpi "
+#FIXME: probably only want the last two pairs after 'make install'
+INCLUDEARGS="-I@top_srcdir@/include -I@top_srcdir@/include/smpi -I@includedir@ -I@includedir@/smpi"
+LINKARGS="-L@top_builddir@/src/.libs -L@libdir@ -lsimgrid -lsmpi "
 
 CMDLINE=""
 while [ -n "$1" ]; do
@@ -49,17 +18,17 @@ while [ -n "$1" ]; do
       LINKARGS=""
       CMDLINE="${CMDLINE} -c "
   elif [ "${ARG%.c}" != "${ARG}" ]; then
-    INCLUDEARGS="-I . -I .. -I ../include -I @includedir@ "
-    SRCFILE="$(realpath ${ARG})"
-    modsource ${SRCFILE}
-    CMDLINE="${CMDLINE} ${TMPDIR}${SRCFILE} "
+    SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
+    if [ -z $SRCFILE ] ; then
+      SRCFILE="$ARG"
+    fi
+    CMDLINE="${CMDLINE} ${SRCFILE} "
   else
     CMDLINE="${CMDLINE} ${ARG} "
   fi
 done
 
-CMDLINE="${CC} ${INCLUDEARGS} ${CMDLINE} ${LINKARGS}"
+CMDLINE="${CC} ${INCLUDEARGS} ${CFLAGS} ${CMDLINE} ${LINKARGS}"
 
 #echo "${CMDLINE}"
 ${CMDLINE}
-rm -rf ${TMPDIR}