rename src/surf/model.c into surf_model.c to avoid name conflicts on .o files

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 93ff77b..890be63 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -82,7 +82,8 @@ EXTRA_DIST= \
        include/simix/simix.h include/simix/datatypes.h \
        simix/private.h \
        \
-       smpi/private.h
+       smpi/private.h \
+       smpi/README
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -168,11 +169,14 @@ XBT_SG_SRC = \
   xbt/xbt_sg_time.c     
 
 SURF_SRC= \
+  surf/surf_model.c                                                          \
+  surf/surf_resource.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     \
@@ -199,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 \
@@ -217,7 +220,8 @@ SMPI_SRC= \
 
 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 \