X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a08c3880c5aceabfda3d53b4e97357d940258a40..9a49f9d2a3af185725e3fa3ee91803b6c76b38aa:/src/Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index d279566c3d..cefabcb593 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -40,13 +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
-@HAVE_JAVA_TRUE@am__append_3 = libsimgrid4java.la
-@HAVE_JAVA_FALSE@am__append_4 = $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
+@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_5 = $(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
@@ -75,21 +77,22 @@ 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 queue.lo xbt_peer.lo xbt_main.lo config.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 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
+	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_3)
+	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) \
@@ -100,29 +103,31 @@ libgras_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(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/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 \
-	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/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 \
@@ -132,31 +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/Msg/sg_msg.c xbt/xbt_sg_synchro.c \
-	amok/amok_base.c amok/Bandwidth/bandwidth.c \
-	amok/Bandwidth/saturate.c amok/PeerManagement/peermanagement.c
-am__objects_6 = 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_7 = 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_8 = $(am__objects_7)
-@HAVE_SDP_TRUE@am__objects_9 = sdp.lo
-am__objects_10 = 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_11 = context.lo
-am__objects_12 = 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_13 = sd_global.lo sd_link.lo sd_task.lo sd_workstation.lo
-am__objects_14 = xbt_sg_synchro.lo
-am__objects_15 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \
-	sg_process.lo sg_time.lo sg_dns.lo sg_msg.lo $(am__objects_14)
-am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_6) \
-	$(am__objects_8) $(am__objects_9) $(am__objects_10) \
-	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
-	$(am__objects_2) $(am__objects_15) $(am__objects_5)
+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_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) \
@@ -164,23 +172,24 @@ 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/queue.c xbt/xbt_peer.c xbt/xbt_main.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 surf/gtnets/gtnets_simulator.cc \
+	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 xbt/xbt_os_thread.c java/jxbt_utilities.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 \
@@ -191,45 +200,54 @@ am__libsimgrid4java_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.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/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/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/Msg/sg_msg.c xbt/xbt_sg_synchro.c \
-	amok/amok_base.c amok/Bandwidth/bandwidth.c \
-	amok/Bandwidth/saturate.c amok/PeerManagement/peermanagement.c
-am__objects_16 = jxbt_context.lo xbt_os_thread.lo
-am__objects_17 = 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
 @HAVE_JAVA_TRUE@am_libsimgrid4java_la_OBJECTS = $(am__objects_1) \
-@HAVE_JAVA_TRUE@	$(am__objects_6) $(am__objects_8) \
-@HAVE_JAVA_TRUE@	$(am__objects_9) $(am__objects_10) \
-@HAVE_JAVA_TRUE@	$(am__objects_16) $(am__objects_17) \
-@HAVE_JAVA_TRUE@	$(am__objects_12) $(am__objects_2) \
-@HAVE_JAVA_TRUE@	$(am__objects_15) $(am__objects_5)
+@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_18 = cunit_unit.$(OBJEXT) \
+am__testall_SOURCES_DIST = @builddir@/cunit_unit.c \
+	@builddir@/ex_unit.c @builddir@/dynar_unit.c \
+	@builddir@/dict_unit.c @builddir@/set_unit.c \
+	@builddir@/swag_unit.c @builddir@/xbt_str_unit.c \
+	@builddir@/config_unit.c @builddir@/simgrid_units_main.c
+@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_18) \
+@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
@@ -255,9 +273,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)
@@ -267,7 +286,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@
@@ -301,8 +320,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@
@@ -336,9 +353,11 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PTH_STACK_GROWTH = @PTH_STACK_GROWTH@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMGRID_DEP = @SIMGRID_DEP@
+SMPI_DEP = @SMPI_DEP@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING = @WARNING@
@@ -400,6 +419,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.
@@ -423,12 +445,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_os_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_4) \
-	$(am__append_5)
+	$(am__append_3) $(am__append_4) $(am__append_6) \
+	$(am__append_7)
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -478,7 +501,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                   \
@@ -493,7 +516,7 @@ XBT_SRC = \
   xbt/set.c                                                                  \
   xbt/xbt_matrix.c                                                           \
   \
-  xbt/queue.c                                                                \
+  xbt/xbt_queue.c                                                            \
   \
   xbt/xbt_peer.c                                                             \
   \
@@ -504,22 +527,17 @@ XBT_SRC = \
   xbt/graphxml_parse.c
 
 XBT_RL_SRC = \
-  xbt/xbt_rl_synchro.c
+  xbt/xbt_rl_synchro.c		\
+  xbt/xbt_rl_time.c
 
 XBT_SG_SRC = \
-  xbt/xbt_sg_synchro.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/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  \
@@ -529,7 +547,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 \
   simix/smx_deployment.c \
@@ -540,6 +558,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 
@@ -573,7 +595,7 @@ GRAS_COMMON_SRC = \
   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_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              \
   \
@@ -589,44 +611,51 @@ 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_time.c \
-	gras/Virtu/rl_dns.c gras/Msg/rl_msg.c $(XBT_RL_SRC)
+	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_time.c \
-	gras/Virtu/sg_dns.c gras/Msg/sg_msg.c $(XBT_SG_SRC)
+	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 libgras.la $(am__append_3)
+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
+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) @SMPI_DEP@ @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@		 	     $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
 
-@HAVE_JAVA_TRUE@libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+@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
@@ -635,17 +664,18 @@ libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_
 @GRAMINE_MODE_FALSE@	    xbt/xbt_str.c                      \
 @GRAMINE_MODE_FALSE@            xbt/config.c 
 
-@GRAMINE_MODE_FALSE@TEST_UNITS = ./cunit_unit.c ./ex_unit.c         \
-@GRAMINE_MODE_FALSE@            ./dynar_unit.c ./dict_unit.c ./set_unit.c ./swag_unit.c \
-@GRAMINE_MODE_FALSE@	    ./xbt_str_unit.c \
-@GRAMINE_MODE_FALSE@            ./config_unit.c 
+@GRAMINE_MODE_FALSE@TEST_UNITS = @builddir@/cunit_unit.c @builddir@/ex_unit.c         \
+@GRAMINE_MODE_FALSE@            @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \
+@GRAMINE_MODE_FALSE@	    @builddir@/xbt_str_unit.c \
+@GRAMINE_MODE_FALSE@            @builddir@/config_unit.c 
 
+@GRAMINE_MODE_FALSE@CLEANFILES = $(TEST_UNITS)
 @GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/surfxml.h surf/surfxml.c \
 @GRAMINE_MODE_FALSE@              ../include/xbt/graphxml.h xbt/graphxml.c \
 @GRAMINE_MODE_FALSE@              gras/DataDesc/ddt_parse.yy.c \
-@GRAMINE_MODE_FALSE@              $(TEST_UNITS) simgrid_units_main.c
+@GRAMINE_MODE_FALSE@	      $(TEST_UNITS) @builddir@/simgrid_units_main.c
 
-@GRAMINE_MODE_FALSE@testall_SOURCES = $(TEST_UNITS) simgrid_units_main.c
+@GRAMINE_MODE_FALSE@testall_SOURCES = $(TEST_UNITS) @builddir@/simgrid_units_main.c
 @GRAMINE_MODE_FALSE@testall_LDADD = libgras.la
 @GRAMINE_MODE_FALSE@TESTS_ENVIRONMENT = $(SG_TEST_EXENV)
 all: $(BUILT_SOURCES) gras_config.h
@@ -734,6 +764,8 @@ 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) $(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 \
@@ -786,6 +818,7 @@ distclean-compile:
 @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@
@@ -812,13 +845,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_gtnets.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peermanagement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queue.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_dns.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_emul.Plo@am__quote@
 @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@
@@ -833,9 +864,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_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@
@@ -850,7 +882,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@
@@ -866,9 +897,14 @@ distclean-compile:
 @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_virtu.Plo@am__quote@
@@ -922,12 +958,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
@@ -1048,12 +1084,12 @@ 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
 
-queue.lo: 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 queue.lo -MD -MP -MF $(DEPDIR)/queue.Tpo -c -o queue.lo `test -f 'xbt/queue.c' || echo '$(srcdir)/'`xbt/queue.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/queue.Tpo $(DEPDIR)/queue.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xbt/queue.c' object='queue.lo' libtool=yes @AMDEPBACKSLASH@
+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 queue.lo `test -f 'xbt/queue.c' || echo '$(srcdir)/'`xbt/queue.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_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
@@ -1125,6 +1161,13 @@ gras_msg_exchange.lo: gras/Msg/gras_msg_exchange.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 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 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
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/rpc.Tpo $(DEPDIR)/rpc.Plo
@@ -1251,13 +1294,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
@@ -1279,6 +1315,13 @@ xbt_rl_synchro.lo: xbt/xbt_rl_synchro.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_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
@@ -1384,6 +1427,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
@@ -1573,13 +1623,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
@@ -1601,6 +1644,13 @@ xbt_sg_synchro.lo: xbt/xbt_sg_synchro.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_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
@@ -1657,117 +1707,145 @@ 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
 
-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
+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: @builddir@/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 '@builddir@/cunit_unit.c' || echo '$(srcdir)/'`@builddir@/cunit_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cunit_unit.Tpo $(DEPDIR)/cunit_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./cunit_unit.c' object='cunit_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/cunit_unit.c' object='cunit_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cunit_unit.o `test -f './cunit_unit.c' || echo '$(srcdir)/'`./cunit_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cunit_unit.o `test -f '@builddir@/cunit_unit.c' || echo '$(srcdir)/'`@builddir@/cunit_unit.c
 
-cunit_unit.obj: ./cunit_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cunit_unit.obj -MD -MP -MF $(DEPDIR)/cunit_unit.Tpo -c -o cunit_unit.obj `if test -f './cunit_unit.c'; then $(CYGPATH_W) './cunit_unit.c'; else $(CYGPATH_W) '$(srcdir)/./cunit_unit.c'; fi`
+cunit_unit.obj: @builddir@/cunit_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cunit_unit.obj -MD -MP -MF $(DEPDIR)/cunit_unit.Tpo -c -o cunit_unit.obj `if test -f '@builddir@/cunit_unit.c'; then $(CYGPATH_W) '@builddir@/cunit_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/cunit_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cunit_unit.Tpo $(DEPDIR)/cunit_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./cunit_unit.c' object='cunit_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/cunit_unit.c' object='cunit_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cunit_unit.obj `if test -f './cunit_unit.c'; then $(CYGPATH_W) './cunit_unit.c'; else $(CYGPATH_W) '$(srcdir)/./cunit_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cunit_unit.obj `if test -f '@builddir@/cunit_unit.c'; then $(CYGPATH_W) '@builddir@/cunit_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/cunit_unit.c'; fi`
 
-ex_unit.o: ./ex_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex_unit.o -MD -MP -MF $(DEPDIR)/ex_unit.Tpo -c -o ex_unit.o `test -f './ex_unit.c' || echo '$(srcdir)/'`./ex_unit.c
+ex_unit.o: @builddir@/ex_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex_unit.o -MD -MP -MF $(DEPDIR)/ex_unit.Tpo -c -o ex_unit.o `test -f '@builddir@/ex_unit.c' || echo '$(srcdir)/'`@builddir@/ex_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ex_unit.Tpo $(DEPDIR)/ex_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./ex_unit.c' object='ex_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/ex_unit.c' object='ex_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ex_unit.o `test -f './ex_unit.c' || echo '$(srcdir)/'`./ex_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ex_unit.o `test -f '@builddir@/ex_unit.c' || echo '$(srcdir)/'`@builddir@/ex_unit.c
 
-ex_unit.obj: ./ex_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex_unit.obj -MD -MP -MF $(DEPDIR)/ex_unit.Tpo -c -o ex_unit.obj `if test -f './ex_unit.c'; then $(CYGPATH_W) './ex_unit.c'; else $(CYGPATH_W) '$(srcdir)/./ex_unit.c'; fi`
+ex_unit.obj: @builddir@/ex_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex_unit.obj -MD -MP -MF $(DEPDIR)/ex_unit.Tpo -c -o ex_unit.obj `if test -f '@builddir@/ex_unit.c'; then $(CYGPATH_W) '@builddir@/ex_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/ex_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ex_unit.Tpo $(DEPDIR)/ex_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./ex_unit.c' object='ex_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/ex_unit.c' object='ex_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ex_unit.obj `if test -f './ex_unit.c'; then $(CYGPATH_W) './ex_unit.c'; else $(CYGPATH_W) '$(srcdir)/./ex_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ex_unit.obj `if test -f '@builddir@/ex_unit.c'; then $(CYGPATH_W) '@builddir@/ex_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/ex_unit.c'; fi`
 
-dynar_unit.o: ./dynar_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dynar_unit.o -MD -MP -MF $(DEPDIR)/dynar_unit.Tpo -c -o dynar_unit.o `test -f './dynar_unit.c' || echo '$(srcdir)/'`./dynar_unit.c
+dynar_unit.o: @builddir@/dynar_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dynar_unit.o -MD -MP -MF $(DEPDIR)/dynar_unit.Tpo -c -o dynar_unit.o `test -f '@builddir@/dynar_unit.c' || echo '$(srcdir)/'`@builddir@/dynar_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dynar_unit.Tpo $(DEPDIR)/dynar_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./dynar_unit.c' object='dynar_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/dynar_unit.c' object='dynar_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dynar_unit.o `test -f './dynar_unit.c' || echo '$(srcdir)/'`./dynar_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dynar_unit.o `test -f '@builddir@/dynar_unit.c' || echo '$(srcdir)/'`@builddir@/dynar_unit.c
 
-dynar_unit.obj: ./dynar_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dynar_unit.obj -MD -MP -MF $(DEPDIR)/dynar_unit.Tpo -c -o dynar_unit.obj `if test -f './dynar_unit.c'; then $(CYGPATH_W) './dynar_unit.c'; else $(CYGPATH_W) '$(srcdir)/./dynar_unit.c'; fi`
+dynar_unit.obj: @builddir@/dynar_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dynar_unit.obj -MD -MP -MF $(DEPDIR)/dynar_unit.Tpo -c -o dynar_unit.obj `if test -f '@builddir@/dynar_unit.c'; then $(CYGPATH_W) '@builddir@/dynar_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/dynar_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dynar_unit.Tpo $(DEPDIR)/dynar_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./dynar_unit.c' object='dynar_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/dynar_unit.c' object='dynar_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dynar_unit.obj `if test -f './dynar_unit.c'; then $(CYGPATH_W) './dynar_unit.c'; else $(CYGPATH_W) '$(srcdir)/./dynar_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dynar_unit.obj `if test -f '@builddir@/dynar_unit.c'; then $(CYGPATH_W) '@builddir@/dynar_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/dynar_unit.c'; fi`
 
-dict_unit.o: ./dict_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dict_unit.o -MD -MP -MF $(DEPDIR)/dict_unit.Tpo -c -o dict_unit.o `test -f './dict_unit.c' || echo '$(srcdir)/'`./dict_unit.c
+dict_unit.o: @builddir@/dict_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dict_unit.o -MD -MP -MF $(DEPDIR)/dict_unit.Tpo -c -o dict_unit.o `test -f '@builddir@/dict_unit.c' || echo '$(srcdir)/'`@builddir@/dict_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dict_unit.Tpo $(DEPDIR)/dict_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./dict_unit.c' object='dict_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/dict_unit.c' object='dict_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dict_unit.o `test -f './dict_unit.c' || echo '$(srcdir)/'`./dict_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dict_unit.o `test -f '@builddir@/dict_unit.c' || echo '$(srcdir)/'`@builddir@/dict_unit.c
 
-dict_unit.obj: ./dict_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dict_unit.obj -MD -MP -MF $(DEPDIR)/dict_unit.Tpo -c -o dict_unit.obj `if test -f './dict_unit.c'; then $(CYGPATH_W) './dict_unit.c'; else $(CYGPATH_W) '$(srcdir)/./dict_unit.c'; fi`
+dict_unit.obj: @builddir@/dict_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dict_unit.obj -MD -MP -MF $(DEPDIR)/dict_unit.Tpo -c -o dict_unit.obj `if test -f '@builddir@/dict_unit.c'; then $(CYGPATH_W) '@builddir@/dict_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/dict_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dict_unit.Tpo $(DEPDIR)/dict_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./dict_unit.c' object='dict_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/dict_unit.c' object='dict_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dict_unit.obj `if test -f './dict_unit.c'; then $(CYGPATH_W) './dict_unit.c'; else $(CYGPATH_W) '$(srcdir)/./dict_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dict_unit.obj `if test -f '@builddir@/dict_unit.c'; then $(CYGPATH_W) '@builddir@/dict_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/dict_unit.c'; fi`
 
-set_unit.o: ./set_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT set_unit.o -MD -MP -MF $(DEPDIR)/set_unit.Tpo -c -o set_unit.o `test -f './set_unit.c' || echo '$(srcdir)/'`./set_unit.c
+set_unit.o: @builddir@/set_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT set_unit.o -MD -MP -MF $(DEPDIR)/set_unit.Tpo -c -o set_unit.o `test -f '@builddir@/set_unit.c' || echo '$(srcdir)/'`@builddir@/set_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/set_unit.Tpo $(DEPDIR)/set_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./set_unit.c' object='set_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/set_unit.c' object='set_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o set_unit.o `test -f './set_unit.c' || echo '$(srcdir)/'`./set_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o set_unit.o `test -f '@builddir@/set_unit.c' || echo '$(srcdir)/'`@builddir@/set_unit.c
 
-set_unit.obj: ./set_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT set_unit.obj -MD -MP -MF $(DEPDIR)/set_unit.Tpo -c -o set_unit.obj `if test -f './set_unit.c'; then $(CYGPATH_W) './set_unit.c'; else $(CYGPATH_W) '$(srcdir)/./set_unit.c'; fi`
+set_unit.obj: @builddir@/set_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT set_unit.obj -MD -MP -MF $(DEPDIR)/set_unit.Tpo -c -o set_unit.obj `if test -f '@builddir@/set_unit.c'; then $(CYGPATH_W) '@builddir@/set_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/set_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/set_unit.Tpo $(DEPDIR)/set_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./set_unit.c' object='set_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/set_unit.c' object='set_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o set_unit.obj `if test -f './set_unit.c'; then $(CYGPATH_W) './set_unit.c'; else $(CYGPATH_W) '$(srcdir)/./set_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o set_unit.obj `if test -f '@builddir@/set_unit.c'; then $(CYGPATH_W) '@builddir@/set_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/set_unit.c'; fi`
 
-swag_unit.o: ./swag_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swag_unit.o -MD -MP -MF $(DEPDIR)/swag_unit.Tpo -c -o swag_unit.o `test -f './swag_unit.c' || echo '$(srcdir)/'`./swag_unit.c
+swag_unit.o: @builddir@/swag_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swag_unit.o -MD -MP -MF $(DEPDIR)/swag_unit.Tpo -c -o swag_unit.o `test -f '@builddir@/swag_unit.c' || echo '$(srcdir)/'`@builddir@/swag_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swag_unit.Tpo $(DEPDIR)/swag_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./swag_unit.c' object='swag_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/swag_unit.c' object='swag_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swag_unit.o `test -f './swag_unit.c' || echo '$(srcdir)/'`./swag_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swag_unit.o `test -f '@builddir@/swag_unit.c' || echo '$(srcdir)/'`@builddir@/swag_unit.c
 
-swag_unit.obj: ./swag_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swag_unit.obj -MD -MP -MF $(DEPDIR)/swag_unit.Tpo -c -o swag_unit.obj `if test -f './swag_unit.c'; then $(CYGPATH_W) './swag_unit.c'; else $(CYGPATH_W) '$(srcdir)/./swag_unit.c'; fi`
+swag_unit.obj: @builddir@/swag_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swag_unit.obj -MD -MP -MF $(DEPDIR)/swag_unit.Tpo -c -o swag_unit.obj `if test -f '@builddir@/swag_unit.c'; then $(CYGPATH_W) '@builddir@/swag_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/swag_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swag_unit.Tpo $(DEPDIR)/swag_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./swag_unit.c' object='swag_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/swag_unit.c' object='swag_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swag_unit.obj `if test -f './swag_unit.c'; then $(CYGPATH_W) './swag_unit.c'; else $(CYGPATH_W) '$(srcdir)/./swag_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swag_unit.obj `if test -f '@builddir@/swag_unit.c'; then $(CYGPATH_W) '@builddir@/swag_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/swag_unit.c'; fi`
 
-xbt_str_unit.o: ./xbt_str_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_str_unit.o -MD -MP -MF $(DEPDIR)/xbt_str_unit.Tpo -c -o xbt_str_unit.o `test -f './xbt_str_unit.c' || echo '$(srcdir)/'`./xbt_str_unit.c
+xbt_str_unit.o: @builddir@/xbt_str_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_str_unit.o -MD -MP -MF $(DEPDIR)/xbt_str_unit.Tpo -c -o xbt_str_unit.o `test -f '@builddir@/xbt_str_unit.c' || echo '$(srcdir)/'`@builddir@/xbt_str_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbt_str_unit.Tpo $(DEPDIR)/xbt_str_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./xbt_str_unit.c' object='xbt_str_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/xbt_str_unit.c' object='xbt_str_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_str_unit.o `test -f './xbt_str_unit.c' || echo '$(srcdir)/'`./xbt_str_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_str_unit.o `test -f '@builddir@/xbt_str_unit.c' || echo '$(srcdir)/'`@builddir@/xbt_str_unit.c
 
-xbt_str_unit.obj: ./xbt_str_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_str_unit.obj -MD -MP -MF $(DEPDIR)/xbt_str_unit.Tpo -c -o xbt_str_unit.obj `if test -f './xbt_str_unit.c'; then $(CYGPATH_W) './xbt_str_unit.c'; else $(CYGPATH_W) '$(srcdir)/./xbt_str_unit.c'; fi`
+xbt_str_unit.obj: @builddir@/xbt_str_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_str_unit.obj -MD -MP -MF $(DEPDIR)/xbt_str_unit.Tpo -c -o xbt_str_unit.obj `if test -f '@builddir@/xbt_str_unit.c'; then $(CYGPATH_W) '@builddir@/xbt_str_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/xbt_str_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbt_str_unit.Tpo $(DEPDIR)/xbt_str_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./xbt_str_unit.c' object='xbt_str_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/xbt_str_unit.c' object='xbt_str_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_str_unit.obj `if test -f './xbt_str_unit.c'; then $(CYGPATH_W) './xbt_str_unit.c'; else $(CYGPATH_W) '$(srcdir)/./xbt_str_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_str_unit.obj `if test -f '@builddir@/xbt_str_unit.c'; then $(CYGPATH_W) '@builddir@/xbt_str_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/xbt_str_unit.c'; fi`
 
-config_unit.o: ./config_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config_unit.o -MD -MP -MF $(DEPDIR)/config_unit.Tpo -c -o config_unit.o `test -f './config_unit.c' || echo '$(srcdir)/'`./config_unit.c
+config_unit.o: @builddir@/config_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config_unit.o -MD -MP -MF $(DEPDIR)/config_unit.Tpo -c -o config_unit.o `test -f '@builddir@/config_unit.c' || echo '$(srcdir)/'`@builddir@/config_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/config_unit.Tpo $(DEPDIR)/config_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./config_unit.c' object='config_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/config_unit.c' object='config_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config_unit.o `test -f './config_unit.c' || echo '$(srcdir)/'`./config_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config_unit.o `test -f '@builddir@/config_unit.c' || echo '$(srcdir)/'`@builddir@/config_unit.c
 
-config_unit.obj: ./config_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config_unit.obj -MD -MP -MF $(DEPDIR)/config_unit.Tpo -c -o config_unit.obj `if test -f './config_unit.c'; then $(CYGPATH_W) './config_unit.c'; else $(CYGPATH_W) '$(srcdir)/./config_unit.c'; fi`
+config_unit.obj: @builddir@/config_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config_unit.obj -MD -MP -MF $(DEPDIR)/config_unit.Tpo -c -o config_unit.obj `if test -f '@builddir@/config_unit.c'; then $(CYGPATH_W) '@builddir@/config_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/config_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/config_unit.Tpo $(DEPDIR)/config_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./config_unit.c' object='config_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/config_unit.c' object='config_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config_unit.obj `if test -f '@builddir@/config_unit.c'; then $(CYGPATH_W) '@builddir@/config_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/config_unit.c'; fi`
+
+simgrid_units_main.o: @builddir@/simgrid_units_main.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simgrid_units_main.o -MD -MP -MF $(DEPDIR)/simgrid_units_main.Tpo -c -o simgrid_units_main.o `test -f '@builddir@/simgrid_units_main.c' || echo '$(srcdir)/'`@builddir@/simgrid_units_main.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/simgrid_units_main.Tpo $(DEPDIR)/simgrid_units_main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/simgrid_units_main.c' object='simgrid_units_main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config_unit.obj `if test -f './config_unit.c'; then $(CYGPATH_W) './config_unit.c'; else $(CYGPATH_W) '$(srcdir)/./config_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simgrid_units_main.o `test -f '@builddir@/simgrid_units_main.c' || echo '$(srcdir)/'`@builddir@/simgrid_units_main.c
+
+simgrid_units_main.obj: @builddir@/simgrid_units_main.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simgrid_units_main.obj -MD -MP -MF $(DEPDIR)/simgrid_units_main.Tpo -c -o simgrid_units_main.obj `if test -f '@builddir@/simgrid_units_main.c'; then $(CYGPATH_W) '@builddir@/simgrid_units_main.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/simgrid_units_main.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/simgrid_units_main.Tpo $(DEPDIR)/simgrid_units_main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/simgrid_units_main.c' object='simgrid_units_main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simgrid_units_main.obj `if test -f '@builddir@/simgrid_units_main.c'; then $(CYGPATH_W) '@builddir@/simgrid_units_main.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/simgrid_units_main.c'; fi`
 
 .cc.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -2008,6 +2086,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -2097,7 +2176,9 @@ 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
 
 @HAVE_JAVA_TRUE@clean-local:
 @HAVE_JAVA_TRUE@	-rm -rf .classes
@@ -2107,28 +2188,33 @@ uninstall-am: uninstall-jarDATA uninstall-libLTLIBRARIES
 @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@@builddir@/cunit_unit.c: xbt/cunit.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./ex_unit.c: xbt/ex.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/ex_unit.c: xbt/ex.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./xbt_str_unit.c: xbt/xbt_str.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/xbt_str_unit.c: xbt/xbt_str.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./dynar_unit.c: xbt/dynar.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/dynar_unit.c: xbt/dynar.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./dict_unit.c: xbt/dict.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/dict_unit.c: xbt/dict.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./set_unit.c: xbt/set.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/set_unit.c: xbt/set.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./swag_unit.c: xbt/swag.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/swag_unit.c: xbt/swag.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./config_unit.c: xbt/config.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/config_unit.c: xbt/config.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
 
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@simgrid_units_main.c: $(TEST_UNITS)
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl xbt/cunit.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/simgrid_units_main.c: $(TEST_UNITS)
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl @srcdir@/xbt/cunit.c
 
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@clean-units:
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	rm -f simgrid_units_main.c *_unit.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	rm -f simgrid_units_main.c *_unit.c @srcdir@/simgrid_units_main.c @srcdir@/*_unit.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	for n in $(TEST_UNITS) ; do \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	  dep=`echo $$n|sed -e 's|.c$$|.Po|' -e 's|[^/]*/||' -e 's|^|.deps/|'`; \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@          echo "Removing dependency tracker of $$n ($$dep @srcdir@/$$dep)"; \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	  rm -vf $$dep @srcdir@/$$dep; touch $$dep; \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@        done
 
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: 
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@	@echo "ERROR: Test units not generated."