From b9381de405ccf92d6e65fd1550c97a23dbc10310 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Fri, 6 Apr 2012 00:47:54 +0200
Subject: [PATCH] --- yaml --- r: 304971 b: refs/heads/master c:
 d0e7b850b7d45ff86868e7df4eb1f3cdd283f776 h: refs/heads/master i:   304969:
 cf95efb980a39d695729b58e23e2ac67b48738fa   304967:
 86503a1029578cf5075f98f7a0e49590fe6b2f75 v: v3

---
 [refs]                               |  2 +-
 trunk/tools/perf/Makefile            | 10 +++++++++-
 trunk/tools/scripts/Makefile.include |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 230328c7a657..7574b1d7e36b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7d82350e597d76dc8765a55c7849843395728b0
+refs/heads/master: d0e7b850b7d45ff86868e7df4eb1f3cdd283f776
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
index 819102342985..46150ab073c7 100644
--- a/trunk/tools/perf/Makefile
+++ b/trunk/tools/perf/Makefile
@@ -178,6 +178,9 @@ $(OUTPUT)python/perf.so: $(PYRF_OBJS) $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)
 
 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
 
+EVENT_PARSE_DIR = ../lib/traceevent/
+LIBTRACEEVENT = $(OUTPUT)$(EVENT_PARSE_DIR)libtraceevent.a
+
 #
 # Single 'perf' binary right now:
 #
@@ -301,6 +304,7 @@ LIB_H += util/cpumap.h
 LIB_H += util/top.h
 LIB_H += $(ARCH_INCLUDE)
 LIB_H += util/cgroup.h
+LIB_H += $(EVENT_PARSE_DIR)event-parse.h
 
 LIB_OBJS += $(OUTPUT)util/abspath.o
 LIB_OBJS += $(OUTPUT)util/alias.o
@@ -695,7 +699,7 @@ $(OUTPUT)perf.o: perf.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS
 		'-DPERF_HTML_PATH="$(htmldir_SQ)"' \
 		$(ALL_CFLAGS) -c $(filter %.c,$^) -o $@
 
-$(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS)
+$(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS) $(LIBTRACEEVENT)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(OUTPUT)perf.o \
                $(BUILTIN_OBJS) $(LIBS) -o $@
 
@@ -801,6 +805,10 @@ $(sort $(dir $(DIRECTORY_DEPS))):
 $(LIB_FILE): $(LIB_OBJS)
 	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
 
+# libparsevent.a
+$(LIBTRACEEVENT):
+	make -C $(EVENT_PARSE_DIR) $(COMMAND_O) libtraceevent.a
+
 help:
 	@echo 'Perf make targets:'
 	@echo '  doc		- make *all* documentation (see below)'
diff --git a/trunk/tools/scripts/Makefile.include b/trunk/tools/scripts/Makefile.include
index 87b55a729a5f..bde8521d56bb 100644
--- a/trunk/tools/scripts/Makefile.include
+++ b/trunk/tools/scripts/Makefile.include
@@ -1,5 +1,6 @@
 ifeq ("$(origin O)", "command line")
 	OUTPUT := $(O)/
+	COMMAND_O := O=$(O)
 endif
 
 ifneq ($(OUTPUT),)