From c7ffa9a44bd559475aebcda0481e7c886a926f7e Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Sun, 1 Oct 2006 20:08:19 +0000
Subject: [PATCH 1/1] Add gras_stub_generator to the gramine

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2850 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 Makefile.am       |  9 +++++----
 configure.ac      | 31 ++++++++++++++++++++++++-------
 tools/Makefile.am |  3 +++
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 83b55464ed..99a51d5c4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # GRAMINE_CUT_BEGIN
-SG_SUBDIRS= tools testsuite examples doc
+SG_SUBDIRS= testsuite examples doc
 
 SG_EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS ChangeLog \
 	acmacro/aci.m4 \
@@ -8,7 +8,7 @@ SG_EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS C
 	   tools/MSG_visualization/colorize.pl
 # GRAMINE_CUT_END
 
-SUBDIRS= include src $(SG_SUBDIRS)
+SUBDIRS= include src tools $(SG_SUBDIRS)
 EXTRA_DIST=$(SG_EXTRA_DIST)
 
 DISTCLEANFILES= stamp.configure stamp.build stamp.check *~  
@@ -24,7 +24,7 @@ all-local:
 gramine:
 	rm -rf gramine-@VERSION@ gramine-@VERSION@.tar*
 	@echo "# Setup sources..."
-	for n in `find include src -name '*.[ch]'`; do \
+	for n in `find include src tools/gras -name '*.[ch]'`; do \
 	  mkdir -p gramine-@VERSION@/`dirname $$n`; \
 	   perl -e '$$/ = undef; $$l=<>; while ($$l=~ m,(/\*.*?\*/),s) { $$rep=$$1; $$rep=~s/\S//sg; $$l=~s,/\*.*?\*/,$$rep,s; } print $$l;' < $$n > gramine-@VERSION@/$$n; \
 	done
@@ -34,7 +34,8 @@ gramine:
 	rm gramine-@VERSION@/src/*_unit.c
 	@echo "# Adapt the configury mechanism to the gramine context"
 	mkdir gramine-@VERSION@/acmacro
-	for n in configure Makefile.in src/Makefile.in include/Makefile.in ; do \
+	for n in configure Makefile.in src/Makefile.in include/Makefile.in \
+	         tools/Makefile.in tools/gras/Makefile.in; do \
 	  sed  -e '/^# GRAMINE_CUT_BEGIN/,/^# GRAMINE_CUT_END/d' \
 	       -e 's/gramine_mode=no/gramine_mode=yes/' $$n > gramine-@VERSION@/$$n; \
 	done
diff --git a/configure.ac b/configure.ac
index 35410a2552..ca8d990af7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,8 +293,25 @@ AC_CONFIG_FILES([
   src/ucontext_stack.h
 ])
 
+# Tools being embeeded in gramine (stub generator)
+AC_CONFIG_FILES([
+  tools/Makefile
+    tools/gras/Makefile
+])
+
 # GRAMINE_CUT_BEGIN
 
+# Tools NOT being embeeded in gramine
+AC_CONFIG_FILES([
+  tools/graspe-slave
+],[
+    for file in                                                 \
+     tools/graspe-slave           tools/graspe-master           \
+    ; do                                                        \
+      test -e $file && chmod +x $file;                          \
+    done
+])
+
 # Testsuite
 
 AC_CONFIG_FILES([  
@@ -310,7 +327,13 @@ AC_CONFIG_FILES([
     done
 ])
 
-# Examples, documentation and tools
+# Documentation
+AC_CONFIG_FILES([
+  doc/Makefile
+  doc/Doxyfile
+])
+
+# Examples
 
 AC_CONFIG_FILES([
   examples/Makefile 
@@ -333,13 +356,8 @@ AC_CONFIG_FILES([
     examples/amok/Makefile       
       examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl
       examples/amok/saturate/Makefile  examples/amok/saturate/test_sg  examples/amok/saturate/test_rl
-  doc/Makefile
-    doc/Doxyfile
-  tools/graspe-slave            tools/Makefile
-    tools/gras/Makefile
 ],[
     for file in                                                 \
-     tools/graspe-slave           tools/graspe-master           \
      \
      examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \
      examples/amok/saturate/test_sg  examples/amok/saturate/test_rl \
@@ -361,7 +379,6 @@ AC_CONFIG_FILES([
     done
 ])
 
-
 #     examples/gras/chord/test_sg  examples/gras/chord/test_rl   \
 #    examples/gras/pastry/test_sg   
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 63dc0201dd..20e7828315 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS=gras
 include $(top_srcdir)/acmacro/dist-files.mk
+if GRAMINE_MODE
+else
 EXTRA_DIST= graspe-master
+endif
-- 
2.20.1