X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/126a6ff45c126c2dfdde4f3a5a7ebefa36d755c4..6d31ded41b278226dc70b269dc7af66588e6474e:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d5229da6fb..baca6a5d3b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,7 +63,9 @@ EXTRA_DIST= \
 	amok/amok_modinter.h
 	\
 	include/simix/simix.h include/simix/datatypes.h \
-	simix/msg_simix_private.h
+	simix/msg_simix_private.h \
+	\
+	smpi/private.h smpi/smpi.h
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -142,11 +144,11 @@ XBT_SRC=\
   xbt/graphxml_parse.c
 
 XBT_RL_SRC = \
-  xbt/xbt_rl_synchro.c																											 \
-	xbt/xbt_rl_time.c
+  xbt/xbt_rl_synchro.c		\
+  xbt/xbt_rl_time.c
 XBT_SG_SRC = \
-  xbt/xbt_sg_synchro.c																											 \
-	xbt/xbt_sg_time.c
+  xbt/xbt_sg_synchro.c		\
+  xbt/xbt_sg_time.c     
 
 SURF_SRC= \
   surf/maxmin.c                                                              \
@@ -159,6 +161,10 @@ SURF_SRC= \
   surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c
 
+if CONTEXT_THREADS
+  SURF_SRC += xbt/xbt_os_thread.c
+endif
+
 GTNETS_SRC= \
   surf/gtnets/gtnets_simulator.cc \
   surf/gtnets/gtnets_topology.cc  \
@@ -167,7 +173,7 @@ GTNETS_SRC= \
 
 # Separated because we don't want it in libsimgrid4java
 CTX_SRC= xbt/context.c
-JCTX_SRC= java/jxbt_context.c java/jxbt_context.h xbt/xbt_os_thread.c
+JCTX_SRC= java/jxbt_context.c java/jxbt_context.h
 
 SIMIX_SRC= \
   simix/smx_global.c \
@@ -179,6 +185,10 @@ SIMIX_SRC= \
   simix/smx_action.c \
   simix/smx_synchro.c
 
+SMPI_SRC= \
+  smpi/smpi_base.c \
+  smpi/smpi_mpi.c
+
 MSG_SRC=  msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
   msg/global.c msg/environment.c msg/deployment.c 
@@ -276,10 +286,10 @@ endif
 ### Declare the library content
 ###
 
-lib_LTLIBRARIES= libsimgrid.la libgras.la 
+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 
+libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm 
 
 libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
                         $(SIMIX_SRC) $(CTX_SRC) \
@@ -287,6 +297,10 @@ libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
 			$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
 libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 
+libsmpi_la_LIBADD = libsimgrid.la
+libsmpi_la_SOURCES = $(SMPI_SRC)
+libsmpi_la_LDFLAGS = -no-undefined $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm
+
 ##
 ## Java cruft