X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/357d3f9c2aedf22f0fed70e6971917f1e8e8099f..305eb3e23d16b8df2801b5c736b42bb48fed3137:/src/Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index e23ca50c60..16b0b07aeb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,6 +14,17 @@
 
 @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.
+# -DNDEBUG cuts asserts and logs at "trace" and "debug" levels.
+
 # Makefile chunk which allows to display the files which should be included
 # into the distribution.
 
@@ -21,6 +32,7 @@
 
 
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -41,13 +53,19 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @CONTEXT_THREADS_TRUE@am__append_1 = xbt/xbt_os_thread.c
-@HAVE_GTNETS_FALSE@am__append_2 = $(GTNETS_SRC)
-@HAVE_SDP_FALSE@am__append_3 = surf/sdp.c
-@HAVE_JAVA_TRUE@am__append_4 = libsimgrid4java.la
-@HAVE_JAVA_FALSE@am__append_5 = $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
+@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
+
+# 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_6 = $(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
@@ -72,17 +90,18 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(jardir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(jardir)"
 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 \
@@ -101,19 +120,20 @@ 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 \
 	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 \
+	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 \
@@ -141,46 +161,48 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.c \
 	amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
 	amok/PeerManagement/peermanagement.c
 @CONTEXT_THREADS_TRUE@am__objects_6 = xbt_os_thread.lo
-am__objects_7 = maxmin.lo lagrange.lo trace_mgr.lo surf.lo \
-	surfxml_parse.lo cpu.lo network.lo workstation.lo \
-	surf_timer.lo network_dassf.lo workstation_KCCFLN05.lo \
-	$(am__objects_6)
-am__objects_8 = gtnets_simulator.lo gtnets_topology.lo \
+@CONTEXT_THREADS_FALSE@am__objects_7 = xbt_os_thread_stubs.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
-@HAVE_GTNETS_TRUE@am__objects_9 = $(am__objects_8)
-@HAVE_SDP_TRUE@am__objects_10 = sdp.lo
-am__objects_11 = smx_global.lo smx_deployment.lo smx_config.lo \
+@HAVE_GTNETS_TRUE@am__objects_10 = $(am__objects_9)
+@HAVE_SDP_TRUE@am__objects_11 = sdp.lo
+am__objects_12 = smx_global.lo smx_deployment.lo smx_config.lo \
 	smx_environment.lo smx_host.lo smx_process.lo smx_action.lo \
 	smx_synchro.lo
-am__objects_12 = context.lo
-am__objects_13 = msg_config.lo task.lo host.lo m_process.lo gos.lo \
+am__objects_13 = context.lo
+am__objects_14 = msg_config.lo task.lo host.lo m_process.lo gos.lo \
 	global.lo environment.lo deployment.lo
-am__objects_14 = sd_global.lo sd_link.lo sd_task.lo sd_workstation.lo
-am__objects_15 = xbt_sg_synchro.lo xbt_sg_time.lo
-am__objects_16 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \
-	sg_process.lo sg_dns.lo sg_msg.lo $(am__objects_15)
-am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_7) \
-	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
-	$(am__objects_12) $(am__objects_13) $(am__objects_14) \
-	$(am__objects_2) $(am__objects_16) $(am__objects_5)
+am__objects_15 = sd_global.lo sd_link.lo sd_task.lo sd_workstation.lo
+am__objects_16 = xbt_sg_synchro.lo xbt_sg_time.lo
+am__objects_17 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \
+	sg_process.lo sg_dns.lo sg_msg.lo $(am__objects_16)
+am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_8) \
+	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
+	$(am__objects_13) $(am__objects_14) $(am__objects_15) \
+	$(am__objects_2) $(am__objects_17) $(am__objects_5)
 libsimgrid_la_OBJECTS = $(am_libsimgrid_la_OBJECTS)
 libsimgrid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(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_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 \
 	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 \
+	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 \
@@ -211,41 +233,46 @@ am__libsimgrid4java_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.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_17 = jxbt_context.lo
-am__objects_18 = jxbt_utilities.lo jmsg.lo jmsg_channel.lo \
+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_7) $(am__objects_9) \
-@HAVE_JAVA_TRUE@	$(am__objects_10) $(am__objects_11) \
-@HAVE_JAVA_TRUE@	$(am__objects_17) $(am__objects_18) \
-@HAVE_JAVA_TRUE@	$(am__objects_13) $(am__objects_2) \
-@HAVE_JAVA_TRUE@	$(am__objects_16) $(am__objects_5)
+@HAVE_JAVA_TRUE@	$(am__objects_8) $(am__objects_10) \
+@HAVE_JAVA_TRUE@	$(am__objects_11) $(am__objects_12) \
+@HAVE_JAVA_TRUE@	$(am__objects_18) $(am__objects_19) \
+@HAVE_JAVA_TRUE@	$(am__objects_14) $(am__objects_2) \
+@HAVE_JAVA_TRUE@	$(am__objects_17) $(am__objects_5)
 libsimgrid4java_la_OBJECTS = $(am_libsimgrid4java_la_OBJECTS)
 libsimgrid4java_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libsimgrid4java_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_JAVA_TRUE@am_libsimgrid4java_la_rpath = -rpath $(libdir)
 libsmpi_la_DEPENDENCIES = libsimgrid.la
-am__objects_19 = smpi_base.lo smpi_mpi.lo
-am_libsmpi_la_OBJECTS = $(am__objects_19)
+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) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libsmpi_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(noinst_PROGRAMS)
-am__testall_SOURCES_DIST = ./cunit_unit.c ./ex_unit.c ./dynar_unit.c \
-	./dict_unit.c ./set_unit.c ./swag_unit.c ./xbt_str_unit.c \
-	./config_unit.c simgrid_units_main.c
-@GRAMINE_MODE_FALSE@am__objects_20 = cunit_unit.$(OBJEXT) \
+am__testall_SOURCES_DIST = @builddir@/cunit_unit.c \
+	@builddir@/ex_unit.c @builddir@/dynar_unit.c \
+	@builddir@/dict_unit.c @builddir@/set_unit.c \
+	@builddir@/swag_unit.c @builddir@/xbt_str_unit.c \
+	@builddir@/config_unit.c @builddir@/simgrid_units_main.c
+@GRAMINE_MODE_FALSE@am__objects_21 = cunit_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@	ex_unit.$(OBJEXT) dynar_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@	dict_unit.$(OBJEXT) set_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@	swag_unit.$(OBJEXT) xbt_str_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@	config_unit.$(OBJEXT)
-@GRAMINE_MODE_FALSE@am_testall_OBJECTS = $(am__objects_20) \
+@GRAMINE_MODE_FALSE@am_testall_OBJECTS = $(am__objects_21) \
 @GRAMINE_MODE_FALSE@	simgrid_units_main.$(OBJEXT)
 testall_OBJECTS = $(am_testall_OBJECTS)
 @GRAMINE_MODE_FALSE@testall_DEPENDENCIES = libgras.la
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -351,6 +378,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMGRID_DEP = @SIMGRID_DEP@
+SMPI_DEP = @SMPI_DEP@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING = @WARNING@
@@ -412,39 +440,30 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-#AM_CPPFLAGS=
-AM_CFLAGS = -g
-#AM_CFLAGS= -DNDEBUG 
-
-# -DNLOG   cuts absolutely all logs at compilation time.
-# -DNDEBUG cuts asserts and logs at "trace" and "debug" levels.
-
-# -g -ffast-math -funroll-loops -O3 -fno-strict-aliasing
-# Those should be added by configure when using gcc
-# fast-math is nasty when using IEEE floating point semantic
-# strict-aliasing breaks my type-punning bad habit.
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include
+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/ex_interface.h surf/maxmin_private.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 \
-	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_2) $(am__append_3) $(am__append_5) \
-	$(am__append_6)
+	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
 #                 | | |
@@ -488,7 +507,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                                          \
@@ -527,10 +546,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)
+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  \
@@ -553,7 +573,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 \
@@ -576,12 +601,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 = \
@@ -627,18 +655,25 @@ AMOK_SRC = \
 ###
 ### Declare the library content
 ###
-lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la $(am__append_4)
+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 = -no-undefined $(VERSION_INFO) @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) \
@@ -653,19 +688,20 @@ libsmpi_la_LDFLAGS = -no-undefined $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm
 @GRAMINE_MODE_FALSE@	    xbt/xbt_str.c                      \
 @GRAMINE_MODE_FALSE@            xbt/config.c 
 
-@GRAMINE_MODE_FALSE@TEST_UNITS = ./cunit_unit.c ./ex_unit.c         \
-@GRAMINE_MODE_FALSE@            ./dynar_unit.c ./dict_unit.c ./set_unit.c ./swag_unit.c \
-@GRAMINE_MODE_FALSE@	    ./xbt_str_unit.c \
-@GRAMINE_MODE_FALSE@            ./config_unit.c 
+@GRAMINE_MODE_FALSE@TEST_UNITS = @builddir@/cunit_unit.c @builddir@/ex_unit.c         \
+@GRAMINE_MODE_FALSE@            @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \
+@GRAMINE_MODE_FALSE@	    @builddir@/xbt_str_unit.c \
+@GRAMINE_MODE_FALSE@            @builddir@/config_unit.c 
 
 @GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/surfxml.h surf/surfxml.c \
 @GRAMINE_MODE_FALSE@              ../include/xbt/graphxml.h xbt/graphxml.c \
 @GRAMINE_MODE_FALSE@              gras/DataDesc/ddt_parse.yy.c \
-@GRAMINE_MODE_FALSE@              $(TEST_UNITS) simgrid_units_main.c
+@GRAMINE_MODE_FALSE@	      $(TEST_UNITS) @builddir@/simgrid_units_main.c
 
-@GRAMINE_MODE_FALSE@testall_SOURCES = $(TEST_UNITS) simgrid_units_main.c
+@GRAMINE_MODE_FALSE@testall_SOURCES = $(TEST_UNITS) @builddir@/simgrid_units_main.c
 @GRAMINE_MODE_FALSE@testall_LDADD = libgras.la
 @GRAMINE_MODE_FALSE@TESTS_ENVIRONMENT = $(SG_TEST_EXENV)
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@CLEANFILES = $(TEST_UNITS)
 all: $(BUILT_SOURCES) gras_config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -764,6 +800,25 @@ clean-noinstPROGRAMS:
 testall$(EXEEXT): $(testall_OBJECTS) $(testall_DEPENDENCIES) 
 	@rm -f testall$(EXEEXT)
 	$(LINK) $(testall_OBJECTS) $(testall_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -798,6 +853,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@
@@ -829,7 +885,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@
@@ -855,7 +910,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@
@@ -879,12 +939,14 @@ 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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_main.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_matrix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_os_thread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_os_thread_stubs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_os_time.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_peer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_queue.Plo@am__quote@
@@ -894,6 +956,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:
@@ -931,6 +994,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
@@ -1344,6 +1414,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
@@ -1400,13 +1477,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
@@ -1414,6 +1484,20 @@ 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
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xbt/xbt_os_thread_stubs.c' object='xbt_os_thread_stubs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_os_thread_stubs.lo `test -f 'xbt/xbt_os_thread_stubs.c' || echo '$(srcdir)/'`xbt/xbt_os_thread_stubs.c
+
 network_gtnets.lo: surf/network_gtnets.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT network_gtnets.lo -MD -MP -MF $(DEPDIR)/network_gtnets.Tpo -c -o network_gtnets.lo `test -f 'surf/network_gtnets.c' || echo '$(srcdir)/'`surf/network_gtnets.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/network_gtnets.Tpo $(DEPDIR)/network_gtnets.Plo
@@ -1694,6 +1778,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
@@ -1701,117 +1799,152 @@ 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
 
-cunit_unit.o: ./cunit_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cunit_unit.o -MD -MP -MF $(DEPDIR)/cunit_unit.Tpo -c -o cunit_unit.o `test -f './cunit_unit.c' || echo '$(srcdir)/'`./cunit_unit.c
+smpi_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./cunit_unit.c' object='cunit_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/cunit_unit.c' object='cunit_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cunit_unit.o `test -f './cunit_unit.c' || echo '$(srcdir)/'`./cunit_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cunit_unit.o `test -f '@builddir@/cunit_unit.c' || echo '$(srcdir)/'`@builddir@/cunit_unit.c
 
-cunit_unit.obj: ./cunit_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cunit_unit.obj -MD -MP -MF $(DEPDIR)/cunit_unit.Tpo -c -o cunit_unit.obj `if test -f './cunit_unit.c'; then $(CYGPATH_W) './cunit_unit.c'; else $(CYGPATH_W) '$(srcdir)/./cunit_unit.c'; fi`
+cunit_unit.obj: @builddir@/cunit_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cunit_unit.obj -MD -MP -MF $(DEPDIR)/cunit_unit.Tpo -c -o cunit_unit.obj `if test -f '@builddir@/cunit_unit.c'; then $(CYGPATH_W) '@builddir@/cunit_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/cunit_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cunit_unit.Tpo $(DEPDIR)/cunit_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./cunit_unit.c' object='cunit_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/cunit_unit.c' object='cunit_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cunit_unit.obj `if test -f './cunit_unit.c'; then $(CYGPATH_W) './cunit_unit.c'; else $(CYGPATH_W) '$(srcdir)/./cunit_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cunit_unit.obj `if test -f '@builddir@/cunit_unit.c'; then $(CYGPATH_W) '@builddir@/cunit_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/cunit_unit.c'; fi`
 
-ex_unit.o: ./ex_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex_unit.o -MD -MP -MF $(DEPDIR)/ex_unit.Tpo -c -o ex_unit.o `test -f './ex_unit.c' || echo '$(srcdir)/'`./ex_unit.c
+ex_unit.o: @builddir@/ex_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex_unit.o -MD -MP -MF $(DEPDIR)/ex_unit.Tpo -c -o ex_unit.o `test -f '@builddir@/ex_unit.c' || echo '$(srcdir)/'`@builddir@/ex_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ex_unit.Tpo $(DEPDIR)/ex_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./ex_unit.c' object='ex_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/ex_unit.c' object='ex_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ex_unit.o `test -f './ex_unit.c' || echo '$(srcdir)/'`./ex_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ex_unit.o `test -f '@builddir@/ex_unit.c' || echo '$(srcdir)/'`@builddir@/ex_unit.c
 
-ex_unit.obj: ./ex_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex_unit.obj -MD -MP -MF $(DEPDIR)/ex_unit.Tpo -c -o ex_unit.obj `if test -f './ex_unit.c'; then $(CYGPATH_W) './ex_unit.c'; else $(CYGPATH_W) '$(srcdir)/./ex_unit.c'; fi`
+ex_unit.obj: @builddir@/ex_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex_unit.obj -MD -MP -MF $(DEPDIR)/ex_unit.Tpo -c -o ex_unit.obj `if test -f '@builddir@/ex_unit.c'; then $(CYGPATH_W) '@builddir@/ex_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/ex_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ex_unit.Tpo $(DEPDIR)/ex_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./ex_unit.c' object='ex_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/ex_unit.c' object='ex_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ex_unit.obj `if test -f './ex_unit.c'; then $(CYGPATH_W) './ex_unit.c'; else $(CYGPATH_W) '$(srcdir)/./ex_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ex_unit.obj `if test -f '@builddir@/ex_unit.c'; then $(CYGPATH_W) '@builddir@/ex_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/ex_unit.c'; fi`
 
-dynar_unit.o: ./dynar_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dynar_unit.o -MD -MP -MF $(DEPDIR)/dynar_unit.Tpo -c -o dynar_unit.o `test -f './dynar_unit.c' || echo '$(srcdir)/'`./dynar_unit.c
+dynar_unit.o: @builddir@/dynar_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dynar_unit.o -MD -MP -MF $(DEPDIR)/dynar_unit.Tpo -c -o dynar_unit.o `test -f '@builddir@/dynar_unit.c' || echo '$(srcdir)/'`@builddir@/dynar_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dynar_unit.Tpo $(DEPDIR)/dynar_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./dynar_unit.c' object='dynar_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/dynar_unit.c' object='dynar_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dynar_unit.o `test -f './dynar_unit.c' || echo '$(srcdir)/'`./dynar_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dynar_unit.o `test -f '@builddir@/dynar_unit.c' || echo '$(srcdir)/'`@builddir@/dynar_unit.c
 
-dynar_unit.obj: ./dynar_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dynar_unit.obj -MD -MP -MF $(DEPDIR)/dynar_unit.Tpo -c -o dynar_unit.obj `if test -f './dynar_unit.c'; then $(CYGPATH_W) './dynar_unit.c'; else $(CYGPATH_W) '$(srcdir)/./dynar_unit.c'; fi`
+dynar_unit.obj: @builddir@/dynar_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dynar_unit.obj -MD -MP -MF $(DEPDIR)/dynar_unit.Tpo -c -o dynar_unit.obj `if test -f '@builddir@/dynar_unit.c'; then $(CYGPATH_W) '@builddir@/dynar_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/dynar_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dynar_unit.Tpo $(DEPDIR)/dynar_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./dynar_unit.c' object='dynar_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/dynar_unit.c' object='dynar_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dynar_unit.obj `if test -f './dynar_unit.c'; then $(CYGPATH_W) './dynar_unit.c'; else $(CYGPATH_W) '$(srcdir)/./dynar_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dynar_unit.obj `if test -f '@builddir@/dynar_unit.c'; then $(CYGPATH_W) '@builddir@/dynar_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/dynar_unit.c'; fi`
 
-dict_unit.o: ./dict_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dict_unit.o -MD -MP -MF $(DEPDIR)/dict_unit.Tpo -c -o dict_unit.o `test -f './dict_unit.c' || echo '$(srcdir)/'`./dict_unit.c
+dict_unit.o: @builddir@/dict_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dict_unit.o -MD -MP -MF $(DEPDIR)/dict_unit.Tpo -c -o dict_unit.o `test -f '@builddir@/dict_unit.c' || echo '$(srcdir)/'`@builddir@/dict_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dict_unit.Tpo $(DEPDIR)/dict_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./dict_unit.c' object='dict_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/dict_unit.c' object='dict_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dict_unit.o `test -f './dict_unit.c' || echo '$(srcdir)/'`./dict_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dict_unit.o `test -f '@builddir@/dict_unit.c' || echo '$(srcdir)/'`@builddir@/dict_unit.c
 
-dict_unit.obj: ./dict_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dict_unit.obj -MD -MP -MF $(DEPDIR)/dict_unit.Tpo -c -o dict_unit.obj `if test -f './dict_unit.c'; then $(CYGPATH_W) './dict_unit.c'; else $(CYGPATH_W) '$(srcdir)/./dict_unit.c'; fi`
+dict_unit.obj: @builddir@/dict_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dict_unit.obj -MD -MP -MF $(DEPDIR)/dict_unit.Tpo -c -o dict_unit.obj `if test -f '@builddir@/dict_unit.c'; then $(CYGPATH_W) '@builddir@/dict_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/dict_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dict_unit.Tpo $(DEPDIR)/dict_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./dict_unit.c' object='dict_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/dict_unit.c' object='dict_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dict_unit.obj `if test -f './dict_unit.c'; then $(CYGPATH_W) './dict_unit.c'; else $(CYGPATH_W) '$(srcdir)/./dict_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dict_unit.obj `if test -f '@builddir@/dict_unit.c'; then $(CYGPATH_W) '@builddir@/dict_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/dict_unit.c'; fi`
 
-set_unit.o: ./set_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT set_unit.o -MD -MP -MF $(DEPDIR)/set_unit.Tpo -c -o set_unit.o `test -f './set_unit.c' || echo '$(srcdir)/'`./set_unit.c
+set_unit.o: @builddir@/set_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT set_unit.o -MD -MP -MF $(DEPDIR)/set_unit.Tpo -c -o set_unit.o `test -f '@builddir@/set_unit.c' || echo '$(srcdir)/'`@builddir@/set_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/set_unit.Tpo $(DEPDIR)/set_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./set_unit.c' object='set_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/set_unit.c' object='set_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o set_unit.o `test -f './set_unit.c' || echo '$(srcdir)/'`./set_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o set_unit.o `test -f '@builddir@/set_unit.c' || echo '$(srcdir)/'`@builddir@/set_unit.c
 
-set_unit.obj: ./set_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT set_unit.obj -MD -MP -MF $(DEPDIR)/set_unit.Tpo -c -o set_unit.obj `if test -f './set_unit.c'; then $(CYGPATH_W) './set_unit.c'; else $(CYGPATH_W) '$(srcdir)/./set_unit.c'; fi`
+set_unit.obj: @builddir@/set_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT set_unit.obj -MD -MP -MF $(DEPDIR)/set_unit.Tpo -c -o set_unit.obj `if test -f '@builddir@/set_unit.c'; then $(CYGPATH_W) '@builddir@/set_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/set_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/set_unit.Tpo $(DEPDIR)/set_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./set_unit.c' object='set_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/set_unit.c' object='set_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o set_unit.obj `if test -f './set_unit.c'; then $(CYGPATH_W) './set_unit.c'; else $(CYGPATH_W) '$(srcdir)/./set_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o set_unit.obj `if test -f '@builddir@/set_unit.c'; then $(CYGPATH_W) '@builddir@/set_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/set_unit.c'; fi`
 
-swag_unit.o: ./swag_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swag_unit.o -MD -MP -MF $(DEPDIR)/swag_unit.Tpo -c -o swag_unit.o `test -f './swag_unit.c' || echo '$(srcdir)/'`./swag_unit.c
+swag_unit.o: @builddir@/swag_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swag_unit.o -MD -MP -MF $(DEPDIR)/swag_unit.Tpo -c -o swag_unit.o `test -f '@builddir@/swag_unit.c' || echo '$(srcdir)/'`@builddir@/swag_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swag_unit.Tpo $(DEPDIR)/swag_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./swag_unit.c' object='swag_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/swag_unit.c' object='swag_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swag_unit.o `test -f './swag_unit.c' || echo '$(srcdir)/'`./swag_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swag_unit.o `test -f '@builddir@/swag_unit.c' || echo '$(srcdir)/'`@builddir@/swag_unit.c
 
-swag_unit.obj: ./swag_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swag_unit.obj -MD -MP -MF $(DEPDIR)/swag_unit.Tpo -c -o swag_unit.obj `if test -f './swag_unit.c'; then $(CYGPATH_W) './swag_unit.c'; else $(CYGPATH_W) '$(srcdir)/./swag_unit.c'; fi`
+swag_unit.obj: @builddir@/swag_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swag_unit.obj -MD -MP -MF $(DEPDIR)/swag_unit.Tpo -c -o swag_unit.obj `if test -f '@builddir@/swag_unit.c'; then $(CYGPATH_W) '@builddir@/swag_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/swag_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swag_unit.Tpo $(DEPDIR)/swag_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./swag_unit.c' object='swag_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/swag_unit.c' object='swag_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swag_unit.obj `if test -f './swag_unit.c'; then $(CYGPATH_W) './swag_unit.c'; else $(CYGPATH_W) '$(srcdir)/./swag_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swag_unit.obj `if test -f '@builddir@/swag_unit.c'; then $(CYGPATH_W) '@builddir@/swag_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/swag_unit.c'; fi`
 
-xbt_str_unit.o: ./xbt_str_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_str_unit.o -MD -MP -MF $(DEPDIR)/xbt_str_unit.Tpo -c -o xbt_str_unit.o `test -f './xbt_str_unit.c' || echo '$(srcdir)/'`./xbt_str_unit.c
+xbt_str_unit.o: @builddir@/xbt_str_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_str_unit.o -MD -MP -MF $(DEPDIR)/xbt_str_unit.Tpo -c -o xbt_str_unit.o `test -f '@builddir@/xbt_str_unit.c' || echo '$(srcdir)/'`@builddir@/xbt_str_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbt_str_unit.Tpo $(DEPDIR)/xbt_str_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./xbt_str_unit.c' object='xbt_str_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/xbt_str_unit.c' object='xbt_str_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_str_unit.o `test -f './xbt_str_unit.c' || echo '$(srcdir)/'`./xbt_str_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_str_unit.o `test -f '@builddir@/xbt_str_unit.c' || echo '$(srcdir)/'`@builddir@/xbt_str_unit.c
 
-xbt_str_unit.obj: ./xbt_str_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_str_unit.obj -MD -MP -MF $(DEPDIR)/xbt_str_unit.Tpo -c -o xbt_str_unit.obj `if test -f './xbt_str_unit.c'; then $(CYGPATH_W) './xbt_str_unit.c'; else $(CYGPATH_W) '$(srcdir)/./xbt_str_unit.c'; fi`
+xbt_str_unit.obj: @builddir@/xbt_str_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_str_unit.obj -MD -MP -MF $(DEPDIR)/xbt_str_unit.Tpo -c -o xbt_str_unit.obj `if test -f '@builddir@/xbt_str_unit.c'; then $(CYGPATH_W) '@builddir@/xbt_str_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/xbt_str_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbt_str_unit.Tpo $(DEPDIR)/xbt_str_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./xbt_str_unit.c' object='xbt_str_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/xbt_str_unit.c' object='xbt_str_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_str_unit.obj `if test -f './xbt_str_unit.c'; then $(CYGPATH_W) './xbt_str_unit.c'; else $(CYGPATH_W) '$(srcdir)/./xbt_str_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_str_unit.obj `if test -f '@builddir@/xbt_str_unit.c'; then $(CYGPATH_W) '@builddir@/xbt_str_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/xbt_str_unit.c'; fi`
 
-config_unit.o: ./config_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config_unit.o -MD -MP -MF $(DEPDIR)/config_unit.Tpo -c -o config_unit.o `test -f './config_unit.c' || echo '$(srcdir)/'`./config_unit.c
+config_unit.o: @builddir@/config_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config_unit.o -MD -MP -MF $(DEPDIR)/config_unit.Tpo -c -o config_unit.o `test -f '@builddir@/config_unit.c' || echo '$(srcdir)/'`@builddir@/config_unit.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/config_unit.Tpo $(DEPDIR)/config_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./config_unit.c' object='config_unit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/config_unit.c' object='config_unit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config_unit.o `test -f './config_unit.c' || echo '$(srcdir)/'`./config_unit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config_unit.o `test -f '@builddir@/config_unit.c' || echo '$(srcdir)/'`@builddir@/config_unit.c
 
-config_unit.obj: ./config_unit.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config_unit.obj -MD -MP -MF $(DEPDIR)/config_unit.Tpo -c -o config_unit.obj `if test -f './config_unit.c'; then $(CYGPATH_W) './config_unit.c'; else $(CYGPATH_W) '$(srcdir)/./config_unit.c'; fi`
+config_unit.obj: @builddir@/config_unit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config_unit.obj -MD -MP -MF $(DEPDIR)/config_unit.Tpo -c -o config_unit.obj `if test -f '@builddir@/config_unit.c'; then $(CYGPATH_W) '@builddir@/config_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/config_unit.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/config_unit.Tpo $(DEPDIR)/config_unit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='./config_unit.c' object='config_unit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/config_unit.c' object='config_unit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config_unit.obj `if test -f './config_unit.c'; then $(CYGPATH_W) './config_unit.c'; else $(CYGPATH_W) '$(srcdir)/./config_unit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config_unit.obj `if test -f '@builddir@/config_unit.c'; then $(CYGPATH_W) '@builddir@/config_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/config_unit.c'; fi`
+
+simgrid_units_main.o: @builddir@/simgrid_units_main.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simgrid_units_main.o -MD -MP -MF $(DEPDIR)/simgrid_units_main.Tpo -c -o simgrid_units_main.o `test -f '@builddir@/simgrid_units_main.c' || echo '$(srcdir)/'`@builddir@/simgrid_units_main.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/simgrid_units_main.Tpo $(DEPDIR)/simgrid_units_main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/simgrid_units_main.c' object='simgrid_units_main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simgrid_units_main.o `test -f '@builddir@/simgrid_units_main.c' || echo '$(srcdir)/'`@builddir@/simgrid_units_main.c
+
+simgrid_units_main.obj: @builddir@/simgrid_units_main.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT simgrid_units_main.obj -MD -MP -MF $(DEPDIR)/simgrid_units_main.Tpo -c -o simgrid_units_main.obj `if test -f '@builddir@/simgrid_units_main.c'; then $(CYGPATH_W) '@builddir@/simgrid_units_main.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/simgrid_units_main.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/simgrid_units_main.Tpo $(DEPDIR)/simgrid_units_main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='@builddir@/simgrid_units_main.c' object='simgrid_units_main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o simgrid_units_main.obj `if test -f '@builddir@/simgrid_units_main.c'; then $(CYGPATH_W) '@builddir@/simgrid_units_main.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/simgrid_units_main.c'; fi`
 
 .cc.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -2029,9 +2162,10 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) gras_config.h
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
+		gras_config.h
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(jardir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(jardir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -2052,6 +2186,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -2087,7 +2222,7 @@ install-data-am: install-jarDATA
 
 install-dvi: install-dvi-am
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am: install-binSCRIPTS install-libLTLIBRARIES
 
 install-html: install-html-am
 
@@ -2119,7 +2254,8 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-jarDATA uninstall-libLTLIBRARIES
+uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
+	uninstall-libLTLIBRARIES
 
 .MAKE: install-am install-strip
 
@@ -2128,59 +2264,65 @@ uninstall-am: uninstall-jarDATA uninstall-libLTLIBRARIES
 	clean-noinstPROGRAMS ctags distclean distclean-compile \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-jarDATA \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-jarDATA \
+	install install-am install-binSCRIPTS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-jarDATA install-libLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	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) $(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 .;
+@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
+@HAVE_JAVA_TRUE@	$(JAR) cvf simgrid.jar -C .classes .
 
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./cunit_unit.c: xbt/cunit.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/cunit_unit.c: xbt/cunit.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./ex_unit.c: xbt/ex.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/ex_unit.c: xbt/ex.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./xbt_str_unit.c: xbt/xbt_str.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/xbt_str_unit.c: xbt/xbt_str.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./dynar_unit.c: xbt/dynar.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/dynar_unit.c: xbt/dynar.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./dict_unit.c: xbt/dict.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/dict_unit.c: xbt/dict.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./set_unit.c: xbt/set.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/set_unit.c: xbt/set.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./swag_unit.c: xbt/swag.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/swag_unit.c: xbt/swag.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@./config_unit.c: xbt/config.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/config_unit.c: xbt/config.c
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl $^
 
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@simgrid_units_main.c: $(TEST_UNITS)
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl xbt/cunit.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/simgrid_units_main.c: $(TEST_UNITS)
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	@top_srcdir@/tools/sg_unit_extractor.pl @srcdir@/xbt/cunit.c
 
 @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@clean-units:
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	rm -f simgrid_units_main.c *_unit.c
-
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_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
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	rm -f simgrid_units_main.c *_unit.c @srcdir@/simgrid_units_main.c @srcdir@/*_unit.c
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	for n in $(TEST_UNITS) ; do \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	  dep=`echo $$n|sed -e 's|.c$$|.Po|' -e 's|[^/]*/||' -e 's|^|.deps/|'`; \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@          echo "Removing dependency tracker of $$n ($$dep @srcdir@/$$dep)"; \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@	  rm -vf $$dep @srcdir@/$$dep; touch $$dep; \
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@        done
+
+@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
@@ -2191,18 +2333,24 @@ uninstall-am: uninstall-jarDATA uninstall-libLTLIBRARIES
 
 @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"