aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/Makefile
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2012-11-13 08:30:35 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-11-14 14:53:03 -0500
commit59ed16b315681a08cf8aa13ee949e9405801f442 (patch)
tree8041412b0f1dbdcb261aef0da8ca9370420155ac /tools/perf/Makefile
parenta5580f3ecb295a514f9522daf0ef7158f73ec2d6 (diff)
perf ui: Always compile browser setup code
We now have proper fallback logic, so always build it regardless of TUI or GTK setting. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Pekka Enberg <penberg@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1352813436-14173-5-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/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 5a9075ea218e..a7c6aa8d4a8b 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -422,6 +422,7 @@ LIB_OBJS += $(OUTPUT)util/intlist.o
422LIB_OBJS += $(OUTPUT)util/vdso.o 422LIB_OBJS += $(OUTPUT)util/vdso.o
423LIB_OBJS += $(OUTPUT)util/stat.o 423LIB_OBJS += $(OUTPUT)util/stat.o
424 424
425LIB_OBJS += $(OUTPUT)ui/setup.o
425LIB_OBJS += $(OUTPUT)ui/helpline.o 426LIB_OBJS += $(OUTPUT)ui/helpline.o
426LIB_OBJS += $(OUTPUT)ui/progress.o 427LIB_OBJS += $(OUTPUT)ui/progress.o
427LIB_OBJS += $(OUTPUT)ui/hist.o 428LIB_OBJS += $(OUTPUT)ui/hist.o
@@ -612,7 +613,6 @@ ifndef NO_NEWT
612 BASIC_CFLAGS += -I/usr/include/slang 613 BASIC_CFLAGS += -I/usr/include/slang
613 BASIC_CFLAGS += -DNEWT_SUPPORT 614 BASIC_CFLAGS += -DNEWT_SUPPORT
614 EXTLIBS += -lnewt -lslang 615 EXTLIBS += -lnewt -lslang
615 LIB_OBJS += $(OUTPUT)ui/setup.o
616 LIB_OBJS += $(OUTPUT)ui/browser.o 616 LIB_OBJS += $(OUTPUT)ui/browser.o
617 LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o 617 LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o
618 LIB_OBJS += $(OUTPUT)ui/browsers/hists.o 618 LIB_OBJS += $(OUTPUT)ui/browsers/hists.o
@@ -651,7 +651,6 @@ ifndef NO_GTK2
651 LIB_OBJS += $(OUTPUT)ui/gtk/progress.o 651 LIB_OBJS += $(OUTPUT)ui/gtk/progress.o
652 # Make sure that it'd be included only once. 652 # Make sure that it'd be included only once.
653 ifeq ($(findstring -DNEWT_SUPPORT,$(BASIC_CFLAGS)),) 653 ifeq ($(findstring -DNEWT_SUPPORT,$(BASIC_CFLAGS)),)
654 LIB_OBJS += $(OUTPUT)ui/setup.o
655 LIB_OBJS += $(OUTPUT)ui/util.o 654 LIB_OBJS += $(OUTPUT)ui/util.o
656 endif 655 endif
657 endif 656 endif