Use simple communications and computations whenever possible...

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 99d5edb..5ea268c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -149,6 +149,7 @@ XBT_SG_SRC = \
 
 SURF_SRC= \
   surf/maxmin.c                                                              \
+  surf/fair_bottleneck.c                                                              \
   surf/lagrange.c                                                            \
   surf/trace_mgr.c                                                           \
   surf/surf.c                                                                \
@@ -156,7 +157,7 @@ SURF_SRC= \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
   surf/surf_timer.c                                                          \
   surf/network_dassf.c                                                       \
-  surf/workstation_KCCFLN05.c
+  surf/workstation_KCCFLN05.c   surf/workstation_ptask_L07.c
 
 if CONTEXT_THREADS
   SURF_SRC += xbt/xbt_os_thread.c
@@ -426,11 +427,16 @@ surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
        set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^
 $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd
        set -e;                flexml            -P surfxml --sysid=surfxml.dtd -H $@ -L $^
+       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
        set -e; flexml            -P graphxml --sysid=graphxml.dtd -H $@ -L $^
+       sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
+       sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@
 else
 
 $(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd