Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Further fix of win build
[simgrid.git] / src / Makefile.in
index 17ca387..20177f7 100644 (file)
@@ -40,11 +40,15 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@USE_GTNETS_FALSE@am__append_1 = $(GTNETS_SRC)
-@HAVE_SDP_FALSE@am__append_2 = surf/sdp.c
+@CONTEXT_THREADS_TRUE@am__append_1 = xbt/xbt_os_thread.c
+@CONTEXT_THREADS_FALSE@am__append_2 = xbt/xbt_os_thread_stubs.c
+@HAVE_GTNETS_FALSE@am__append_3 = $(GTNETS_SRC)
+@HAVE_SDP_FALSE@am__append_4 = surf/sdp.c
+@HAVE_JAVA_TRUE@am__append_5 = libsimgrid4java.la
+@HAVE_JAVA_FALSE@am__append_6 = $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
 @GRAMINE_MODE_FALSE@noinst_PROGRAMS = testall$(EXEEXT)
 @GRAMINE_MODE_FALSE@TESTS = testall$(EXEEXT)
-@GRAMINE_MODE_FALSE@am__append_3 = $(testall_SOURCES)
+@GRAMINE_MODE_FALSE@am__append_7 = $(testall_SOURCES)
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(srcdir)/gras_config.h.in $(srcdir)/ucontext_stack.h.in \
        $(top_srcdir)/acmacro/dist-files.mk
@@ -73,51 +77,57 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(jardir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libgras_la_LIBADD =
-am__objects_1 = snprintf.lo xbt_str.lo ex.lo xbt_virtu.lo sysdep.lo \
-       asserts.lo log.lo xbt_log_appender_file.lo \
+am__objects_1 = snprintf.lo xbt_str.lo ex.lo xbt_virtu.lo \
+       xbt_os_time.lo asserts.lo log.lo xbt_log_appender_file.lo \
        xbt_log_layout_simple.lo xbt_log_layout_format.lo \
        mallocator.lo dynar.lo dict.lo dict_elm.lo dict_cursor.lo \
        dict_multi.lo heap.lo fifo.lo swag.lo graph.lo set.lo \
-       xbt_matrix.lo xbt_peer.lo xbt_main.lo config.lo cunit.lo \
-       graphxml_parse.lo
-am__objects_2 = gras.lo transport.lo msg.lo rpc.lo timer.lo process.lo \
-       gras_module.lo ddt_create.lo ddt_convert.lo ddt_exchange.lo \
-       cbps.lo datadesc.lo ddt_parse.lo ddt_parse.yy.lo
-am__objects_3 = rl_stubs.lo xbt_thread.lo rl_transport.lo \
+       xbt_matrix.lo xbt_queue.lo xbt_peer.lo xbt_main.lo config.lo \
+       cunit.lo graphxml_parse.lo
+am__objects_2 = gras.lo transport.lo gras_msg_mod.lo gras_msg_types.lo \
+       gras_msg_exchange.lo gras_msg_listener.lo rpc.lo timer.lo \
+       process.lo gras_module.lo ddt_create.lo ddt_convert.lo \
+       ddt_exchange.lo cbps.lo datadesc.lo ddt_parse.lo \
+       ddt_parse.yy.lo
+am__objects_3 = xbt_rl_synchro.lo xbt_rl_time.lo
+am__objects_4 = rl_stubs.lo xbt_os_thread.lo rl_transport.lo \
        transport_plugin_file.lo transport_plugin_tcp.lo rl_emul.lo \
-       rl_process.lo rl_time.lo rl_dns.lo rl_msg.lo
-am__objects_4 = amok_base.lo bandwidth.lo saturate.lo \
+       rl_process.lo rl_dns.lo rl_msg.lo $(am__objects_3)
+am__objects_5 = amok_base.lo bandwidth.lo saturate.lo \
        peermanagement.lo
 am_libgras_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
-       $(am__objects_3) $(am__objects_4)
+       $(am__objects_4) $(am__objects_5)
 libgras_la_OBJECTS = $(am_libgras_la_OBJECTS)
 libgras_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libgras_la_LDFLAGS) $(LDFLAGS) -o $@
 libsimgrid_la_LIBADD =
 am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.c \
-       xbt_modinter.h gras_modinter.h xbt/xbt_virtu.c xbt/sysdep.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 \
-       xbt/mallocator.c xbt/dynar.c xbt/dict.c xbt/dict_elm.c \
-       xbt/dict_cursor.c xbt/dict_multi.c xbt/heap.c xbt/fifo.c \
-       xbt/swag.c xbt/graph.c xbt/set.c xbt/xbt_matrix.c \
-       xbt/xbt_peer.c xbt/xbt_main.c xbt/config.c xbt/cunit.c \
-       xbt/graphxml_parse.c surf/maxmin.c surf/lagrange.c \
-       surf/trace_mgr.c surf/surf.c surf/surfxml_parse.c surf/cpu.c \
-       surf/network.c surf/workstation.c surf/surf_timer.c \
-       surf/network_dassf.c surf/workstation_KCCFLN05.c \
-       surf/gtnets/gtnets_simulator.cc surf/gtnets/gtnets_topology.cc \
-       surf/gtnets/gtnets_interface.cc surf/network_gtnets.c \
-       surf/sdp.c simix/smx_global.c simix/smx_deployment.c \
-       simix/smx_config.c simix/smx_environment.c simix/smx_host.c \
-       simix/smx_process.c simix/smx_action.c simix/smx_synchro.c \
-       xbt/context.c 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 simdag/sd_global.c simdag/sd_link.c \
-       simdag/sd_task.c simdag/sd_workstation.c gras/gras.c \
-       gras/Transport/transport.c gras/Transport/transport_private.h \
-       gras/Msg/msg.c gras/Msg/rpc.c gras/Msg/timer.c \
+       xbt_modinter.h gras_modinter.h xbt/xbt_virtu.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 xbt/mallocator.c xbt/dynar.c \
+       xbt/dict.c xbt/dict_elm.c xbt/dict_cursor.c xbt/dict_multi.c \
+       xbt/heap.c xbt/fifo.c xbt/swag.c 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 surf/maxmin.c \
+       surf/lagrange.c surf/trace_mgr.c surf/surf.c \
+       surf/surfxml_parse.c surf/cpu.c surf/network.c \
+       surf/workstation.c surf/surf_timer.c surf/network_dassf.c \
+       surf/workstation_KCCFLN05.c xbt/xbt_os_thread.c \
+       xbt/xbt_os_thread_stubs.c surf/gtnets/gtnets_simulator.cc \
+       surf/gtnets/gtnets_topology.cc surf/gtnets/gtnets_interface.cc \
+       surf/network_gtnets.c surf/sdp.c simix/smx_global.c \
+       simix/smx_deployment.c simix/smx_config.c \
+       simix/smx_environment.c simix/smx_host.c simix/smx_process.c \
+       simix/smx_action.c simix/smx_synchro.c xbt/context.c \
+       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 \
+       simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c \
+       simdag/sd_workstation.c gras/gras.c gras/Transport/transport.c \
+       gras/Transport/transport_private.h gras/Msg/gras_msg_mod.c \
+       gras/Msg/gras_msg_types.c gras/Msg/gras_msg_exchange.c \
+       gras/Msg/gras_msg_listener.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 \
        gras/DataDesc/ddt_create.c gras/DataDesc/ddt_convert.c \
@@ -127,30 +137,34 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.c \
        gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h \
        gras/Transport/sg_transport.c \
        gras/Transport/transport_plugin_sg.c gras/Virtu/sg_emul.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 \
-       amok/amok_base.c amok/Bandwidth/bandwidth.c \
-       amok/Bandwidth/saturate.c amok/PeerManagement/peermanagement.c
-am__objects_5 = maxmin.lo lagrange.lo trace_mgr.lo surf.lo \
+       gras/Virtu/sg_process.c gras/Virtu/sg_dns.c gras/Msg/sg_msg.c \
+       xbt/xbt_sg_synchro.c xbt/xbt_sg_time.c amok/amok_base.c \
+       amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
+       amok/PeerManagement/peermanagement.c
+@CONTEXT_THREADS_TRUE@am__objects_6 = xbt_os_thread.lo
+@CONTEXT_THREADS_FALSE@am__objects_7 = xbt_os_thread_stubs.lo
+am__objects_8 = maxmin.lo lagrange.lo trace_mgr.lo surf.lo \
        surfxml_parse.lo cpu.lo network.lo workstation.lo \
-       surf_timer.lo network_dassf.lo workstation_KCCFLN05.lo
-am__objects_6 = gtnets_simulator.lo gtnets_topology.lo \
+       surf_timer.lo network_dassf.lo workstation_KCCFLN05.lo \
+       $(am__objects_6) $(am__objects_7)
+am__objects_9 = gtnets_simulator.lo gtnets_topology.lo \
        gtnets_interface.lo network_gtnets.lo
-@USE_GTNETS_TRUE@am__objects_7 = $(am__objects_6)
-@HAVE_SDP_TRUE@am__objects_8 = sdp.lo
-am__objects_9 = smx_global.lo smx_deployment.lo smx_config.lo \
+@HAVE_GTNETS_TRUE@am__objects_10 = $(am__objects_9)
+@HAVE_SDP_TRUE@am__objects_11 = sdp.lo
+am__objects_12 = smx_global.lo smx_deployment.lo smx_config.lo \
        smx_environment.lo smx_host.lo smx_process.lo smx_action.lo \
        smx_synchro.lo
-am__objects_10 = context.lo
-am__objects_11 = msg_config.lo task.lo host.lo m_process.lo gos.lo \
+am__objects_13 = context.lo
+am__objects_14 = msg_config.lo task.lo host.lo m_process.lo gos.lo \
        global.lo environment.lo deployment.lo
-am__objects_12 = sd_global.lo sd_link.lo sd_task.lo sd_workstation.lo
-am__objects_13 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \
-       sg_process.lo sg_time.lo sg_dns.lo sg_stubs.lo sg_msg.lo
-am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_5) \
-       $(am__objects_7) $(am__objects_8) $(am__objects_9) \
+am__objects_15 = sd_global.lo sd_link.lo sd_task.lo sd_workstation.lo
+am__objects_16 = xbt_sg_synchro.lo xbt_sg_time.lo
+am__objects_17 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \
+       sg_process.lo sg_dns.lo sg_msg.lo $(am__objects_16)
+am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_8) \
        $(am__objects_10) $(am__objects_11) $(am__objects_12) \
-       $(am__objects_2) $(am__objects_13) $(am__objects_4)
+       $(am__objects_13) $(am__objects_14) $(am__objects_15) \
+       $(am__objects_2) $(am__objects_17) $(am__objects_5)
 libsimgrid_la_OBJECTS = $(am_libsimgrid_la_OBJECTS)
 libsimgrid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -158,67 +172,80 @@ libsimgrid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 libsimgrid4java_la_LIBADD =
 am__libsimgrid4java_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
        xbt/ex.c xbt_modinter.h gras_modinter.h xbt/xbt_virtu.c \
-       xbt/sysdep.c xbt/asserts.c xbt/log.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 xbt/mallocator.c xbt/dynar.c \
        xbt/dict.c xbt/dict_elm.c xbt/dict_cursor.c xbt/dict_multi.c \
        xbt/heap.c xbt/fifo.c xbt/swag.c xbt/graph.c xbt/set.c \
-       xbt/xbt_matrix.c xbt/xbt_peer.c xbt/xbt_main.c xbt/config.c \
-       xbt/cunit.c xbt/graphxml_parse.c surf/maxmin.c surf/lagrange.c \
-       surf/trace_mgr.c surf/surf.c surf/surfxml_parse.c surf/cpu.c \
-       surf/network.c surf/workstation.c surf/surf_timer.c \
-       surf/network_dassf.c surf/workstation_KCCFLN05.c \
-       surf/gtnets/gtnets_simulator.cc surf/gtnets/gtnets_topology.cc \
-       surf/gtnets/gtnets_interface.cc surf/network_gtnets.c \
-       surf/sdp.c simix/smx_global.c simix/smx_deployment.c \
-       simix/smx_config.c simix/smx_environment.c simix/smx_host.c \
-       simix/smx_process.c simix/smx_action.c simix/smx_synchro.c \
-       java/jxbt_context.c java/jxbt_context.h xbt/xbt_thread.c \
-       java/jxbt_utilities.c java/jxbt_utilities.h java/jmsg.c \
-       java/jmsg.h java/jmsg_channel.c java/jmsg_channel.h \
-       java/jmsg_host.c java/jmsg_host.h java/jmsg_parallel_task.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 surf/maxmin.c \
+       surf/lagrange.c surf/trace_mgr.c surf/surf.c \
+       surf/surfxml_parse.c surf/cpu.c surf/network.c \
+       surf/workstation.c surf/surf_timer.c surf/network_dassf.c \
+       surf/workstation_KCCFLN05.c xbt/xbt_os_thread.c \
+       xbt/xbt_os_thread_stubs.c surf/gtnets/gtnets_simulator.cc \
+       surf/gtnets/gtnets_topology.cc surf/gtnets/gtnets_interface.cc \
+       surf/network_gtnets.c surf/sdp.c simix/smx_global.c \
+       simix/smx_deployment.c simix/smx_config.c \
+       simix/smx_environment.c simix/smx_host.c simix/smx_process.c \
+       simix/smx_action.c simix/smx_synchro.c java/jxbt_context.c \
+       java/jxbt_context.h java/jxbt_utilities.c \
+       java/jxbt_utilities.h java/jmsg.c java/jmsg.h \
+       java/jmsg_channel.c java/jmsg_channel.h java/jmsg_host.c \
+       java/jmsg_host.h java/jmsg_parallel_task.c \
        java/jmsg_parallel_task.h java/jmsg_process.c \
        java/jmsg_process.h java/jmsg_task.c java/jmsg_task.h \
        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 \
        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/Virtu/process.c \
-       gras/Virtu/gras_module.c gras/DataDesc/ddt_create.c \
-       gras/DataDesc/ddt_convert.c gras/DataDesc/ddt_exchange.c \
-       gras/DataDesc/cbps.c gras/DataDesc/datadesc.c \
-       gras/DataDesc/datadesc_interface.h \
+       gras/Transport/transport_private.h gras/Msg/gras_msg_mod.c \
+       gras/Msg/gras_msg_types.c gras/Msg/gras_msg_exchange.c \
+       gras/Msg/gras_msg_listener.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 \
+       gras/DataDesc/ddt_create.c gras/DataDesc/ddt_convert.c \
+       gras/DataDesc/ddt_exchange.c gras/DataDesc/cbps.c \
+       gras/DataDesc/datadesc.c gras/DataDesc/datadesc_interface.h \
        gras/DataDesc/datadesc_private.h gras/DataDesc/ddt_parse.c \
        gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h \
        gras/Transport/sg_transport.c \
        gras/Transport/transport_plugin_sg.c gras/Virtu/sg_emul.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 \
-       amok/amok_base.c amok/Bandwidth/bandwidth.c \
-       amok/Bandwidth/saturate.c amok/PeerManagement/peermanagement.c
-am__objects_14 = jxbt_context.lo xbt_thread.lo
-am__objects_15 = jxbt_utilities.lo jmsg.lo jmsg_channel.lo \
+       gras/Virtu/sg_process.c gras/Virtu/sg_dns.c gras/Msg/sg_msg.c \
+       xbt/xbt_sg_synchro.c xbt/xbt_sg_time.c amok/amok_base.c \
+       amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
+       amok/PeerManagement/peermanagement.c
+am__objects_18 = jxbt_context.lo
+am__objects_19 = jxbt_utilities.lo jmsg.lo jmsg_channel.lo \
        jmsg_host.lo jmsg_parallel_task.lo jmsg_process.lo \
        jmsg_task.lo
-am_libsimgrid4java_la_OBJECTS = $(am__objects_1) $(am__objects_5) \
-       $(am__objects_7) $(am__objects_8) $(am__objects_9) \
-       $(am__objects_14) $(am__objects_15) $(am__objects_11) \
-       $(am__objects_2) $(am__objects_13) $(am__objects_4)
+@HAVE_JAVA_TRUE@am_libsimgrid4java_la_OBJECTS = $(am__objects_1) \
+@HAVE_JAVA_TRUE@       $(am__objects_8) $(am__objects_10) \
+@HAVE_JAVA_TRUE@       $(am__objects_11) $(am__objects_12) \
+@HAVE_JAVA_TRUE@       $(am__objects_18) $(am__objects_19) \
+@HAVE_JAVA_TRUE@       $(am__objects_14) $(am__objects_2) \
+@HAVE_JAVA_TRUE@       $(am__objects_17) $(am__objects_5)
 libsimgrid4java_la_OBJECTS = $(am_libsimgrid4java_la_OBJECTS)
 libsimgrid4java_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(libsimgrid4java_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_JAVA_TRUE@am_libsimgrid4java_la_rpath = -rpath $(libdir)
+libsmpi_la_DEPENDENCIES = libsimgrid.la
+am__objects_20 = smpi_base.lo smpi_mpi.lo
+am_libsmpi_la_OBJECTS = $(am__objects_20)
+libsmpi_la_OBJECTS = $(am_libsmpi_la_OBJECTS)
+libsmpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(libsmpi_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(noinst_PROGRAMS)
 am__testall_SOURCES_DIST = ./cunit_unit.c ./ex_unit.c ./dynar_unit.c \
        ./dict_unit.c ./set_unit.c ./swag_unit.c ./xbt_str_unit.c \
        ./config_unit.c simgrid_units_main.c
-@GRAMINE_MODE_FALSE@am__objects_16 = cunit_unit.$(OBJEXT) \
+@GRAMINE_MODE_FALSE@am__objects_21 = cunit_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@   ex_unit.$(OBJEXT) dynar_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@   dict_unit.$(OBJEXT) set_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@   swag_unit.$(OBJEXT) xbt_str_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@   config_unit.$(OBJEXT)
-@GRAMINE_MODE_FALSE@am_testall_OBJECTS = $(am__objects_16) \
+@GRAMINE_MODE_FALSE@am_testall_OBJECTS = $(am__objects_21) \
 @GRAMINE_MODE_FALSE@   simgrid_units_main.$(OBJEXT)
 testall_OBJECTS = $(am_testall_OBJECTS)
 @GRAMINE_MODE_FALSE@testall_DEPENDENCIES = libgras.la
@@ -244,9 +271,10 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
 SOURCES = $(libgras_la_SOURCES) $(libsimgrid_la_SOURCES) \
-       $(libsimgrid4java_la_SOURCES) $(testall_SOURCES)
+       $(libsimgrid4java_la_SOURCES) $(libsmpi_la_SOURCES) \
+       $(testall_SOURCES)
 DIST_SOURCES = $(libgras_la_SOURCES) $(am__libsimgrid_la_SOURCES_DIST) \
-       $(am__libsimgrid4java_la_SOURCES_DIST) \
+       $(am__libsimgrid4java_la_SOURCES_DIST) $(libsmpi_la_SOURCES) \
        $(am__testall_SOURCES_DIST)
 jarDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(jar_DATA)
@@ -256,7 +284,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADDR2LINE = @ADDR2LINE@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@ -g @GTNETS_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -290,8 +318,6 @@ GCJDEPMODE = @GCJDEPMODE@
 GCJFLAGS = @GCJFLAGS@
 GRAS_DEP = @GRAS_DEP@
 GREP = @GREP@
-GTNETS_CFLAGS = @GTNETS_CFLAGS@
-GTNETS_LDFLAGS = @GTNETS_LDFLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -389,6 +415,9 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+
+#AM_CPPFLAGS=
+AM_CFLAGS = -g
 #AM_CFLAGS= -DNDEBUG 
 
 # -DNLOG   cuts absolutely all logs at compilation time.
@@ -412,11 +441,13 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \
        surf/network_dassf_private.h \
        surf/workstation_KCCFLN05_private.h include/surf/maxmin.h \
        include/surf/trace_mgr.h include/surf/surf.h \
-       include/surf/surfxml_parse_private.h \
-       include/xbt/xbt_portability.h include/xbt/xbt_thread.h \
-       include/xbt/context.h msg/private.h simdag/private.h \
+       include/surf/surfxml_parse_private.h include/xbt/xbt_os_time.h \
+       include/xbt/xbt_os_thread.h include/xbt/context.h \
+       msg/private.h simdag/private.h gras/DataDesc/ddt_parse.yy.l \
+       gras/Virtu/virtu_interface.h \
        amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \
-       $(am__append_1) $(am__append_2) $(am__append_3)
+       $(am__append_3) $(am__append_4) $(am__append_6) \
+       $(am__append_7)
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -466,7 +497,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                   \
@@ -480,23 +511,29 @@ 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
 
-SURF_SRC = \
-  surf/maxmin.c                                                              \
-  surf/lagrange.c                                                            \
-  surf/trace_mgr.c                                                           \
-  surf/surf.c                                                                \
-  surf/surfxml_parse.c                                                       \
-  surf/cpu.c   surf/network.c   surf/workstation.c                           \
-  surf/surf_timer.c                                                          \
-  surf/network_dassf.c                                                       \
-  surf/workstation_KCCFLN05.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 surf/trace_mgr.c surf/surf.c \
+       surf/surfxml_parse.c surf/cpu.c surf/network.c \
+       surf/workstation.c surf/surf_timer.c surf/network_dassf.c \
+       surf/workstation_KCCFLN05.c $(am__append_1) $(am__append_2)
 GTNETS_SRC = \
   surf/gtnets/gtnets_simulator.cc \
   surf/gtnets/gtnets_topology.cc  \
@@ -506,7 +543,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
 SIMIX_SRC = \
   simix/smx_global.c \
   simix/smx_deployment.c \
@@ -517,6 +554,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 
@@ -549,8 +590,10 @@ SIMDAG_SRC = simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_work
 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/gras_msg_listener.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  \
   \
@@ -560,62 +603,58 @@ GRAS_COMMON_SRC = \
   gras/DataDesc/datadesc_interface.h  gras/DataDesc/datadesc_private.h \
   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/Transport/rl_transport.c          \
-  gras/Transport/transport_plugin_file.c   gras/Transport/transport_plugin_tcp.c  \
-  \
-  gras/Virtu/rl_emul.c \
-  gras/Virtu/rl_process.c        gras/Virtu/rl_time.c \
-  gras/Virtu/rl_dns.c\
-  \
-  gras/Msg/rl_msg.c
-
-GRAS_SG_SRC = gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c        \
-  \
-  gras/Virtu/sg_emul.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_RL_SRC = 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 gras/Virtu/rl_emul.c \
+       gras/Virtu/rl_process.c gras/Virtu/rl_dns.c gras/Msg/rl_msg.c \
+       $(XBT_RL_SRC)
+GRAS_SG_SRC = gras/Transport/sg_transport.c \
+       gras/Transport/transport_plugin_sg.c gras/Virtu/sg_emul.c \
+       gras/Virtu/sg_process.c gras/Virtu/sg_dns.c gras/Msg/sg_msg.c \
+       $(XBT_SG_SRC)
 AMOK_SRC = \
   amok/amok_base.c \
   amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
   amok/PeerManagement/peermanagement.c
 
-@USE_GTNETS_FALSE@GTNETS_USED = 
+@HAVE_GTNETS_FALSE@GTNETS_USED = 
 
 ##############################
 # Deal with optional modules #
 ##############################
-@USE_GTNETS_TRUE@GTNETS_USED = $(GTNETS_SRC)
+@HAVE_GTNETS_TRUE@GTNETS_USED = $(GTNETS_SRC)
 @HAVE_SDP_FALSE@SDP_SRC = 
 @HAVE_SDP_TRUE@SDP_SRC = surf/sdp.c
 
 ###
 ### Declare the library content
 ###
-lib_LTLIBRARIES = libsimgrid.la libsimgrid4java.la libgras.la
+lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la $(am__append_5)
 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) \
                         $(MSG_SRC) $(SIMDAG_SRC) \
                        $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
 
-libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
-libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
-                             $(SIMIX_SRC) $(JCTX_SRC) \
-                             $(JMSG_C_SRC) $(MSG_SRC) \
-                            $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
-
-libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
-libsimgrid4java_la_GCJFLAGS = -fjni
-jardir = $(prefix)/jar 
-jar_DATA = simgrid.jar
+libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+
+# Please do not add -no-undefined to libsmpi_la_LDFLAGS:
+# smpi_simulated_main is indeed defined in user code, and undef in the
+# library (no idea why it works under linux, but it fails under windows)
+libsmpi_la_LIBADD = libsimgrid.la
+libsmpi_la_SOURCES = $(SMPI_SRC)
+libsmpi_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm
+@HAVE_JAVA_TRUE@libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
+@HAVE_JAVA_TRUE@                             $(SIMIX_SRC) $(JCTX_SRC) \
+@HAVE_JAVA_TRUE@                             $(JMSG_C_SRC) $(MSG_SRC) \
+@HAVE_JAVA_TRUE@                            $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
+
+@HAVE_JAVA_TRUE@libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+@HAVE_JAVA_TRUE@libsimgrid4java_la_GCJFLAGS = -fjni
+@HAVE_JAVA_TRUE@jardir = $(prefix)/jar 
+@HAVE_JAVA_TRUE@jar_DATA = simgrid.jar
 @GRAMINE_MODE_FALSE@TEST_CFILES = xbt/cunit.c  xbt/ex.c          \
 @GRAMINE_MODE_FALSE@            xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
 @GRAMINE_MODE_FALSE@       xbt/xbt_str.c                      \
@@ -719,7 +758,9 @@ libgras.la: $(libgras_la_OBJECTS) $(libgras_la_DEPENDENCIES)
 libsimgrid.la: $(libsimgrid_la_OBJECTS) $(libsimgrid_la_DEPENDENCIES) 
        $(libsimgrid_la_LINK) -rpath $(libdir) $(libsimgrid_la_OBJECTS) $(libsimgrid_la_LIBADD) $(LIBS)
 libsimgrid4java.la: $(libsimgrid4java_la_OBJECTS) $(libsimgrid4java_la_DEPENDENCIES) 
-       $(libsimgrid4java_la_LINK) -rpath $(libdir) $(libsimgrid4java_la_OBJECTS) $(libsimgrid4java_la_LIBADD) $(LIBS)
+       $(libsimgrid4java_la_LINK) $(am_libsimgrid4java_la_rpath) $(libsimgrid4java_la_OBJECTS) $(libsimgrid4java_la_LIBADD) $(LIBS)
+libsmpi.la: $(libsmpi_la_OBJECTS) $(libsmpi_la_DEPENDENCIES) 
+       $(libsmpi_la_LINK) -rpath $(libdir) $(libsmpi_la_OBJECTS) $(libsmpi_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
        @list='$(noinst_PROGRAMS)'; for p in $$list; do \
@@ -771,6 +812,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphxml_parse.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gras.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gras_module.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gras_msg_exchange.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gras_msg_listener.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gras_msg_mod.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gras_msg_types.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtnets_interface.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtnets_simulator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtnets_topology.Plo@am__quote@
@@ -789,7 +834,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_process.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mallocator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maxmin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg_config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_dassf.Plo@am__quote@
@@ -801,7 +845,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_msg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_process.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_stubs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_time.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_transport.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saturate.Plo@am__quote@
@@ -816,10 +859,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_emul.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_msg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_process.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_stubs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_time.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_transport.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simgrid_units_main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smpi_base.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smpi_mpi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smx_action.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smx_config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smx_deployment.Plo@am__quote@
@@ -834,7 +877,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/surfxml_parse.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swag.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swag_unit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysdep.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trace_mgr.Plo@am__quote@
@@ -849,10 +891,17 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_log_layout_simple.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_main.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_matrix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_os_thread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_os_thread_stubs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_os_time.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_peer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_queue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_rl_synchro.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_rl_time.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sg_synchro.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sg_time.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_str.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_str_unit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_thread.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_virtu.Plo@am__quote@
 
 .c.o:
@@ -904,12 +953,12 @@ xbt_virtu.lo: xbt/xbt_virtu.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_virtu.lo `test -f 'xbt/xbt_virtu.c' || echo '$(srcdir)/'`xbt/xbt_virtu.c
 
-sysdep.lo: xbt/sysdep.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sysdep.lo -MD -MP -MF $(DEPDIR)/sysdep.Tpo -c -o sysdep.lo `test -f 'xbt/sysdep.c' || echo '$(srcdir)/'`xbt/sysdep.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/sysdep.Tpo $(DEPDIR)/sysdep.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/sysdep.c' object='sysdep.lo' libtool=yes @AMDEPBACKSLASH@
+xbt_os_time.lo: xbt/xbt_os_time.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_os_time.lo -MD -MP -MF $(DEPDIR)/xbt_os_time.Tpo -c -o xbt_os_time.lo `test -f 'xbt/xbt_os_time.c' || echo '$(srcdir)/'`xbt/xbt_os_time.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_os_time.Tpo $(DEPDIR)/xbt_os_time.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_os_time.c' object='xbt_os_time.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sysdep.lo `test -f 'xbt/sysdep.c' || echo '$(srcdir)/'`xbt/sysdep.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_os_time.lo `test -f 'xbt/xbt_os_time.c' || echo '$(srcdir)/'`xbt/xbt_os_time.c
 
 asserts.lo: xbt/asserts.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT asserts.lo -MD -MP -MF $(DEPDIR)/asserts.Tpo -c -o asserts.lo `test -f 'xbt/asserts.c' || echo '$(srcdir)/'`xbt/asserts.c
@@ -1030,6 +1079,13 @@ xbt_matrix.lo: xbt/xbt_matrix.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_matrix.lo `test -f 'xbt/xbt_matrix.c' || echo '$(srcdir)/'`xbt/xbt_matrix.c
 
+xbt_queue.lo: xbt/xbt_queue.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_queue.lo -MD -MP -MF $(DEPDIR)/xbt_queue.Tpo -c -o xbt_queue.lo `test -f 'xbt/xbt_queue.c' || echo '$(srcdir)/'`xbt/xbt_queue.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_queue.Tpo $(DEPDIR)/xbt_queue.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_queue.c' object='xbt_queue.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_queue.lo `test -f 'xbt/xbt_queue.c' || echo '$(srcdir)/'`xbt/xbt_queue.c
+
 xbt_peer.lo: xbt/xbt_peer.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_peer.lo -MD -MP -MF $(DEPDIR)/xbt_peer.Tpo -c -o xbt_peer.lo `test -f 'xbt/xbt_peer.c' || echo '$(srcdir)/'`xbt/xbt_peer.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_peer.Tpo $(DEPDIR)/xbt_peer.Plo
@@ -1079,12 +1135,33 @@ transport.lo: gras/Transport/transport.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o transport.lo `test -f 'gras/Transport/transport.c' || echo '$(srcdir)/'`gras/Transport/transport.c
 
-msg.lo: gras/Msg/msg.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msg.lo -MD -MP -MF $(DEPDIR)/msg.Tpo -c -o msg.lo `test -f 'gras/Msg/msg.c' || echo '$(srcdir)/'`gras/Msg/msg.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/msg.Tpo $(DEPDIR)/msg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='gras/Msg/msg.c' object='msg.lo' libtool=yes @AMDEPBACKSLASH@
+gras_msg_mod.lo: gras/Msg/gras_msg_mod.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gras_msg_mod.lo -MD -MP -MF $(DEPDIR)/gras_msg_mod.Tpo -c -o gras_msg_mod.lo `test -f 'gras/Msg/gras_msg_mod.c' || echo '$(srcdir)/'`gras/Msg/gras_msg_mod.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/gras_msg_mod.Tpo $(DEPDIR)/gras_msg_mod.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='gras/Msg/gras_msg_mod.c' object='gras_msg_mod.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gras_msg_mod.lo `test -f 'gras/Msg/gras_msg_mod.c' || echo '$(srcdir)/'`gras/Msg/gras_msg_mod.c
+
+gras_msg_types.lo: gras/Msg/gras_msg_types.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gras_msg_types.lo -MD -MP -MF $(DEPDIR)/gras_msg_types.Tpo -c -o gras_msg_types.lo `test -f 'gras/Msg/gras_msg_types.c' || echo '$(srcdir)/'`gras/Msg/gras_msg_types.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/gras_msg_types.Tpo $(DEPDIR)/gras_msg_types.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='gras/Msg/gras_msg_types.c' object='gras_msg_types.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gras_msg_types.lo `test -f 'gras/Msg/gras_msg_types.c' || echo '$(srcdir)/'`gras/Msg/gras_msg_types.c
+
+gras_msg_exchange.lo: gras/Msg/gras_msg_exchange.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gras_msg_exchange.lo -MD -MP -MF $(DEPDIR)/gras_msg_exchange.Tpo -c -o gras_msg_exchange.lo `test -f 'gras/Msg/gras_msg_exchange.c' || echo '$(srcdir)/'`gras/Msg/gras_msg_exchange.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/gras_msg_exchange.Tpo $(DEPDIR)/gras_msg_exchange.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='gras/Msg/gras_msg_exchange.c' object='gras_msg_exchange.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gras_msg_exchange.lo `test -f 'gras/Msg/gras_msg_exchange.c' || echo '$(srcdir)/'`gras/Msg/gras_msg_exchange.c
+
+gras_msg_listener.lo: gras/Msg/gras_msg_listener.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gras_msg_listener.lo -MD -MP -MF $(DEPDIR)/gras_msg_listener.Tpo -c -o gras_msg_listener.lo `test -f 'gras/Msg/gras_msg_listener.c' || echo '$(srcdir)/'`gras/Msg/gras_msg_listener.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/gras_msg_listener.Tpo $(DEPDIR)/gras_msg_listener.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='gras/Msg/gras_msg_listener.c' object='gras_msg_listener.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msg.lo `test -f 'gras/Msg/msg.c' || echo '$(srcdir)/'`gras/Msg/msg.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gras_msg_listener.lo `test -f 'gras/Msg/gras_msg_listener.c' || echo '$(srcdir)/'`gras/Msg/gras_msg_listener.c
 
 rpc.lo: gras/Msg/rpc.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rpc.lo -MD -MP -MF $(DEPDIR)/rpc.Tpo -c -o rpc.lo `test -f 'gras/Msg/rpc.c' || echo '$(srcdir)/'`gras/Msg/rpc.c
@@ -1170,12 +1247,12 @@ rl_stubs.lo: gras/rl_stubs.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rl_stubs.lo `test -f 'gras/rl_stubs.c' || echo '$(srcdir)/'`gras/rl_stubs.c
 
-xbt_thread.lo: xbt/xbt_thread.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_thread.lo -MD -MP -MF $(DEPDIR)/xbt_thread.Tpo -c -o xbt_thread.lo `test -f 'xbt/xbt_thread.c' || echo '$(srcdir)/'`xbt/xbt_thread.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_thread.Tpo $(DEPDIR)/xbt_thread.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_thread.c' object='xbt_thread.lo' libtool=yes @AMDEPBACKSLASH@
+xbt_os_thread.lo: xbt/xbt_os_thread.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_os_thread.lo -MD -MP -MF $(DEPDIR)/xbt_os_thread.Tpo -c -o xbt_os_thread.lo `test -f 'xbt/xbt_os_thread.c' || echo '$(srcdir)/'`xbt/xbt_os_thread.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_os_thread.Tpo $(DEPDIR)/xbt_os_thread.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_os_thread.c' object='xbt_os_thread.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_thread.lo `test -f 'xbt/xbt_thread.c' || echo '$(srcdir)/'`xbt/xbt_thread.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_os_thread.lo `test -f 'xbt/xbt_os_thread.c' || echo '$(srcdir)/'`xbt/xbt_os_thread.c
 
 rl_transport.lo: gras/Transport/rl_transport.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rl_transport.lo -MD -MP -MF $(DEPDIR)/rl_transport.Tpo -c -o rl_transport.lo `test -f 'gras/Transport/rl_transport.c' || echo '$(srcdir)/'`gras/Transport/rl_transport.c
@@ -1212,13 +1289,6 @@ rl_process.lo: gras/Virtu/rl_process.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rl_process.lo `test -f 'gras/Virtu/rl_process.c' || echo '$(srcdir)/'`gras/Virtu/rl_process.c
 
-rl_time.lo: gras/Virtu/rl_time.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rl_time.lo -MD -MP -MF $(DEPDIR)/rl_time.Tpo -c -o rl_time.lo `test -f 'gras/Virtu/rl_time.c' || echo '$(srcdir)/'`gras/Virtu/rl_time.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/rl_time.Tpo $(DEPDIR)/rl_time.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='gras/Virtu/rl_time.c' object='rl_time.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rl_time.lo `test -f 'gras/Virtu/rl_time.c' || echo '$(srcdir)/'`gras/Virtu/rl_time.c
-
 rl_dns.lo: gras/Virtu/rl_dns.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rl_dns.lo -MD -MP -MF $(DEPDIR)/rl_dns.Tpo -c -o rl_dns.lo `test -f 'gras/Virtu/rl_dns.c' || echo '$(srcdir)/'`gras/Virtu/rl_dns.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/rl_dns.Tpo $(DEPDIR)/rl_dns.Plo
@@ -1233,6 +1303,20 @@ rl_msg.lo: gras/Msg/rl_msg.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rl_msg.lo `test -f 'gras/Msg/rl_msg.c' || echo '$(srcdir)/'`gras/Msg/rl_msg.c
 
+xbt_rl_synchro.lo: xbt/xbt_rl_synchro.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_rl_synchro.lo -MD -MP -MF $(DEPDIR)/xbt_rl_synchro.Tpo -c -o xbt_rl_synchro.lo `test -f 'xbt/xbt_rl_synchro.c' || echo '$(srcdir)/'`xbt/xbt_rl_synchro.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_rl_synchro.Tpo $(DEPDIR)/xbt_rl_synchro.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_rl_synchro.c' object='xbt_rl_synchro.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_rl_synchro.lo `test -f 'xbt/xbt_rl_synchro.c' || echo '$(srcdir)/'`xbt/xbt_rl_synchro.c
+
+xbt_rl_time.lo: xbt/xbt_rl_time.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_rl_time.lo -MD -MP -MF $(DEPDIR)/xbt_rl_time.Tpo -c -o xbt_rl_time.lo `test -f 'xbt/xbt_rl_time.c' || echo '$(srcdir)/'`xbt/xbt_rl_time.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_rl_time.Tpo $(DEPDIR)/xbt_rl_time.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_rl_time.c' object='xbt_rl_time.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_rl_time.lo `test -f 'xbt/xbt_rl_time.c' || echo '$(srcdir)/'`xbt/xbt_rl_time.c
+
 amok_base.lo: amok/amok_base.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT amok_base.lo -MD -MP -MF $(DEPDIR)/amok_base.Tpo -c -o amok_base.lo `test -f 'amok/amok_base.c' || echo '$(srcdir)/'`amok/amok_base.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/amok_base.Tpo $(DEPDIR)/amok_base.Plo
@@ -1338,6 +1422,13 @@ workstation_KCCFLN05.lo: surf/workstation_KCCFLN05.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o workstation_KCCFLN05.lo `test -f 'surf/workstation_KCCFLN05.c' || echo '$(srcdir)/'`surf/workstation_KCCFLN05.c
 
+xbt_os_thread_stubs.lo: xbt/xbt_os_thread_stubs.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_os_thread_stubs.lo -MD -MP -MF $(DEPDIR)/xbt_os_thread_stubs.Tpo -c -o xbt_os_thread_stubs.lo `test -f 'xbt/xbt_os_thread_stubs.c' || echo '$(srcdir)/'`xbt/xbt_os_thread_stubs.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_os_thread_stubs.Tpo $(DEPDIR)/xbt_os_thread_stubs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_os_thread_stubs.c' object='xbt_os_thread_stubs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_os_thread_stubs.lo `test -f 'xbt/xbt_os_thread_stubs.c' || echo '$(srcdir)/'`xbt/xbt_os_thread_stubs.c
+
 network_gtnets.lo: surf/network_gtnets.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT network_gtnets.lo -MD -MP -MF $(DEPDIR)/network_gtnets.Tpo -c -o network_gtnets.lo `test -f 'surf/network_gtnets.c' || echo '$(srcdir)/'`surf/network_gtnets.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/network_gtnets.Tpo $(DEPDIR)/network_gtnets.Plo
@@ -1527,13 +1618,6 @@ sg_process.lo: gras/Virtu/sg_process.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sg_process.lo `test -f 'gras/Virtu/sg_process.c' || echo '$(srcdir)/'`gras/Virtu/sg_process.c
 
-sg_time.lo: gras/Virtu/sg_time.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sg_time.lo -MD -MP -MF $(DEPDIR)/sg_time.Tpo -c -o sg_time.lo `test -f 'gras/Virtu/sg_time.c' || echo '$(srcdir)/'`gras/Virtu/sg_time.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/sg_time.Tpo $(DEPDIR)/sg_time.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='gras/Virtu/sg_time.c' object='sg_time.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sg_time.lo `test -f 'gras/Virtu/sg_time.c' || echo '$(srcdir)/'`gras/Virtu/sg_time.c
-
 sg_dns.lo: gras/Virtu/sg_dns.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sg_dns.lo -MD -MP -MF $(DEPDIR)/sg_dns.Tpo -c -o sg_dns.lo `test -f 'gras/Virtu/sg_dns.c' || echo '$(srcdir)/'`gras/Virtu/sg_dns.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/sg_dns.Tpo $(DEPDIR)/sg_dns.Plo
@@ -1541,13 +1625,6 @@ sg_dns.lo: gras/Virtu/sg_dns.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sg_dns.lo `test -f 'gras/Virtu/sg_dns.c' || echo '$(srcdir)/'`gras/Virtu/sg_dns.c
 
-sg_stubs.lo: gras/sg_stubs.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sg_stubs.lo -MD -MP -MF $(DEPDIR)/sg_stubs.Tpo -c -o sg_stubs.lo `test -f 'gras/sg_stubs.c' || echo '$(srcdir)/'`gras/sg_stubs.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/sg_stubs.Tpo $(DEPDIR)/sg_stubs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='gras/sg_stubs.c' object='sg_stubs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sg_stubs.lo `test -f 'gras/sg_stubs.c' || echo '$(srcdir)/'`gras/sg_stubs.c
-
 sg_msg.lo: gras/Msg/sg_msg.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sg_msg.lo -MD -MP -MF $(DEPDIR)/sg_msg.Tpo -c -o sg_msg.lo `test -f 'gras/Msg/sg_msg.c' || echo '$(srcdir)/'`gras/Msg/sg_msg.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/sg_msg.Tpo $(DEPDIR)/sg_msg.Plo
@@ -1555,6 +1632,20 @@ sg_msg.lo: gras/Msg/sg_msg.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sg_msg.lo `test -f 'gras/Msg/sg_msg.c' || echo '$(srcdir)/'`gras/Msg/sg_msg.c
 
+xbt_sg_synchro.lo: xbt/xbt_sg_synchro.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_sg_synchro.lo -MD -MP -MF $(DEPDIR)/xbt_sg_synchro.Tpo -c -o xbt_sg_synchro.lo `test -f 'xbt/xbt_sg_synchro.c' || echo '$(srcdir)/'`xbt/xbt_sg_synchro.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_sg_synchro.Tpo $(DEPDIR)/xbt_sg_synchro.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_sg_synchro.c' object='xbt_sg_synchro.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_sg_synchro.lo `test -f 'xbt/xbt_sg_synchro.c' || echo '$(srcdir)/'`xbt/xbt_sg_synchro.c
+
+xbt_sg_time.lo: xbt/xbt_sg_time.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_sg_time.lo -MD -MP -MF $(DEPDIR)/xbt_sg_time.Tpo -c -o xbt_sg_time.lo `test -f 'xbt/xbt_sg_time.c' || echo '$(srcdir)/'`xbt/xbt_sg_time.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_sg_time.Tpo $(DEPDIR)/xbt_sg_time.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_sg_time.c' object='xbt_sg_time.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_sg_time.lo `test -f 'xbt/xbt_sg_time.c' || echo '$(srcdir)/'`xbt/xbt_sg_time.c
+
 jxbt_context.lo: java/jxbt_context.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jxbt_context.lo -MD -MP -MF $(DEPDIR)/jxbt_context.Tpo -c -o jxbt_context.lo `test -f 'java/jxbt_context.c' || echo '$(srcdir)/'`java/jxbt_context.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jxbt_context.Tpo $(DEPDIR)/jxbt_context.Plo
@@ -1611,6 +1702,20 @@ jmsg_task.lo: java/jmsg_task.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_task.lo `test -f 'java/jmsg_task.c' || echo '$(srcdir)/'`java/jmsg_task.c
 
+smpi_base.lo: smpi/smpi_base.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT smpi_base.lo -MD -MP -MF $(DEPDIR)/smpi_base.Tpo -c -o smpi_base.lo `test -f 'smpi/smpi_base.c' || echo '$(srcdir)/'`smpi/smpi_base.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/smpi_base.Tpo $(DEPDIR)/smpi_base.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='smpi/smpi_base.c' object='smpi_base.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o smpi_base.lo `test -f 'smpi/smpi_base.c' || echo '$(srcdir)/'`smpi/smpi_base.c
+
+smpi_mpi.lo: smpi/smpi_mpi.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT smpi_mpi.lo -MD -MP -MF $(DEPDIR)/smpi_mpi.Tpo -c -o smpi_mpi.lo `test -f 'smpi/smpi_mpi.c' || echo '$(srcdir)/'`smpi/smpi_mpi.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/smpi_mpi.Tpo $(DEPDIR)/smpi_mpi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='smpi/smpi_mpi.c' object='smpi_mpi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o smpi_mpi.lo `test -f 'smpi/smpi_mpi.c' || echo '$(srcdir)/'`smpi/smpi_mpi.c
+
 cunit_unit.o: ./cunit_unit.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cunit_unit.o -MD -MP -MF $(DEPDIR)/cunit_unit.Tpo -c -o cunit_unit.o `test -f './cunit_unit.c' || echo '$(srcdir)/'`./cunit_unit.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/cunit_unit.Tpo $(DEPDIR)/cunit_unit.Po
@@ -1971,6 +2076,7 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+@HAVE_JAVA_FALSE@clean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
@@ -2050,15 +2156,17 @@ uninstall-am: uninstall-jarDATA uninstall-libLTLIBRARIES
 
        \
        include/simix/simix.h include/simix/datatypes.h \
-       simix/msg_simix_private.h
+       simix/msg_simix_private.h \
+       \
+       smpi/private.h smpi/smpi.h
 
-clean-local:
-       -rm -rf .classes
+@HAVE_JAVA_TRUE@clean-local:
+@HAVE_JAVA_TRUE@       -rm -rf .classes
 
-simgrid.jar: $(JMSG_JAVA_SRC)
-       [ -e .classes ] || mkdir .classes
-       $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
-       $(JAR) cvf simgrid.jar -C .classes .;
+@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC)
+@HAVE_JAVA_TRUE@       [ -e .classes ] || mkdir .classes
+@HAVE_JAVA_TRUE@       $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
+@HAVE_JAVA_TRUE@       $(JAR) cvf simgrid.jar -C .classes .;
 
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./cunit_unit.c: xbt/cunit.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     @top_srcdir@/tools/sg_unit_extractor.pl $^