X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c94898122fc054483e0e4b0313cd52f385582d2a..42ad1e118f005d56af6f9e87d7ecec75bb311108:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b1c11f755a..fd675c7a08 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,8 +31,6 @@ EXTRA_DIST= \
 	xbt/graphxml.l \
 	xbt/graphxml.c \
 	xbt/graphxml.dtd \
-        xbt/xbt_context_private.h \
-        xbt/xbt_context_java.h \
 	xbt/log_private.h \
 	xbt/ex_interface.h \
         xbt/backtrace_linux.c xbt/backtrace_windows.c xbt/backtrace_dummy.c \
@@ -40,20 +38,18 @@ 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 \
 	surf/simgrid.dtd \
 	surf/network_private.h \
-	surf/network_common.h \
 	surf/network_gtnets_private.h \
 	surf/gtnets/gtnets_interface.h \
 	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 \
@@ -61,7 +57,6 @@ EXTRA_DIST= \
 	include/surf/random_mgr.h \
 	\
 	include/xbt/wine_dbghelp.h \
-	include/xbt/context.h \
 	include/xbt/xbt_os_time.h \
 	include/xbt/xbt_os_thread.h \
 	\
@@ -80,9 +75,13 @@ EXTRA_DIST= \
 	amok/amok_modinter.h \
 	\
 	include/simix/simix.h include/simix/datatypes.h \
+	include/simix/context.h \
 	simix/private.h \
+        simix/smx_context_private.h \
+        simix/smx_context_java.h \
 	\
 	smpi/private.h \
+	smpi/smpi_coll_private.h \
 	smpi/README
 
 #LIBRARY_VERSION= 0:0:0
@@ -169,8 +168,9 @@ XBT_SG_SRC = \
   xbt/xbt_sg_time.c     
 
 SURF_SRC= \
-  surf/model.c                                                               \
-  surf/surf_resource.c                                                       \
+  surf/surf_model.c                                                          \
+  surf/surf_action.c                                                         \
+  surf/surf_routing.c                                                        \
   surf/surf_config.c                                                         \
   surf/maxmin.c                                                              \
   surf/fair_bottleneck.c                                                     \
@@ -180,14 +180,12 @@ 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
 
 if CONTEXT_THREADS
-  SURF_SRC +=  xbt/xbt_os_thread.c xbt/xbt_context_thread.c  
-else  
-  SURF_SRC += xbt/xbt_context_sysv.c
+  SURF_SRC +=  xbt/xbt_os_thread.c
 endif
 
 GTNETS_SRC= \
@@ -198,7 +196,7 @@ GTNETS_SRC= \
 
 # Separated because src/gras/rl_stubs also define the function xbt_context_mod_init() and xbt_context_mod_exit()
 # so there is an implementation of these functions in the simgrid library and an implementatin in the gras library 
-CTX_SRC= xbt/xbt_context.c
+CTX_SRC= simix/smx_context.c
 
 SIMIX_SRC= \
   simix/smx_global.c \
@@ -208,6 +206,12 @@ SIMIX_SRC= \
   simix/smx_process.c \
   simix/smx_action.c \
   simix/smx_synchro.c
+  
+if CONTEXT_THREADS
+  SURF_SRC += simix/smx_context_thread.c  
+else  
+  SURF_SRC += simix/smx_context_sysv.c
+endif  
 
 SMPI_SRC= \
   smpi/smpi_base.c \
@@ -216,7 +220,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 \
@@ -224,7 +229,7 @@ MSG_SRC=  msg/msg_config.c \
   msg/msg_actions.c
 
 JMSG_C_SRC = \
-  xbt/xbt_context_java.c \
+  simix/smx_context_java.c \
   java/jxbt_utilities.c     java/jxbt_utilities.h      \
   java/jmsg.c               java/jmsg.h                \
   java/jmsg_channel.c       java/jmsg_channel.h        \
@@ -310,13 +315,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
 ###
@@ -326,7 +324,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)