6 files changed, 27 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index c4b13b9..8d93d08 100644
--- a/Makefile
+++ b/Makefile
@@ -4,21 +4,21 @@ EXT = -std=gnu99
 CFLAGS = -g -Wall # -O2
 INCLUDES = -I. -I/usr/local/include
 
-LIBS = -L. -lparsevent -ldl
+LIBS = -L. -ltracecmd -ldl
 
 %.o: %.c
         $(CC) -c $(CFLAGS) $(EXT) $(INCLUDES) $< -o $@
 
-TARGETS = libparsevent.a trace-cmd plugin_hrtimer.so plugin_mac80211.so
+TARGETS = libparsevent.a libtracecmd.a trace-cmd plugin_hrtimer.so plugin_mac80211.so
 
 all: $(TARGETS)
 
-LIB_FILE = libparsevent.a
+LIB_FILE = libtracecmd.a
 
 trace-read.o::          parse-events.h
 trace-cmd.o::           parse-events.h $(LIB_FILE)
 
-trace-cmd:: trace-cmd.o trace-read.o trace-util.o
+trace-cmd:: trace-cmd.o trace-read.o
         $(CC) $^ $(LIBS) -rdynamic -o $@
 
 parse-events.o: parse-events.c parse-events.h
@@ -27,12 +27,17 @@ parse-events.o: parse-events.c parse-events.h
 trace-seq.o: trace-seq.c parse-events.h
         $(CC) -c $(CFLAGS) $(EXT) $(INCLUDES) -fPIC $< -o $@
 
-LIB_OBJS = parse-events.o trace-seq.o
+PEVENT_LIB_OBJS = parse-events.o trace-seq.o
 
-libparsevent.so: $(LIB_OBJS)
+libparsevent.so: $(PEVENT_LIB_OBJS)
         $(CC) --shared $^ -o $@
 
-libparsevent.a: $(LIB_OBJS)
+libparsevent.a: $(PEVENT_LIB_OBJS)
+        $(RM) $@;  $(AR) rcs $@ $^
+
+TCMD_LIB_OBJS = $(PEVENT_LIB_OBJS) trace-util.o
+
+libtracecmd.a: $(TCMD_LIB_OBJS)
         $(RM) $@;  $(AR) rcs $@ $^
 
 plugin_hrtimer.o: plugin_hrtimer.c parse-events.h
diff --git a/trace-cmd.c b/trace-cmd.c
index 7d41744..6719fc3 100644
--- a/trace-cmd.c
+++ b/trace-cmd.c
@@ -33,8 +33,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include "parse-events.h"
-#include "trace-cmd.h"
+#include "trace-local.h"
 
 #define VERSION "0.5"
 
diff --git a/trace-cmd.h b/trace-cmd.h
index 1a33d04..667ab3e 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -1,6 +1,8 @@
 #ifndef _TRACE_CMD_H
 #define _TRACE_CMD_H
 
+#include "parse-events.h"
+
 extern int input_fd;
 extern const char *input_file;
 
@@ -10,7 +12,6 @@ extern unsigned int page_size;
 #define PAGE_MASK (page_size - 1)
 #endif
 
-void usage(char **argv);
 int read_trace_header(void);
 int read_trace_files(void);
 
diff --git a/trace-local.h b/trace-local.h
new file mode 100644
index 0000000..d3fddff
--- /dev/null
+++ b/trace-local.h
@@ -0,0 +1,11 @@
+#ifndef __TRACE_LOCAL_H
+#define __TRACE_LOCAL_H
+
+#include "trace-cmd.h"
+
+/* for local shared information with trace-cmd executable */
+
+void usage(char **argv);
+
+
+#endif /* __TRACE_LOCAL_H */
diff --git a/trace-read.c b/trace-read.c
index 9be0817..cb358b0 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -36,8 +36,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include "parse-events.h"
-#include "trace-cmd.h"
+#include "trace-local.h"
 
 int input_fd;
 const char *input_file = "trace.dat";
diff --git a/trace-util.c b/trace-util.c
index 0bdf009..542e712 100644
--- a/trace-util.c
+++ b/trace-util.c
@@ -9,7 +9,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "parse-events.h"
 #include "trace-cmd.h"
 
 #define PLUGIN_DIR ".trace-cmd/plugins"