Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Impact of the new context switch implementation of the Makefile.in
[simgrid.git] / src / Makefile.in
index 2863ff1..9320038 100644 (file)
 
 @SET_MAKE@
 
+# Copyright (c) 2004-2007. The SimGrid team. All right reserved.
+
+# This file is part of the SimGrid project. This is free software:
+# You can redistribute and/or modify it under the terms of the
+# GNU LGPL (v2.1) licence.
+
 #AM_CFLAGS= -DNDEBUG 
 
 # -DNLOG   cuts absolutely all logs at compilation time.
@@ -55,11 +61,10 @@ target_triplet = @target@
 @IS_WINDOWS_TRUE@am__append_5 = -Wl,--output-def,libgras.def
 @IS_WINDOWS_TRUE@am__append_6 = -Wl,--output-def,libsimgrid.def
 @IS_WINDOWS_TRUE@am__append_7 = -Wl,--output-def,libsmpi.def
-@HAVE_JAVA_TRUE@am__append_8 = libsimgrid4java.la
-@HAVE_JAVA_FALSE@am__append_9 = $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
+@HAVE_JAVA_FALSE@am__append_8 = $(JMSG_C_SRC) $(MSG_SRC)
 @GRAMINE_MODE_FALSE@noinst_PROGRAMS = testall$(EXEEXT)
 @GRAMINE_MODE_FALSE@TESTS = testall$(EXEEXT)
-@GRAMINE_MODE_FALSE@am__append_10 = $(testall_SOURCES)
+@GRAMINE_MODE_FALSE@am__append_9 = $(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
@@ -89,13 +94,13 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libgras_la_LIBADD =
-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_queue.lo xbt_peer.lo xbt_main.lo config.lo \
-       cunit.lo graphxml_parse.lo
+am__objects_1 = snprintf.lo xbt_str.lo xbt_strbuff.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_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 \
@@ -114,9 +119,9 @@ 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/xbt_os_time.c xbt/asserts.c xbt/log.c \
+am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
+       xbt/xbt_strbuff.c xbt/ex.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 \
@@ -133,7 +138,7 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.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 \
+       xbt/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 \
@@ -167,7 +172,7 @@ am__objects_9 = gtnets_simulator.lo gtnets_topology.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_13 = context.lo
+am__objects_13 = xbt_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_15 = sd_global.lo sd_link.lo sd_task.lo sd_workstation.lo
@@ -182,70 +187,10 @@ libsimgrid_la_OBJECTS = $(am_libsimgrid_la_OBJECTS)
 libsimgrid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(libsimgrid_la_LDFLAGS) $(LDFLAGS) -o $@
-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/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/fair_bottleneck.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/workstation_KCCFLN05.c surf/workstation_ptask_L07.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/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_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_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_bench.lo smpi_global.lo smpi_mpi.lo \
+am__objects_18 = smpi_base.lo smpi_bench.lo smpi_global.lo smpi_mpi.lo \
        smpi_sender.lo smpi_receiver.lo smpi_util.lo
-am_libsmpi_la_OBJECTS = $(am__objects_20)
+am_libsmpi_la_OBJECTS = $(am__objects_18)
 libsmpi_la_OBJECTS = $(am_libsmpi_la_OBJECTS)
 libsmpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -256,12 +201,12 @@ am__testall_SOURCES_DIST = @builddir@/cunit_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@am__objects_19 = 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_21) \
+@GRAMINE_MODE_FALSE@am_testall_OBJECTS = $(am__objects_19) \
 @GRAMINE_MODE_FALSE@   simgrid_units_main.$(OBJEXT)
 testall_OBJECTS = $(am_testall_OBJECTS)
 @GRAMINE_MODE_FALSE@testall_DEPENDENCIES = libgras.la
@@ -289,11 +234,9 @@ 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) $(libsmpi_la_SOURCES) \
-       $(testall_SOURCES)
+       $(libsmpi_la_SOURCES) $(testall_SOURCES)
 DIST_SOURCES = $(libgras_la_SOURCES) $(am__libsimgrid_la_SOURCES_DIST) \
-       $(am__libsimgrid4java_la_SOURCES_DIST) $(libsmpi_la_SOURCES) \
-       $(am__testall_SOURCES_DIST)
+       $(libsmpi_la_SOURCES) $(am__testall_SOURCES_DIST)
 jarDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(jar_DATA)
 ETAGS = etags
@@ -440,21 +383,26 @@ bin_SCRIPTS = smpi/smpicc smpi/smpirun
 EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \
        xbt/dict_private.h xbt/heap_private.h xbt/fifo_private.h \
        xbt/graph_private.h xbt/graphxml_parse.c xbt/graphxml.l \
-       xbt/graphxml.c xbt/graphxml.dtd xbt/context_private.h \
+       xbt/graphxml.c xbt/graphxml.dtd xbt/xbt_context_private.h \
+       xbt/xbt_context_factory.h xbt/xbt_thread_context.h \
+       xbt/xbt_ucontext.h xbt/xbt_jcontext.h xbt/log_private.h \
        xbt/ex_interface.h surf/maxmin_private.h \
        surf/trace_mgr_private.h surf/surf_private.h \
        surf/cpu_private.h surf/workstation_private.h \
        surf/surf_timer_private.h surf/surfxml_parse.c surf/surfxml.l \
        surf/surfxml.c surf/surfxml.dtd surf/network_private.h \
-       network_gtnets_private.h include/surf/maxmin.h \
+       surf/network_gtnets_private.h include/surf/maxmin.h \
        include/surf/trace_mgr.h include/surf/surf.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 \
+       include/xbt/xbt_os_thread.h msg/private.h simdag/private.h \
+       gras/DataDesc/ddt_parse.yy.l gras/Virtu/virtu_rl.h \
+       gras/Virtu/virtu_sg.h gras/Virtu/virtu_interface.h \
+       gras/Virtu/virtu_private.h \
+       gras/Transport/transport_interface.h \
        amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \
-       $(am__append_3) $(am__append_4) $(am__append_9) \
-       $(am__append_10)
+       include/simix/simix.h include/simix/datatypes.h \
+       simix/private.h smpi/private.h $(am__append_3) $(am__append_4) \
+       $(JMSG_JAVA_SRC) $(am__append_8) $(am__append_9)
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -498,7 +446,7 @@ VERSION_INFO = -version-info 2:0:0
 ################################################
 XBT_SRC = \
   \
-  xbt/snprintf.c    xbt/xbt_str.c                                            \
+  xbt/snprintf.c    xbt/xbt_str.c xbt/xbt_strbuff.c                          \
   xbt/ex.c                                                                   \
   \
   xbt_modinter.h    gras_modinter.h                                          \
@@ -549,9 +497,9 @@ GTNETS_SRC = \
   surf/network_gtnets.c
 
 
-# Separated because we don't want it in libsimgrid4java
-CTX_SRC = xbt/context.c
-JCTX_SRC = java/jxbt_context.c java/jxbt_context.h
+# Separated because src/gras/rl_stubs also define the function xbt_context_mod_init() and xbt_context_mod_exit()
+# so there is an implementation of these functions in the simgrid library and an implementatin in the gras library 
+CTX_SRC = xbt/xbt_context.c
 SIMIX_SRC = \
   simix/smx_global.c \
   simix/smx_deployment.c \
@@ -646,7 +594,7 @@ AMOK_SRC = \
 ###
 ### Declare the library content
 ###
-lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la $(am__append_8)
+lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la
 libgras_la_SOURCES = $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
 libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ \
        @LD_DYNAMIC_FLAGS@ -lm $(am__append_5)
@@ -665,13 +613,6 @@ libsmpi_la_LIBADD = libsimgrid.la
 libsmpi_la_SOURCES = $(SMPI_SRC)
 libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm \
        $(am__append_7)
-@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          \
@@ -684,7 +625,6 @@ libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm \
 @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 \
@@ -693,6 +633,7 @@ libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm \
 @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)
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@CLEANFILES = $(TEST_UNITS)
 all: $(BUILT_SOURCES) gras_config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -777,8 +718,6 @@ libgras.la: $(libgras_la_OBJECTS) $(libgras_la_DEPENDENCIES)
        $(libgras_la_LINK) -rpath $(libdir) $(libgras_la_OBJECTS) $(libgras_la_LIBADD) $(LIBS)
 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)
 
@@ -823,7 +762,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbps.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config_unit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cunit.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cunit_unit.Po@am__quote@
@@ -861,14 +799,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtnets_topology.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/host.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_channel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_host.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_parallel_task.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_process.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_task.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jxbt_context.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jxbt_utilities.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lagrange.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_process.Plo@am__quote@
@@ -931,6 +861,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workstation.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workstation_KCCFLN05.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workstation_ptask_L07.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_context.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_log_appender_file.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_log_layout_format.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_log_layout_simple.Plo@am__quote@
@@ -947,6 +878,7 @@ distclean-compile:
 @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_strbuff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_virtu.Plo@am__quote@
 
 .c.o:
@@ -984,6 +916,13 @@ xbt_str.lo: xbt/xbt_str.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_str.lo `test -f 'xbt/xbt_str.c' || echo '$(srcdir)/'`xbt/xbt_str.c
 
+xbt_strbuff.lo: xbt/xbt_strbuff.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_strbuff.lo -MD -MP -MF $(DEPDIR)/xbt_strbuff.Tpo -c -o xbt_strbuff.lo `test -f 'xbt/xbt_strbuff.c' || echo '$(srcdir)/'`xbt/xbt_strbuff.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_strbuff.Tpo $(DEPDIR)/xbt_strbuff.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_strbuff.c' object='xbt_strbuff.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_strbuff.lo `test -f 'xbt/xbt_strbuff.c' || echo '$(srcdir)/'`xbt/xbt_strbuff.c
+
 ex.lo: xbt/ex.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex.lo -MD -MP -MF $(DEPDIR)/ex.Tpo -c -o ex.lo `test -f 'xbt/ex.c' || echo '$(srcdir)/'`xbt/ex.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/ex.Tpo $(DEPDIR)/ex.Plo
@@ -1551,12 +1490,12 @@ smx_synchro.lo: simix/smx_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 smx_synchro.lo `test -f 'simix/smx_synchro.c' || echo '$(srcdir)/'`simix/smx_synchro.c
 
-context.lo: xbt/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 context.lo -MD -MP -MF $(DEPDIR)/context.Tpo -c -o context.lo `test -f 'xbt/context.c' || echo '$(srcdir)/'`xbt/context.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/context.Tpo $(DEPDIR)/context.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/context.c' object='context.lo' libtool=yes @AMDEPBACKSLASH@
+xbt_context.lo: xbt/xbt_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 xbt_context.lo -MD -MP -MF $(DEPDIR)/xbt_context.Tpo -c -o xbt_context.lo `test -f 'xbt/xbt_context.c' || echo '$(srcdir)/'`xbt/xbt_context.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_context.Tpo $(DEPDIR)/xbt_context.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_context.c' object='xbt_context.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 context.lo `test -f 'xbt/context.c' || echo '$(srcdir)/'`xbt/context.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_context.lo `test -f 'xbt/xbt_context.c' || echo '$(srcdir)/'`xbt/xbt_context.c
 
 msg_config.lo: msg/msg_config.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_config.lo -MD -MP -MF $(DEPDIR)/msg_config.Tpo -c -o msg_config.lo `test -f 'msg/msg_config.c' || echo '$(srcdir)/'`msg/msg_config.c
@@ -1698,62 +1637,6 @@ xbt_sg_time.lo: xbt/xbt_sg_time.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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='java/jxbt_context.c' object='jxbt_context.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 jxbt_context.lo `test -f 'java/jxbt_context.c' || echo '$(srcdir)/'`java/jxbt_context.c
-
-jxbt_utilities.lo: java/jxbt_utilities.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_utilities.lo -MD -MP -MF $(DEPDIR)/jxbt_utilities.Tpo -c -o jxbt_utilities.lo `test -f 'java/jxbt_utilities.c' || echo '$(srcdir)/'`java/jxbt_utilities.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jxbt_utilities.Tpo $(DEPDIR)/jxbt_utilities.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='java/jxbt_utilities.c' object='jxbt_utilities.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 jxbt_utilities.lo `test -f 'java/jxbt_utilities.c' || echo '$(srcdir)/'`java/jxbt_utilities.c
-
-jmsg.lo: java/jmsg.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg.lo -MD -MP -MF $(DEPDIR)/jmsg.Tpo -c -o jmsg.lo `test -f 'java/jmsg.c' || echo '$(srcdir)/'`java/jmsg.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg.Tpo $(DEPDIR)/jmsg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='java/jmsg.c' object='jmsg.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 jmsg.lo `test -f 'java/jmsg.c' || echo '$(srcdir)/'`java/jmsg.c
-
-jmsg_channel.lo: java/jmsg_channel.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_channel.lo -MD -MP -MF $(DEPDIR)/jmsg_channel.Tpo -c -o jmsg_channel.lo `test -f 'java/jmsg_channel.c' || echo '$(srcdir)/'`java/jmsg_channel.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg_channel.Tpo $(DEPDIR)/jmsg_channel.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='java/jmsg_channel.c' object='jmsg_channel.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 jmsg_channel.lo `test -f 'java/jmsg_channel.c' || echo '$(srcdir)/'`java/jmsg_channel.c
-
-jmsg_host.lo: java/jmsg_host.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_host.lo -MD -MP -MF $(DEPDIR)/jmsg_host.Tpo -c -o jmsg_host.lo `test -f 'java/jmsg_host.c' || echo '$(srcdir)/'`java/jmsg_host.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg_host.Tpo $(DEPDIR)/jmsg_host.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='java/jmsg_host.c' object='jmsg_host.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 jmsg_host.lo `test -f 'java/jmsg_host.c' || echo '$(srcdir)/'`java/jmsg_host.c
-
-jmsg_parallel_task.lo: java/jmsg_parallel_task.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_parallel_task.lo -MD -MP -MF $(DEPDIR)/jmsg_parallel_task.Tpo -c -o jmsg_parallel_task.lo `test -f 'java/jmsg_parallel_task.c' || echo '$(srcdir)/'`java/jmsg_parallel_task.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg_parallel_task.Tpo $(DEPDIR)/jmsg_parallel_task.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='java/jmsg_parallel_task.c' object='jmsg_parallel_task.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 jmsg_parallel_task.lo `test -f 'java/jmsg_parallel_task.c' || echo '$(srcdir)/'`java/jmsg_parallel_task.c
-
-jmsg_process.lo: java/jmsg_process.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_process.lo -MD -MP -MF $(DEPDIR)/jmsg_process.Tpo -c -o jmsg_process.lo `test -f 'java/jmsg_process.c' || echo '$(srcdir)/'`java/jmsg_process.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg_process.Tpo $(DEPDIR)/jmsg_process.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='java/jmsg_process.c' object='jmsg_process.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 jmsg_process.lo `test -f 'java/jmsg_process.c' || echo '$(srcdir)/'`java/jmsg_process.c
-
-jmsg_task.lo: java/jmsg_task.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_task.lo -MD -MP -MF $(DEPDIR)/jmsg_task.Tpo -c -o jmsg_task.lo `test -f 'java/jmsg_task.c' || echo '$(srcdir)/'`java/jmsg_task.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg_task.Tpo $(DEPDIR)/jmsg_task.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='java/jmsg_task.c' object='jmsg_task.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 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
@@ -2044,7 +1927,6 @@ distclean-tags:
 
 check-TESTS: $(TESTS)
        @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[        ]'; \
-       faillist=""; xpasslist=""; xfaillist=""; skiplist=""; \
        srcdir=$(srcdir); export srcdir; \
        list=' $(TESTS) '; \
        if test -n "$$list"; then \
@@ -2058,7 +1940,6 @@ check-TESTS: $(TESTS)
              *$$ws$$tst$$ws*) \
                xpass=`expr $$xpass + 1`; \
                failed=`expr $$failed + 1`; \
-               xpasslist="$$xpasslist $$tst"; \
                echo "XPASS: $$tst"; \
              ;; \
              *) \
@@ -2070,18 +1951,15 @@ check-TESTS: $(TESTS)
              case " $(XFAIL_TESTS) " in \
              *$$ws$$tst$$ws*) \
                xfail=`expr $$xfail + 1`; \
-               xfaillist="$$xfaillist $$tst"; \
                echo "XFAIL: $$tst"; \
              ;; \
              *) \
                failed=`expr $$failed + 1`; \
-               faillist="$$faillist $$tst"; \
                echo "FAIL: $$tst"; \
              ;; \
              esac; \
            else \
              skip=`expr $$skip + 1`; \
-             skiplist="$$skiplist $$tst"; \
              echo "SKIP: $$tst"; \
            fi; \
          done; \
@@ -2117,30 +1995,6 @@ check-TESTS: $(TESTS)
          test -z "$$skipped" || echo "$$skipped"; \
          test -z "$$report" || echo "$$report"; \
          echo "$$dashes"; \
-         if test -n "$$faillist" ; then \
-           echo "Failed tests:";\
-           for tst in $$faillist ; do \
-             echo "  "$$tst;\
-           done;\
-         fi;\
-         if test -n "$$xpasslist" ; then \
-           echo "Unexpectedly passed tests:";\
-           for tst in $$xpasslist ; do \
-             echo "  "$$tst;\
-           done;\
-         fi;\
-         if test -n "$$xfaillist" ; then \
-           echo "Expected failures:";\
-           for tst in $$xfaillist ; do \
-             echo "  "$$tst;\
-           done;\
-         fi;\
-         if test -n "$$skiplist" ; then \
-           echo "Skipped tests:";\
-           for tst in $$skiplist ; do \
-             echo "  "$$tst;\
-           done;\
-         fi;\
          test "$$failed" -eq 0; \
        else :; fi
 
@@ -2288,19 +2142,15 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
        uninstall-am uninstall-binSCRIPTS uninstall-jarDATA \
        uninstall-libLTLIBRARIES
 
-       \
-       include/simix/simix.h include/simix/datatypes.h \
-       simix/msg_simix_private.h \
-       \
-       smpi/private.h
-
 @HAVE_JAVA_TRUE@clean-local:
 @HAVE_JAVA_TRUE@       -rm -rf .classes
 
-@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd
+@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/surfxml.dtd
 @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 . ./surf/surfxml.dtd;
+@HAVE_JAVA_TRUE@       $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file))
+@HAVE_JAVA_TRUE@       [ -e .classes/surf ] || mkdir .classes/surf
+@HAVE_JAVA_TRUE@       cp $(srcdir)/surf/surfxml.dtd .classes/surf
+@HAVE_JAVA_TRUE@       $(JAR) cvf simgrid.jar -C .classes .
 
 @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 $^
@@ -2348,13 +2198,15 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
 
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@surf/surfxml.c: surf/surfxml.l
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     sed 's/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n#  ifndef __STRICT_ANSI__\n#    include <io.h>\n#    include <process.h>\n#  endif\n#else\n#  include <unistd.h>\n#endif/g' -i $@
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@xbt/graphxml.c: xbt/graphxml.l
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@     sed 's/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n#  ifndef __STRICT_ANSI__\n#    include <io.h>\n#    include <process.h>\n#  endif\n#else\n#  include <unistd.h>\n#endif/g' -i $@
 
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
-@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^
+@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
-@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e;                flexml            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
+@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e;                flexml --root-tags platform            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@