3 files changed, 17 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 6c00ac9..7533dee 100644
--- a/Makefile
+++ b/Makefile
@@ -19,26 +19,28 @@ CFLAGS = -g -Wall $(CONFIG_FLAGS)
         $(CC) -c $(CFLAGS) $(EXT) $(INCLUDES) $< -o $@
 
 TARGETS = libparsevent.a libtracecmd.a trace-cmd plugin_hrtimer.so plugin_mac80211.so \
-        plugin_sched_switch.so trace-graph
+        plugin_sched_switch.so trace-graph trace-view
 
 all: $(TARGETS)
 
 LIB_FILE = libtracecmd.a
 
-HEADERS = parse-events.h trace-cmd.h trace-local.h trace-view-store.h
+HEADERS = parse-events.h trace-cmd.h trace-local.h
 
 trace-read.o::          $(HEADERS) 
 trace-cmd.o::           $(HEADERS) $(LIB_FILE)
 trace-util.o::          $(HEADERS)
 trace-ftrace.o::        $(HEADERS)
 trace-input.o::         $(HEADERS)
-trace-view.o::          $(HEADERS)
-trace-view-store.o::    $(HEADERS)
+trace-view.o::          $(HEADERS) trace-view-store.h
+trace-view-store.o::    $(HEADERS) trace-view-store.h
 trace-filter.o::        $(HEADERS)
 trace-graph.o::         $(HEADERS)
 
-trace-cmd:: trace-cmd.o trace-read.o trace-view.o trace-view-store.o \
-        trace-filter.o
+trace-cmd:: trace-cmd.o trace-read.o
+        $(CC) $^ -rdynamic -o $@ $(LIBS)
+
+trace-view:: trace-view.o trace-view-store.o trace-filter.o
         $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS)
 
 trace-graph:: trace-graph.o trace-compat.o
diff --git a/trace-cmd.c b/trace-cmd.c
index cd45a6e..b755ebe 100644
--- a/trace-cmd.c
+++ b/trace-cmd.c
@@ -785,9 +785,6 @@ int main (int argc, char **argv)
         if (strcmp(argv[1], "report") == 0) {
                 trace_report(argc, argv);
                 exit(0);
-        } else if (strcmp(argv[1], "view") == 0) {
-                trace_view(argc, argv);
-                exit(0);
         } else if ((record = (strcmp(argv[1], "record") == 0)) ||
                    (strcmp(argv[1], "start") == 0) ||
                    ((extract = strcmp(argv[1], "extract") == 0))) {
diff --git a/trace-view.c b/trace-view.c
index 1a372a4..dc0cd90 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -31,6 +31,7 @@
 
 #define TRACE_WIDTH     800
 #define TRACE_HEIGHT    600
+#define input_file "trace.dat"
 
 enum {
         COL_CPU,
@@ -224,7 +225,8 @@ void trace_view(int argc, char **argv)
         GtkWidget *label;
         GtkWidget *spin;
 
-        handle = read_trace_header();
+        handle = tracecmd_open(input_file);
+
         if (!handle)
                 die("error reading header");
 
@@ -392,3 +394,9 @@ void trace_view(int argc, char **argv)
         gtk_widget_show (window);
         gtk_main ();
 }
+
+int main(int argc, char **argv)
+{
+        trace_view(argc, argv);
+        return 0;
+}