Cosmetics + adding simdag to the main compilation branch.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2431 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/configure.ac b/configure.ac
index 5843484..a398013 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -264,6 +264,7 @@ AC_CONFIG_FILES([
   src/ucontext_stack.h
   examples/Makefile 
     examples/msg/Makefile           examples/msg/run_msg_test
+    examples/simdag/Makefile
     examples/gras/Makefile 
       examples/gras/ping/Makefile   examples/gras/ping/test_sg   examples/gras/ping/test_rl
       examples/gras/rpc/Makefile    examples/gras/rpc/test_sg    examples/gras/rpc/test_rl

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 37b3fb2..30707eb 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS= msg gras amok
+SUBDIRS= msg gras amok simdag
 
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/simdag/Makefile.am b/examples/simdag/Makefile.am
new file mode 100644 (file)
index 0000000..b29a672
--- /dev/null
+++ b/examples/simdag/Makefile.am
@@ -0,0 +1,10 @@
+INCLUDES= -I$(top_srcdir)/include
+AM_CFLAGS=-g
+
+#TESTS=run_msg_test
+check_PROGRAMS=sd_test
+
+sd_test_SOURCES= sd_test.c
+sd_test_LDADD= $(top_builddir)/src/libsimgrid.la
+
+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/include/Makefile.am b/include/Makefile.am
index 89efd8a..12e39ae 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -21,6 +21,9 @@ nobase_include_HEADERS = \
        msg/msg.h \
        msg/datatypes.h \
        \
+       simdag/simdag.h \
+       simdag/datatypes.h \
+       \
        surf/surfxml_parse.h \
        surf/surfxml.h \
        \

diff --git a/src/Makefile.am b/src/Makefile.am
index f6b6779..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     \