declare portable snprintf and vsnprintf functions for Visual C++ 7

[simgrid.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 21e7bac..1d9be0e 100644 (file)
--- 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 \
@@ -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
 
@@ -2348,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 <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n#  ifndef __STRICT_ANSI__\n#    include <io.h>\n#    include <process.h>\n#  endif\n#else\n#  include <unistd.h>\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 <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n#  ifndef __STRICT_ANSI__\n#    include <io.h>\n#    include <process.h>\n#  endif\n#else\n#  include <unistd.h>\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 $^