include/surf/surf.h \
include/surf/surfxml_parse_private.h \
\
- include/xbt/xbt_portability.h \
- include/xbt/xbt_thread.h \
+ include/xbt/xbt_os_time.h \
+ include/xbt/xbt_os_thread.h \
include/xbt/context.h \
\
msg/private.h \
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 \
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
+XBT_RL_SRC = \
+ xbt/xbt_rl_synchro.c \
+ xbt/xbt_rl_time.c
+XBT_SG_SRC = \
+ xbt/xbt_sg_synchro.c \
+ xbt/xbt_sg_time.c
+
SURF_SRC= \
surf/maxmin.c \
surf/lagrange.c \
# Separated because we don't want it in libsimgrid4java
CTX_SRC= xbt/context.c
-JCTX_SRC= java/jxbt_context.c java/jxbt_context.h xbt/xbt_thread.c
+JCTX_SRC= java/jxbt_context.c java/jxbt_context.h xbt/xbt_os_thread.c
SIMIX_SRC= \
simix/smx_global.c \
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/rpc.c gras/Msg/timer.c \
+ gras/Msg/msg_interface.h gras/Msg/msg_private.h \
\
gras/Virtu/process.c gras/Virtu/gras_module.c \
\
gras/DataDesc/ddt_parse.c gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h
GRAS_RL_SRC= \
- gras/rl_stubs.c xbt/xbt_thread.c \
+ gras/rl_stubs.c xbt/xbt_os_thread.c \
\
gras/Transport/rl_transport.c \
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
+
+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/sg_stubs.c \
gras/Msg/sg_msg.c
+GRAS_SG_SRC+=$(XBT_SG_SRC)
+
AMOK_SRC= \
amok/amok_base.c \
amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \