diff options
author | Steven Rostedt <srostedt@redhat.com> | 2012-04-05 18:47:54 -0400 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2012-04-25 07:01:40 -0400 |
commit | d0e7b850b7d45ff86868e7df4eb1f3cdd283f776 (patch) | |
tree | 4c932b66a76ce9597da8474ae5a69f9337178af5 /tools/perf/Makefile | |
parent | f7d82350e597d76dc8765a55c7849843395728b0 (diff) |
perf: Build libtraceevent.a
Have building perf also build libtraceevent.a. Currently, perf does
not use the code within libtraceevent.a, but it soon will.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Arun Sharma <asharma@fb.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'tools/perf/Makefile')
-rw-r--r-- | tools/perf/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 819102342985..46150ab073c7 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
@@ -178,6 +178,9 @@ $(OUTPUT)python/perf.so: $(PYRF_OBJS) $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) | |||
178 | 178 | ||
179 | SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) | 179 | SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) |
180 | 180 | ||
181 | EVENT_PARSE_DIR = ../lib/traceevent/ | ||
182 | LIBTRACEEVENT = $(OUTPUT)$(EVENT_PARSE_DIR)libtraceevent.a | ||
183 | |||
181 | # | 184 | # |
182 | # Single 'perf' binary right now: | 185 | # Single 'perf' binary right now: |
183 | # | 186 | # |
@@ -301,6 +304,7 @@ LIB_H += util/cpumap.h | |||
301 | LIB_H += util/top.h | 304 | LIB_H += util/top.h |
302 | LIB_H += $(ARCH_INCLUDE) | 305 | LIB_H += $(ARCH_INCLUDE) |
303 | LIB_H += util/cgroup.h | 306 | LIB_H += util/cgroup.h |
307 | LIB_H += $(EVENT_PARSE_DIR)event-parse.h | ||
304 | 308 | ||
305 | LIB_OBJS += $(OUTPUT)util/abspath.o | 309 | LIB_OBJS += $(OUTPUT)util/abspath.o |
306 | LIB_OBJS += $(OUTPUT)util/alias.o | 310 | LIB_OBJS += $(OUTPUT)util/alias.o |
@@ -695,7 +699,7 @@ $(OUTPUT)perf.o: perf.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS | |||
695 | '-DPERF_HTML_PATH="$(htmldir_SQ)"' \ | 699 | '-DPERF_HTML_PATH="$(htmldir_SQ)"' \ |
696 | $(ALL_CFLAGS) -c $(filter %.c,$^) -o $@ | 700 | $(ALL_CFLAGS) -c $(filter %.c,$^) -o $@ |
697 | 701 | ||
698 | $(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS) | 702 | $(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS) $(LIBTRACEEVENT) |
699 | $(QUIET_LINK)$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(OUTPUT)perf.o \ | 703 | $(QUIET_LINK)$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(OUTPUT)perf.o \ |
700 | $(BUILTIN_OBJS) $(LIBS) -o $@ | 704 | $(BUILTIN_OBJS) $(LIBS) -o $@ |
701 | 705 | ||
@@ -801,6 +805,10 @@ $(sort $(dir $(DIRECTORY_DEPS))): | |||
801 | $(LIB_FILE): $(LIB_OBJS) | 805 | $(LIB_FILE): $(LIB_OBJS) |
802 | $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS) | 806 | $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS) |
803 | 807 | ||
808 | # libparsevent.a | ||
809 | $(LIBTRACEEVENT): | ||
810 | make -C $(EVENT_PARSE_DIR) $(COMMAND_O) libtraceevent.a | ||
811 | |||
804 | help: | 812 | help: |
805 | @echo 'Perf make targets:' | 813 | @echo 'Perf make targets:' |
806 | @echo ' doc - make *all* documentation (see below)' | 814 | @echo ' doc - make *all* documentation (see below)' |