Cosmetics + adding simdag to the main compilation branch.

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c3fe26c..3748c59 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,8 @@ EXTRA_DIST= \
        \
        msg/private.h \
        \
+       simdag/private.h \
+       \
        gras/Transport/transport_interface.h \
        gras/Virtu/virtu_interface.h          gras/Virtu/virtu_private.h\
        gras/Virtu/virtu_rl.h                 gras/Virtu/virtu_sg.h \
@@ -153,14 +155,14 @@ RL_SRC= \
   gras/Msg/rl_msg.c
 
 SG_SRC=  \
-  xbt/context.c                                                                \
+  xbt/context.c                                                              \
   \
   surf/maxmin.c                                                              \
   surf/trace_mgr.c                                                           \
   surf/surf.c                                                                \
-  surf/surfxml_parse.c                                                          \
+  surf/surfxml_parse.c                                                       \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
-  surf/surf_timer.c                                                               \
+  surf/surf_timer.c                                                          \
   surf/network_dassf.c                                                       \
   surf/workstation_KCCFLN05.c  \
   \
@@ -168,7 +170,10 @@ SG_SRC=  \
   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             \
+  simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c                       \
+  simdag/sd_workstation.c                                                    \
+  \
+  gras/Transport/sg_transport.c  gras/Transport/transport_plugin_sg.c        \
   \
   gras/Virtu/sg_emul.c \
   gras/Virtu/sg_process.c        gras/Virtu/sg_time.c     \
@@ -268,12 +273,12 @@ 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"
+       @echo "ERROR:   touch include/surf/surfxml.h src/surf/surfxml.l"
        @exit 1
 ../include/xbt/graphxml.h xbt/graphxml.l: xbt/graphxml.dtd
        @echo "ERROR: src/xbt/graphxml.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/xbt/graphxml.h src/xbt/graphxml.l"
+       @echo "ERROR:   touch include/xbt/graphxml.h src/xbt/graphxml.l"
        @exit 1
 endif
 endif