-SUBDIRS= . amok
-
AM_CFLAGS= -g
#AM_CFLAGS= -DNDEBUG
\
portable.h \
\
+ xbt/dynar_private.h \
xbt/dict_private.h \
xbt/heap_private.h \
xbt/fifo_private.h \
surf/surf_private.h \
surf/cpu_private.h \
surf/workstation_private.h \
+ surf/surf_timer_private.h \
surf/surf_parse.c \
surf/surfxml.l \
surf/surfxml.c \
include/surf/maxmin.h \
include/surf/trace_mgr.h \
include/surf/surf.h \
- include/surf/surf_parse.h \
+ include/surf/surf_parse_private.h \
\
include/xbt/xbt_portability.h \
include/xbt/context.h \
gras/Transport/transport_interface.h \
gras/Virtu/virtu_interface.h gras/Virtu/virtu_private.h\
gras/Virtu/virtu_rl.h gras/Virtu/virtu_sg.h \
- gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c
-
+ gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c \
+ \
+ amok/Bandwidth/bandwidth_private.h
# gras_private.h
# | Set to zero if current is incremented
# +- Increment if interfaces have been added, removed or changed
-VERSION_INFO= -release 20050131 -version-info 0:0:0
+VERSION_INFO= -release 20050627 -version-info 0:0:0
# from `info libtool "Updating version info"`
# and `info libtool "Release numbers"`
#
COMMON_SRC=\
\
- xbt_modinter.h gras_modinter.h \
+ xbt/snprintf.c \
+ xbt/ex.c \
+ \
+ xbt_modinter.h gras_modinter.h \
\
- xbt/sysdep.c \
- xbt/log.c xbt/log_default_appender.c xbt/error.c \
- xbt/dynar.c \
+ xbt/sysdep.c \
+ xbt/asserts.c \
+ xbt/log.c xbt/log_default_appender.c \
+ xbt/dynar.c \
xbt/dict.c xbt/dict_elm.c xbt/dict_cursor.c \
- xbt/heap.c \
- xbt/fifo.c \
- xbt/swag.c \
- xbt/set.c \
- xbt/module.c \
- xbt/config.c \
+ xbt/dict_multi.c \
+ xbt/heap.c \
+ xbt/fifo.c \
+ xbt/swag.c \
+ xbt/set.c \
+ xbt/module.c \
+ xbt/config.c \
+ xbt/testsuite.c \
\
gras/gras.c \
\
- gras/Transport/transport.c gras/Transport/transport_private.h gras/Transport/transport_plugin_buf.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/Virtu/process.c
RL_SRC= \
- gras/Transport/rl_transport.c gras/Transport/transport_plugin_tcp.c gras/Transport/transport_plugin_file.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_dns.c
+ gras/Virtu/rl_dns.c\
+ \
+ gras/Msg/rl_msg.c
SG_SRC= \
xbt/context.c \
surf/surf.c \
surf/surf_parse.c \
surf/cpu.c surf/network.c surf/workstation.c \
+ surf/surf_timer.c \
surf/network_dassf.c \
surf/workstation_KCCFLN05.c \
- include/surf/surfxml.h \
\
+ 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 \
\
\
gras/Virtu/sg_emul.c \
gras/Virtu/sg_process.c gras/Virtu/sg_time.c \
- gras/Virtu/sg_dns.c
+ gras/Virtu/sg_dns.c\
+ \
+ gras/Msg/sg_msg.c
+
+AMOK_SRC= \
+ amok/base.c \
+ amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c
-BUILT_SOURCES=include/surf/surfxml.h surf/surfxml.c \
+BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \
gras/DataDesc/ddt_parse.yy.c
gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
if HAVE_FLEXML
surf/surfxml.l: surf/surfxml.dtd
- set -e; cd surf; flexml -b 1000000 -S -L surfxml.dtd ; \
- mv surfxml.l surfxml.l.bak ; \
- sed 's/surfxml\.h/surf\/surfxml\.h/g' surfxml.l.bak > surfxml.l
-include/surf/surfxml.h: surf/surfxml.dtd
- cd include/surf; flexml -H -L ../../surf/surfxml.dtd
+ set -e; cd surf; flexml -b 1000000 -S -L surfxml.dtd
+../include/surf/surfxml.h: surf/surfxml.dtd
+ cd ../include/surf; flexml -H -L ../../src/surf/surfxml.dtd
else
-include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
+../include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
@echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected"
@echo "ERROR: Please install it, or if you didn't modify this file, try this:"
@echo "ERROR: touch src/include/surf/surfxml.h src/surf/surfxml.l"
endif
endif
-libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC)
-libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ -lm
+libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC)
+libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm
-libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC)
-libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ -lm
+libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC)
+libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
include $(top_srcdir)/acmacro/dist-files.mk
