merge redundant surf_cpu_state_t and surf_link_state_t into surf_resource_state_t...

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a59dca3..9c4b175 100644 (file)
--- 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 \
@@ -54,6 +51,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 \
@@ -83,6 +81,7 @@ EXTRA_DIST= \
        simix/private.h \
        \
        smpi/private.h \
+       smpi/smpi_coll_private.h \
        smpi/README
 
 #LIBRARY_VERSION= 0:0:0
@@ -169,6 +168,10 @@ 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                                                     \
@@ -178,7 +181,7 @@ SURF_SRC= \
   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
 
@@ -214,7 +217,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 \