From 190724cdfc53eeebfd895b594f875b53a72adf37 Mon Sep 17 00:00:00 2001
From: Yannick Brosseau <yannick.brosseau@gmail.com>
Date: Sun, 26 May 2013 14:03:41 -0400
Subject: [PATCH] Fix tar.gz build by removing legacy include to ltt directory

The ltt directory is not packaged and will be removed in a near future.

Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
---
 lttv/lttv/Makefile.am                                      | 3 ++-
 lttv/lttv/attribute.c                                      | 3 +--
 lttv/lttv/filter.h                                         | 7 ++-----
 lttv/lttv/hook.c                                           | 2 --
 lttv/lttv/main.c                                           | 2 +-
 lttv/lttv/print.c                                          | 4 ----
 lttv/lttv/time.h                                           | 4 ++++
 lttv/lttv/traceset.h                                       | 4 ++--
 lttv/modules/gui/controlflow/drawing.c                     | 2 --
 lttv/modules/gui/controlflow/drawing.h                     | 1 -
 lttv/modules/gui/controlflow/eventhooks.c                  | 4 ----
 lttv/modules/gui/controlflow/eventhooks.h                  | 1 -
 lttv/modules/gui/controlflow/processlist.h                 | 1 -
 lttv/modules/gui/detailedevents/events.c                   | 3 ---
 lttv/modules/gui/histogram/histobuttonwidget.h             | 1 -
 lttv/modules/gui/histogram/histodrawing.c                  | 2 --
 lttv/modules/gui/histogram/histodrawing.h                  | 1 -
 lttv/modules/gui/histogram/histoeventhooks.c               | 4 ----
 lttv/modules/gui/histogram/histoeventhooks.h               | 1 -
 lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c         | 4 +---
 lttv/modules/gui/lttvwindow/lttvwindow/init_module.c       | 1 -
 lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c        | 1 -
 lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h        | 2 --
 lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.c  | 2 --
 lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.h  | 2 +-
 .../modules/gui/lttvwindow/lttvwindow/mainwindow-private.h | 1 -
 lttv/modules/gui/lttvwindow/lttvwindow/mainwindow.h        | 2 +-
 lttv/modules/gui/lttvwindow/lttvwindow/timebar.c           | 2 +-
 lttv/modules/gui/lttvwindow/lttvwindow/timebar.h           | 2 +-
 lttv/modules/gui/resourceview/drawing.c                    | 2 --
 lttv/modules/gui/resourceview/drawing.h                    | 1 -
 lttv/modules/gui/resourceview/eventhooks.c                 | 4 ----
 lttv/modules/gui/resourceview/eventhooks.h                 | 1 -
 lttv/modules/gui/resourceview/processlist.h                | 1 -
 lttv/modules/text/batchAnalysis.c                          | 1 -
 lttv/modules/text/textDump.c                               | 3 ---
 36 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/lttv/lttv/Makefile.am b/lttv/lttv/Makefile.am
index 74b3b03d..52fa76d2 100644
--- a/lttv/lttv/Makefile.am
+++ b/lttv/lttv/Makefile.am
@@ -106,7 +106,8 @@ lttvinclude_HEADERS = \
 	traceset.h\
 	filter.h\
 	print.h\
-	event.h
+	event.h\
+	trace.h
 
 #man_MANS = lttv.1
 #EXTRA_DIST = lttv.1
diff --git a/lttv/lttv/attribute.c b/lttv/lttv/attribute.c
index 7eeac124..57c6d332 100644
--- a/lttv/lttv/attribute.c
+++ b/lttv/lttv/attribute.c
@@ -22,8 +22,7 @@
 
 #include <string.h>
 #include <lttv/attribute.h>
-#include <ltt/ltt.h>
-#include <ltt/compiler.h>
+#include <lttv/compiler.h>
 
 typedef union _AttributeValue {
 	int dv_int;
diff --git a/lttv/lttv/filter.h b/lttv/lttv/filter.h
index 4b51025b..80ec271b 100644
--- a/lttv/lttv/filter.h
+++ b/lttv/lttv/filter.h
@@ -50,9 +50,6 @@
 #include <lttv/traceset-process.h>
 #include <lttv/state.h>
 #include <lttv/module.h>
-#include <ltt/ltt.h>
-#include <ltt/time.h>
-#include <ltt/event.h>
 
 /* structures prototypes */
 typedef enum _LttvStructType LttvStructType; 
@@ -344,7 +341,7 @@ void lttv_filter_clear_expression(LttvFilter* filter);
 LttvFilterTree* lttv_filter_tree_new();
 
 void lttv_filter_tree_destroy(LttvFilterTree* tree);
-
+#ifdef BABEL_CLEANUP
 gboolean lttv_filter_tree_parse(
 		const LttvFilterTree* t,
 		const LttEvent* event,
@@ -359,7 +356,7 @@ gboolean lttv_filter_tree_parse_branch(
 		const LttTracefile* tracefile,
 		const LttTrace* trace,
 		const LttvProcessState* state);
-
+#endif
 /*
  *  Debug functions
  */
diff --git a/lttv/lttv/hook.c b/lttv/lttv/hook.c
index 3d82f111..ab0f9120 100644
--- a/lttv/lttv/hook.c
+++ b/lttv/lttv/hook.c
@@ -21,8 +21,6 @@
 #endif
 
 #include <lttv/hook.h>
-#include <ltt/compiler.h>
-#include <ltt/ltt.h>
 
 typedef struct _LttvHookClosure {
 	LttvHook      hook;
diff --git a/lttv/lttv/main.c b/lttv/lttv/main.c
index a24e6bb6..7d604055 100644
--- a/lttv/lttv/main.c
+++ b/lttv/lttv/main.c
@@ -27,7 +27,7 @@
 #include <lttv/attribute.h>
 #include <lttv/option.h>
 #include <lttv/traceset.h>
-#include <ltt/trace.h>
+#include <lttv/trace.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/lttv/lttv/print.c b/lttv/lttv/print.c
index ff9cedac..e8df4ed9 100644
--- a/lttv/lttv/print.c
+++ b/lttv/lttv/print.c
@@ -37,12 +37,8 @@
 #include <lttv/filter.h>
 #endif
 #include <lttv/print.h>
-#include <ltt/ltt.h>
-#include <ltt/event.h>
-#include <ltt/trace.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <ltt/ltt-private.h>
 #include <babeltrace/ctf/events.h>
 #include <string.h>
 #include <inttypes.h>
diff --git a/lttv/lttv/time.h b/lttv/lttv/time.h
index c82011e4..4456a0c7 100644
--- a/lttv/lttv/time.h
+++ b/lttv/lttv/time.h
@@ -29,6 +29,10 @@ typedef struct _LttTime {
   unsigned long tv_nsec;
 } LttTime;
 
+typedef struct _TimeInterval {
+  LttTime start_time;
+  LttTime end_time;  
+} TimeInterval;
 
 #define NANOSECONDS_PER_SECOND 1000000000
 
diff --git a/lttv/lttv/traceset.h b/lttv/lttv/traceset.h
index 4f326fd8..9761c919 100644
--- a/lttv/lttv/traceset.h
+++ b/lttv/lttv/traceset.h
@@ -22,9 +22,9 @@
 #include <lttv/attribute.h>
 #include <lttv/hook.h>
 #include <lttv/event.h>
-#include <ltt/ltt.h>
-#include <ltt/time.h>
+#include <lttv/time.h>
 #include <lttv/trace.h>
+
 /* A traceset is a set of traces to be analyzed together. */
 
 typedef struct _LttvTraceset LttvTraceset;
diff --git a/lttv/modules/gui/controlflow/drawing.c b/lttv/modules/gui/controlflow/drawing.c
index 9fac5cd3..f1441e05 100644
--- a/lttv/modules/gui/controlflow/drawing.c
+++ b/lttv/modules/gui/controlflow/drawing.c
@@ -24,8 +24,6 @@
 #include <gdk/gdk.h>
 #include <string.h>
 
-#include <ltt/trace.h>
-
 #include <lttv/lttv.h>
 #include <lttvwindow/lttvwindow.h>
 #include <lttv/state.h>
diff --git a/lttv/modules/gui/controlflow/drawing.h b/lttv/modules/gui/controlflow/drawing.h
index b481e365..dc4dac01 100644
--- a/lttv/modules/gui/controlflow/drawing.h
+++ b/lttv/modules/gui/controlflow/drawing.h
@@ -23,7 +23,6 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include <ltt/ltt.h>
 #ifdef BABEL_CLEANUP
 #include <lttv/tracecontext.h>
 #endif //babel_cleanup
diff --git a/lttv/modules/gui/controlflow/eventhooks.c b/lttv/modules/gui/controlflow/eventhooks.c
index f024cd35..242f9457 100644
--- a/lttv/modules/gui/controlflow/eventhooks.c
+++ b/lttv/modules/gui/controlflow/eventhooks.c
@@ -59,10 +59,6 @@
 
 //#include <pango/pango.h>
 
-#include <ltt/event.h>
-#include <ltt/time.h>
-#include <ltt/trace.h>
-
 #include <lttv/lttv.h>
 #include <lttv/hook.h>
 #include <lttv/state.h>
diff --git a/lttv/modules/gui/controlflow/eventhooks.h b/lttv/modules/gui/controlflow/eventhooks.h
index dc1052ca..ab457ff7 100644
--- a/lttv/modules/gui/controlflow/eventhooks.h
+++ b/lttv/modules/gui/controlflow/eventhooks.h
@@ -28,7 +28,6 @@
 
 #include <gtk/gtk.h>
 #include <lttvwindow/mainwindow.h>
-#include <ltt/time.h>
 
 #include "processlist.h"
 #include "drawing.h"
diff --git a/lttv/modules/gui/controlflow/processlist.h b/lttv/modules/gui/controlflow/processlist.h
index d9484603..d7bb66ca 100644
--- a/lttv/modules/gui/controlflow/processlist.h
+++ b/lttv/modules/gui/controlflow/processlist.h
@@ -24,7 +24,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <lttv/state.h>
-#include <ltt/ltt.h>
 
 #include "drawitem.h"
 
diff --git a/lttv/modules/gui/detailedevents/events.c b/lttv/modules/gui/detailedevents/events.c
index 5a467546..c688a056 100644
--- a/lttv/modules/gui/detailedevents/events.c
+++ b/lttv/modules/gui/detailedevents/events.c
@@ -53,9 +53,6 @@
 #include <gdk/gdkx.h>
 #include <string.h>
 
-#include <ltt/ltt.h>
-#include <ltt/event.h>
-#include <ltt/trace.h>
 #include <lttv/lttv.h>
 #include <lttv/module.h>
 #include <lttv/hook.h>
diff --git a/lttv/modules/gui/histogram/histobuttonwidget.h b/lttv/modules/gui/histogram/histobuttonwidget.h
index 886b7f0a..4500beef 100644
--- a/lttv/modules/gui/histogram/histobuttonwidget.h
+++ b/lttv/modules/gui/histogram/histobuttonwidget.h
@@ -21,7 +21,6 @@
 
 #include <gtk/gtk.h>
 #include <lttv/state.h>
-#include <ltt/ltt.h>
 #include "histocfv.h"
 #include "histodrawitem.h"
 
diff --git a/lttv/modules/gui/histogram/histodrawing.c b/lttv/modules/gui/histogram/histodrawing.c
index 47829c64..0732fb37 100644
--- a/lttv/modules/gui/histogram/histodrawing.c
+++ b/lttv/modules/gui/histogram/histodrawing.c
@@ -24,8 +24,6 @@
 #include <gdk/gdk.h>
 #include <string.h>
 
-#include <ltt/trace.h>
-
 #include <lttv/lttv.h>
 #include <lttvwindow/lttvwindow.h>
 #include <lttv/state.h>
diff --git a/lttv/modules/gui/histogram/histodrawing.h b/lttv/modules/gui/histogram/histodrawing.h
index b2f17338..39015bfd 100644
--- a/lttv/modules/gui/histogram/histodrawing.h
+++ b/lttv/modules/gui/histogram/histodrawing.h
@@ -23,7 +23,6 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include <ltt/ltt.h>
 //#include <lttv/tracecontext.h>
 #include <lttv/traceset.h>
 #include <lttvwindow/lttvwindow.h>
diff --git a/lttv/modules/gui/histogram/histoeventhooks.c b/lttv/modules/gui/histogram/histoeventhooks.c
index 4c11cf3d..8e5d780a 100644
--- a/lttv/modules/gui/histogram/histoeventhooks.c
+++ b/lttv/modules/gui/histogram/histoeventhooks.c
@@ -59,10 +59,6 @@
 
 //#include <pango/pango.h>
 
-#include <ltt/event.h>
-#include <ltt/time.h>
-#include <ltt/trace.h>
-
 #include <lttv/lttv.h>
 #include <lttv/hook.h>
 #include <lttv/state.h>
diff --git a/lttv/modules/gui/histogram/histoeventhooks.h b/lttv/modules/gui/histogram/histoeventhooks.h
index f5a76309..35a11d5f 100644
--- a/lttv/modules/gui/histogram/histoeventhooks.h
+++ b/lttv/modules/gui/histogram/histoeventhooks.h
@@ -28,7 +28,6 @@
 
 #include <gtk/gtk.h>
 #include <lttvwindow/mainwindow.h>
-#include <ltt/time.h>
 
 #include "histobuttonwidget.h"
 #include "histodrawing.h"
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index 9b70ee3f..ff2081c2 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -31,9 +31,7 @@
 #include "callbacks.h"
 #include "interface.h"
 #include "support.h"
-#include <ltt/trace.h>
-#include <ltt/time.h>
-#include <ltt/event.h>
+#include <lttv/time.h>
 #include <lttv/lttv.h>
 #include <lttv/module.h>
 #include <lttv/iattribute.h>
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c b/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
index 03e25810..26ed2f13 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
@@ -48,7 +48,6 @@
 #include <lttvwindow/mainwindow.h>
 #include <lttvwindow/mainwindow-private.h>
 #include "callbacks.h"
-#include <ltt/trace.h>
 
 
 __EXPORT LttvTraceInfo
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
index 9d42fc88..a930e616 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
@@ -32,7 +32,6 @@
 #include <config.h>
 #endif
 
-#include <ltt/ltt.h>
 #include <lttv/lttv.h>
 #include <lttv/state.h>
 #include <lttv/traceset.h>
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h
index e3c497ae..c6245062 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h
@@ -252,8 +252,6 @@ FIXME : explain other important events
  */
 
 #include <gtk/gtk.h>
-#include <ltt/ltt.h>
-#include <ltt/time.h>
 #include <lttv/traceset.h>
 #include <lttv/hook.h>
 #ifdef BABEL_CLEANUP
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.c b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.c
index 80efe432..0cd5d5f5 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.c
@@ -30,8 +30,6 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include <ltt/time.h>
-#include <ltt/trace.h>
 #include <glib.h>
 #include <lttv/lttv.h>
 #include <lttv/traceset.h>
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.h b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.h
index 6d7c061b..38a49887 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.h
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindowtraces.h
@@ -68,7 +68,7 @@
 #ifndef LTTVWINDOWTRACES_H
 #define LTTVWINDOWTRACES_H
 
-#include <ltt/time.h>
+#include <lttv/time.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/mainwindow-private.h b/lttv/modules/gui/lttvwindow/lttvwindow/mainwindow-private.h
index 3770e12a..f97a514d 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/mainwindow-private.h
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/mainwindow-private.h
@@ -21,7 +21,6 @@
 
 #include <gtk/gtk.h>
 
-#include <ltt/ltt.h>
 #include <lttv/attribute.h>
 #include <lttv/traceset.h>
 
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/mainwindow.h b/lttv/modules/gui/lttvwindow/lttvwindow/mainwindow.h
index 9874d0d9..34ccaf81 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/mainwindow.h
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/mainwindow.h
@@ -20,7 +20,7 @@
 #define _MAIN_WINDOW_
 
 #include <glib.h>
-#include <ltt/time.h>
+#include <lttv/time.h>
 
 typedef struct _MainWindow MainWindow;
 typedef struct _TimeWindow TimeWindow;
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/timebar.c b/lttv/modules/gui/lttvwindow/lttvwindow/timebar.c
index 0395b814..78006752 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/timebar.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/timebar.c
@@ -21,7 +21,7 @@
 
 #include <gtk/gtkeventbox.h>
 #include <gtk/gtkvseparator.h>
-#include <ltt/time.h>
+#include <lttv/time.h>
 
 enum {
 	SIGNAL_START_TIME_CHANGED,
diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/timebar.h b/lttv/modules/gui/lttvwindow/lttvwindow/timebar.h
index a5954168..ea4538cd 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/timebar.h
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/timebar.h
@@ -22,7 +22,7 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtktooltips.h>
 #include <gtk/gtkwidget.h>
-#include <ltt/time.h>
+#include <lttv/time.h>
 
 G_BEGIN_DECLS
 
diff --git a/lttv/modules/gui/resourceview/drawing.c b/lttv/modules/gui/resourceview/drawing.c
index d8f70d5d..bba1f984 100644
--- a/lttv/modules/gui/resourceview/drawing.c
+++ b/lttv/modules/gui/resourceview/drawing.c
@@ -24,8 +24,6 @@
 #include <gdk/gdk.h>
 #include <string.h>
 
-#include <ltt/trace.h>
-
 #include <lttv/lttv.h>
 #include <lttvwindow/lttvwindow.h>
 #include <lttv/state.h>
diff --git a/lttv/modules/gui/resourceview/drawing.h b/lttv/modules/gui/resourceview/drawing.h
index 4944e058..e9577277 100644
--- a/lttv/modules/gui/resourceview/drawing.h
+++ b/lttv/modules/gui/resourceview/drawing.h
@@ -23,7 +23,6 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include <ltt/ltt.h>
 #include <lttv/state.h>
 #include <lttvwindow/lttvwindow.h>
 #include "cfv.h"
diff --git a/lttv/modules/gui/resourceview/eventhooks.c b/lttv/modules/gui/resourceview/eventhooks.c
index 8075f27a..86bb8cdb 100644
--- a/lttv/modules/gui/resourceview/eventhooks.c
+++ b/lttv/modules/gui/resourceview/eventhooks.c
@@ -60,10 +60,6 @@
 
 //#include <pango/pango.h>
 
-#include <ltt/event.h>
-#include <ltt/time.h>
-#include <ltt/trace.h>
-
 #include <lttv/lttv.h>
 #include <lttv/hook.h>
 #include <lttv/state.h>
diff --git a/lttv/modules/gui/resourceview/eventhooks.h b/lttv/modules/gui/resourceview/eventhooks.h
index 9ff63b32..09efbfae 100644
--- a/lttv/modules/gui/resourceview/eventhooks.h
+++ b/lttv/modules/gui/resourceview/eventhooks.h
@@ -28,7 +28,6 @@
 
 #include <gtk/gtk.h>
 #include <lttvwindow/mainwindow.h>
-#include <ltt/time.h>
 
 #include "processlist.h"
 #include "drawing.h"
diff --git a/lttv/modules/gui/resourceview/processlist.h b/lttv/modules/gui/resourceview/processlist.h
index ce32e16e..e627d694 100644
--- a/lttv/modules/gui/resourceview/processlist.h
+++ b/lttv/modules/gui/resourceview/processlist.h
@@ -22,7 +22,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <lttv/state.h>
-#include <ltt/ltt.h>
 
 #include "drawitem.h"
 #include "cfv.h"
diff --git a/lttv/modules/text/batchAnalysis.c b/lttv/modules/text/batchAnalysis.c
index cfd2bab7..e0f453bf 100644
--- a/lttv/modules/text/batchAnalysis.c
+++ b/lttv/modules/text/batchAnalysis.c
@@ -36,7 +36,6 @@
 #include <lttv/stats.h>
 #include <lttv/filter.h>
 #endif
-#include <ltt/trace.h>
 #ifdef BABEL_CLEANUP_SYNC
 #include <lttv/sync/sync_chain_lttv.h>
 #endif
diff --git a/lttv/modules/text/textDump.c b/lttv/modules/text/textDump.c
index c11db5d9..aa628c98 100644
--- a/lttv/modules/text/textDump.c
+++ b/lttv/modules/text/textDump.c
@@ -37,9 +37,6 @@
 #endif
 // #include <lttv/traceset.h>
 #include <lttv/print.h>
-#include <ltt/ltt.h>
-#include <ltt/event.h>
-#include <ltt/trace.h>
 #include <stdio.h>
 #include <inttypes.h>
 
-- 
2.39.5