Commit a32f4936 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move programs check into config/Makefile 



Moving programs check into config/Makefile.

Signed-off-by: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8bd407b9

tools/perf/Makefile

+8 −16
Original line number Diff line number Diff line
@@ -58,6 +58,14 @@ $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE 
CC = $(CROSS_COMPILE)gcc

AR = $(CROSS_COMPILE)ar



RM      = rm -f

MKDIR   = mkdir

FIND    = find

INSTALL = install

FLEX    = flex

BISON   = bison

STRIP  ?= strip



# include config/Makefile by default and rule out

# non-config cases

config := 1
@@ -100,7 +108,6 @@ CFLAGS = -fno-omit-frame-pointer -ggdb3 -funwind-tables -Wall -Wextra -std=gnu99 
EXTLIBS = -lpthread -lrt -lelf -lm

ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

ALL_LDFLAGS = $(LDFLAGS)

STRIP ?= strip



# Among the variables below, these:

#   perfexecdir
@@ -137,13 +144,6 @@ lib = lib 


export prefix bindir sharedir sysconfdir



RM = rm -f

MKDIR = mkdir

FIND = find

INSTALL = install

FLEX = flex

BISON= bison



# sparse is architecture-neutral, which means that we need to tell it

# explicitly what architecture to check for. Fix this up for yours..

SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
@@ -152,14 +152,6 @@ ifneq ($(MAKECMDGOALS),clean) 
ifneq ($(MAKECMDGOALS),tags)

-include config/feature-tests.mak



ifeq ($(call get-executable,$(FLEX)),)

	dummy := $(error Error: $(FLEX) is missing on this system, please install it)

endif



ifeq ($(call get-executable,$(BISON)),)

	dummy := $(error Error: $(BISON) is missing on this system, please install it)

endif



ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y)

	CFLAGS := $(CFLAGS) -fstack-protector-all

endif

tools/perf/config/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -32,3 +32,13 @@ endif 
ifeq ($(NO_PERF_REGS),0)

        BASIC_CFLAGS += -DHAVE_PERF_REGS

endif



-include config/feature-tests.mak



ifeq ($(call get-executable,$(FLEX)),)

	dummy := $(error Error: $(FLEX) is missing on this system, please install it)

endif



ifeq ($(call get-executable,$(BISON)),)

	dummy := $(error Error: $(BISON) is missing on this system, please install it)

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE