From: Julien Desfossez <julien.desfossez@efficios.com>
Date: Thu, 16 Feb 2012 17:33:25 +0000 (-0500)
Subject: API : cleanup includes
X-Git-Tag: v0.12~5
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=64a35d1b706151f9f002df4975aaa1536a68286e;ds=sidebyside

API : cleanup includes

The user just need to include babeltrace/babeltrace.h to use the API.
Also, create a babeltrace/ctf directory to store CTF-related code.

Signed-off-by: Julien Desfossez <julien.desfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/configure.ac b/configure.ac
index b5cbb42f..843e836d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,9 @@ AC_SUBST(PACKAGE_CFLAGS)
 babeltraceincludedir="${includedir}/babeltrace"
 AC_SUBST(babeltraceincludedir)
 
+babeltracectfincludedir="${includedir}/babeltrace/ctf"
+AC_SUBST(babeltracectfincludedir)
+
 AC_CONFIG_FILES([
 	Makefile
 	types/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
index 4ad0af4c..baafcea1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -4,9 +4,10 @@ babeltraceinclude_HEADERS = \
 	babeltrace/context.h \
 	babeltrace/iterator.h \
 	babeltrace/trace-collection.h \
-	babeltrace/trace-handle.h \
-	babeltrace/ctf/events.h
+	babeltrace/trace-handle.h
 
+babeltracectfinclude_HEADERS = \
+       babeltrace/ctf/events.h
 
 noinst_HEADERS = \
 	babeltrace/align.h \
diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index aacedaeb..8fe9a9c6 100644
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -18,7 +18,12 @@
  */
 
 #include <glib.h>
+#include <babeltrace/context.h>
 #include <babeltrace/format.h>
+#include <babeltrace/iterator.h>
+#include <babeltrace/trace-collection.h>
+#include <babeltrace/trace-handle.h>
+#include <babeltrace/ctf/events.h>
 
 typedef GQuark bt_event_name;
 
diff --git a/include/babeltrace/trace-collection.h b/include/babeltrace/trace-collection.h
index ad4b9564..bf68d4e6 100644
--- a/include/babeltrace/trace-collection.h
+++ b/include/babeltrace/trace-collection.h
@@ -21,6 +21,8 @@
  * all copies or substantial portions of the Software.
  */
 
+struct trace_collection;
+
 void init_trace_collection(struct trace_collection *tc);
 void finalize_trace_collection(struct trace_collection *tc);
 int trace_collection_add(struct trace_collection *tc,