A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revalidate output
[simgrid.git]
/
examples
/
msg
/
Makefile.am
diff --git
a/examples/msg/Makefile.am
b/examples/msg/Makefile.am
index
32e76e4
..
d71b491
100644
(file)
--- 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
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/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
TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
@@
-25,9
+34,11
@@
TESTS = sendrecv/sendrecv_KCCFLN05.tesh \
suspend/suspend.tesh \
masterslave/masterslave.tesh \
masterslave/masterslave_forwarder.tesh \
suspend/suspend.tesh \
masterslave/masterslave.tesh \
masterslave/masterslave_forwarder.tesh \
+ masterslave/masterslave_failure.tesh \
masterslave/masterslave_bypass.tesh \
parallel_task/parallel_task.tesh \
masterslave/masterslave_bypass.tesh \
parallel_task/parallel_task.tesh \
- priority/priority.tesh
+ priority/priority.tesh \
+ properties/msg_prop.tesh
if HAVE_SDP
if HAVE_SDP
@@
-41,11
+52,12
@@
CLEANFILES = sendrecv/*~ \
suspend/*~ \
suspend/suspend \
masterslave/*~ \
suspend/*~ \
suspend/suspend \
masterslave/*~ \
- masterslave/masterslave \
masterslave/masterslave_forwarder \
masterslave/masterslave_forwarder \
+ masterslave/masterslave_failure \
masterslave/masterslave_bypass \
parallel_task/parallel_task \
masterslave/masterslave_bypass \
parallel_task/parallel_task \
- priority/priority
+ priority/priority \
+ properties/msg_prop
if HAVE_GTNETS
CLEANFILES += gtnets/gtnets
if HAVE_GTNETS
CLEANFILES += gtnets/gtnets
@@
-56,18
+68,22
@@
endif
noinst_PROGRAMS = sendrecv/sendrecv \
suspend/suspend \
noinst_PROGRAMS = sendrecv/sendrecv \
suspend/suspend \
- masterslave/masterslave \
masterslave/masterslave_forwarder \
masterslave/masterslave_failure \
masterslave/masterslave_bypass \
parallel_task/parallel_task \
masterslave/masterslave_forwarder \
masterslave/masterslave_failure \
masterslave/masterslave_bypass \
parallel_task/parallel_task \
- priority/priority
+ priority/priority \
+ properties/msg_prop
if HAVE_GTNETS
noinst_PROGRAMS += gtnets/gtnets
endif
if HAVE_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
# sendrecv simple example
sendrecv_sendrecv_SOURCES = sendrecv/sendrecv.c
@@
-85,10
+101,6
@@
parallel_task_parallel_task_LDADD = $(top_builddir)/src/libsimgrid.la
priority_priority_SOURCES = priority/priority.c
priority_priority_LDADD = $(top_builddir)/src/libsimgrid.la
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
-
# 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 using a forwarder module
masterslave_masterslave_forwarder_SOURCES = masterslave/masterslave_forwarder.c
masterslave_masterslave_forwarder_LDADD = $(top_builddir)/src/libsimgrid.la