Also move the module headers

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

diff --git a/configure.ac b/configure.ac
index 6410e43..5094f00 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,6 @@ AC_CONFIG_FILES([
   Makefile
   src/Makefile
     src/include/Makefile
-      src/include/modules/Makefile
     src/base/Makefile
       src/base/Tests/Makefile
       src/base/Tests/run_tests

diff --git a/include/Makefile.am b/include/Makefile.am
index 44c241a..06231bb 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS=modules
 include_HEADERS = gras.h
 nobase_include_HEADERS = \
        gras/log.h gras/error.h \
@@ -11,5 +10,8 @@ nobase_include_HEADERS = \
        \
        gras/messages.h \
        \
-       gras/core.h
+       gras/core.h\
+       \
+       gras/modules/base.h \
+       gras/modules/bandwidth.h
 

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

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

diff --git a/include/modules/.cvsignore b/include/modules/.cvsignore
deleted file mode 100644 (file)
index aa61a42..0000000
--- a/include/modules/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.in Makefile

diff --git a/include/modules/Makefile.am b/include/modules/Makefile.am
deleted file mode 100644 (file)
index d6e4564..0000000
--- a/include/modules/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST=    \
-       bandwidth.h  base.h