X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d97b684df677b8bc978204f2226cbe749d4c38d9..cf56a22da60094d8e7f14b1457526dc194d40226:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index e94b00f881..78f465906f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,10 @@ +# Copyright (c) 2004-2007. The SimGrid team. All right reserved. + +# This file is part of the SimGrid project. This is free software: +# You can redistribute and/or modify it under the terms of the +# GNU LGPL (v2.1) licence. + + #AM_CFLAGS= -DNDEBUG # -DNLOG cuts absolutely all logs at compilation time. @@ -24,7 +31,10 @@ EXTRA_DIST= \ xbt/graphxml.l \ xbt/graphxml.c \ xbt/graphxml.dtd \ - xbt/context_private.h \ + xbt/xbt_context_private.h \ + xbt/xbt_context_factory.h \ + xbt/xbt_jcontext.h \ + xbt/log_private.h \ xbt/ex_interface.h \ \ surf/maxmin_private.h \ @@ -44,10 +54,11 @@ EXTRA_DIST= \ include/surf/trace_mgr.h \ include/surf/surf.h \ include/surf/surfxml_parse_private.h \ + include/surf/random_mgr.h \ \ + include/xbt/context.h \ include/xbt/xbt_os_time.h \ include/xbt/xbt_os_thread.h \ - include/xbt/context.h \ \ msg/private.h \ \ @@ -58,6 +69,7 @@ EXTRA_DIST= \ gras/Virtu/virtu_sg.h \ gras/Virtu/virtu_interface.h \ gras/Virtu/virtu_private.h \ + gras/Transport/transport_interface.h \ amok/Bandwidth/bandwidth_private.h \ amok/amok_modinter.h \ \ @@ -111,7 +123,7 @@ VERSION_INFO= -version-info 2:0:0 XBT_SRC=\ \ - xbt/snprintf.c xbt/xbt_str.c \ + xbt/snprintf.c xbt/xbt_str.c xbt/xbt_strbuff.c \ xbt/ex.c \ \ xbt_modinter.h gras_modinter.h \ @@ -154,16 +166,18 @@ SURF_SRC= \ surf/fair_bottleneck.c \ surf/lagrange.c \ surf/trace_mgr.c \ + surf/random_mgr.c \ surf/surf.c \ surf/surfxml_parse.c \ surf/cpu.c surf/network.c surf/workstation.c \ surf/surf_timer.c \ - surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c + surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c \ + xbt/xbt_sg_stubs.c if CONTEXT_THREADS - SURF_SRC += xbt/xbt_os_thread.c + SURF_SRC += xbt/xbt_os_thread.c xbt/xbt_thread_context.c else - SURF_SRC += xbt/xbt_os_thread_stubs.c + SURF_SRC += xbt/xbt_ucontext.c endif GTNETS_SRC= \ @@ -172,9 +186,9 @@ GTNETS_SRC= \ surf/gtnets/gtnets_interface.cc \ surf/network_gtnets.c -# Separated because we don't want it in libsimgrid4java -CTX_SRC= xbt/context.c -JCTX_SRC= java/jxbt_context.c java/jxbt_context.h +# Separated because src/gras/rl_stubs also define the function xbt_context_mod_init() and xbt_context_mod_exit() +# so there is an implementation of these functions in the simgrid library and an implementatin in the gras library +CTX_SRC= xbt/xbt_context.c SIMIX_SRC= \ simix/smx_global.c \ @@ -200,11 +214,11 @@ MSG_SRC= msg/msg_config.c \ msg/global.c msg/environment.c msg/deployment.c JMSG_C_SRC = \ + xbt/xbt_jcontext.c \ java/jxbt_utilities.c java/jxbt_utilities.h \ java/jmsg.c java/jmsg.h \ java/jmsg_channel.c java/jmsg_channel.h \ java/jmsg_host.c java/jmsg_host.h \ - java/jmsg_parallel_task.c java/jmsg_parallel_task.h \ java/jmsg_process.c java/jmsg_process.h \ java/jmsg_task.c java/jmsg_task.h @@ -215,14 +229,14 @@ JMSG_JAVA_SRC = \ java/simgrid/msg/HostNotFoundException.java \ java/simgrid/msg/ProcessNotFoundException.java \ \ + java/simgrid/msg/Msg.java \ java/simgrid/msg/Process.java \ - java/simgrid/msg/DTDResolver.java \ - java/simgrid/msg/ApplicationHandler.java \ - java/simgrid/msg/Channel.java \ java/simgrid/msg/Host.java \ - java/simgrid/msg/Msg.java \ java/simgrid/msg/Task.java \ - java/simgrid/msg/ParallelTask.java \ + \ + java/simgrid/msg/MsgNative.java \ + java/simgrid/msg/DTDResolver.java \ + java/simgrid/msg/ApplicationHandler.java \ \ java/simgrid/msg/Sem.java @@ -324,15 +338,10 @@ endif ## ## Java cruft -if HAVE_JAVA -lib_LTLIBRARIES += libsimgrid4java.la +EXTRA_DIST+=$(JMSG_JAVA_SRC) -libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ - $(SIMIX_SRC) $(JCTX_SRC) \ - $(JMSG_C_SRC) $(MSG_SRC) \ - $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) -libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm -libsimgrid4java_la_GCJFLAGS = -fjni +if HAVE_JAVA +libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library clean-local: -rm -rf .classes @@ -340,12 +349,14 @@ clean-local: jardir = $(prefix)/jar jar_DATA = simgrid.jar -simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd +simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/surfxml.dtd [ -e .classes ] || mkdir .classes - $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) - $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd; + $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file)) + [ -e .classes/surf ] || mkdir .classes/surf + cp $(srcdir)/surf/surfxml.dtd .classes/surf + $(JAR) cvf simgrid.jar -C .classes . else -EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC) +EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC) endif if GRAMINE_MODE @@ -448,9 +459,9 @@ xbt/graphxml.c: xbt/graphxml.l if HAVE_FLEXML surf/surfxml.l: $(srcdir)/surf/surfxml.dtd - set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^ + set -e; mkdir -p surf; flexml --root-tags platform -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 $^ + set -e; flexml --root-tags platform -P surfxml --sysid=surfxml.dtd -H $@ -L $^ sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@