diff options
author | Namhyung Kim <namhyung.kim@lge.com> | 2012-11-14 11:47:40 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-12-09 06:46:04 -0500 |
commit | 752914208ada0d9ae0a6b3bf2906d43f3605832f (patch) | |
tree | 24aa9815eafe719170c36e319aa0d5d317ac0534 /tools/perf/Makefile | |
parent | 919d590f13c94c5465db723178e4b72200fd5f90 (diff) |
perf ui: Always compile error printing code
It is used everywhere so always build it regardless of ui engine.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1352911664-24620-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/Makefile')
-rw-r--r-- | tools/perf/Makefile | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 891bc77bdb2c..8fca560cf78e 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
@@ -378,8 +378,11 @@ LIB_H += util/rblist.h | |||
378 | LIB_H += util/intlist.h | 378 | LIB_H += util/intlist.h |
379 | LIB_H += util/perf_regs.h | 379 | LIB_H += util/perf_regs.h |
380 | LIB_H += util/unwind.h | 380 | LIB_H += util/unwind.h |
381 | LIB_H += ui/helpline.h | ||
382 | LIB_H += util/vdso.h | 381 | LIB_H += util/vdso.h |
382 | LIB_H += ui/helpline.h | ||
383 | LIB_H += ui/progress.h | ||
384 | LIB_H += ui/util.h | ||
385 | LIB_H += ui/ui.h | ||
383 | 386 | ||
384 | LIB_OBJS += $(OUTPUT)util/abspath.o | 387 | LIB_OBJS += $(OUTPUT)util/abspath.o |
385 | LIB_OBJS += $(OUTPUT)util/alias.o | 388 | LIB_OBJS += $(OUTPUT)util/alias.o |
@@ -453,6 +456,7 @@ LIB_OBJS += $(OUTPUT)util/stat.o | |||
453 | LIB_OBJS += $(OUTPUT)ui/setup.o | 456 | LIB_OBJS += $(OUTPUT)ui/setup.o |
454 | LIB_OBJS += $(OUTPUT)ui/helpline.o | 457 | LIB_OBJS += $(OUTPUT)ui/helpline.o |
455 | LIB_OBJS += $(OUTPUT)ui/progress.o | 458 | LIB_OBJS += $(OUTPUT)ui/progress.o |
459 | LIB_OBJS += $(OUTPUT)ui/util.o | ||
456 | LIB_OBJS += $(OUTPUT)ui/hist.o | 460 | LIB_OBJS += $(OUTPUT)ui/hist.o |
457 | LIB_OBJS += $(OUTPUT)ui/stdio/hist.o | 461 | LIB_OBJS += $(OUTPUT)ui/stdio/hist.o |
458 | 462 | ||
@@ -646,7 +650,6 @@ ifndef NO_NEWT | |||
646 | LIB_OBJS += $(OUTPUT)ui/browsers/hists.o | 650 | LIB_OBJS += $(OUTPUT)ui/browsers/hists.o |
647 | LIB_OBJS += $(OUTPUT)ui/browsers/map.o | 651 | LIB_OBJS += $(OUTPUT)ui/browsers/map.o |
648 | LIB_OBJS += $(OUTPUT)ui/browsers/scripts.o | 652 | LIB_OBJS += $(OUTPUT)ui/browsers/scripts.o |
649 | LIB_OBJS += $(OUTPUT)ui/util.o | ||
650 | LIB_OBJS += $(OUTPUT)ui/tui/setup.o | 653 | LIB_OBJS += $(OUTPUT)ui/tui/setup.o |
651 | LIB_OBJS += $(OUTPUT)ui/tui/util.o | 654 | LIB_OBJS += $(OUTPUT)ui/tui/util.o |
652 | LIB_OBJS += $(OUTPUT)ui/tui/helpline.o | 655 | LIB_OBJS += $(OUTPUT)ui/tui/helpline.o |
@@ -655,9 +658,6 @@ ifndef NO_NEWT | |||
655 | LIB_H += ui/browsers/map.h | 658 | LIB_H += ui/browsers/map.h |
656 | LIB_H += ui/keysyms.h | 659 | LIB_H += ui/keysyms.h |
657 | LIB_H += ui/libslang.h | 660 | LIB_H += ui/libslang.h |
658 | LIB_H += ui/progress.h | ||
659 | LIB_H += ui/util.h | ||
660 | LIB_H += ui/ui.h | ||
661 | endif | 661 | endif |
662 | endif | 662 | endif |
663 | 663 | ||
@@ -677,10 +677,6 @@ ifndef NO_GTK2 | |||
677 | LIB_OBJS += $(OUTPUT)ui/gtk/util.o | 677 | LIB_OBJS += $(OUTPUT)ui/gtk/util.o |
678 | LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o | 678 | LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o |
679 | LIB_OBJS += $(OUTPUT)ui/gtk/progress.o | 679 | LIB_OBJS += $(OUTPUT)ui/gtk/progress.o |
680 | # Make sure that it'd be included only once. | ||
681 | ifeq ($(findstring -DNEWT_SUPPORT,$(BASIC_CFLAGS)),) | ||
682 | LIB_OBJS += $(OUTPUT)ui/util.o | ||
683 | endif | ||
684 | endif | 680 | endif |
685 | endif | 681 | endif |
686 | 682 | ||