X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d830be0a1bae5f138f8458a2d931fcaba8ae9ee..de06d16ffe51a0f739ffc8d5e8259788c79fd16d:/examples/msg/Makefile.am

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index 7c3e4c6746..32e76e41ed 100644
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -2,25 +2,39 @@ INCLUDES  = -I$(top_srcdir)/include
 AM_CFLAGS = -g
 
 EXTRA_DIST = msg_platform.xml \
+             small_platform.xml \
              sendrecv/platform_sendrecv.xml \
-             sendrecv/deployment_sendrecv.xml
+             sendrecv/deployment_sendrecv.xml \
+             suspend/deployment_suspend.xml \
+             masterslave/deployment_masterslave_forwarder.xml \
+             masterslave/deployment_masterslave.xml \
+             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
 
-TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
 
-TESTS = sendrecv/sendrecv_KCCFLN05.tesh
-if HAVE_SDP
-  TESTS += sendrecv/sendrecv_KCCFLN05_proportional.tesh
-endif
-if USE_GTNETS
-endif
+TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
 
 
-TESTS+= sendrecv/sendrecv_KCCFLN05_Vegas.tesh \
-        sendrecv/sendrecv_KCCFLN05_Reno.tesh \
+TESTS = sendrecv/sendrecv_KCCFLN05.tesh \
+        sendrecv/sendrecv_Vegas.tesh \
+        sendrecv/sendrecv_Reno.tesh \
         suspend/suspend.tesh \
 	masterslave/masterslave.tesh \
-	masterslave/masterslave_forwarder.tesh
-        #masterslave/masterslave_bypass.tesh
+	masterslave/masterslave_forwarder.tesh \
+        masterslave/masterslave_bypass.tesh \
+        parallel_task/parallel_task.tesh \
+        priority/priority.tesh
+
+
+if HAVE_SDP
+  BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh
+endif
+if HAVE_GTNETS
+endif
 
 CLEANFILES = sendrecv/*~ \
              sendrecv/sendrecv \
@@ -28,24 +42,29 @@ CLEANFILES = sendrecv/*~ \
              suspend/suspend \
              masterslave/*~ \
              masterslave/masterslave \
-             masterslave/masterslave_forwarder 
-             #masterslave/masterslave_bypass
+             masterslave/masterslave_forwarder \
+             masterslave/masterslave_bypass \
+             parallel_task/parallel_task \
+             priority/priority
 
-if USE_GTNETS
+if HAVE_GTNETS
              CLEANFILES += gtnets/gtnets 
 endif
 
 
 
 
-bin_PROGRAMS = sendrecv/sendrecv \
-               suspend/suspend \
-               masterslave/masterslave \
-               masterslave/masterslave_forwarder
-               #masterslave/masterslave_bypass
+noinst_PROGRAMS = sendrecv/sendrecv \
+                  suspend/suspend \
+                  masterslave/masterslave \
+                  masterslave/masterslave_forwarder \
+                  masterslave/masterslave_failure \
+                  masterslave/masterslave_bypass \
+                  parallel_task/parallel_task \
+                  priority/priority
 
-if USE_GTNETS
-               bin_PROGRAMS += gtnets/gtnets 
+if HAVE_GTNETS
+  noinst_PROGRAMS += gtnets/gtnets 
 endif
 
 
@@ -58,22 +77,36 @@ sendrecv_sendrecv_LDADD   = $(top_builddir)/src/libsimgrid.la
 suspend_suspend_SOURCES = suspend/suspend.c
 suspend_suspend_LDADD   = $(top_builddir)/src/libsimgrid.la
 
-# master/slave application example using a forwarder module
+# parallel task example
+parallel_task_parallel_task_SOURCES = parallel_task/parallel_task.c
+parallel_task_parallel_task_LDADD   = $(top_builddir)/src/libsimgrid.la
+
+# playing with priorities example
+priority_priority_SOURCES = priority/priority.c
+priority_priority_LDADD   = $(top_builddir)/src/libsimgrid.la
+
+# master/slave application example
 masterslave_masterslave_SOURCES = masterslave/masterslave.c
 masterslave_masterslave_LDADD   = $(top_builddir)/src/libsimgrid.la
 
-# verify the communication time of a simple simulation
+# master/slave application example using a forwarder module
 masterslave_masterslave_forwarder_SOURCES = masterslave/masterslave_forwarder.c
 masterslave_masterslave_forwarder_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
+
 # bypass the surf xml parser
-#masterslave_masterslave_bypass_SOURCES = masterslave/masterslave_bypass.c
-#masterslave_masterslave_bypass_LDADD   = $(top_builddir)/src/libsimgrid.la
+masterslave_masterslave_bypass_SOURCES = masterslave/masterslave_bypass.c
+masterslave_masterslave_bypass_LDADD   = $(top_builddir)/src/libsimgrid.la
 
 # verify if the GTNETS feature is working
-if USE_GTNETS
+if HAVE_GTNETS
 gtnets_gtnets_SOURCES = gtnets/gtnets.c
 gtnets_gtnets_LDADD   = $(top_builddir)/src/libsimgrid.la
+else
+  EXTRA_DIST+= gtnets/gtnets.c
 endif
 
 include $(top_srcdir)/acmacro/dist-files.mk