X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d471f92e8c432218b42fbde386427a230695fc6..ae9dd98bc4600e591fca903341d35d7cce68fe26:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 712816dd96..a78d849167 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,9 @@ MAINTAINERCLEANFILES=Makefile.in INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include + +bin_SCRIPTS= smpi/smpicc smpi/smpirun + EXTRA_DIST= \ \ portable.h \ @@ -35,8 +38,7 @@ EXTRA_DIST= \ surf/surfxml.c \ surf/surfxml.dtd \ surf/network_private.h \ - surf/network_dassf_private.h \ - surf/workstation_KCCFLN05_private.h \ + network_gtnets_private.h \ \ include/surf/maxmin.h \ include/surf/trace_mgr.h \ @@ -59,7 +61,7 @@ EXTRA_DIST= \ include/simix/simix.h include/simix/datatypes.h \ simix/msg_simix_private.h \ \ - smpi/private.h smpi/smpi.h + smpi/private.h #LIBRARY_VERSION= 0:0:0 # | | | @@ -146,14 +148,14 @@ XBT_SG_SRC = \ SURF_SRC= \ surf/maxmin.c \ + surf/fair_bottleneck.c \ surf/lagrange.c \ surf/trace_mgr.c \ surf/surf.c \ surf/surfxml_parse.c \ surf/cpu.c surf/network.c surf/workstation.c \ surf/surf_timer.c \ - surf/network_dassf.c \ - surf/workstation_KCCFLN05.c + surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c if CONTEXT_THREADS SURF_SRC += xbt/xbt_os_thread.c @@ -183,7 +185,12 @@ SIMIX_SRC= \ SMPI_SRC= \ smpi/smpi_base.c \ - smpi/smpi_mpi.c + smpi/smpi_bench.c \ + smpi/smpi_global.c \ + smpi/smpi_mpi.c \ + smpi/smpi_sender.c \ + smpi/smpi_receiver.c \ + smpi/smpi_util.c MSG_SRC= msg/msg_config.c \ msg/task.c msg/host.c msg/m_process.c msg/gos.c \ @@ -206,12 +213,16 @@ JMSG_JAVA_SRC = \ java/simgrid/msg/ProcessNotFoundException.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/ParallelTask.java \ + \ + java/simgrid/msg/Sem.java + SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c @@ -300,6 +311,12 @@ libsmpi_la_LIBADD = libsimgrid.la libsmpi_la_SOURCES = $(SMPI_SRC) libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm +# Windows users (at least, MSVC ones) need a def file. +if IS_WINDOWS +libgras_la_LDFLAGS += -Wl,--output-def,libgras.def +libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def +libsmpi_la_LDFLAGS += -Wl,--output-def,libsmpi.def +endif ## ## Java cruft @@ -320,10 +337,10 @@ clean-local: jardir = $(prefix)/jar jar_DATA = simgrid.jar -simgrid.jar: $(JMSG_JAVA_SRC) +simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd [ -e .classes ] || mkdir .classes - $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) - $(JAR) cvf simgrid.jar -C .classes .; + $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) + $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd; else EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC) endif @@ -352,7 +369,6 @@ TEST_UNITS= @builddir@/cunit_unit.c @builddir@/ex_unit.c \ @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \ @builddir@/xbt_str_unit.c \ @builddir@/config_unit.c -CLEANFILES=$(TEST_UNITS) BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \ ../include/xbt/graphxml.h xbt/graphxml.c \ @@ -367,6 +383,8 @@ TESTS_ENVIRONMENT=$(SG_TEST_EXENV) EXTRA_DIST+=$(testall_SOURCES) if MAINTAINER_MODE +CLEANFILES=$(TEST_UNITS) + @builddir@/cunit_unit.c: xbt/cunit.c @top_srcdir@/tools/sg_unit_extractor.pl $^ @builddir@/ex_unit.c: xbt/ex.c @@ -396,12 +414,17 @@ clean-units: done else +if BOTBUILD_MODE +$(TEST_UNITS) simgrid_units_main.c clean-units: + @echo "WARNING: Test units not generated, but touched instead since this is a bot build." + touch $@ +else $(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 you are using a SVN checkout, configure with the --enable-maintainer-mode flag" @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." @exit 1 - +endif endif ### @@ -415,19 +438,25 @@ gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l if MAINTAINER_MODE surf/surfxml.c: surf/surfxml.l set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^ + sed 's/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n# ifndef __STRICT_ANSI__\n# include \n# include \n# endif\n#else\n# include \n#endif/g' -i $@ xbt/graphxml.c: xbt/graphxml.l set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^ + sed 's/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n# ifndef __STRICT_ANSI__\n# include \n# include \n# endif\n#else\n# include \n#endif/g' -i $@ 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 $^ $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd set -e; flexml -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 $@ 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 $^ + sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ + sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@ else $(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd