use temps-gras-stub.mk to cleanup

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

diff --git a/examples/alnem/Makefile.am b/examples/alnem/Makefile.am
index adfc6b8..694b0f6 100644 (file)
--- a/examples/alnem/Makefile.am
+++ b/examples/alnem/Makefile.am
@@ -17,12 +17,10 @@ alnem_maestro_LDADD=      $(top_srcdir)/src/base/libgrasrl.a $(top_srcdir)/src/m
 bin_PROGRAMS=alnem_builder
 alnem_builder_LDADD=  @LIBS_SimGrid@ 
 
 bin_PROGRAMS=alnem_builder
 alnem_builder_LDADD=  @LIBS_SimGrid@ 
 

-# cleanup temps
-CLEANFILES= _alnem_simulator.c _alnem_sensor.c _alnem_maestro.c 
-
-# generate temps 
-_alnem_sensor.c _alnem_maestro.c _alnem_simulator.c: alnem_deployment.txt
-       ../gras_stub_generator alnem alnem_deployment.txt >/dev/null
+# Take care of generatated sources
+NAME=alnem
+PROCESSES=sensor maestro
+include $(top_srcdir)/examples/temps-gras-stub.mk

 
 
 
 
 
 

diff --git a/examples/bandwidth/Makefile.am b/examples/bandwidth/Makefile.am
index 4a3d360..f172e6c 100644 (file)
--- a/examples/bandwidth/Makefile.am
+++ b/examples/bandwidth/Makefile.am
@@ -14,20 +14,10 @@ bandwidth_maestro_LDADD=    $(top_builddir)/src/libgras.la $(top_builddir)/src/amok
 bandwidth_sensor_SOURCES=      _bandwidth_sensor.c bandwidth.c
 bandwidth_sensor_LDADD=        $(top_builddir)/src/libgras.la $(top_builddir)/src/amok/libamok.la
 
 bandwidth_sensor_SOURCES=      _bandwidth_sensor.c bandwidth.c
 bandwidth_sensor_LDADD=        $(top_builddir)/src/libgras.la $(top_builddir)/src/amok/libamok.la
 

-# cleanup temps
-CLEANFILES=_bandwidth_simulator.c _bandwidth_maestro.c _bandwidth_sensor.c \
-          bandwidth.Makefile.local bandwidth.Makefile.remote bandwidth.deploy.sh
-          
-MOSTLYCLEANFILES = bandwidth.trace
-
-# generate temps
+# Take care of generatated sources

 NAME=bandwidth
 PROCESSES= maestro sensor
 NAME=bandwidth
 PROCESSES= maestro sensor

+include $(top_srcdir)/examples/temps-gras-stub.mk

 
 

-$(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME)_deployment.xml ../../../tools/gras/gras_stub_generator@EXEEXT@
-       [ x@EXEEXT@ = x ] || exenv=wine; $$exenv ../../../tools/gras/gras_stub_generator@EXEEXT@ $(NAME) $(srcdir)/$(NAME)_deployment.xml >/dev/null
-
-../../../tools/gras/gras_stub_generator@EXEEXT@:
-       make -C   ../../../tools/gras/ gras_stub_generator@EXEEXT@
-
+# Cruft 

 include $(top_srcdir)/acmacro/dist-files.mk
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/gras/chrono/Makefile.am b/examples/gras/chrono/Makefile.am
index 23d946f..487ed43 100644 (file)
--- a/examples/gras/chrono/Makefile.am
+++ b/examples/gras/chrono/Makefile.am
@@ -12,20 +12,10 @@ chrono_simulator_LDADD=     $(top_builddir)/src/libsimgrid.la
 chrono_multiplier_SOURCES=     _chrono_multiplier.c chrono.c
 chrono_multiplier_LDADD=       $(top_builddir)/src/libgras.la
 
 chrono_multiplier_SOURCES=     _chrono_multiplier.c chrono.c
 chrono_multiplier_LDADD=       $(top_builddir)/src/libgras.la
 

+# Take care of generatated sources
+NAME=chrono
+PROCESSES=multiplier
+include $(top_srcdir)/examples/temps-gras-stub.mk

 
 

-# cleanup temps
-CLEANFILES = _chrono_simulator.c _chrono_multiplier.c \
-             chrono.Makefile.local chrono.Makefile.remote chrono.deploy.sh 
-
-MOSTLYCLEANFILES = chrono.trace
-
-# generate temps
-
-# A rule to generate the source file each time the deployment file changes
-_chrono_multiplier.c _chrono_simulator.c: chrono_deployment.xml ../../../tools/gras/gras_stub_generator@EXEEXT@
-       [ x@EXEEXT@ = x ] || exenv=wine; $$exenv ../../../tools/gras/gras_stub_generator chrono $(srcdir)/chrono_deployment.xml >/dev/null
-
-../../../tools/gras/gras_stub_generator@EXEEXT@:
-       make -C   ../../../tools/gras/ gras_stub_generator@EXEEXT@
-
+# Cruft

 include $(top_srcdir)/acmacro/dist-files.mk
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/gras/ping/Makefile.am b/examples/gras/ping/Makefile.am
index 2125c8b..4e02379 100644 (file)
--- a/examples/gras/ping/Makefile.am
+++ b/examples/gras/ping/Makefile.am
@@ -14,20 +14,10 @@ ping_client_LDADD=  $(top_builddir)/src/libgras.la
 ping_server_SOURCES=   _ping_server.c ping.c
 ping_server_LDADD=     $(top_builddir)/src/libgras.la
 
 ping_server_SOURCES=   _ping_server.c ping.c
 ping_server_LDADD=     $(top_builddir)/src/libgras.la
 

-# cleanup temps
-CLEANFILES = _ping_simulator.c _ping_client.c _ping_server.c \
-             ping.Makefile.local ping.Makefile.remote ping.deploy.sh 
-
-MOSTLYCLEANFILES = ping.trace
-
-# generate temps
+# Take care of generatated sources

 NAME=ping
 PROCESSES= client server
 NAME=ping
 PROCESSES= client server

+include $(top_srcdir)/examples/temps-gras-stub.mk

 
 

-$(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _ping_simulator.c: $(srcdir)/ping_deployment.xml ../../../tools/gras/gras_stub_generator@EXEEXT@
-       [ x@EXEEXT@ = x ] || exenv=wine; $$exenv ../../../tools/gras/gras_stub_generator@EXEEXT@ ping $(srcdir)/ping_deployment.xml >/dev/null
-
-../../../tools/gras/gras_stub_generator@EXEEXT@:
-       make -C   ../../../tools/gras/ gras_stub_generator@EXEEXT@
-
+# Cruft

 include $(top_srcdir)/acmacro/dist-files.mk
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/gras/timer/Makefile.am b/examples/gras/timer/Makefile.am
index 21e9e32..5b812ae 100644 (file)
--- a/examples/gras/timer/Makefile.am
+++ b/examples/gras/timer/Makefile.am
@@ -1,7 +1,5 @@
 INCLUDES= -I$(top_srcdir)/include
 AM_CFLAGS=-g
 INCLUDES= -I$(top_srcdir)/include
 AM_CFLAGS=-g

-NAME=timer
-PROCESSES= client

 
 TESTS= test_rl test_sg
 EXTRA_DIST=$(NAME)_deployment.xml $(TESTS)
 
 TESTS= test_rl test_sg
 EXTRA_DIST=$(NAME)_deployment.xml $(TESTS)


@@ -15,18 +13,10 @@ timer_simulator_LDADD=      $(top_builddir)/src/libsimgrid.la
 timer_client_SOURCES=  _timer_client.c timer.c
 timer_client_LDADD=    $(top_builddir)/src/libgras.la
 
 timer_client_SOURCES=  _timer_client.c timer.c
 timer_client_LDADD=    $(top_builddir)/src/libgras.la
 

-# cleanup temps
-CLEANFILES = _$(NAME)_simulator.c _$(NAME)_client.c _$(NAME)_server.c \
-             $(NAME).Makefile.local $(NAME).Makefile.remote $(NAME).deploy.sh 
-
-MOSTLYCLEANFILES = $(NAME).trace
-
-# generate temps
-
-$(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME)_deployment.xml ../../../tools/gras/gras_stub_generator@EXEEXT@
-       [ x@EXEEXT@ = x ] || exenv=wine; $$exenv ../../../tools/gras/gras_stub_generator $(NAME) $(srcdir)/$(NAME)_deployment.xml >/dev/null
-
-../../../tools/gras/gras_stub_generator@EXEEXT@:
-       make -C   ../../../tools/gras/ gras_stub_generator@EXEEXT@
+# Take care of generatated sources
+NAME=timer
+PROCESSES= client
+include $(top_srcdir)/examples/temps-gras-stub.mk

 
 

+# Cruft

 include $(top_srcdir)/acmacro/dist-files.mk
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/saturate/Makefile.am b/examples/saturate/Makefile.am
index 7cad623..0ade892 100644 (file)
--- a/examples/saturate/Makefile.am
+++ b/examples/saturate/Makefile.am
@@ -4,27 +4,21 @@ AM_CFLAGS=-g
 TESTS=test_rl test_sg
 EXTRA_DIST=saturate_deployment.txt $(TESTS)
 
 TESTS=test_rl test_sg
 EXTRA_DIST=saturate_deployment.txt $(TESTS)
 

-if HAVE_SG
- check_PROGRAMS=saturate_simulator saturate_sensor saturate_maestro
+check_PROGRAMS=saturate_simulator saturate_sensor saturate_maestro

 
 

- saturate_simulator_SOURCES=_saturate_simulator.c saturate.c
- saturate_simulator_LDADD=     $(top_builddir)/src/libgrassg.la @LIBS_SimGrid@ # $(top_srcdir)/src/modules/libgrasmodules.la
-else
- check_PROGRAMS=saturate_sensor saturate_maestro
-endif
+saturate_simulator_SOURCES=_saturate_simulator.c saturate.c
+saturate_simulator_LDADD=      $(top_builddir)/src/libsimgrid.la

 
 saturate_sensor_SOURCES=          _saturate_sensor.c saturate.c
 saturate_maestro_SOURCES=         _saturate_maestro.c saturate.c
 
 
 saturate_sensor_SOURCES=          _saturate_sensor.c saturate.c
 saturate_maestro_SOURCES=         _saturate_maestro.c saturate.c
 

-saturate_sensor_LDADD=            $(top_srcdir)/src/libgrasrl.la # $(top_srcdir)/src/modules/libgrasmodules.a
-saturate_maestro_LDADD=          $(top_srcdir)/src/libgrasrl.la # $(top_srcdir)/src/modules/libgrasmodules.a
+saturate_sensor_LDADD=            $(top_srcdir)/src/libgras.la # $(top_srcdir)/src/modules/libgrasmodules.a
+saturate_maestro_LDADD=          $(top_srcdir)/src/libgras.la # $(top_srcdir)/src/modules/libgrasmodules.a

 
 

-# cleanup templates
-CLEANFILES= _saturate_simulator.c _saturate_sensor.c _saturate_maestro.c 
-
-# generate templates 
-_saturate_sensor.c _saturate_maestro.c _saturate_simulator.c: saturate_deployment.txt
-       $(top_srcdir)/examples/gras_stub_generator saturate saturate_deployment.txt >/dev/null
+# Take care of generatated sources
+NAME=saturate
+PROCESSES=sensor maestro
+include $(top_srcdir)/examples/temps-gras-stub.mk