X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b936dbbe0c1785e04074e78d5c85dfa916eec58a..0caba370ea99d7ba91606850d0ee8657f39bdbe1:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 93ff77b29b..6c73acdcc9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,12 +37,10 @@ EXTRA_DIST= \
 	xbt/ex_interface.h \
         xbt/backtrace_linux.c xbt/backtrace_windows.c xbt/backtrace_dummy.c \
         \
+        surf/surf_resource.h  \
 	surf/maxmin_private.h \
 	surf/trace_mgr_private.h \
 	surf/surf_private.h \
-	surf/cpu_private.h \
-	surf/workstation_private.h \
-	surf/surf_timer_private.h \
 	surf/surfxml_parse.c \
 	surf/simgrid_dtd.l \
 	surf/simgrid_dtd.c \
@@ -54,6 +52,7 @@ EXTRA_DIST= \
 	surf/gtnets/gtnets_simulator.h \
 	surf/gtnets/gtnets_topology.h  \
 	\
+	include/surf/datatypes.h \
 	include/surf/maxmin.h \
 	include/surf/trace_mgr.h \
 	include/surf/surf.h \
@@ -82,7 +81,9 @@ EXTRA_DIST= \
 	include/simix/simix.h include/simix/datatypes.h \
 	simix/private.h \
 	\
-	smpi/private.h
+	smpi/private.h \
+	smpi/smpi_coll_private.h \
+	smpi/README
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -168,15 +169,19 @@ XBT_SG_SRC = \
   xbt/xbt_sg_time.c     
 
 SURF_SRC= \
+  surf/surf_model.c                                                          \
+  surf/surf_action.c                                                         \
+  surf/surf_routing.c                                                        \
+  surf/surf_config.c                                                         \
   surf/maxmin.c                                                              \
-  surf/fair_bottleneck.c                                                              \
+  surf/fair_bottleneck.c                                                     \
   surf/lagrange.c                                                            \
   surf/trace_mgr.c                                                           \
-  surf/random_mgr.c                                                           \
+  surf/random_mgr.c                                                          \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
   surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \
-  surf/surf_timer.c                                                          \
+  surf/surf_model_timer.c                                                    \
   surf/workstation_ptask_L07.c                                               \
   xbt/xbt_sg_stubs.c
 
@@ -199,7 +204,6 @@ CTX_SRC= xbt/xbt_context.c
 SIMIX_SRC= \
   simix/smx_global.c \
   simix/smx_deployment.c \
-  simix/smx_config.c \
   simix/smx_environment.c \
   simix/smx_host.c \
   simix/smx_process.c \
@@ -213,11 +217,13 @@ SMPI_SRC= \
   smpi/smpi_mpi.c \
   smpi/smpi_sender.c \
   smpi/smpi_receiver.c \
-  smpi/smpi_util.c
+  smpi/smpi_util.c \
+  smpi/smpi_coll.c
 
 MSG_SRC=  msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
-  msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c
+  msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c \
+  msg/msg_actions.c
 
 JMSG_C_SRC = \
   xbt/xbt_context_java.c \