aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/Makefile
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2013-03-24 19:32:01 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-05-28 09:24:06 -0400
commita32f4936bc022fd82b08a350a5587bd5a7e500d1 (patch)
treecb88bb7504099d3ace2a0f40a4af761b9674553c /tools/perf/Makefile
parent8bd407b962e39f34d5df08de8cd02d0f5add802b (diff)
perf tools: Move programs check into config/Makefile
Moving programs check into config/Makefile. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1369398928-9809-4-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/Makefile')
-rw-r--r--tools/perf/Makefile24
1 files changed, 8 insertions, 16 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index a4abdaf56401..2a7547673c6b 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -58,6 +58,14 @@ $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE
58CC = $(CROSS_COMPILE)gcc 58CC = $(CROSS_COMPILE)gcc
59AR = $(CROSS_COMPILE)ar 59AR = $(CROSS_COMPILE)ar
60 60
61RM = rm -f
62MKDIR = mkdir
63FIND = find
64INSTALL = install
65FLEX = flex
66BISON = bison
67STRIP ?= strip
68
61# include config/Makefile by default and rule out 69# include config/Makefile by default and rule out
62# non-config cases 70# non-config cases
63config := 1 71config := 1
@@ -100,7 +108,6 @@ CFLAGS = -fno-omit-frame-pointer -ggdb3 -funwind-tables -Wall -Wextra -std=gnu99
100EXTLIBS = -lpthread -lrt -lelf -lm 108EXTLIBS = -lpthread -lrt -lelf -lm
101ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE 109ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
102ALL_LDFLAGS = $(LDFLAGS) 110ALL_LDFLAGS = $(LDFLAGS)
103STRIP ?= strip
104 111
105# Among the variables below, these: 112# Among the variables below, these:
106# perfexecdir 113# perfexecdir
@@ -137,13 +144,6 @@ lib = lib
137 144
138export prefix bindir sharedir sysconfdir 145export prefix bindir sharedir sysconfdir
139 146
140RM = rm -f
141MKDIR = mkdir
142FIND = find
143INSTALL = install
144FLEX = flex
145BISON= bison
146
147# sparse is architecture-neutral, which means that we need to tell it 147# sparse is architecture-neutral, which means that we need to tell it
148# explicitly what architecture to check for. Fix this up for yours.. 148# explicitly what architecture to check for. Fix this up for yours..
149SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ 149SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
@@ -152,14 +152,6 @@ ifneq ($(MAKECMDGOALS),clean)
152ifneq ($(MAKECMDGOALS),tags) 152ifneq ($(MAKECMDGOALS),tags)
153-include config/feature-tests.mak 153-include config/feature-tests.mak
154 154
155ifeq ($(call get-executable,$(FLEX)),)
156 dummy := $(error Error: $(FLEX) is missing on this system, please install it)
157endif
158
159ifeq ($(call get-executable,$(BISON)),)
160 dummy := $(error Error: $(BISON) is missing on this system, please install it)
161endif
162
163ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y) 155ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y)
164 CFLAGS := $(CFLAGS) -fstack-protector-all 156 CFLAGS := $(CFLAGS) -fstack-protector-all
165endif 157endif