perf tools: Rename libparsevent to libtraceevent in Makefile
Change some variable names according to new library name. Signed-off-by: Namhyung Kim <namhyung.kim@lge.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1337677434-4881-1-git-send-email-namhyung.kim@lge.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
8784eb7497
commit
59f3bea53b
|
@ -155,7 +155,7 @@ endif
|
||||||
|
|
||||||
### --- END CONFIGURATION SECTION ---
|
### --- END CONFIGURATION SECTION ---
|
||||||
|
|
||||||
BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)/util -I$(EVENT_PARSE_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
|
BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)/util -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
|
||||||
BASIC_LDFLAGS =
|
BASIC_LDFLAGS =
|
||||||
|
|
||||||
# Guard against environment variables
|
# Guard against environment variables
|
||||||
|
@ -184,16 +184,16 @@ $(OUTPUT)python/perf.so: $(PYRF_OBJS) $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)
|
||||||
|
|
||||||
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
|
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
|
||||||
|
|
||||||
EVENT_PARSE_DIR = ../lib/traceevent/
|
TRACE_EVENT_DIR = ../lib/traceevent/
|
||||||
|
|
||||||
ifeq ("$(origin O)", "command line")
|
ifeq ("$(origin O)", "command line")
|
||||||
EP_PATH=$(OUTPUT)/
|
TE_PATH=$(OUTPUT)/
|
||||||
else
|
else
|
||||||
EP_PATH=$(EVENT_PARSE_DIR)/
|
TE_PATH=$(TRACE_EVENT_DIR)/
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBPARSEVENT = $(EP_PATH)libtraceevent.a
|
LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
|
||||||
EP_LIB := -L$(EP_PATH) -ltraceevent
|
TE_LIB := -L$(TE_PATH) -ltraceevent
|
||||||
|
|
||||||
#
|
#
|
||||||
# Single 'perf' binary right now:
|
# Single 'perf' binary right now:
|
||||||
|
@ -317,7 +317,7 @@ LIB_H += util/cpumap.h
|
||||||
LIB_H += util/top.h
|
LIB_H += util/top.h
|
||||||
LIB_H += $(ARCH_INCLUDE)
|
LIB_H += $(ARCH_INCLUDE)
|
||||||
LIB_H += util/cgroup.h
|
LIB_H += util/cgroup.h
|
||||||
LIB_H += $(EVENT_PARSE_DIR)event-parse.h
|
LIB_H += $(TRACE_EVENT_DIR)event-parse.h
|
||||||
LIB_H += util/target.h
|
LIB_H += util/target.h
|
||||||
|
|
||||||
LIB_OBJS += $(OUTPUT)util/abspath.o
|
LIB_OBJS += $(OUTPUT)util/abspath.o
|
||||||
|
@ -417,7 +417,7 @@ BUILTIN_OBJS += $(OUTPUT)builtin-kvm.o
|
||||||
BUILTIN_OBJS += $(OUTPUT)builtin-test.o
|
BUILTIN_OBJS += $(OUTPUT)builtin-test.o
|
||||||
BUILTIN_OBJS += $(OUTPUT)builtin-inject.o
|
BUILTIN_OBJS += $(OUTPUT)builtin-inject.o
|
||||||
|
|
||||||
PERFLIBS = $(LIB_FILE) $(LIBPARSEVENT)
|
PERFLIBS = $(LIB_FILE) $(LIBTRACEEVENT)
|
||||||
|
|
||||||
# Files needed for the python binding, perf.so
|
# Files needed for the python binding, perf.so
|
||||||
# pyrf is just an internal name needed for all those wrappers.
|
# pyrf is just an internal name needed for all those wrappers.
|
||||||
|
@ -826,9 +826,9 @@ $(sort $(dir $(DIRECTORY_DEPS))):
|
||||||
$(LIB_FILE): $(LIB_OBJS)
|
$(LIB_FILE): $(LIB_OBJS)
|
||||||
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
|
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
|
||||||
|
|
||||||
# libparsevent.a
|
# libtraceevent.a
|
||||||
$(LIBPARSEVENT):
|
$(LIBTRACEEVENT):
|
||||||
make -C $(EVENT_PARSE_DIR) $(COMMAND_O) libtraceevent.a
|
$(MAKE) -C $(TRACE_EVENT_DIR) $(COMMAND_O) libtraceevent.a
|
||||||
|
|
||||||
help:
|
help:
|
||||||
@echo 'Perf make targets:'
|
@echo 'Perf make targets:'
|
||||||
|
|
Loading…
Reference in New Issue