move the dynar type definition to a specific header so that we can share it with...

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a0ecb38..a3dce08 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,7 @@ EXTRA_DIST= \
         \
        portable.h \
        \
+       xbt/dynar_private.h \
         xbt/dict_private.h \
         xbt/heap_private.h \
         xbt/fifo_private.h \
@@ -28,6 +29,7 @@ EXTRA_DIST= \
        surf/surf_private.h \
        surf/cpu_private.h \
        surf/workstation_private.h \
+       surf/surf_timer_private.h \
        surf/surf_parse.c \
        surf/surfxml.l \
        surf/surfxml.c \
@@ -41,6 +43,7 @@ EXTRA_DIST= \
        include/surf/surf.h \
        include/surf/surf_parse.h \
        \
+       include/xbt/xbt_portability.h \
        include/xbt/context.h \
        \
        msg/private.h \
@@ -107,22 +110,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,29 +129,57 @@ 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_emul.c \
+  gras/Virtu/rl_process.c        gras/Virtu/rl_time.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/surf_timer.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_emul.c \
+  gras/Virtu/sg_process.c        gras/Virtu/sg_time.c     \
+  gras/Virtu/sg_dns.c
+
+BUILT_SOURCES=include/surf/surfxml.h surf/surfxml.c \
+              gras/DataDesc/ddt_parse.yy.c
 
 gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l
        @LEX@ -o$@ -Pgras_ddt_parse_ $^
 
-surf/surf_parse.c: surf/surfxml.c
-
 if MAINTAINER_MODE
 surf/surfxml.c: surf/surfxml.l
        @LEX@ -o$@ -Psurf_parse_ $^
 
+if HAVE_FLEXML
 surf/surfxml.l: surf/surfxml.dtd
-       cd surf; flexml -b 10000000 -S -L surfxml.dtd ; \
+       set -e; 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
-
 include/surf/surfxml.h: surf/surfxml.dtd
        cd include/surf; flexml -H -L ../../surf/surfxml.dtd
+else
+
+include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd
+       @echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected"
+       @echo "ERROR: Please install it, or if you didn't modify this file, try this:"
+       @echo "ERROR:   touch src/include/surf/surfxml.h src/surf/surfxml.l"
+       @exit 1
+endif
 endif
 
 libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC)
@@ -170,3 +187,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