Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
autogenerated
[simgrid.git] / src / Makefile.in
index e84979e..18e0116 100644 (file)
@@ -50,11 +50,16 @@ target_triplet = @target@
 @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)
+
+# Windows users (at least, MSVC ones) need a def file.
+@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)
 @GRAMINE_MODE_FALSE@noinst_PROGRAMS = testall$(EXEEXT)
 @GRAMINE_MODE_FALSE@TESTS = testall$(EXEEXT)
-@GRAMINE_MODE_FALSE@am__append_7 = $(testall_SOURCES)
+@GRAMINE_MODE_FALSE@am__append_10 = $(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
@@ -118,28 +123,29 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.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 \
-       gras/DataDesc/ddt_exchange.c gras/DataDesc/cbps.c \
-       gras/DataDesc/datadesc.c gras/DataDesc/datadesc_interface.h \
+       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 \
+       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 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 \
@@ -150,9 +156,9 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.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_8 = maxmin.lo fair_bottleneck.lo lagrange.lo trace_mgr.lo \
+       surf.lo surfxml_parse.lo cpu.lo network.lo workstation.lo \
+       surf_timer.lo workstation_KCCFLN05.lo workstation_ptask_L07.lo \
        $(am__objects_6) $(am__objects_7)
 am__objects_9 = gtnets_simulator.lo gtnets_topology.lo \
        gtnets_interface.lo network_gtnets.lo
@@ -186,17 +192,17 @@ am__libsimgrid4java_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.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 java/jxbt_context.c \
-       java/jxbt_context.h java/jxbt_utilities.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 \
@@ -237,7 +243,8 @@ libsimgrid4java_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(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__objects_20 = 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)
 libsmpi_la_OBJECTS = $(am_libsmpi_la_OBJECTS)
 libsmpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -439,16 +446,18 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_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 \
-       surf/network_dassf_private.h \
-       surf/workstation_KCCFLN05_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 \
+       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_6) \
-       $(am__append_7)
+       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_9) $(am__append_10)
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -531,10 +540,11 @@ XBT_SG_SRC = \
   xbt/xbt_sg_synchro.c         \
   xbt/xbt_sg_time.c     
 
-SURF_SRC = surf/maxmin.c surf/lagrange.c surf/trace_mgr.c surf/surf.c \
-       surf/surfxml_parse.c surf/cpu.c surf/network.c \
-       surf/workstation.c surf/surf_timer.c surf/network_dassf.c \
-       surf/workstation_KCCFLN05.c $(am__append_1) $(am__append_2)
+SURF_SRC = 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 \
+       $(am__append_1) $(am__append_2)
 GTNETS_SRC = \
   surf/gtnets/gtnets_simulator.cc \
   surf/gtnets/gtnets_topology.cc  \
@@ -557,7 +567,12 @@ SIMIX_SRC = \
 
 SMPI_SRC = \
   smpi/smpi_base.c \
-  smpi/smpi_mpi.c
+  smpi/smpi_bench.c \
+  smpi/smpi_global.c \
+  smpi/smpi_mpi.c \
+  smpi/smpi_sender.c \
+  smpi/smpi_receiver.c \
+  smpi/smpi_util.c
 
 MSG_SRC = msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@ -580,12 +595,15 @@ JMSG_JAVA_SRC = \
   java/simgrid/msg/ProcessNotFoundException.java     \
   \
   java/simgrid/msg/Process.java                      \
+  java/simgrid/msg/DTDResolver.java                  \
   java/simgrid/msg/ApplicationHandler.java           \
   java/simgrid/msg/Channel.java                      \
   java/simgrid/msg/Host.java                         \
   java/simgrid/msg/Msg.java                          \
   java/simgrid/msg/Task.java                         \
-  java/simgrid/msg/ParallelTask.java                 
+  java/simgrid/msg/ParallelTask.java                 \
+  \
+  java/simgrid/msg/Sem.java
 
 SIMDAG_SRC = simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c
 GRAS_COMMON_SRC = \
@@ -631,22 +649,25 @@ AMOK_SRC = \
 ###
 ### Declare the library content
 ###
-lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la $(am__append_5)
+lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la $(am__append_8)
 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 $(am__append_5)
 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) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ \
+       @LD_DYNAMIC_FLAGS@ -lm $(am__append_6)
 
 # 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
+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) \
@@ -666,7 +687,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 \
@@ -675,6 +695,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
 
@@ -826,6 +847,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ex.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ex_unit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fair_bottleneck.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fifo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gos.Plo@am__quote@
@@ -857,7 +879,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maxmin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg_config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_dassf.Plo@am__quote@
 @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@
@@ -883,7 +904,12 @@ distclean-compile:
 @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_bench.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smpi_global.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smpi_mpi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smpi_receiver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smpi_sender.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smpi_util.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@
@@ -907,6 +933,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transport_plugin_tcp.Plo@am__quote@
 @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_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@
@@ -1373,6 +1400,13 @@ maxmin.lo: surf/maxmin.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 maxmin.lo `test -f 'surf/maxmin.c' || echo '$(srcdir)/'`surf/maxmin.c
 
+fair_bottleneck.lo: surf/fair_bottleneck.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fair_bottleneck.lo -MD -MP -MF $(DEPDIR)/fair_bottleneck.Tpo -c -o fair_bottleneck.lo `test -f 'surf/fair_bottleneck.c' || echo '$(srcdir)/'`surf/fair_bottleneck.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/fair_bottleneck.Tpo $(DEPDIR)/fair_bottleneck.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='surf/fair_bottleneck.c' object='fair_bottleneck.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 fair_bottleneck.lo `test -f 'surf/fair_bottleneck.c' || echo '$(srcdir)/'`surf/fair_bottleneck.c
+
 lagrange.lo: surf/lagrange.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lagrange.lo -MD -MP -MF $(DEPDIR)/lagrange.Tpo -c -o lagrange.lo `test -f 'surf/lagrange.c' || echo '$(srcdir)/'`surf/lagrange.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/lagrange.Tpo $(DEPDIR)/lagrange.Plo
@@ -1429,13 +1463,6 @@ surf_timer.lo: surf/surf_timer.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 surf_timer.lo `test -f 'surf/surf_timer.c' || echo '$(srcdir)/'`surf/surf_timer.c
 
-network_dassf.lo: surf/network_dassf.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_dassf.lo -MD -MP -MF $(DEPDIR)/network_dassf.Tpo -c -o network_dassf.lo `test -f 'surf/network_dassf.c' || echo '$(srcdir)/'`surf/network_dassf.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/network_dassf.Tpo $(DEPDIR)/network_dassf.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='surf/network_dassf.c' object='network_dassf.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 network_dassf.lo `test -f 'surf/network_dassf.c' || echo '$(srcdir)/'`surf/network_dassf.c
-
 workstation_KCCFLN05.lo: surf/workstation_KCCFLN05.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT workstation_KCCFLN05.lo -MD -MP -MF $(DEPDIR)/workstation_KCCFLN05.Tpo -c -o workstation_KCCFLN05.lo `test -f 'surf/workstation_KCCFLN05.c' || echo '$(srcdir)/'`surf/workstation_KCCFLN05.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/workstation_KCCFLN05.Tpo $(DEPDIR)/workstation_KCCFLN05.Plo
@@ -1443,6 +1470,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
 
+workstation_ptask_L07.lo: surf/workstation_ptask_L07.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT workstation_ptask_L07.lo -MD -MP -MF $(DEPDIR)/workstation_ptask_L07.Tpo -c -o workstation_ptask_L07.lo `test -f 'surf/workstation_ptask_L07.c' || echo '$(srcdir)/'`surf/workstation_ptask_L07.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/workstation_ptask_L07.Tpo $(DEPDIR)/workstation_ptask_L07.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='surf/workstation_ptask_L07.c' object='workstation_ptask_L07.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 workstation_ptask_L07.lo `test -f 'surf/workstation_ptask_L07.c' || echo '$(srcdir)/'`surf/workstation_ptask_L07.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
@@ -1730,6 +1764,20 @@ smpi_base.lo: smpi/smpi_base.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 smpi_base.lo `test -f 'smpi/smpi_base.c' || echo '$(srcdir)/'`smpi/smpi_base.c
 
+smpi_bench.lo: smpi/smpi_bench.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_bench.lo -MD -MP -MF $(DEPDIR)/smpi_bench.Tpo -c -o smpi_bench.lo `test -f 'smpi/smpi_bench.c' || echo '$(srcdir)/'`smpi/smpi_bench.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/smpi_bench.Tpo $(DEPDIR)/smpi_bench.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='smpi/smpi_bench.c' object='smpi_bench.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_bench.lo `test -f 'smpi/smpi_bench.c' || echo '$(srcdir)/'`smpi/smpi_bench.c
+
+smpi_global.lo: smpi/smpi_global.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_global.lo -MD -MP -MF $(DEPDIR)/smpi_global.Tpo -c -o smpi_global.lo `test -f 'smpi/smpi_global.c' || echo '$(srcdir)/'`smpi/smpi_global.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/smpi_global.Tpo $(DEPDIR)/smpi_global.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='smpi/smpi_global.c' object='smpi_global.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_global.lo `test -f 'smpi/smpi_global.c' || echo '$(srcdir)/'`smpi/smpi_global.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
@@ -1737,6 +1785,27 @@ smpi_mpi.lo: smpi/smpi_mpi.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 smpi_mpi.lo `test -f 'smpi/smpi_mpi.c' || echo '$(srcdir)/'`smpi/smpi_mpi.c
 
+smpi_sender.lo: smpi/smpi_sender.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_sender.lo -MD -MP -MF $(DEPDIR)/smpi_sender.Tpo -c -o smpi_sender.lo `test -f 'smpi/smpi_sender.c' || echo '$(srcdir)/'`smpi/smpi_sender.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/smpi_sender.Tpo $(DEPDIR)/smpi_sender.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='smpi/smpi_sender.c' object='smpi_sender.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_sender.lo `test -f 'smpi/smpi_sender.c' || echo '$(srcdir)/'`smpi/smpi_sender.c
+
+smpi_receiver.lo: smpi/smpi_receiver.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_receiver.lo -MD -MP -MF $(DEPDIR)/smpi_receiver.Tpo -c -o smpi_receiver.lo `test -f 'smpi/smpi_receiver.c' || echo '$(srcdir)/'`smpi/smpi_receiver.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/smpi_receiver.Tpo $(DEPDIR)/smpi_receiver.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='smpi/smpi_receiver.c' object='smpi_receiver.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_receiver.lo `test -f 'smpi/smpi_receiver.c' || echo '$(srcdir)/'`smpi/smpi_receiver.c
+
+smpi_util.lo: smpi/smpi_util.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_util.lo -MD -MP -MF $(DEPDIR)/smpi_util.Tpo -c -o smpi_util.lo `test -f 'smpi/smpi_util.c' || echo '$(srcdir)/'`smpi/smpi_util.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/smpi_util.Tpo $(DEPDIR)/smpi_util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='smpi/smpi_util.c' object='smpi_util.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_util.lo `test -f 'smpi/smpi_util.c' || echo '$(srcdir)/'`smpi/smpi_util.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
@@ -2193,19 +2262,14 @@ 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 smpi/smpi.h
 
 @HAVE_JAVA_TRUE@clean-local:
 @HAVE_JAVA_TRUE@       -rm -rf .classes
 
-@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC)
+@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) ./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 .;
+@HAVE_JAVA_TRUE@       $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) 
+@HAVE_JAVA_TRUE@       $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd;
 
 @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 $^
@@ -2235,11 +2299,14 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
 @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."
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@    @echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag"
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@    @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list."
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@    @exit 1
+@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: 
+@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@        @echo "WARNING: Test units not generated, but touched instead since this is a bot build."
+@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@        touch $@
+@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: 
+@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@       @echo "ERROR: Test units not generated."
+@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@       @echo "ERROR: If you are using a SVN checkout, configure with the --enable-maintainer-mode flag"
+@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@       @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list."
+@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@       @exit 1
 
 ###
 ### Regenerate what needs to with flex & flexml
@@ -2250,18 +2317,24 @@ 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@$(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@   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 $@
 
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@   set -e; flexml            -P graphxml --sysid=graphxml.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 $@
 
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd
 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@  @echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected"