aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2012-05-22 05:03:53 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-05-22 11:34:52 -0400
commit59f3bea53bfe2f395d548906fa39d01df620f0ac (patch)
treeae1d28205828eabc3555cfcf3338e104b567e50e /tools
parent8784eb7497b928de33a715e26da2bd51d424bec1 (diff)
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/Makefile22
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index b24623645ef6..ef75a5570d94 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -155,7 +155,7 @@ endif
155 155
156### --- END CONFIGURATION SECTION --- 156### --- END CONFIGURATION SECTION ---
157 157
158BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)/util -I$(EVENT_PARSE_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE 158BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)/util -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
159BASIC_LDFLAGS = 159BASIC_LDFLAGS =
160 160
161# Guard against environment variables 161# Guard against environment variables
@@ -184,16 +184,16 @@ $(OUTPUT)python/perf.so: $(PYRF_OBJS) $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)
184 184
185SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) 185SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
186 186
187EVENT_PARSE_DIR = ../lib/traceevent/ 187TRACE_EVENT_DIR = ../lib/traceevent/
188 188
189ifeq ("$(origin O)", "command line") 189ifeq ("$(origin O)", "command line")
190 EP_PATH=$(OUTPUT)/ 190 TE_PATH=$(OUTPUT)/
191else 191else
192 EP_PATH=$(EVENT_PARSE_DIR)/ 192 TE_PATH=$(TRACE_EVENT_DIR)/
193endif 193endif
194 194
195LIBPARSEVENT = $(EP_PATH)libtraceevent.a 195LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
196EP_LIB := -L$(EP_PATH) -ltraceevent 196TE_LIB := -L$(TE_PATH) -ltraceevent
197 197
198# 198#
199# Single 'perf' binary right now: 199# Single 'perf' binary right now:
@@ -317,7 +317,7 @@ LIB_H += util/cpumap.h
317LIB_H += util/top.h 317LIB_H += util/top.h
318LIB_H += $(ARCH_INCLUDE) 318LIB_H += $(ARCH_INCLUDE)
319LIB_H += util/cgroup.h 319LIB_H += util/cgroup.h
320LIB_H += $(EVENT_PARSE_DIR)event-parse.h 320LIB_H += $(TRACE_EVENT_DIR)event-parse.h
321LIB_H += util/target.h 321LIB_H += util/target.h
322 322
323LIB_OBJS += $(OUTPUT)util/abspath.o 323LIB_OBJS += $(OUTPUT)util/abspath.o
@@ -417,7 +417,7 @@ BUILTIN_OBJS += $(OUTPUT)builtin-kvm.o
417BUILTIN_OBJS += $(OUTPUT)builtin-test.o 417BUILTIN_OBJS += $(OUTPUT)builtin-test.o
418BUILTIN_OBJS += $(OUTPUT)builtin-inject.o 418BUILTIN_OBJS += $(OUTPUT)builtin-inject.o
419 419
420PERFLIBS = $(LIB_FILE) $(LIBPARSEVENT) 420PERFLIBS = $(LIB_FILE) $(LIBTRACEEVENT)
421 421
422# Files needed for the python binding, perf.so 422# Files needed for the python binding, perf.so
423# pyrf is just an internal name needed for all those wrappers. 423# pyrf is just an internal name needed for all those wrappers.
@@ -826,9 +826,9 @@ $(sort $(dir $(DIRECTORY_DEPS))):
826$(LIB_FILE): $(LIB_OBJS) 826$(LIB_FILE): $(LIB_OBJS)
827 $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS) 827 $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
828 828
829# libparsevent.a 829# libtraceevent.a
830$(LIBPARSEVENT): 830$(LIBTRACEEVENT):
831 make -C $(EVENT_PARSE_DIR) $(COMMAND_O) libtraceevent.a 831 $(MAKE) -C $(TRACE_EVENT_DIR) $(COMMAND_O) libtraceevent.a
832 832
833help: 833help:
834 @echo 'Perf make targets:' 834 @echo 'Perf make targets:'