X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24f30a1f9d0c0c7b741d4c019ea3979d3d2e54e3..037955e458fb05c8ad1a1bdc3509bac0664f87a2:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index d5012d1b98..2cce60ca00 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS+= -g +AM_CFLAGS+= -g @GTNETS_CFLAGS@ #AM_CFLAGS= -DNDEBUG # -DNLOG cuts absolutely all logs at compilation time. @@ -58,21 +58,9 @@ EXTRA_DIST= \ \ amok/Bandwidth/bandwidth_private.h \ amok/amok_modinter.h - -if USE_SIMIX - EXTRA_DIST+=include/simix/simix.h include/simix/datatypes.h simix/msg_simix_private.h \ - gras_simix/Transport/gras_simix_transport_interface.h \ - gras_simix/Virtu/gras_simix_virtu_interface.h gras_simix/Virtu/gras_simix_virtu_private.h\ - gras_simix/Virtu/gras_simix_virtu_rl.h gras_simix/Virtu/gras_simix_virtu_sg.h \ - gras_simix/DataDesc/gras_simix_ddt_parse.yy.l gras_simix/DataDesc/gras_simix_ddt_parse.yy.c -else - EXTRA_DIST+=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 -endif - -# gras_private.h + \ + include/simix/simix.h include/simix/datatypes.h \ + simix/msg_simix_private.h #LIBRARY_VERSION= 0:0:0 # | | | @@ -87,7 +75,7 @@ endif # | Set to zero if current is incremented # +- Increment if interfaces have been added, removed or changed -VERSION_INFO= -version-info 1:0:0 +VERSION_INFO= -version-info 2:0:0 # from `info libtool "Updating version info"` # and `info libtool "Release numbers"` # @@ -116,14 +104,16 @@ lib_LTLIBRARIES= libsimgrid.la libgras.la 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/xbt_virtu.c \ \ 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 \ @@ -152,18 +142,6 @@ RL_SRC= \ \ 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= \ xbt/context.c \ \ @@ -180,8 +158,22 @@ SG_SRC= \ 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= \ @@ -198,16 +190,7 @@ 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 - -GRAS_SRC= gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ +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 \ @@ -216,39 +199,9 @@ GRAS_SRC= gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.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_emul.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+=$(SIMIX_SRC) - 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 \ +SG_SRC+=$(SIMIX_SRC) $(MSG_SRC) $(GRAS_SG_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 \ @@ -260,7 +213,6 @@ else 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= \ amok/amok_base.c \ @@ -285,10 +237,12 @@ else 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 \ @@ -298,6 +252,7 @@ BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \ testall_SOURCES= $(TEST_UNITS) simgrid_units_main.c testall_LDADD=libgras.la TESTS=testall +TESTS_ENVIRONMENT=$(SG_TEST_EXENV) EXTRA_DIST+=$(testall_SOURCES) @@ -306,6 +261,8 @@ if MAINTAINER_MODE @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 @@ -377,15 +334,11 @@ endif ### 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) -endif -libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm +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