X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1686afc63c9643f647b5d44a64fdf4665e88ddd..7a4e264744a18d8953c3bd5e4a1df05f5d6088b9:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 71f276f6fa..32c5006278 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,6 @@ EXTRA_DIST= \
 	portable.h \
 	\
         xbt/mallocator_private.h \
-	xbt/dynar_private.h \
         xbt/dict_private.h \
         xbt/heap_private.h \
         xbt/fifo_private.h \
@@ -31,8 +30,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 \
@@ -49,6 +46,7 @@ EXTRA_DIST= \
 	surf/gtnets/gtnets_interface.h \
 	surf/gtnets/gtnets_simulator.h \
 	surf/gtnets/gtnets_topology.h  \
+	surf/cpu_ti_private.h \
 	\
         include/surf/surf_resource.h  \
 	include/surf/datatypes.h \
@@ -57,9 +55,9 @@ EXTRA_DIST= \
 	include/surf/surf.h \
 	include/surf/surfxml_parse_private.h \
 	include/surf/random_mgr.h \
+	include/surf/surf_resource_lmm.h \
 	\
 	include/xbt/wine_dbghelp.h \
-	include/xbt/context.h \
 	include/xbt/xbt_os_time.h \
 	include/xbt/xbt_os_thread.h \
 	\
@@ -78,10 +76,14 @@ 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/smpi_mpi_dt_private.h \
 	smpi/README
 
 #LIBRARY_VERSION= 0:0:0
@@ -182,6 +184,8 @@ SURF_SRC= \
   surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \
   surf/surf_model_timer.c                                                    \
   surf/workstation_ptask_L07.c                                               \
+  surf/cpu_ti.c                                               \
+  surf/cpu_im.c                                               \
   xbt/xbt_sg_stubs.c
 
 if CONTEXT_THREADS
@@ -194,23 +198,21 @@ GTNETS_SRC= \
   surf/gtnets/gtnets_interface.cc \
   surf/network_gtnets.c
 
-# 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= simix/xbt_context.c
-
 SIMIX_SRC= \
   simix/smx_global.c \
   simix/smx_deployment.c \
   simix/smx_environment.c \
   simix/smx_host.c \
   simix/smx_process.c \
+  simix/smx_context.c \
   simix/smx_action.c \
-  simix/smx_synchro.c
+  simix/smx_synchro.c \
+  simix/smx_network.c
   
 if CONTEXT_THREADS
-  SURF_SRC += simix/xbt_context_thread.c  
+  SURF_SRC += simix/smx_context_thread.c  
 else  
-  SURF_SRC += simix/xbt_context_sysv.c
+  SURF_SRC += simix/smx_context_sysv.c
 endif  
 
 SMPI_SRC= \
@@ -221,7 +223,8 @@ SMPI_SRC= \
   smpi/smpi_sender.c \
   smpi/smpi_receiver.c \
   smpi/smpi_util.c \
-  smpi/smpi_coll.c
+  smpi/smpi_coll.c \
+  smpi/smpi_mpi_dt.c
 
 MSG_SRC=  msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@ -229,7 +232,7 @@ MSG_SRC=  msg/msg_config.c \
   msg/msg_actions.c
 
 JMSG_C_SRC = \
-  simix/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        \
@@ -325,8 +328,7 @@ 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) \
-                        $(SIMIX_SRC) $(CTX_SRC) \
-                        $(MSG_SRC) $(SIMDAG_SRC) \
+                        $(SIMIX_SRC) $(MSG_SRC) $(SIMDAG_SRC) \
 			$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
 libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 # -Wl,--entry -Wl,simgrid_version
@@ -354,7 +356,7 @@ if HAVE_JAVA
 libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library
 
 clean-local:
-	-rm -rf .classes
+	-rm -rf .classes simgrid.jar
 
 jardir = $(prefix)/jar
 jar_DATA =  simgrid.jar
@@ -366,7 +368,7 @@ simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
 	cp $(srcdir)/surf/simgrid.dtd .classes/surf
 	$(JAR) cvf simgrid.jar -C .classes .
 else
-EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC)
+EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
 endif
 
 if GRAMINE_MODE