SURF: Kill the SDP model

[simgrid.git] / examples / msg / Makefile.am

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index f5d0ea1..74bddc2 100644 (file)
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -10,17 +10,23 @@ AM_CFLAGS = -g
 
 EXTRA_DIST = msg_platform.xml \
              small_platform.xml \
+             small_platform_with_failures.xml \
+             jupiter_state.trace link5_state.trace \
              sendrecv/platform_sendrecv.xml \
              sendrecv/deployment_sendrecv.xml \
              suspend/deployment_suspend.xml \
              masterslave/deployment_masterslave_forwarder.xml \
              masterslave/deployment_masterslave.xml \
+             migration/migration.deploy \
              gtnets/r-n200-f50-s4-2-d.xml \
              gtnets/onelink-p.xml \
              gtnets/onelink-d.xml \
              gtnets/r-n200-f50-s4-2-p.xml \
              gtnets/dogbone-d.xml \
              gtnets/dogbone-p.xml \
+             parallel_task/test_ptask_deployment.xml \
+             parallel_task/test_ptask_platform.xml \
+             priority/deployment_priority.xml \
              properties/deployment_properties.xml
 
 
@@ -35,15 +41,13 @@ TESTS = sendrecv/sendrecv_CLM03.tesh \
        masterslave/masterslave_forwarder.tesh \
        masterslave/masterslave_failure.tesh \
         masterslave/masterslave_bypass.tesh \
+        migration/migration.tesh \
         parallel_task/parallel_task.tesh \
         priority/priority.tesh \
        properties/msg_prop.tesh
 
-
-if HAVE_SDP
-  BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh
-endif
 if HAVE_GTNETS
+  TESTS += gtnets/gtnets.tesh
 endif
 
 CLEANFILES = sendrecv/*~ \
@@ -55,11 +59,12 @@ CLEANFILES = sendrecv/*~ \
              masterslave/masterslave_failure \
              masterslave/masterslave_bypass \
              parallel_task/parallel_task \
+             parallel_task/test_ptask \
              priority/priority \
              properties/msg_prop
 
 if HAVE_GTNETS
-             CLEANFILES += gtnets/gtnets 
+             CLEANFILES += gtnets/gtnets gtnets/gtnets_kayo
 endif
 
 
@@ -70,12 +75,15 @@ noinst_PROGRAMS = sendrecv/sendrecv \
                   masterslave/masterslave_forwarder \
                   masterslave/masterslave_failure \
                   masterslave/masterslave_bypass \
+                  migration/migration \
                   parallel_task/parallel_task \
+                  parallel_task/test_ptask \
                   priority/priority \
-                  properties/msg_prop
+                  properties/msg_prop \
+                  actions/actions
 
 if HAVE_GTNETS
-  noinst_PROGRAMS += gtnets/gtnets 
+  noinst_PROGRAMS += gtnets/gtnets gtnets/gtnets_kayo
 endif
 
 
@@ -83,6 +91,14 @@ endif
 properties_msg_prop_SOURCES = properties/msg_prop.c
 properties_msg_prop_LDADD   = $(top_builddir)/src/libsimgrid.la
 
+# actions example
+actions_actions_SOURCES = actions/actions.c
+actions_actions_LDADD   = $(top_builddir)/src/libsimgrid.la
+
+# migration example
+migration_migration_SOURCES = migration/migration.c
+migration_migration_LDADD   = $(top_builddir)/src/libsimgrid.la
+
 
 # sendrecv simple example
 sendrecv_sendrecv_SOURCES = sendrecv/sendrecv.c
@@ -95,6 +111,8 @@ suspend_suspend_LDADD   = $(top_builddir)/src/libsimgrid.la
 # parallel task example
 parallel_task_parallel_task_SOURCES = parallel_task/parallel_task.c
 parallel_task_parallel_task_LDADD   = $(top_builddir)/src/libsimgrid.la
+parallel_task_test_ptask_SOURCES = parallel_task/test_ptask.c
+parallel_task_test_ptask_LDADD   = $(top_builddir)/src/libsimgrid.la
 
 # playing with priorities example
 priority_priority_SOURCES = priority/priority.c
@@ -114,10 +132,13 @@ masterslave_masterslave_bypass_LDADD   = $(top_builddir)/src/libsimgrid.la
 
 # verify if the GTNETS feature is working
 if HAVE_GTNETS
-gtnets_gtnets_SOURCES = gtnets/gtnets.c
+gtnets_gtnets_SOURCES  = gtnets/gtnets.c
+gtnets_gtnets_kayo_SOURCES  = gtnets/gtnets_kayo.c
 gtnets_gtnets_LDADD   = $(top_builddir)/src/libsimgrid.la
+gtnets_gtnets_kayo_LDADD   = $(top_builddir)/src/libsimgrid.la
 else
-  EXTRA_DIST+= gtnets/gtnets.c
+  EXTRA_DIST+= gtnets/gtnets.c gtnets/gtnets_kayo.c
 endif
 
+EXTRA_DIST+=$(TESTS)
 include $(top_srcdir)/acmacro/dist-files.mk