split gras and gros

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

diff --git a/include/Makefile.am b/include/Makefile.am
index 06231bb..be8f9b1 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,9 +1,9 @@
-include_HEADERS = gras.h
+include_HEADERS = gras.h gros.h
 nobase_include_HEADERS = \
-       gras/log.h gras/error.h \
-       gras/module.h \
-       gras/dynar.h gras/dict.h gras/set.h \
-       gras/config.h \
+       gros/log.h gros/error.h \
+       gros/module.h \
+       gros/dynar.h gros/dict.h gros/set.h \
+       gros/config.h \
        \
        gras/datadesc.h gras/transport.h \
        gras/virtu.h gras/cond.h gras/process.h \

diff --git a/include/gras.h b/include/gras.h
index ce3f387..347e1da 100644 (file)
--- a/include/gras.h
+++ b/include/gras.h
@@ -11,24 +11,7 @@
 #ifndef GRAS_H
 #define GRAS_H
 
-#define max(a, b) (((a) > (b))?(a):(b))
-#define min(a, b) (((a) < (b))?(a):(b))
-
-#define TRUE  1
-#define FALSE 0
-
-#define GRAS_MAX_CHANNEL 10 /* FIXME: killme */
-
-#include <gras/error.h>
-#include <gras/log.h>
-
-#include <gras/module.h>
-
-#include <gras/dynar.h>
-#include <gras/dict.h>
-#include <gras/set.h>
-
-#include <gras/config.h>
+#include <gros.h> /* our toolbox */
 
 #include <gras/core.h> /* FIXME: killme */
 #include <gras/process.h>
@@ -39,6 +22,8 @@
 #include <gras/datadesc.h>
 #include <gras/messages.h>
 
+/* FIXME: This is amok */
+
 #include <gras/modules/base.h>
 #include <gras/modules/bandwidth.h>
 

diff --git a/include/xbt.h b/include/xbt.h
new file mode 100644 (file)
index 0000000..38f65ef
--- /dev/null
+++ b/include/xbt.h
@@ -0,0 +1,33 @@
+/* $Id$ */
+
+/* gros.h - Public interface to the GROS (gras's toolbox)                   */
+
+/* Authors: Martin Quinson                                                  */
+/* Copyright (C) 2004 the OURAGAN project.                                  */
+
+/* This program is free software; you can redistribute it and/or modify it
+   under the terms of the license (GNU LGPL) which comes with this package. */
+
+#ifndef GROS_H
+#define GROS_H
+
+#define max(a, b) (((a) > (b))?(a):(b))
+#define min(a, b) (((a) < (b))?(a):(b))
+
+#define TRUE  1
+#define FALSE 0
+
+#define GRAS_MAX_CHANNEL 10 /* FIXME: killme */
+
+#include <gros/error.h>
+#include <gros/log.h>
+
+#include <gros/module.h>
+
+#include <gros/dynar.h>
+#include <gros/dict.h>
+#include <gros/set.h>
+
+#include <gros/config.h>
+
+#endif /* GROS_H */

diff --git a/include/gras/config.h b/include/xbt/config.h
similarity index 100%
rename from include/gras/config.h
rename to include/xbt/config.h

diff --git a/include/gras/dict.h b/include/xbt/dict.h
similarity index 100%
rename from include/gras/dict.h
rename to include/xbt/dict.h

diff --git a/include/gras/dynar.h b/include/xbt/dynar.h
similarity index 100%
rename from include/gras/dynar.h
rename to include/xbt/dynar.h

diff --git a/include/gras/error.h b/include/xbt/error.h
similarity index 100%
rename from include/gras/error.h
rename to include/xbt/error.h

diff --git a/include/gras/log.h b/include/xbt/log.h
similarity index 100%
rename from include/gras/log.h
rename to include/xbt/log.h

diff --git a/include/gras/module.h b/include/xbt/module.h
similarity index 100%
rename from include/gras/module.h
rename to include/xbt/module.h

diff --git a/include/gras/set.h b/include/xbt/set.h
similarity index 100%
rename from include/gras/set.h
rename to include/xbt/set.h