Reduce a bit the flexml stack now that flexml 1.3 is out

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a0ecb38..cfed457 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,22 +107,8 @@ COMMON_SRC=\
   xbt/set.c                                                                    \
   xbt/module.c                                                                 \
   xbt/config.c                                                                 \
-  xbt/context.c                                                                \
-  \
-  surf/maxmin.c                                                              \
-  surf/trace_mgr.c                                                           \
-  surf/surf.c                                                                \
-  surf/surf_parse.c                                                          \
-  surf/cpu.c   surf/network.c   surf/workstation.c                           \
-  surf/network_dassf.c                                                       \
-  surf/workstation_KCCFLN05.c  \
-  include/surf/surfxml.h \
-  \
-  msg/task.c msg/host.c msg/m_process.c msg/gos.c \
-  msg/global.c msg/environment.c msg/deployment.c  \
   \
   gras/gras.c \
-  gras/chrono.c \
   \
   gras/Transport/transport.c          gras/Transport/transport_private.h   gras/Transport/transport_plugin_buf.c  \
   \
@@ -140,12 +126,30 @@ COMMON_SRC=\
 RL_SRC= \
   gras/Transport/rl_transport.c  gras/Transport/transport_plugin_tcp.c  gras/Transport/transport_plugin_file.c  \
   \
-  gras/Virtu/rl_process.c        gras/Virtu/rl_time.c                   gras/Virtu/rl_conditional.c
+  gras/Virtu/rl_chrono.c \
+  gras/Virtu/rl_process.c        gras/Virtu/rl_time.c gras/Virtu/rl_conditional.c \
+  gras/Virtu/rl_dns.c
 
 SG_SRC=  \
+  xbt/context.c                                                                \
+  \
+  surf/maxmin.c                                                              \
+  surf/trace_mgr.c                                                           \
+  surf/surf.c                                                                \
+  surf/surf_parse.c                                                          \
+  surf/cpu.c   surf/network.c   surf/workstation.c                           \
+  surf/network_dassf.c                                                       \
+  surf/workstation_KCCFLN05.c  \
+  include/surf/surfxml.h \
+  \
+  msg/task.c msg/host.c msg/m_process.c msg/gos.c \
+  msg/global.c msg/environment.c msg/deployment.c  \
+  \
   gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c             \
   \
-  gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c 
+  gras/Virtu/sg_chrono.c \
+  gras/Virtu/sg_process.c        gras/Virtu/sg_time.c                 gras/Virtu/sg_conditional.c \
+  gras/Virtu/sg_dns.c
 
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
        @LEX@ -o$@ -Pgras_ddt_parse_ $^
@@ -157,7 +161,7 @@ surf/surfxml.c: surf/surfxml.l
        @LEX@ -o$@ -Psurf_parse_ $^
 
 surf/surfxml.l: surf/surfxml.dtd
-       cd surf; flexml -b 10000000 -S -L surfxml.dtd ; \
+       cd surf; flexml -b 1000000 -S -L surfxml.dtd ; \
        mv surfxml.l surfxml.l.bak ; \
        sed 's/surfxml\.h/surf\/surfxml\.h/g' surfxml.l.bak > surfxml.l
 
@@ -170,3 +174,6 @@ libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ -lm
 
 libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC)
 libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ -lm
+
+
+include $(top_srcdir)/acmacro/dist-files.mk