Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0e7b850 authored by Steven Rostedt's avatar Steven Rostedt Committed by Frederic Weisbecker
Browse files

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: default avatarSteven 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: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent f7d82350

tools/perf/Makefile

+9 −1
Original line number Diff line number Diff line
@@ -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)'

tools/scripts/Makefile.include

+1 −0
Original line number Diff line number Diff line 
ifeq ("$(origin O)", "command line")

	OUTPUT := $(O)/

	COMMAND_O := O=$(O)

endif



ifneq ($(OUTPUT),)