X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20ab7b029068573eb7ac3d983782a9cb27c96cec..d6d7151bb90b62f3cc983b6a9fa4ffae66181412:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 3a57627b33..36eea9f4f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,7 +48,7 @@ EXTRA_DIST= \ include/surf/surf.h \ include/surf/surfxml_parse_private.h \ \ - include/xbt/xbt_portability.h \ + include/xbt/xbt_os_time.h \ include/xbt/xbt_os_thread.h \ include/xbt/context.h \ \ @@ -113,7 +113,7 @@ XBT_SRC=\ xbt_modinter.h gras_modinter.h \ xbt/xbt_virtu.c \ \ - xbt/sysdep.c \ + xbt/xbt_os_time.c \ xbt/asserts.c \ xbt/log.c xbt/xbt_log_appender_file.c \ xbt/xbt_log_layout_simple.c xbt/xbt_log_layout_format.c \ @@ -128,7 +128,7 @@ XBT_SRC=\ xbt/set.c \ xbt/xbt_matrix.c \ \ - xbt/queue.c \ + xbt/xbt_queue.c \ \ xbt/xbt_peer.c \ \ @@ -139,10 +139,11 @@ XBT_SRC=\ xbt/graphxml_parse.c XBT_RL_SRC = \ - xbt/xbt_rl_synchro.c - + xbt/xbt_rl_synchro.c \ + xbt/xbt_rl_time.c XBT_SG_SRC = \ - xbt/xbt_sg_synchro.c + xbt/xbt_sg_synchro.c \ + xbt/xbt_sg_time.c SURF_SRC= \ surf/maxmin.c \ @@ -208,8 +209,10 @@ SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_works GRAS_COMMON_SRC= \ gras/gras.c \ gras/Transport/transport.c gras/Transport/transport_private.h \ - gras/Msg/msg.c gras/Msg/rpc.c gras/Msg/timer.c \ - gras/Msg/msg_interface.h gras/Msg/msg_private.h \ + gras/Msg/gras_msg_mod.c gras/Msg/gras_msg_types.c \ + gras/Msg/gras_msg_exchange.c gras/Msg/gras_msg_listener.c \ + gras/Msg/rpc.c gras/Msg/timer.c \ + gras/Msg/msg_interface.h gras/Msg/msg_private.h \ \ gras/Virtu/process.c gras/Virtu/gras_module.c \ \ @@ -226,7 +229,7 @@ GRAS_RL_SRC= \ gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \ \ gras/Virtu/rl_emul.c \ - gras/Virtu/rl_process.c gras/Virtu/rl_time.c \ + gras/Virtu/rl_process.c \ gras/Virtu/rl_dns.c\ \ gras/Msg/rl_msg.c @@ -236,7 +239,7 @@ GRAS_RL_SRC+=$(XBT_RL_SRC) GRAS_SG_SRC= gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ \ gras/Virtu/sg_emul.c \ - gras/Virtu/sg_process.c gras/Virtu/sg_time.c \ + gras/Virtu/sg_process.c \ gras/Virtu/sg_dns.c\ \ gras/Msg/sg_msg.c