From d95d93298e8bb71b312af6d0d9ad70e6b1644e74 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 11 Jul 2007 11:43:05 +0000 Subject: [PATCH] Generate the temps manually in this dir because the child process is not in the deployment file, so gras_stub_generator needs an extra argument to see it git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3733 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/gras/spawn/Makefile.am | 13 ++++++++++--- examples/gras/spawn/Makefile.in | 22 +++++++++------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/examples/gras/spawn/Makefile.am b/examples/gras/spawn/Makefile.am index 7b188a8a18..009ffe3f6f 100644 --- a/examples/gras/spawn/Makefile.am +++ b/examples/gras/spawn/Makefile.am @@ -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 diff --git a/examples/gras/spawn/Makefile.in b/examples/gras/spawn/Makefile.in index 49541b90a0..1a0b4e83f0 100644 --- a/examples/gras/spawn/Makefile.in +++ b/examples/gras/spawn/Makefile.in @@ -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@ -- 2.20.1