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

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index ad5163ad05..32e76e41ed 100644
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -24,8 +24,11 @@ TESTS = sendrecv/sendrecv_KCCFLN05.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
@@ -39,8 +42,10 @@ 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 HAVE_GTNETS
              CLEANFILES += gtnets/gtnets 
@@ -49,15 +54,17 @@ endif
 
 
 
-bin_PROGRAMS = sendrecv/sendrecv \
-               suspend/suspend \
-               masterslave/masterslave \
-               masterslave/masterslave_forwarder \
-               masterslave/masterslave_failure
-               #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 HAVE_GTNETS
-               bin_PROGRAMS += gtnets/gtnets 
+  noinst_PROGRAMS += gtnets/gtnets 
 endif
 
 
@@ -70,6 +77,14 @@ sendrecv_sendrecv_LDADD   = $(top_builddir)/src/libsimgrid.la
 suspend_suspend_SOURCES = suspend/suspend.c
 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
+
+# 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
@@ -83,8 +98,8 @@ 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 HAVE_GTNETS