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 b5cbb42f747e76229b7715bc7327211c85aaa62a..843e836d55e412e221f0a3f0e5a2b5c580ebe6e1 100644 (file)
--- 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 4ad0af4c5663455fda5de64e479986b193f7c3b1..baafcea1a2f16a26248be34af6bfa5aed28aeb20 100644 (file)
--- 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 aacedaebcede77bb2ea630463f5839593ffcce22..8fe9a9c69f3ef7798930d6b84358cfca725526ef 100644 (file)
--- 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 ad4b9564132ad2cda82dc3185e3374353bc55bdd..bf68d4e69ebfcacacc916d7ae9e03b706e5e53ff 100644 (file)
--- 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,