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

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index ad5163ad05..d71b491da2 100644
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -1,3 +1,10 @@
+# Copyright (c) 2004-2007. The SimGrid team. All right reserved.
+
+# This file is part of the SimGrid project. This is free software:
+# You can redistribute and/or modify it under the terms of the
+# GNU LGPL (v2.1) licence.
+
+
 INCLUDES  = -I$(top_srcdir)/include
 AM_CFLAGS = -g
 
@@ -13,7 +20,9 @@ EXTRA_DIST = msg_platform.xml \
              gtnets/onelink-d.xml \
              gtnets/r-n200-f50-s4-2-p.xml \
              gtnets/dogbone-d.xml \
-             gtnets/dogbone-p.xml
+             gtnets/dogbone-p.xml \
+             properties/deployment_platform.xml \
+             properties/deployment_properties.xml
 
 
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
@@ -24,8 +33,13 @@ 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_failure.tesh \
+        masterslave/masterslave_bypass.tesh \
+        parallel_task/parallel_task.tesh \
+        priority/priority.tesh \
+	properties/msg_prop.tesh
+
 
 if HAVE_SDP
   BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh
@@ -38,9 +52,12 @@ CLEANFILES = sendrecv/*~ \
              suspend/*~ \
              suspend/suspend \
              masterslave/*~ \
-             masterslave/masterslave \
-             masterslave/masterslave_forwarder 
-             #masterslave/masterslave_bypass
+             masterslave/masterslave_forwarder \
+             masterslave/masterslave_failure \
+             masterslave/masterslave_bypass \
+             parallel_task/parallel_task \
+             priority/priority \
+             properties/msg_prop
 
 if HAVE_GTNETS
              CLEANFILES += gtnets/gtnets 
@@ -49,18 +66,24 @@ 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_forwarder \
+                  masterslave/masterslave_failure \
+                  masterslave/masterslave_bypass \
+                  parallel_task/parallel_task \
+                  priority/priority \
+                  properties/msg_prop
 
 if HAVE_GTNETS
-               bin_PROGRAMS += gtnets/gtnets 
+  noinst_PROGRAMS += gtnets/gtnets 
 endif
 
 
+# property handle example
+properties_msg_prop_SOURCES = properties/msg_prop.c
+properties_msg_prop_LDADD   = $(top_builddir)/src/libsimgrid.la
+
 
 # sendrecv simple example
 sendrecv_sendrecv_SOURCES = sendrecv/sendrecv.c
@@ -70,9 +93,13 @@ 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
-masterslave_masterslave_SOURCES = masterslave/masterslave.c
-masterslave_masterslave_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 using a forwarder module
 masterslave_masterslave_forwarder_SOURCES = masterslave/masterslave_forwarder.c
@@ -83,8 +110,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