Bug fix.

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a093f2b..5d69dfa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,7 +38,7 @@ EXTRA_DIST= \
        surf/surfxml.c \
        surf/surfxml.dtd \
        surf/network_private.h \
-       surf/network_dassf_private.h \
+       network_gtnets_private.h \
        surf/workstation_KCCFLN05_private.h \
        \
        include/surf/maxmin.h \
@@ -149,14 +149,14 @@ XBT_SG_SRC = \
 
 SURF_SRC= \
   surf/maxmin.c                                                              \
+  surf/fair_bottleneck.c                                                              \
   surf/lagrange.c                                                            \
   surf/trace_mgr.c                                                           \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
   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
@@ -427,6 +427,7 @@ surf/surfxml.l: $(srcdir)/surf/surfxml.dtd
 $(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
@@ -434,6 +435,7 @@ xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd
 $(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