Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Generate the temps manually in this dir because the child process is not in the deplo...
authormquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Wed, 11 Jul 2007 11:43:05 +0000 (11:43 +0000)
committermquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Wed, 11 Jul 2007 11:43:05 +0000 (11:43 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3733 48e7efb5-ca39-0410-a469-dd3cf9ba447f

examples/gras/spawn/Makefile.am
examples/gras/spawn/Makefile.in

index 7b188a8..009ffe3 100644 (file)
@@ -16,9 +16,16 @@ spawn_father_SOURCES=        _spawn_father.c  spawn_father.c spawn_child.c spawn_common
 spawn_father_LDADD=    $(top_builddir)/src/libgras.la
 
 # Take care of generatated sources
-NAME=spawn
-PROCESSES= child father
-include $(top_srcdir)/examples/temps-gras-stub.mk
+# (manually since the child is not in the deployment file, so we need an extra argument to the stub generator)
+
+_spawn_father.c _spawn_child.c _spawn_simulator.c: $(srcdir)/spawn.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
+       [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ --extra-process=child spawn $(srcdir)/spawn.xml
+
+$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@:
+       make -C $(top_builddir)/tools/gras/ gras_stub_generator@EXEEXT@
+
+CLEANFILES = _spawn_simulator.c spawn.mk _spawn_father.c _spawn_child.c
+MOSTLYCLEANFILES = spawn.trace
 
 # Cruft
 include $(top_srcdir)/acmacro/dist-files.mk
index 49541b9..1a0b4e8 100644 (file)
@@ -53,8 +53,7 @@ host_triplet = @host@
 target_triplet = @target@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/acmacro/dist-files.mk \
-       $(top_srcdir)/examples/gras/tests.mk \
-       $(top_srcdir)/examples/temps-gras-stub.mk
+       $(top_srcdir)/examples/gras/tests.mk
 noinst_PROGRAMS = spawn_child$(EXEEXT) spawn_father$(EXEEXT) \
        spawn_simulator$(EXEEXT)
 subdir = examples/gras/spawn
@@ -253,19 +252,13 @@ spawn_child_SOURCES = _spawn_child.c                  spawn_child.c spawn_common
 spawn_child_LDADD = $(top_builddir)/src/libgras.la
 spawn_father_SOURCES = _spawn_father.c  spawn_father.c spawn_child.c spawn_common.c
 spawn_father_LDADD = $(top_builddir)/src/libgras.la
-
-# Take care of generatated sources
-NAME = spawn
-PROCESSES = child father
-CLEANFILES = _$(NAME)_simulator.c $(NAME).mk $(NAME).Makefile.local $(NAME).Makefile.remote $(NAME).deploy.sh \
-             $(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c)
-
-MOSTLYCLEANFILES = $(NAME).trace
+CLEANFILES = _spawn_simulator.c spawn.mk _spawn_father.c _spawn_child.c
+MOSTLYCLEANFILES = spawn.trace
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/examples/gras/tests.mk $(top_srcdir)/examples/temps-gras-stub.mk $(top_srcdir)/acmacro/dist-files.mk $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/examples/gras/tests.mk $(top_srcdir)/acmacro/dist-files.mk $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -616,8 +609,11 @@ force:
 
 .PHONY: test_sg_32 test_SG_64 test_rl 
 
-$(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME).xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
-       [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ $(NAME) $(srcdir)/$(NAME).xml
+# Take care of generatated sources
+# (manually since the child is not in the deployment file, so we need an extra argument to the stub generator)
+
+_spawn_father.c _spawn_child.c _spawn_simulator.c: $(srcdir)/spawn.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
+       [ x@EXEEXT@ = x ] || exenv=wine; $$exenv $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ --extra-process=child spawn $(srcdir)/spawn.xml
 
 $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@:
        make -C $(top_builddir)/tools/gras/ gras_stub_generator@EXEEXT@