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

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index 3215f56150..9bc9b61a04 100644
--- 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 \
@@ -58,7 +58,8 @@ TESTS = sendrecv/sendrecv_CLM03.tesh \
         parallel_task/parallel_task.tesh \
         priority/priority.tesh \
 	properties/msg_prop.tesh \
-  	trace/trace.tesh
+    trace/trace.tesh \
+	masterslave/masterslave_cpu_ti.tesh
 
 if HAVE_GTNETS
   TESTS += gtnets/gtnets.tesh
@@ -79,7 +80,7 @@ CLEANFILES = sendrecv/*~ \
              trace/test_trace_integration
 
 if HAVE_GTNETS
-             CLEANFILES += gtnets/gtnets gtnets/gtnets_kayo
+             CLEANFILES += gtnets/gtnets
 endif
 
 
@@ -99,7 +100,7 @@ noinst_PROGRAMS = sendrecv/sendrecv \
                   trace/test_trace_integration
 
 if HAVE_GTNETS
-  noinst_PROGRAMS += gtnets/gtnets gtnets/gtnets_kayo
+  noinst_PROGRAMS += gtnets/gtnets
 endif
 
 
@@ -153,11 +154,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)