Yet another s/_deployment// massive change. Damnit, why can't I get them all right...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2763 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/amok/bandwidth/Makefile.am b/examples/amok/bandwidth/Makefile.am
index acf2d5add37934d46a8e65720c051e7576663df6..5fcd0ebcbfcac499b22ad46b15a7c6c173cc3c2c 100644 (file)
--- a/examples/amok/bandwidth/Makefile.am
+++ b/examples/amok/bandwidth/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES= -I$(top_srcdir)/include
 AM_CFLAGS=-g
 TESTS=test_rl test_sg
-EXTRA_DIST=bandwidth_deployment.xml $(TESTS)
+EXTRA_DIST=bandwidth.xml $(TESTS)
 
 noinst_PROGRAMS=bandwidth_maestro bandwidth_sensor bandwidth_simulator
   

diff --git a/examples/amok/saturate/Makefile.am b/examples/amok/saturate/Makefile.am
index 4da4647094dbeccbb39e388a730980cb13b7bdb8..d92feade85ca323a4e04cdaf9f48347a793e3957 100644 (file)
--- a/examples/amok/saturate/Makefile.am
+++ b/examples/amok/saturate/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
 AM_CFLAGS=-g
 
 TESTS=test_rl test_sg
-EXTRA_DIST=saturate_deployment.xml $(TESTS)
+EXTRA_DIST=saturate.xml $(TESTS)
 
 noinst_PROGRAMS=saturate_simulator saturate_sensor saturate_maestro
 

diff --git a/examples/gras/all2all/Makefile.am b/examples/gras/all2all/Makefile.am
index 149c9b8e8d823d865ba20d98666a2198569f0ffa..efb698167b2363aba7c300a0f3cfddea29734eb8 100644 (file)
--- a/examples/gras/all2all/Makefile.am
+++ b/examples/gras/all2all/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES= -I$(top_srcdir)/include
 TESTS= test_sg test_rl
-EXTRA_DIST=all2all_deployment.xml test_sg.in test_rl.in
+EXTRA_DIST=all2all.xml test_sg.in test_rl.in
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=all2all_sender all2all_receiver all2all_simulator

diff --git a/examples/gras/chrono/Makefile.am b/examples/gras/chrono/Makefile.am
index 487ed43b1154a0ceea4da15574baf26cf67280e2..05103c30dd5133f33e0da5a156b93751a2b2ca84 100644 (file)
--- a/examples/gras/chrono/Makefile.am
+++ b/examples/gras/chrono/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES= -I$(top_srcdir)/include
 AM_CFLAGS=-g
 TESTS= test_rl test_sg
-EXTRA_DIST=chrono_deployment.xml
+EXTRA_DIST=chrono.xml
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=chrono_simulator chrono_multiplier

diff --git a/examples/gras/mmrpc/Makefile.am b/examples/gras/mmrpc/Makefile.am
index 2011f2b4ba67a9c6e36b7cd58a0f3d36bb5499f9..440ef4adf6b863b704c7412b0d38c19ffb3e6921 100644 (file)
--- a/examples/gras/mmrpc/Makefile.am
+++ b/examples/gras/mmrpc/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES= -I$(top_srcdir)/include
 TESTS= test_rl test_sg
-EXTRA_DIST=mmrpc_deployment.xml mmrpc.h $(TESTS)
+EXTRA_DIST=mmrpc.xml mmrpc.h $(TESTS)
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=mmrpc_client mmrpc_server mmrpc_simulator

diff --git a/examples/gras/p2p/can/Makefile.am b/examples/gras/p2p/can/Makefile.am
index 0ff3b4850121c42619a5dacf58514ed938772f50..cc0d8e6ffb3c8bf4fca326df1dc18efde4da7509 100644 (file)
--- a/examples/gras/p2p/can/Makefile.am
+++ b/examples/gras/p2p/can/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES= -I$(top_srcdir)/include
 #TESTS= test_rl test_sg
-EXTRA_DIST=can_tests.c types.h can_deployment.xml $(TESTS)
+EXTRA_DIST=can_tests.c types.h can.xml $(TESTS)
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=can_node can_start_war can_simulator 

diff --git a/examples/gras/p2p/chord/Makefile.am b/examples/gras/p2p/chord/Makefile.am
index 29d9d553e842970fcdedc048f7a4958de445d34c..6604bf72dd2d31b1818b00010e911ba99f57c348 100644 (file)
--- a/examples/gras/p2p/chord/Makefile.am
+++ b/examples/gras/p2p/chord/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES= -I$(top_srcdir)/include
 #TESTS= test_rl test_sg
-EXTRA_DIST=chord_deployment.xml $(TESTS)
+EXTRA_DIST=chord.xml $(TESTS)
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=chord_node chord_simulator

diff --git a/examples/gras/ping/Makefile.am b/examples/gras/ping/Makefile.am
index b1c19c95d64698aad188c003528de2a89493f090..1286fce040b23481c77dba5633589af6b38745b1 100644 (file)
--- a/examples/gras/ping/Makefile.am
+++ b/examples/gras/ping/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES= -I$(top_srcdir)/include
 TESTS= test_rl test_sg
-EXTRA_DIST=ping_deployment.xml ping.h $(TESTS)
+EXTRA_DIST=ping.xml ping.h $(TESTS)
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=ping_client ping_server ping_simulator

diff --git a/examples/gras/pmm/Makefile.am b/examples/gras/pmm/Makefile.am
index 04ca5b4c030931d3cd962081a0af90416433ada3..de51d7953145e43e63065bd4da1c8ec64b9bfbaf 100644 (file)
--- a/examples/gras/pmm/Makefile.am
+++ b/examples/gras/pmm/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES= -I$(top_srcdir)/include
 TESTS= test_sg test_rl
-EXTRA_DIST=pmm_deployment.xml  test_sg.in test_rl.in $(TESTS)
+EXTRA_DIST=pmm.xml  test_sg.in test_rl.in $(TESTS)
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=pmm_slave pmm_master pmm_simulator

diff --git a/examples/gras/rpc/Makefile.am b/examples/gras/rpc/Makefile.am
index 6263bb9c991659310ce72e41e283c708c77370d7..36e260bb383a95d69551b4dc11f33c963fc0830a 100644 (file)
--- a/examples/gras/rpc/Makefile.am
+++ b/examples/gras/rpc/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES= -I$(top_srcdir)/include
 TESTS= test_rl test_sg
-EXTRA_DIST=rpc_deployment.xml $(TESTS)
+EXTRA_DIST=rpc.xml $(TESTS)
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=rpc_client rpc_forwarder rpc_server rpc_simulator

diff --git a/examples/gras/timer/Makefile.am b/examples/gras/timer/Makefile.am
index 5b812ae594c34ed8a03d2086d07e4af347bfb564..4adfc5a1b2865b1a84ca59b570dd8d6e06793d80 100644 (file)
--- a/examples/gras/timer/Makefile.am
+++ b/examples/gras/timer/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
 AM_CFLAGS=-g
 
 TESTS= test_rl test_sg
-EXTRA_DIST=$(NAME)_deployment.xml $(TESTS)
+EXTRA_DIST=$(NAME).xml $(TESTS)
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=timer_client timer_simulator