Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add carriage returns to help gcc compiling... (otherwise, it fails!).
[simgrid.git] / src / Makefile.am
index e5868bc..3e7d886 100644 (file)
@@ -77,11 +77,12 @@ EXTRA_DIST= \
        include/simix/simix.h include/simix/datatypes.h \
        include/simix/context.h \
        simix/private.h \
-        simix/xbt_context_private.h \
-        simix/xbt_context_java.h \
+        simix/smx_context_private.h \
+        simix/smx_context_java.h \
        \
        smpi/private.h \
        smpi/smpi_coll_private.h \
+      smpi/smpi_mpi_dt_private.h \
        smpi/README
 
 #LIBRARY_VERSION= 0:0:0
@@ -196,7 +197,7 @@ GTNETS_SRC= \
 
 # Separated because src/gras/rl_stubs also define the function xbt_context_mod_init() and xbt_context_mod_exit()
 # so there is an implementation of these functions in the simgrid library and an implementatin in the gras library 
-CTX_SRC= simix/xbt_context.c
+CTX_SRC= simix/smx_context.c
 
 SIMIX_SRC= \
   simix/smx_global.c \
@@ -208,9 +209,9 @@ SIMIX_SRC= \
   simix/smx_synchro.c
   
 if CONTEXT_THREADS
-  SURF_SRC += simix/xbt_context_thread.c  
+  SURF_SRC += simix/smx_context_thread.c  
 else  
-  SURF_SRC += simix/xbt_context_sysv.c
+  SURF_SRC += simix/smx_context_sysv.c
 endif  
 
 SMPI_SRC= \
@@ -221,7 +222,8 @@ SMPI_SRC= \
   smpi/smpi_sender.c \
   smpi/smpi_receiver.c \
   smpi/smpi_util.c \
-  smpi/smpi_coll.c
+  smpi/smpi_coll.c \
+  smpi/smpi_mpi_dt.c
 
 MSG_SRC=  msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@ -229,7 +231,7 @@ MSG_SRC=  msg/msg_config.c \
   msg/msg_actions.c
 
 JMSG_C_SRC = \
-  simix/xbt_context_java.c \
+  simix/smx_context_java.c \
   java/jxbt_utilities.c     java/jxbt_utilities.h      \
   java/jmsg.c               java/jmsg.h                \
   java/jmsg_channel.c       java/jmsg_channel.h        \