Merge tracing_config.h into simgrid_config.h, where it belongs

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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 067538c..e9f76d7 100755 (executable)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -407,7 +407,6 @@ include/gras/timer.h
 include/amok/peermanagement.h
 include/amok/bandwidth.h
 include/instr/instr.h
-include/instr/tracing_config.h
 include/simgrid_config.h
 include/gras.h 
 include/xbt.h
@@ -751,7 +750,6 @@ set(source_to_pack
        buildtools/Cmake/test_prog/prog_va_copy.c
        buildtools/Cmake/test_prog/prog_vsnprintf.c
        buildtools/Cmake/gras_config.h.in
-       buildtools/Cmake/tracing_config.h.in
        AUTHORS
        ChangeLog
        COPYING

diff --git a/buildtools/Cmake/tracing_config.h.in b/buildtools/Cmake/tracing_config.h.in
deleted file mode 100644 (file)
index 1aa5f02..0000000
--- a/buildtools/Cmake/tracing_config.h.in
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * tracing_config.h
- *
- *  Created on: Apri 1, 2010
- *      Author: Lucas Schnorr
- *     License: 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.
- *
- *     Copyright (c) 2009 The SimGrid team.
- */
-
-#ifndef __TRACING_CONFIG_H
-#define __TRACING_CONFIG_H
-
-/* Tracing SimGrid */
-#cmakedefine HAVE_TRACING @HAVE_TRACING@
-
-#endif

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index d5e8cab..6b01102 100644 (file)
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -19,9 +19,9 @@
        #endif
 #endif
 
-#cmakedefine _XBT_WIN32 @_XBT_WIN32@   //this variable is set if it is a windows platform
-#cmakedefine _WIN32 @_WIN32@                   //this variable is set if it is a 32 bits windows platform
-#cmakedefine _WIN64 @_WIN64@                   //this variable is set if it is a 64 bits  windows platform
+#cmakedefine _XBT_WIN32 @_XBT_WIN32@   /*this variable is set if it is a windows platform*/
+#cmakedefine _WIN32 @_WIN32@                   /*this variable is set if it is a 32 bits windows platform*/
+#cmakedefine _WIN64 @_WIN64@                   /*this variable is set if it is a 64 bits  windows platform*/
 #cmakedefine __VISUALC__ @__VISUALC__@
 #cmakedefine __BORLANDC__ @__BORLANDC__@
 
@@ -84,5 +84,8 @@ XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap);
 XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
 /** @} */
 
+/* Tracing SimGrid */
+#cmakedefine HAVE_TRACING @HAVE_TRACING@
+
 SG_END_DECL()
 #endif /* SIMGRID_PUBLIC_CONFIG_H */

diff --git a/src/instr/private.h b/src/instr/private.h
index a2b9663..113ec5a 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -7,7 +7,7 @@
 #ifndef INSTR_PRIVATE_H_
 #define INSTR_PRIVATE_H_
 
-#include "instr/tracing_config.h"
+#include "simgrid_config.h"
 
 #ifdef HAVE_TRACING