Don't call lmm_solve and correctly use latency in update_actions_state

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c9e05ca..ca6aac1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,6 +49,7 @@ EXTRA_DIST= \
        surf/simgrid_dtd.c \
        surf/simgrid.dtd \
        surf/network_private.h \
+       surf/network_common.h \
        surf/network_gtnets_private.h \
        \
        include/surf/maxmin.h \
@@ -172,7 +173,7 @@ SURF_SRC= \
   surf/random_mgr.c                                                           \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
-  surf/cpu.c   surf/network.c   surf/workstation.c                           \
+  surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \
   surf/surf_timer.c                                                          \
   surf/workstation_ptask_L07.c                                               \
   xbt/xbt_sg_stubs.c
@@ -465,8 +466,9 @@ if HAVE_FLEXML
 surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd
        set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S $@ -L $^ 
 $(top_srcdir)/include/surf/simgrid_dtd.h: $(srcdir)/surf/simgrid.dtd
+       rm -f $(top_srcdir)/include/surf/simgrid.h 
        set -e;                flexml --root-tags platform            -P surfxml --sysid=simgrid.dtd -H $@ -L $^ 
-       mv $(top_srcdir)/include/surf/simgrid.h $@
+       if test -e $(top_srcdir)/include/surf/simgrid.h ; then mv $(top_srcdir)/include/surf/simgrid.h $@ ; fi
        sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
        sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@