add a proper example of master/slaves, using mailboxes

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

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index 2b148ce..2b4286c 100644 (file)
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -18,12 +18,12 @@ EXTRA_DIST = msg_platform.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 \
+             gtnets/waxman-d.xml \
+             gtnets/waxman-p.xml \
              parallel_task/test_ptask_deployment.xml \
              parallel_task/test_ptask_platform.xml \
              priority/deployment_priority.xml \
@@ -40,7 +40,8 @@ EXTRA_DIST = msg_platform.xml \
              trace/test8.xml \
              trace/test9.xml \
              trace/test10.xml \
-             trace/test11.xml
+             trace/test11.xml \
+            fafard_state.trace jupiter_state.trace link5_state.trace
 
 
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
@@ -59,7 +60,6 @@ TESTS = sendrecv/sendrecv_CLM03.tesh \
         priority/priority.tesh \
        properties/msg_prop.tesh \
     trace/trace.tesh \
-       masterslave/masterslave_cas01_im.tesh \
        masterslave/masterslave_cpu_ti.tesh
 
 if HAVE_GTNETS
@@ -81,7 +81,7 @@ CLEANFILES = sendrecv/*~ \
              trace/test_trace_integration
 
 if HAVE_GTNETS
-             CLEANFILES += gtnets/gtnets gtnets/gtnets_kayo
+             CLEANFILES += gtnets/gtnets
 endif
 
 
@@ -89,6 +89,7 @@ endif
 
 noinst_PROGRAMS = sendrecv/sendrecv \
                   suspend/suspend \
+                  masterslave/masterslave_mailbox \
                   masterslave/masterslave_forwarder \
                   masterslave/masterslave_failure \
                   masterslave/masterslave_bypass \
@@ -101,7 +102,7 @@ noinst_PROGRAMS = sendrecv/sendrecv \
                   trace/test_trace_integration
 
 if HAVE_GTNETS
-  noinst_PROGRAMS += gtnets/gtnets gtnets/gtnets_kayo
+  noinst_PROGRAMS += gtnets/gtnets
 endif
 
 
@@ -140,6 +141,10 @@ priority_priority_LDADD   = $(top_builddir)/src/libsimgrid.la
 masterslave_masterslave_forwarder_SOURCES = masterslave/masterslave_forwarder.c
 masterslave_masterslave_forwarder_LDADD   = $(top_builddir)/src/libsimgrid.la
 
+# master/slave application example using a mailboxes
+masterslave_masterslave_mailbox_SOURCES = masterslave/masterslave_mailbox.c
+masterslave_masterslave_mailbox_LDADD   = $(top_builddir)/src/libsimgrid.la
+
 # master/slave application example with failures
 masterslave_masterslave_failure_SOURCES = masterslave/masterslave_failure.c
 masterslave_masterslave_failure_LDADD   = $(top_builddir)/src/libsimgrid.la
@@ -155,11 +160,9 @@ trace_test_trace_integration_LDADD   = $(top_builddir)/src/libsimgrid.la
 # verify if the GTNETS feature is working
 if HAVE_GTNETS
 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 gtnets/gtnets_kayo.c
+  EXTRA_DIST+= gtnets/gtnets.c
 endif
 
 EXTRA_DIST+=$(TESTS)