X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78fee3006db95dc64540374a81299f6c9f01ac4a..a431c02b798ec8bdd1c9c8e0314a1300e57ed028:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 085d6f0868..6adcaa2e8e 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 \
@@ -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
@@ -185,9 +187,7 @@ SURF_SRC= \
   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 +198,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 +208,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 \
@@ -217,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 \
@@ -225,7 +232,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        \
@@ -350,7 +357,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
@@ -362,7 +369,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