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

diff --git a/src/Makefile.in b/src/Makefile.in
index 4e0f298809..0c414acd50 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -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
@@ -238,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 sender.lo receiver.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) \
@@ -363,7 +369,6 @@ 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@
@@ -441,15 +446,15 @@ 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 \
-	network_gtnets_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_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 \
+	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 \
 	amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \
-	$(am__append_3) $(am__append_4) $(am__append_6) \
-	$(am__append_7)
+	$(am__append_3) $(am__append_4) $(am__append_9) \
+	$(am__append_10)
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -559,9 +564,12 @@ SIMIX_SRC = \
 
 SMPI_SRC = \
   smpi/smpi_base.c \
+  smpi/smpi_bench.c \
+  smpi/smpi_global.c \
   smpi/smpi_mpi.c \
-  smpi/sender.c \
-  smpi/receiver.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 \
@@ -584,12 +592,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 = \
@@ -635,22 +646,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) \
@@ -670,7 +684,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 \
@@ -679,6 +692,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
 
@@ -865,7 +879,6 @@ 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)/receiver.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@
@@ -879,7 +892,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sd_task.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sd_workstation.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sender.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_unit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg_dns.Plo@am__quote@
@@ -889,7 +901,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@
@@ -1744,6 +1761,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
@@ -1751,19 +1782,26 @@ 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
 
-sender.lo: 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 sender.lo -MD -MP -MF $(DEPDIR)/sender.Tpo -c -o sender.lo `test -f 'smpi/sender.c' || echo '$(srcdir)/'`smpi/sender.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/sender.Tpo $(DEPDIR)/sender.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='smpi/sender.c' object='sender.lo' libtool=yes @AMDEPBACKSLASH@
+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 sender.lo `test -f 'smpi/sender.c' || echo '$(srcdir)/'`smpi/sender.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 smpi_receiver.lo `test -f 'smpi/smpi_receiver.c' || echo '$(srcdir)/'`smpi/smpi_receiver.c
 
-receiver.lo: 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 receiver.lo -MD -MP -MF $(DEPDIR)/receiver.Tpo -c -o receiver.lo `test -f 'smpi/receiver.c' || echo '$(srcdir)/'`smpi/receiver.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/receiver.Tpo $(DEPDIR)/receiver.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='smpi/receiver.c' object='receiver.lo' libtool=yes @AMDEPBACKSLASH@
+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 receiver.lo `test -f 'smpi/receiver.c' || echo '$(srcdir)/'`smpi/receiver.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 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
@@ -2006,6 +2044,7 @@ 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 \
@@ -2019,6 +2058,7 @@ check-TESTS: $(TESTS)
 	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
+		xpasslist="$$xpasslist $$tst"; \
 		echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -2030,15 +2070,18 @@ 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; \
@@ -2074,6 +2117,30 @@ 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
 
@@ -2230,10 +2297,10 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
 @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 $^
@@ -2263,11 +2330,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
@@ -2278,8 +2348,10 @@ 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 $^