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 acf2d5a..5fcd0eb 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
 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
   
 
 noinst_PROGRAMS=bandwidth_maestro bandwidth_sensor bandwidth_simulator
   

diff --git a/examples/amok/saturate/Makefile.am b/examples/amok/saturate/Makefile.am
index 4da4647..d92fead 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
 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
 
 
 noinst_PROGRAMS=saturate_simulator saturate_sensor saturate_maestro
 

diff --git a/examples/gras/all2all/Makefile.am b/examples/gras/all2all/Makefile.am
index 149c9b8..efb6981 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
 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
 
 # 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 487ed43..05103c3 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
 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
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=chrono_simulator chrono_multiplier

diff --git a/examples/gras/mmrpc/Makefile.am b/examples/gras/mmrpc/Makefile.am
index 2011f2b..440ef4a 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
 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
 
 # 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 0ff3b48..cc0d8e6 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
 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 
 
 # 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 29d9d55..6604bf7 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
 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
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=chord_node chord_simulator

diff --git a/examples/gras/ping/Makefile.am b/examples/gras/ping/Makefile.am
index b1c19c9..1286fce 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
 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
 
 # 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 04ca5b4..de51d79 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
 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
 
 # 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 6263bb9..36e260b 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
 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
 
 # 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 5b812ae..4adfc5a 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
 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
 
 # AUTOMAKE variable definition
 noinst_PROGRAMS=timer_client timer_simulator