X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b470fc7653464e7e6cb440ca449beb41b5c9df1..d97b684df677b8bc978204f2226cbe749d4c38d9:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 14e3b9ba81..e94b00f881 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,7 +38,7 @@ EXTRA_DIST= \
 	surf/surfxml.c \
 	surf/surfxml.dtd \
 	surf/network_private.h \
-	network_gtnets_private.h \
+	surf/network_gtnets_private.h \
 	\
 	include/surf/maxmin.h \
 	include/surf/trace_mgr.h \
@@ -54,12 +54,15 @@ EXTRA_DIST= \
 	simdag/private.h \
 	\
 	gras/DataDesc/ddt_parse.yy.l \
+	gras/Virtu/virtu_rl.h \
+	gras/Virtu/virtu_sg.h \
 	gras/Virtu/virtu_interface.h \
+	gras/Virtu/virtu_private.h \
 	amok/Bandwidth/bandwidth_private.h \
-	amok/amok_modinter.h
+	amok/amok_modinter.h \
 	\
-	include/simix/simix.h include/simix/datatypes.h \
-	simix/msg_simix_private.h \
+	include/simix/simix.h include/simix/datatypes.h \
+	simix/private.h \
 	\
 	smpi/private.h
 
@@ -369,7 +372,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 \
@@ -384,6 +386,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
@@ -437,8 +441,10 @@ 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 <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 $@
 xbt/graphxml.c: xbt/graphxml.l
 	set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^
+	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 $@
 
 if HAVE_FLEXML
 surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
@@ -448,7 +454,6 @@ $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
 	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