-AM_CFLAGS+= -g
+AM_CFLAGS+= -g @GTNETS_CFLAGS@
#AM_CFLAGS= -DNDEBUG
# -DNLOG cuts absolutely all logs at compilation time.
COMMON_SRC=\
\
- xbt/snprintf.c xbt/getline.c xbt/trim.c \
+ xbt/snprintf.c xbt/xbt_str.c \
xbt/ex.c \
\
xbt_modinter.h gras_modinter.h \
\
xbt/sysdep.c \
xbt/asserts.c \
- xbt/log.c xbt/log_default_appender.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/xbt_main.c \
xbt/config.c \
xbt/cunit.c \
- xbt/graphxml_parse.c \
- gras/gras.c \
- \
- gras/Transport/transport.c gras/Transport/transport_private.h \
- \
- gras/DataDesc/ddt_create.c \
- gras/DataDesc/ddt_convert.c gras/DataDesc/ddt_exchange.c \
- gras/DataDesc/cbps.c gras/DataDesc/datadesc.c \
- gras/DataDesc/datadesc_interface.h gras/DataDesc/datadesc_private.h \
- gras/DataDesc/ddt_parse.c gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h \
- \
- gras/Msg/msg.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
+ xbt/graphxml_parse.c
+
RL_SRC= \
gras/rl_stubs.c xbt/xbt_thread.c \
\
\
gras/Msg/rl_msg.c
+RL_SIMIX_SRC= \
+ gras_simix/gras_simix_rl_stubs.c xbt/xbt_thread.c \
+ \
+ gras_simix/Transport/gras_simix_rl_transport.c \
+ gras_simix/Transport/gras_simix_transport_plugin_file.c gras_simix/Transport/gras_simix_transport_plugin_tcp.c \
+ \
+ gras_simix/Virtu/gras_simix_rl_emul.c \
+ gras_simix/Virtu/gras_simix_rl_process.c gras_simix/Virtu/gras_simix_rl_time.c \
+ gras_simix/Virtu/gras_simix_rl_dns.c\
+ \
+ gras_simix/Msg/gras_simix_rl_msg.c
+
SG_SRC= \
- gras/sg_stubs.c \
xbt/context.c \
\
surf/maxmin.c \
simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c \
simdag/sd_workstation.c
+GTNETS_SRC= \
+ surf/gtnets/gtnets_simulator.cc \
+ surf/gtnets/gtnets_topology.cc \
+ surf/gtnets/gtnets_interface.cc \
+ surf/network_gtnets.c
+
+if USE_GTNETS
+ SG_SRC+=$(GTNETS_SRC)
+else
+ EXTRA_DIST+=$(GTNETS_SRC)
+endif
+
if HAVE_SDP
- SG_SRC+= surf/sdp.c
+ SG_SRC+= surf/sdp.c
+else
+ EXTRA_DIST+=surf/sdp.c
endif
SIMIX_SRC= \
gras/Virtu/sg_process.c gras/Virtu/sg_time.c \
gras/Virtu/sg_dns.c\
\
+ gras/sg_stubs.c \
gras/Msg/sg_msg.c
GRAS_SIMIX_SRC= gras_simix/Transport/gras_simix_sg_transport.c gras_simix/Transport/gras_simix_transport_plugin_sg.c \
gras_simix/Virtu/gras_simix_sg_process.c gras_simix/Virtu/gras_simix_sg_time.c \
gras_simix/Virtu/gras_simix_sg_dns.c\
\
+ gras_simix/gras_simix_sg_stubs.c \
gras_simix/Msg/gras_simix_sg_msg.c
if USE_SIMIX
SG_SRC+=$(MSG_SIMIX_SRC)
SG_SRC+=$(GRAS_SIMIX_SRC)
EXTRA_DIST+=$(MSG_SRC)
+ COMMON_SRC+=gras_simix/gras_simix_gras.c \
+ gras_simix/Transport/gras_simix_transport.c gras_simix/Transport/gras_simix_transport_private.h \
+ gras_simix/Msg/gras_simix_msg.c gras_simix/Msg/gras_simix_rpc.c gras_simix/Msg/gras_simix_timer.c \
+ gras_simix/Msg/gras_simix_msg_interface.h gras_simix/Msg/gras_simix_msg_private.h \
+ gras_simix/Virtu/gras_simix_process.c gras_simix/Virtu/gras_simix_gras_module.c \
+ \
+ gras_simix/DataDesc/gras_simix_ddt_create.c \
+ gras_simix/DataDesc/gras_simix_ddt_convert.c gras_simix/DataDesc/gras_simix_ddt_exchange.c \
+ gras_simix/DataDesc/gras_simix_cbps.c gras_simix/DataDesc/gras_simix_datadesc.c \
+ gras_simix/DataDesc/gras_simix_datadesc_interface.h gras_simix/DataDesc/gras_simix_datadesc_private.h \
+ gras_simix/DataDesc/gras_simix_ddt_parse.c gras_simix/DataDesc/gras_simix_ddt_parse.yy.c gras_simix/DataDesc/gras_simix_ddt_parse.yy.h
+
else
EXTRA_DIST+=$(SIMIX_SRC)
EXTRA_DIST+=$(MSG_SIMIX_SRC)
EXTRA_DIST+=$(GRAS_SIMIX_SRC)
SG_SRC+=$(MSG_SRC)
SG_SRC+=$(GRAS_SRC)
+ 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/Virtu/process.c gras/Virtu/gras_module.c \
+ \
+ gras/DataDesc/ddt_create.c \
+ gras/DataDesc/ddt_convert.c gras/DataDesc/ddt_exchange.c \
+ gras/DataDesc/cbps.c gras/DataDesc/datadesc.c \
+ gras/DataDesc/datadesc_interface.h gras/DataDesc/datadesc_private.h \
+ gras/DataDesc/ddt_parse.c gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h
endif
AMOK_SRC= \
noinst_PROGRAMS=testall
TEST_CFILES=xbt/cunit.c xbt/ex.c \
xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
- xbt/config.c
+ xbt/xbt_str.c \
+ xbt/config.c
TEST_UNITS= ./cunit_unit.c ./ex_unit.c \
./dynar_unit.c ./dict_unit.c ./set_unit.c ./swag_unit.c \
- ./config_unit.c
+ ./xbt_str_unit.c \
+ ./config_unit.c
BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
../include/xbt/graphxml.h xbt/graphxml.c \
@top_srcdir@/tools/sg_unit_extractor.pl $^
./ex_unit.c: xbt/ex.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
+./xbt_str_unit.c: xbt/xbt_str.c
+ @top_srcdir@/tools/sg_unit_extractor.pl $^
./dynar_unit.c: xbt/dynar.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
./dict_unit.c: xbt/dict.c
### Declare the library content
###
+if USE_SIMIX
+libgras_la_SOURCES= $(COMMON_SRC) $(RL_SIMIX_SRC) $(AMOK_SRC)
+else
libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
-libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+endif
+libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm
libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)
-libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
