X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/025965074dbe4c1b04466cc260260470f28b7472..3178b09e74d106b37d4bde47bb66e92ccc4088ef:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5fd51a917f..aee232d61d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,9 +40,6 @@ EXTRA_DIST= \
 	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 \
@@ -83,6 +80,7 @@ EXTRA_DIST= \
 	simix/private.h \
 	\
 	smpi/private.h \
+	smpi/smpi_coll_private.h \
 	smpi/README
 
 #LIBRARY_VERSION= 0:0:0
@@ -169,15 +167,20 @@ XBT_SG_SRC = \
   xbt/xbt_sg_time.c     
 
 SURF_SRC= \
+  surf/surf_model.c                                                          \
+  surf/surf_resource.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
 
@@ -200,7 +203,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 \
@@ -214,7 +216,8 @@ 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 \