X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3913bb7b7d28a6c8f383b7973f72a4fc7a1f4f01..111463df0d9a94d78e136d3d81ff828ea96a2cac:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a13bee8c6e..3f2bc94161 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,8 +48,8 @@ EXTRA_DIST= \
 	include/surf/surf.h \
 	include/surf/surfxml_parse_private.h \
 	\
-	include/xbt/xbt_portability.h \
-	include/xbt/xbt_thread.h \
+	include/xbt/xbt_os_time.h \
+	include/xbt/xbt_os_thread.h \
 	include/xbt/context.h \
 	\
 	msg/private.h \
@@ -113,7 +113,7 @@ XBT_SRC=\
   xbt_modinter.h    gras_modinter.h                                          \
   xbt/xbt_virtu.c                                                            \
   \
-  xbt/sysdep.c                                                               \
+  xbt/xbt_os_time.c                                                          \
   xbt/asserts.c                                                              \
   xbt/log.c                    xbt/xbt_log_appender_file.c                   \
   xbt/xbt_log_layout_simple.c  xbt/xbt_log_layout_format.c                   \
@@ -127,12 +127,24 @@ XBT_SRC=\
   xbt/graph.c                                                                \
   xbt/set.c                                                                  \
   xbt/xbt_matrix.c                                                           \
+  \
+  xbt/xbt_queue.c                                                            \
+  \
   xbt/xbt_peer.c                                                             \
+  \
   xbt/xbt_main.c                                                             \
+  \
   xbt/config.c                                                               \
   xbt/cunit.c                                                                \
   xbt/graphxml_parse.c
 
+XBT_RL_SRC = \
+  xbt/xbt_rl_synchro.c																											 \
+	xbt/xbt_rl_time.c
+XBT_SG_SRC = \
+  xbt/xbt_sg_synchro.c																											 \
+	xbt/xbt_sg_time.c
+
 SURF_SRC= \
   surf/maxmin.c                                                              \
   surf/lagrange.c                                                            \
@@ -152,7 +164,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_thread.c
+JCTX_SRC= java/jxbt_context.c java/jxbt_context.h xbt/xbt_os_thread.c
 
 SIMIX_SRC= \
   simix/smx_global.c \
@@ -197,8 +209,10 @@ SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_works
 GRAS_COMMON_SRC= \
   gras/gras.c  \
   gras/Transport/transport.c          gras/Transport/transport_private.h  \
-  gras/Msg/msg.c                      gras/Msg/rpc.c                       gras/Msg/timer.c                 \
-  gras/Msg/msg_interface.h            gras/Msg/msg_private.h           \
+  gras/Msg/gras_msg_mod.c             gras/Msg/gras_msg_types.c           \
+  gras/Msg/gras_msg_exchange.c                                            \
+  gras/Msg/rpc.c                      gras/Msg/timer.c                    \
+  gras/Msg/msg_interface.h            gras/Msg/msg_private.h              \
   \
   gras/Virtu/process.c gras/Virtu/gras_module.c  \
   \
@@ -209,7 +223,7 @@ GRAS_COMMON_SRC= \
   gras/DataDesc/ddt_parse.c           gras/DataDesc/ddt_parse.yy.c         gras/DataDesc/ddt_parse.yy.h
 
 GRAS_RL_SRC= \
-  gras/rl_stubs.c                     xbt/xbt_thread.c                    \
+  gras/rl_stubs.c                     xbt/xbt_os_thread.c                    \
   \
   gras/Transport/rl_transport.c          \
   gras/Transport/transport_plugin_file.c   gras/Transport/transport_plugin_tcp.c  \
@@ -219,6 +233,8 @@ GRAS_RL_SRC= \
   gras/Virtu/rl_dns.c\
   \
   gras/Msg/rl_msg.c
+  
+GRAS_RL_SRC+=$(XBT_RL_SRC)
 
 GRAS_SG_SRC= gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c        \
   \
@@ -226,9 +242,10 @@ GRAS_SG_SRC= gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c
   gras/Virtu/sg_process.c        gras/Virtu/sg_time.c     \
   gras/Virtu/sg_dns.c\
   \
-  gras/sg_stubs.c                         \
   gras/Msg/sg_msg.c
 
+GRAS_SG_SRC+=$(XBT_SG_SRC)
+
 AMOK_SRC= \
   amok/amok_base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
@@ -256,7 +273,7 @@ endif
 ### Declare the library content
 ###
 
-lib_LTLIBRARIES= libsimgrid.la libsimgrid4java.la libgras.la
+lib_LTLIBRARIES= libsimgrid.la libgras.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 
@@ -267,6 +284,12 @@ 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) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 
+##
+## Java cruft
+
+if HAVE_JAVA
+lib_LTLIBRARIES += libsimgrid4java.la
+
 libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
                              $(SIMIX_SRC) $(JCTX_SRC) \
                              $(JMSG_C_SRC) $(MSG_SRC) \
@@ -284,6 +307,9 @@ simgrid.jar: $(JMSG_JAVA_SRC)
 	[ -e .classes ] || mkdir .classes
 	$(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
 	$(JAR) cvf simgrid.jar -C .classes .;
+else
+EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
+endif
 
 if GRAMINE_MODE
 else