X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8507d8131d46fa3f2c111c155111a7992f717886..771c4cd2f6fe9a8e22eb0cdcfa6086cbc24cee51:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index 8a0dbf264d..1d9be0e70f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -446,12 +446,12 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \ surf/cpu_private.h surf/workstation_private.h \ surf/surf_timer_private.h surf/surfxml_parse.c surf/surfxml.l \ surf/surfxml.c surf/surfxml.dtd surf/network_private.h \ - network_gtnets_private.h surf/workstation_KCCFLN05_private.h \ - include/surf/maxmin.h include/surf/trace_mgr.h \ - include/surf/surf.h include/surf/surfxml_parse_private.h \ - include/xbt/xbt_os_time.h include/xbt/xbt_os_thread.h \ - include/xbt/context.h msg/private.h simdag/private.h \ - gras/DataDesc/ddt_parse.yy.l gras/Virtu/virtu_interface.h \ + surf/network_gtnets_private.h include/surf/maxmin.h \ + include/surf/trace_mgr.h include/surf/surf.h \ + include/surf/surfxml_parse_private.h include/xbt/xbt_os_time.h \ + include/xbt/xbt_os_thread.h include/xbt/context.h \ + msg/private.h simdag/private.h gras/DataDesc/ddt_parse.yy.l \ + gras/Virtu/virtu_interface.h \ amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \ $(am__append_3) $(am__append_4) $(am__append_9) \ $(am__append_10) @@ -592,12 +592,15 @@ 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 GRAS_COMMON_SRC = \ @@ -681,7 +684,6 @@ libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm \ @GRAMINE_MODE_FALSE@ @builddir@/xbt_str_unit.c \ @GRAMINE_MODE_FALSE@ @builddir@/config_unit.c -@GRAMINE_MODE_FALSE@CLEANFILES = $(TEST_UNITS) @GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/surfxml.h surf/surfxml.c \ @GRAMINE_MODE_FALSE@ ../include/xbt/graphxml.h xbt/graphxml.c \ @GRAMINE_MODE_FALSE@ gras/DataDesc/ddt_parse.yy.c \ @@ -690,6 +692,7 @@ libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm \ @GRAMINE_MODE_FALSE@testall_SOURCES = $(TEST_UNITS) @builddir@/simgrid_units_main.c @GRAMINE_MODE_FALSE@testall_LDADD = libgras.la @GRAMINE_MODE_FALSE@TESTS_ENVIRONMENT = $(SG_TEST_EXENV) +@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@CLEANFILES = $(TEST_UNITS) all: $(BUILT_SOURCES) gras_config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -2258,17 +2261,17 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ \ include/simix/simix.h include/simix/datatypes.h \ - simix/msg_simix_private.h \ + simix/private.h \ \ smpi/private.h @HAVE_JAVA_TRUE@clean-local: @HAVE_JAVA_TRUE@ -rm -rf .classes -@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) +@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd @HAVE_JAVA_TRUE@ [ -e .classes ] || mkdir .classes -@HAVE_JAVA_TRUE@ $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) -@HAVE_JAVA_TRUE@ $(JAR) cvf simgrid.jar -C .classes .; +@HAVE_JAVA_TRUE@ $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) +@HAVE_JAVA_TRUE@ $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd; @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/cunit_unit.c: xbt/cunit.c @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ @top_srcdir@/tools/sg_unit_extractor.pl $^ @@ -2298,11 +2301,14 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ rm -vf $$dep @srcdir@/$$dep; touch $$dep; \ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ done -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: Test units not generated." -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag" -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @exit 1 +@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: +@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "WARNING: Test units not generated, but touched instead since this is a bot build." +@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ touch $@ +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: Test units not generated." +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If you are using a SVN checkout, configure with the --enable-maintainer-mode flag" +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @exit 1 ### ### Regenerate what needs to with flex & flexml @@ -2313,8 +2319,10 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@surf/surfxml.c: surf/surfxml.l @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^ +@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ 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 $@ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@xbt/graphxml.c: xbt/graphxml.l @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^ +@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ 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 $@ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@surf/surfxml.l: $(srcdir)/surf/surfxml.dtd @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^