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

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index d71b491da2..4198ad671f 100644
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -10,6 +10,8 @@ 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 \
@@ -21,14 +23,16 @@ EXTRA_DIST = msg_platform.xml \
              gtnets/r-n200-f50-s4-2-p.xml \
              gtnets/dogbone-d.xml \
              gtnets/dogbone-p.xml \
-             properties/deployment_platform.xml \
+             parallel_task/test_ptask_deployment.xml \
+             parallel_task/test_ptask_platform.xml \
+             priority/deployment_priority.xml \
              properties/deployment_properties.xml
 
 
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
 
 
-TESTS = sendrecv/sendrecv_KCCFLN05.tesh \
+TESTS = sendrecv/sendrecv_CLM03.tesh \
         sendrecv/sendrecv_Vegas.tesh \
         sendrecv/sendrecv_Reno.tesh \
         suspend/suspend.tesh \
@@ -45,6 +49,7 @@ if HAVE_SDP
   BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh
 endif
 if HAVE_GTNETS
+  TESTS += gtnets/gtnets.tesh
 endif
 
 CLEANFILES = sendrecv/*~ \
@@ -56,11 +61,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
 
 
@@ -72,11 +78,13 @@ noinst_PROGRAMS = sendrecv/sendrecv \
                   masterslave/masterslave_failure \
                   masterslave/masterslave_bypass \
                   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
 
 
@@ -84,6 +92,10 @@ 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
+
 
 # sendrecv simple example
 sendrecv_sendrecv_SOURCES = sendrecv/sendrecv.c
@@ -96,6 +108,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
@@ -115,10 +129,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