From 58823a084d5ee98512c5e61d7a7e98e2730e9fff Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 19 Jul 2006 14:18:17 +0000
Subject: [PATCH] cleanup the GRAS+AMOK initialization schema

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2631 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 include/Makefile.am            | 1 -
 include/amok/bandwidth.h       | 2 --
 include/amok/peermanagement.h  | 1 -
 src/amok/Bandwidth/bandwidth.c | 2 --
 src/gras/gras.c                | 4 ++++
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/Makefile.am b/include/Makefile.am
index e77d47a2ed..744d4b7e92 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -32,7 +32,6 @@ nobase_include_HEADERS = \
 	\
 	gras/messages.h gras/timer.h \
 	\
-	amok/base.h \
 	amok/peermanagement.h \
 	amok/bandwidth.h
 
diff --git a/include/amok/bandwidth.h b/include/amok/bandwidth.h
index 129f81850d..0976f95ac3 100644
--- a/include/amok/bandwidth.h
+++ b/include/amok/bandwidth.h
@@ -10,8 +10,6 @@
 #ifndef AMOK_BANDWIDTH_H
 #define AMOK_BANDWIDTH_H
 
-#include "amok/base.h"
-   
 /** \addtogroup AMOK_bw
  *  \brief Test the bandwidth between two nodes
  *
diff --git a/include/amok/peermanagement.h b/include/amok/peermanagement.h
index fd5727d81c..e0d7c0d0a3 100644
--- a/include/amok/peermanagement.h
+++ b/include/amok/peermanagement.h
@@ -11,7 +11,6 @@
 #define AMOK_PEER_MANAGEMENT_H
 
 #include <gras.h>
-#include <amok/base.h>
 
 /** \addtogroup AMOK_pm
  *  \brief Managing remote servers
diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c
index 415ba4b03e..bc56423e41 100644
--- a/src/amok/Bandwidth/bandwidth.c
+++ b/src/amok/Bandwidth/bandwidth.c
@@ -25,8 +25,6 @@ static short _amok_bw_initialized = 0;
 /** @brief module initialization; all participating nodes must run this */
 void amok_bw_init(void) {
 
-  amok_base_init();
-
   if (! _amok_bw_initialized) {
     amok_bw_bw_init();
     amok_bw_sat_init();
diff --git a/src/gras/gras.c b/src/gras/gras.c
index 28a5ead0d7..65e2ebb09a 100644
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -12,6 +12,7 @@
 #include "xbt/module.h" /* xbt_init/exit */
 
 #include "gras_modinter.h"   /* module init/exit */
+#include "amok/amok_modinter.h"   /* module init/exit */
 #include "xbt_modinter.h"   /* module init/exit */
 
 #include "gras.h"
@@ -73,6 +74,9 @@ void gras_init(int *argc,char **argv) {
     signal(SIGINT,gras_sigint_handler);
 #endif     
   }
+   
+  /* and then init amok */
+  amok_init();
 }
 
 void gras_exit(void) {
-- 
2.20.1