Commit 4e319027 authored by Robert Richter's avatar Robert Richter Committed by Arnaldo Carvalho de Melo

perf tools: Use default include path notation for libtraceevent headers

Header files of libtraceevent or no longer local headers. Thus, use
default path notation for them. Also removing extra traceevent include
path and instead handle this similar to liblk.
Signed-off-by: default avatarRobert Richter <robert.richter@linaro.org>
Signed-off-by: default avatarRobert Richter <rric@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Robert Richter <rric@kernel.org>
Link: http://lkml.kernel.org/r/1370964558-8599-1-git-send-email-rric@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 450ac18d
...@@ -281,7 +281,7 @@ LIB_H += util/cpumap.h ...@@ -281,7 +281,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 += $(TRACE_EVENT_DIR)event-parse.h LIB_H += $(LIB_INCLUDE)traceevent/event-parse.h
LIB_H += util/target.h LIB_H += util/target.h
LIB_H += util/rblist.h LIB_H += util/rblist.h
LIB_H += util/intlist.h LIB_H += util/intlist.h
......
#include <traceevent/event-parse.h>
#include "builtin.h" #include "builtin.h"
#include "util/color.h" #include "util/color.h"
#include "util/evlist.h" #include "util/evlist.h"
...@@ -5,7 +6,6 @@ ...@@ -5,7 +6,6 @@
#include "util/thread.h" #include "util/thread.h"
#include "util/parse-options.h" #include "util/parse-options.h"
#include "util/thread_map.h" #include "util/thread_map.h"
#include "event-parse.h"
#include <libaudit.h> #include <libaudit.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -46,6 +46,8 @@ ifneq ($(obj-perf),) ...@@ -46,6 +46,8 @@ ifneq ($(obj-perf),)
obj-perf := $(abspath $(obj-perf))/ obj-perf := $(abspath $(obj-perf))/
endif endif
LIB_INCLUDE := $(srctree)/tools/lib/
# include ARCH specific config # include ARCH specific config
-include $(src-perf)/arch/$(ARCH)/Makefile -include $(src-perf)/arch/$(ARCH)/Makefile
...@@ -121,8 +123,7 @@ endif ...@@ -121,8 +123,7 @@ endif
CFLAGS += -I$(src-perf)/util CFLAGS += -I$(src-perf)/util
CFLAGS += -I$(src-perf) CFLAGS += -I$(src-perf)
CFLAGS += -I$(TRACE_EVENT_DIR) CFLAGS += -I$(LIB_INCLUDE)
CFLAGS += -I$(srctree)/tools/lib/
CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
......
#include <traceevent/event-parse.h>
#include "evsel.h" #include "evsel.h"
#include "tests.h" #include "tests.h"
#include "event-parse.h"
static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name, static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
int size, bool should_be_signed) int size, bool should_be_signed)
......
...@@ -9,17 +9,17 @@ ...@@ -9,17 +9,17 @@
#include <byteswap.h> #include <byteswap.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include "asm/bug.h"
#include <lk/debugfs.h> #include <lk/debugfs.h>
#include "event-parse.h" #include <traceevent/event-parse.h>
#include <linux/hw_breakpoint.h>
#include <linux/perf_event.h>
#include "asm/bug.h"
#include "evsel.h" #include "evsel.h"
#include "evlist.h" #include "evlist.h"
#include "util.h" #include "util.h"
#include "cpumap.h" #include "cpumap.h"
#include "thread_map.h" #include "thread_map.h"
#include "target.h" #include "target.h"
#include <linux/hw_breakpoint.h>
#include <linux/perf_event.h>
#include "perf_regs.h" #include "perf_regs.h"
static struct { static struct {
......
#include <linux/kernel.h> #include <linux/kernel.h>
#include <traceevent/event-parse.h>
#include <byteswap.h> #include <byteswap.h>
#include <unistd.h> #include <unistd.h>
...@@ -12,7 +13,6 @@ ...@@ -12,7 +13,6 @@
#include "sort.h" #include "sort.h"
#include "util.h" #include "util.h"
#include "cpumap.h" #include "cpumap.h"
#include "event-parse.h"
#include "perf_regs.h" #include "perf_regs.h"
#include "vdso.h" #include "vdso.h"
......
#ifndef _PERF_UTIL_TRACE_EVENT_H #ifndef _PERF_UTIL_TRACE_EVENT_H
#define _PERF_UTIL_TRACE_EVENT_H #define _PERF_UTIL_TRACE_EVENT_H
#include <traceevent/event-parse.h>
#include "parse-events.h" #include "parse-events.h"
#include "event-parse.h"
#include "session.h" #include "session.h"
struct machine; struct machine;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment