change mmalloc.h into a public header

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

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 7405294..dd6419e 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -19,7 +19,6 @@ set(EXTRA_DIST
        ${PROJECT_DIRECTORY}/src/xbt/setset_private.h
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/keys.c
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmalloc.c
-       ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmalloc.h
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mm.c
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mmprivate.h
        ${PROJECT_DIRECTORY}/src/xbt/mmalloc/mrealloc.c
@@ -382,6 +381,7 @@ set(install_HEADERS
 ./include/xbt/synchro_core.h
 ./include/xbt/queue.h
 ./include/xbt/setset.h
+./include/mmalloc.h
 ./include/msg/msg.h
 ./include/msg/datatypes.h
 ./include/simdag/simdag.h

diff --git a/include/Makefile.am b/include/Makefile.am
index 06f26d1..864f9a9 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -32,6 +32,8 @@ nobase_include_HEADERS = \
        xbt/time.h \
        xbt/synchro.h  xbt/synchro_core.h\
        xbt/queue.h \
+       xbt/setset.h \
+       xbt/mmalloc.h \
        \
        msg/msg.h \
        msg/datatypes.h \

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 4d92c95..9cbfb14 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -178,7 +178,7 @@ XBT_SRC=\
 EXTRA_DIST+= \
   xbt/mmalloc/keys.c      xbt/mmalloc/mmalloc.c  \
   xbt/mmalloc/mm.c        xbt/mmalloc/mmprivate.h xbt/mmalloc/mrealloc.c \
-  xbt/mmalloc/attach.c    xbt/mmalloc/mcalloc.c   xbt/mmalloc/mmalloc.h  \
+  xbt/mmalloc/attach.c    xbt/mmalloc/mcalloc.c  \
   xbt/mmalloc/mmcheck.c   xbt/mmalloc/mmstats.c   xbt/mmalloc/mvalloc.c  \
   xbt/mmalloc/detach.c    xbt/mmalloc/mfree.c     xbt/mmalloc/mmap-sup.c \
   xbt/mmalloc/mmemalign.c xbt/mmalloc/mmtrace.c   xbt/mmalloc/sbrk-sup.c

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index 6a73ac2..ff0d970 100644 (file)
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.
 #ifndef __MMPRIVATE_H
 #define __MMPRIVATE_H 1
 
-#include "mmalloc.h"
+#include "xbt/mmalloc.h"
 
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>