SURF: Kill the SDP model

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a184411..f60d142 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,6 +51,8 @@ EXTRA_DIST= \
        surf/gtnets/gtnets_simulator.h \
        surf/gtnets/gtnets_topology.h  \
        \
+        include/surf/surf_resource.h  \
+       include/surf/datatypes.h \
        include/surf/maxmin.h \
        include/surf/trace_mgr.h \
        include/surf/surf.h \
@@ -80,6 +82,7 @@ EXTRA_DIST= \
        simix/private.h \
        \
        smpi/private.h \
+       smpi/smpi_coll_private.h \
        smpi/README
 
 #LIBRARY_VERSION= 0:0:0
@@ -167,7 +170,6 @@ XBT_SG_SRC = \
 
 SURF_SRC= \
   surf/surf_model.c                                                          \
-  surf/surf_resource.c                                                       \
   surf/surf_action.c                                                         \
   surf/surf_routing.c                                                        \
   surf/surf_config.c                                                         \
@@ -215,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 \
@@ -309,13 +312,6 @@ else
   EXTRA_DIST+=$(GTNETS_SRC)
 endif
 
-if HAVE_SDP
-  SDP_SRC= surf/sdp.c
-else 
-  SDP_SRC=
-  EXTRA_DIST+=surf/sdp.c
-endif
-
 ###
 ### Declare the library content
 ###
@@ -325,7 +321,7 @@ lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la
 libgras_la_SOURCES=  $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
 libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
 
-libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
+libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \
                         $(SIMIX_SRC) $(CTX_SRC) \
                         $(MSG_SRC) $(SIMDAG_SRC) \
                        $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)