X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d535428dd046734638334061f8b2ceb1a037854d..d184124fe746b760ff77116171493c43e0eaff89:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index 11473d35df..1d9be0e70f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -446,7 +446,7 @@ 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 include/surf/maxmin.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 \ @@ -684,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 \ @@ -693,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 @@ -2044,7 +2044,6 @@ distclean-tags: check-TESTS: $(TESTS) @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - faillist=""; xpasslist=""; xfaillist=""; skiplist=""; \ srcdir=$(srcdir); export srcdir; \ list=' $(TESTS) '; \ if test -n "$$list"; then \ @@ -2058,7 +2057,6 @@ check-TESTS: $(TESTS) *$$ws$$tst$$ws*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ - xpasslist="$$xpasslist $$tst"; \ echo "XPASS: $$tst"; \ ;; \ *) \ @@ -2070,18 +2068,15 @@ check-TESTS: $(TESTS) case " $(XFAIL_TESTS) " in \ *$$ws$$tst$$ws*) \ xfail=`expr $$xfail + 1`; \ - xfaillist="$$xfaillist $$tst"; \ echo "XFAIL: $$tst"; \ ;; \ *) \ failed=`expr $$failed + 1`; \ - faillist="$$faillist $$tst"; \ echo "FAIL: $$tst"; \ ;; \ esac; \ else \ skip=`expr $$skip + 1`; \ - skiplist="$$skiplist $$tst"; \ echo "SKIP: $$tst"; \ fi; \ done; \ @@ -2117,30 +2112,6 @@ check-TESTS: $(TESTS) test -z "$$skipped" || echo "$$skipped"; \ test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ - if test -n "$$faillist" ; then \ - echo "Failed tests:";\ - for tst in $$faillist ; do \ - echo " "$$tst;\ - done;\ - fi;\ - if test -n "$$xpasslist" ; then \ - echo "Unexpectedly passed tests:";\ - for tst in $$xpasslist ; do \ - echo " "$$tst;\ - done;\ - fi;\ - if test -n "$$xfaillist" ; then \ - echo "Expected failures:";\ - for tst in $$xfaillist ; do \ - echo " "$$tst;\ - done;\ - fi;\ - if test -n "$$skiplist" ; then \ - echo "Skipped tests:";\ - for tst in $$skiplist ; do \ - echo " "$$tst;\ - done;\ - fi;\ test "$$failed" -eq 0; \ else :; fi @@ -2290,7 +2261,7 @@ 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 @@ -2330,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 @@ -2345,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 $^