-AM_CFLAGS= -g
+AM_CFLAGS+= -g
#AM_CFLAGS= -DNDEBUG
# -DNLOG cuts absolutely all logs at compilation time.
xbt/graphxml.l \
xbt/graphxml.c \
xbt/graphxml.dtd \
- xbt/context_private.h xbt/context_win32.h xbt/context_win32.c\
+ xbt/context_private.h \
xbt/ex_interface.h \
\
surf/maxmin_private.h \
include/surf/surfxml_parse_private.h \
\
include/xbt/xbt_portability.h \
+ include/xbt/xbt_thread.h \
include/xbt/context.h \
\
msg/private.h \
amok/amok_modinter.h
if USE_SIMIX
- EXTRA_DIST+=include/simix/simix.h
+ EXTRA_DIST+=include/simix/simix.h include/simix/datatypes.h simix/msg_simix_private.h
endif
# gras_private.h
# | Set to zero if current is incremented
# +- Increment if interfaces have been added, removed or changed
-VERSION_INFO= -version-info 0:0:0
+VERSION_INFO= -version-info 1:0:0
# from `info libtool "Updating version info"`
# and `info libtool "Release numbers"`
#
COMMON_SRC=\
\
- xbt/snprintf.c \
+ xbt/snprintf.c xbt/getline.c xbt/trim.c \
xbt/ex.c \
\
xbt_modinter.h gras_modinter.h \
gras/Virtu/process.c gras/Virtu/gras_module.c
RL_SRC= \
+ gras/rl_stubs.c xbt/xbt_thread.c \
+ \
gras/Transport/rl_transport.c \
gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \
\
gras/Msg/rl_msg.c
SG_SRC= \
+ gras/sg_stubs.c \
xbt/context.c \
\
surf/maxmin.c \
+ surf/lagrange.c \
surf/trace_mgr.c \
surf/surf.c \
surf/surfxml_parse.c \
surf/network_dassf.c \
surf/workstation_KCCFLN05.c \
\
- msg/msg_config.c \
- msg/task.c msg/host.c msg/m_process.c msg/gos.c \
- msg/global.c msg/environment.c msg/deployment.c \
- \
simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c \
simdag/sd_workstation.c \
\
SG_SRC+= surf/sdp.c
endif
+SIMIX_SRC= \
+ simix/smx_global.c \
+ simix/smx_deployment.c \
+ simix/smx_config.c \
+ simix/smx_environment.c \
+ simix/smx_host.c \
+ simix/smx_process.c \
+ simix/smx_action.c \
+ simix/smx_synchro.c
+
+MSG_SRC= msg/msg_config.c \
+ msg/task.c msg/host.c msg/m_process.c msg/gos.c \
+ msg/global.c msg/environment.c msg/deployment.c
+
+MSG_SIMIX_SRC= msg_simix/msg_simix_config.c \
+ msg_simix/msg_simix_task.c \
+ msg_simix/msg_simix_host.c \
+ msg_simix/msg_simix_process.c \
+ msg_simix/msg_simix_gos.c \
+ msg_simix/msg_simix_global.c \
+ msg_simix/msg_simix_environment.c \
+ msg_simix/msg_simix_deployment.c
+
if USE_SIMIX
- SG_SRC+=simix/smx_global.c
+ SG_SRC+=$(SIMIX_SRC)
+ SG_SRC+=$(MSG_SIMIX_SRC)
+ EXTRA_DIST+=$(MSG_SRC)
+else
+ EXTRA_DIST+=$(SIMIX_SRC)
+ EXTRA_DIST+=$(MSG_SIMIX_SRC)
+ SG_SRC+=$(MSG_SRC)
endif
AMOK_SRC= \
TEST_CFILES=xbt/cunit.c xbt/ex.c \
xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.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
+TEST_UNITS= ./cunit_unit.c ./ex_unit.c \
+ ./dynar_unit.c ./dict_unit.c ./set_unit.c ./swag_unit.c \
+ ./config_unit.c
BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
../include/xbt/graphxml.h xbt/graphxml.c \
EXTRA_DIST+=$(testall_SOURCES)
if MAINTAINER_MODE
-cunit_unit.c: xbt/cunit.c
+./cunit_unit.c: xbt/cunit.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-ex_unit.c: xbt/ex.c
+./ex_unit.c: xbt/ex.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-dynar_unit.c: xbt/dynar.c
+./dynar_unit.c: xbt/dynar.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-dict_unit.c: xbt/dict.c
+./dict_unit.c: xbt/dict.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-set_unit.c: xbt/set.c
+./set_unit.c: xbt/set.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-swag_unit.c: xbt/swag.c
+./swag_unit.c: xbt/swag.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
-config_unit.c: xbt/config.c
+./config_unit.c: xbt/config.c
@top_srcdir@/tools/sg_unit_extractor.pl $^
simgrid_units_main.c: $(TEST_UNITS)