X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af235f79bfa9e9a73d80e5279432fb5d903c4068..7fc9fe25f03b219bd45664a5244b7487b89d1afc:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index c5aea1c620..09ca7f59a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS= . amok - AM_CFLAGS= -g #AM_CFLAGS= -DNDEBUG @@ -13,12 +11,12 @@ AM_CFLAGS= -g MAINTAINERCLEANFILES=Makefile.in -INCLUDES= -I$(top_srcdir)/include \ - @CFLAGS_SimGrid@ +INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include EXTRA_DIST= \ \ portable.h \ \ + xbt/dynar_private.h \ xbt/dict_private.h \ xbt/heap_private.h \ xbt/fifo_private.h \ @@ -29,16 +27,31 @@ EXTRA_DIST= \ surf/surf_private.h \ surf/cpu_private.h \ surf/workstation_private.h \ - surf/surf_parse.l \ + surf/surf_timer_private.h \ + surf/surf_parse.c \ + surf/surfxml.l \ + surf/surfxml.c \ + surf/surfxml.dtd \ surf/network_private.h \ + surf/network_dassf_private.h \ + surf/workstation_KCCFLN05_private.h \ + \ + include/surf/maxmin.h \ + include/surf/trace_mgr.h \ + include/surf/surf.h \ + include/surf/surf_parse_private.h \ + \ + include/xbt/xbt_portability.h \ + include/xbt/context.h \ \ msg/private.h \ \ gras/Transport/transport_interface.h \ - gras/Virtu/virtu_interface.h \ - gras/Virtu/virtu_rl.h \ - gras/Virtu/virtu_sg.h \ - gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c + 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 \ + \ + amok/Bandwidth/bandwidth_private.h # gras_private.h @@ -55,7 +68,7 @@ EXTRA_DIST= \ # | Set to zero if current is incremented # +- Increment if interfaces have been added, removed or changed -VERSION_INFO= -release 20040722 -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"` # @@ -80,46 +93,32 @@ VERSION_INFO= -release 20040722 -version-info 0:0:0 # It modifies the library name, and you thus cannot say that a library # using this trick is ready for a "stable" release (say, in Debian). -if HAVE_SG - lib_LTLIBRARIES= libgrasrl.la libgrassg.la -else - lib_LTLIBRARIES= libgrasrl.la -endif +lib_LTLIBRARIES= libsimgrid.la libgras.la - -COMMON_S=\ +COMMON_SRC=\ \ - xbt_modinter.h gras_modinter.h \ + xbt/snprintf.c \ + xbt/ex.c \ \ - xbt/sysdep.c \ - xbt/log.c xbt/log_default_appender.c xbt/error.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/context.c \ + xbt_modinter.h gras_modinter.h \ \ - surf/maxmin.c \ - surf/trace_mgr.c \ - surf/surf.c \ - surf/surf_parse.c \ - surf/cpu.c surf/network.c surf/workstation.c \ - \ - msg/task.c \ - msg/host.c \ - msg/m_process.c \ - msg/gos.c \ - msg/global.c \ - msg/environment.c \ - msg/deployment.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/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 \ @@ -127,26 +126,79 @@ COMMON_S=\ 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/msg_interface.h gras/Msg/msg_private.h \ + gras/Msg/msg.c gras/Msg/timer.c \ + gras/Msg/msg_interface.h gras/Msg/msg_private.h \ \ gras/Virtu/process.c +RL_SRC= \ + 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/Msg/rl_msg.c + +SG_SRC= \ + xbt/context.c \ + \ + surf/maxmin.c \ + surf/trace_mgr.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 \ + \ + 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/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 \ + 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 \ + gras/DataDesc/ddt_parse.yy.c + gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l @LEX@ -o$@ -Pgras_ddt_parse_ $^ -surf/surf_parse.c: surf/surf_parse.l +if MAINTAINER_MODE +surf/surfxml.c: surf/surfxml.l @LEX@ -o$@ -Psurf_parse_ $^ -libgrasrl_la_SOURCES= $(COMMON_S) \ - gras/Transport/rl_transport.c gras/Transport/transport_plugin_tcp.c gras/Transport/transport_plugin_file.c \ - \ - gras/Virtu/rl_process.c gras/Virtu/rl_time.c gras/Virtu/rl_conditional.c -libgrasrl_la_LDFLAGS = $(VERSION_INFO) @GRAS_RL_DEP@ - -if HAVE_SG - libgrassg_la_SOURCES= $(COMMON_S) \ - gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ - \ - gras/Virtu/sg_process.c gras/Virtu/sg_time.c gras/Virtu/sg_conditional.c - libgrassg_la_LDFLAGS = $(VERSION_INFO) @GRAS_SG_DEP@ +if HAVE_FLEXML +surf/surfxml.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 + @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" + @exit 1 endif +endif + +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) $(AMOK_SRC) +libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm + + +include $(top_srcdir)/acmacro/dist-files.mk