aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@linaro.org>2013-06-11 11:29:18 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-07-12 12:45:54 -0400
commit4e319027a7aee58ce8d409f5597b418f08307841 (patch)
treeb3fe55127499102a4260c6fc48321031d30917bf
parent450ac18d8f8076f0c522af1afb8519614a3b32f5 (diff)
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: Robert Richter <robert.richter@linaro.org> Signed-off-by: Robert 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.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/Makefile2
-rw-r--r--tools/perf/builtin-trace.c2
-rw-r--r--tools/perf/config/Makefile5
-rw-r--r--tools/perf/tests/evsel-tp-sched.c2
-rw-r--r--tools/perf/util/evsel.c8
-rw-r--r--tools/perf/util/session.c2
-rw-r--r--tools/perf/util/trace-event.h2
7 files changed, 12 insertions, 11 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 641fccddb249..5b7c6db87fde 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -281,7 +281,7 @@ LIB_H += util/cpumap.h
281LIB_H += util/top.h 281LIB_H += util/top.h
282LIB_H += $(ARCH_INCLUDE) 282LIB_H += $(ARCH_INCLUDE)
283LIB_H += util/cgroup.h 283LIB_H += util/cgroup.h
284LIB_H += $(TRACE_EVENT_DIR)event-parse.h 284LIB_H += $(LIB_INCLUDE)traceevent/event-parse.h
285LIB_H += util/target.h 285LIB_H += util/target.h
286LIB_H += util/rblist.h 286LIB_H += util/rblist.h
287LIB_H += util/intlist.h 287LIB_H += util/intlist.h
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index ab3ed4af1466..87fc7d08ca02 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1,3 +1,4 @@
1#include <traceevent/event-parse.h>
1#include "builtin.h" 2#include "builtin.h"
2#include "util/color.h" 3#include "util/color.h"
3#include "util/evlist.h" 4#include "util/evlist.h"
@@ -5,7 +6,6 @@
5#include "util/thread.h" 6#include "util/thread.h"
6#include "util/parse-options.h" 7#include "util/parse-options.h"
7#include "util/thread_map.h" 8#include "util/thread_map.h"
8#include "event-parse.h"
9 9
10#include <libaudit.h> 10#include <libaudit.h>
11#include <stdlib.h> 11#include <stdlib.h>
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index b5d9238cb181..214e17e97e5c 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -46,6 +46,8 @@ ifneq ($(obj-perf),)
46obj-perf := $(abspath $(obj-perf))/ 46obj-perf := $(abspath $(obj-perf))/
47endif 47endif
48 48
49LIB_INCLUDE := $(srctree)/tools/lib/
50
49# include ARCH specific config 51# include ARCH specific config
50-include $(src-perf)/arch/$(ARCH)/Makefile 52-include $(src-perf)/arch/$(ARCH)/Makefile
51 53
@@ -121,8 +123,7 @@ endif
121 123
122CFLAGS += -I$(src-perf)/util 124CFLAGS += -I$(src-perf)/util
123CFLAGS += -I$(src-perf) 125CFLAGS += -I$(src-perf)
124CFLAGS += -I$(TRACE_EVENT_DIR) 126CFLAGS += -I$(LIB_INCLUDE)
125CFLAGS += -I$(srctree)/tools/lib/
126 127
127CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE 128CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
128 129
diff --git a/tools/perf/tests/evsel-tp-sched.c b/tools/perf/tests/evsel-tp-sched.c
index a5d2fcc5ae35..f79e7d059820 100644
--- a/tools/perf/tests/evsel-tp-sched.c
+++ b/tools/perf/tests/evsel-tp-sched.c
@@ -1,6 +1,6 @@
1#include <traceevent/event-parse.h>
1#include "evsel.h" 2#include "evsel.h"
2#include "tests.h" 3#include "tests.h"
3#include "event-parse.h"
4 4
5static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name, 5static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
6 int size, bool should_be_signed) 6 int size, bool should_be_signed)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index c9c7494506a1..a6354619fa5d 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -9,17 +9,17 @@
9 9
10#include <byteswap.h> 10#include <byteswap.h>
11#include <linux/bitops.h> 11#include <linux/bitops.h>
12#include "asm/bug.h"
13#include <lk/debugfs.h> 12#include <lk/debugfs.h>
14#include "event-parse.h" 13#include <traceevent/event-parse.h>
14#include <linux/hw_breakpoint.h>
15#include <linux/perf_event.h>
16#include "asm/bug.h"
15#include "evsel.h" 17#include "evsel.h"
16#include "evlist.h" 18#include "evlist.h"
17#include "util.h" 19#include "util.h"
18#include "cpumap.h" 20#include "cpumap.h"
19#include "thread_map.h" 21#include "thread_map.h"
20#include "target.h" 22#include "target.h"
21#include <linux/hw_breakpoint.h>
22#include <linux/perf_event.h>
23#include "perf_regs.h" 23#include "perf_regs.h"
24 24
25static struct { 25static struct {
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index cf1fe01b7e89..ad47fb9d0204 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1,4 +1,5 @@
1#include <linux/kernel.h> 1#include <linux/kernel.h>
2#include <traceevent/event-parse.h>
2 3
3#include <byteswap.h> 4#include <byteswap.h>
4#include <unistd.h> 5#include <unistd.h>
@@ -12,7 +13,6 @@
12#include "sort.h" 13#include "sort.h"
13#include "util.h" 14#include "util.h"
14#include "cpumap.h" 15#include "cpumap.h"
15#include "event-parse.h"
16#include "perf_regs.h" 16#include "perf_regs.h"
17#include "vdso.h" 17#include "vdso.h"
18 18
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index 1978c398ad87..11eb7fd37608 100644
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -1,8 +1,8 @@
1#ifndef _PERF_UTIL_TRACE_EVENT_H 1#ifndef _PERF_UTIL_TRACE_EVENT_H
2#define _PERF_UTIL_TRACE_EVENT_H 2#define _PERF_UTIL_TRACE_EVENT_H
3 3
4#include <traceevent/event-parse.h>
4#include "parse-events.h" 5#include "parse-events.h"
5#include "event-parse.h"
6#include "session.h" 6#include "session.h"
7 7
8struct machine; 8struct machine;