X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3523ea09ad6f22794c862a3ce1f6c08666b03600..421c862bdd97e9846933dea70327d47e4b0a122c:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index afabaf5409..c895516afb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,6 +16,7 @@ EXTRA_DIST= \ \ portable.h \ \ + xbt/mallocator_private.h \ xbt/dynar_private.h \ xbt/dict_private.h \ xbt/heap_private.h \ @@ -59,7 +60,12 @@ EXTRA_DIST= \ gras/Virtu/virtu_rl.h gras/Virtu/virtu_sg.h \ gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c \ \ - amok/Bandwidth/bandwidth_private.h + amok/Bandwidth/bandwidth_private.h \ + amok/amok_modinter.h + +if USE_SIMIX + EXTRA_DIST+=include/simix/simix.h +endif # gras_private.h @@ -76,7 +82,7 @@ EXTRA_DIST= \ # | Set to zero if current is incremented # +- Increment if interfaces have been added, removed or changed -VERSION_INFO= -release 20050627 -version-info 0:0:0 +VERSION_INFO= -version-info 0:0:0 # from `info libtool "Updating version info"` # and `info libtool "Release numbers"` # @@ -102,7 +108,6 @@ VERSION_INFO= -release 20050627 -version-info 0:0:0 # using this trick is ready for a "stable" release (say, in Debian). lib_LTLIBRARIES= libsimgrid.la libgras.la -noinst_PROGRAMS=testall COMMON_SRC=\ \ @@ -114,6 +119,7 @@ COMMON_SRC=\ xbt/sysdep.c \ xbt/asserts.c \ xbt/log.c xbt/log_default_appender.c \ + xbt/mallocator.c \ xbt/dynar.c \ xbt/dict.c xbt/dict_elm.c xbt/dict_cursor.c \ xbt/dict_multi.c \ @@ -123,8 +129,8 @@ COMMON_SRC=\ xbt/graph.c \ xbt/set.c \ xbt/xbt_matrix.c \ - xbt/xbt_host.c \ - xbt/module.c \ + xbt/xbt_peer.c \ + xbt/xbt_main.c \ xbt/config.c \ xbt/cunit.c \ xbt/graphxml_parse.c \ @@ -142,7 +148,7 @@ COMMON_SRC=\ 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/process.c gras/Virtu/gras_module.c RL_SRC= \ gras/Transport/rl_transport.c \ @@ -181,11 +187,21 @@ SG_SRC= \ \ gras/Msg/sg_msg.c +if HAVE_SDP + SG_SRC+= surf/sdp.c +endif + +if USE_SIMIX + SG_SRC+=simix/smx_global.c +endif + AMOK_SRC= \ - amok/base.c \ + amok/amok_base.c \ amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \ - amok/HostManagement/hostmanagement.c + amok/PeerManagement/peermanagement.c +if GRAMINE_MODE +else ### ### Testing infrastructure ### @@ -195,10 +211,11 @@ AMOK_SRC= \ # are generated. Sorry about that. # If you add a test unit, you should regenerate simgrid_units_main.c from scratch: -# rm -f simgrid_units_main.c *_unit.c ; make testall +# make clean-units ; make testall # Suites and tests run in the given order. +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 @@ -234,10 +251,14 @@ config_unit.c: xbt/config.c @top_srcdir@/tools/sg_unit_extractor.pl $^ simgrid_units_main.c: $(TEST_UNITS) + @top_srcdir@/tools/sg_unit_extractor.pl xbt/cunit.c + +clean-units: + rm -f simgrid_units_main.c *_unit.c else -$(TEST_UNITS) simgrid_units_main.c: +$(TEST_UNITS) simgrid_units_main.c clean-units: @echo "ERROR: Test units not generated." @echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag" @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." @@ -251,47 +272,49 @@ endif gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l - @LEX@ -o$@ -Pgras_ddt_parse_ $^ + set -e;@LEX@ -o$@ -Pgras_ddt_parse_ --noline $^ if MAINTAINER_MODE surf/surfxml.c: surf/surfxml.l - mkdir -p `basename $@`; @LEX@ -o$@ -Psurf_parse_ $^ + set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^ xbt/graphxml.c: xbt/graphxml.l - mkdir -p `basename $@`; @LEX@ -o$@ -Pxbt_graph_parse_ $^ + set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^ if HAVE_FLEXML -surf/surfxml.l: surf/surfxml.dtd - set -e; cd surf; flexml -b 1000000 -P surfxml -S -L surfxml.dtd -../include/surf/surfxml.h: surf/surfxml.dtd - cd ../include/surf; flexml -P surfxml -H -L ../../src/surf/surfxml.dtd -xbt/graphxml.l: xbt/graphxml.dtd - set -e; cd xbt; flexml -b 1000000 -P graphxml -S -L graphxml.dtd -../include/xbt/graphxml.h: xbt/graphxml.dtd - cd ../include/xbt; flexml -P graphxml -H -L ../../src/xbt/graphxml.dtd +surf/surfxml.l: $(srcdir)/surf/surfxml.dtd + set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^ +$(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd + set -e; flexml -P surfxml --sysid=surfxml.dtd -H $@ -L $^ + +xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd + set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^ +$(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd + set -e; flexml -P graphxml --sysid=graphxml.dtd -H $@ -L $^ else -../include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd +$(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/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 include/surf/surfxml.h src/surf/surfxml.l" @exit 1 -../include/xbt/graphxml.h xbt/graphxml.l: xbt/graphxml.dtd +$(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graphxml.dtd @echo "ERROR: src/xbt/graphxml.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 include/xbt/graphxml.h src/xbt/graphxml.l" @exit 1 endif endif +endif ### ### Declare the library content ### libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC) -libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm +libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC) -libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm +libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm