Commit 98d89bfd authored by Borislav Petkov's avatar Borislav Petkov Committed by Arnaldo Carvalho de Melo
Browse files

tools: Add Makefile.include 



Put generic enough build settings which could be reused by other tools
into a common Makefile.include file.

This commit reintroduces QUIET_SUBDIR{0,1} (see a3d1ee10) which are
going to be used in the following patches.

Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Sam Ravnborg <sam@ravnborg.org>
Link: http://lkml.kernel.org/r/1334162178-17152-2-git-send-email-bp@amd64.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2381da7a

tools/perf/Makefile

+1 −46
Original line number Diff line number Diff line 
ifeq ("$(origin O)", "command line")

	OUTPUT := $(O)/

endif

include ../scripts/Makefile.include



# The default target of this Makefile is...

all:



include config/utilities.mak



ifneq ($(OUTPUT),)

# check that the output directory actually exists

OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)

$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))

endif



# Define V to have a more verbose compile.

#

# Define O to save output files in a separate directory.
@@ -84,31 +76,6 @@ ifneq ($(WERROR),0) 
	CFLAGS_WERROR := -Werror

endif



#

# Include saner warnings here, which can catch bugs:

#



EXTRA_WARNINGS := -Wformat

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wformat-security

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wformat-y2k

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wshadow

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Winit-self

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wpacked

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wredundant-decls

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-aliasing=3

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wswitch-default

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wswitch-enum

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wno-system-headers

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wundef

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wwrite-strings

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wbad-function-cast

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wmissing-declarations

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wmissing-prototypes

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wnested-externs

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wold-style-definition

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-prototypes

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wdeclaration-after-statement



ifeq ("$(origin DEBUG)", "command line")

  PERF_DEBUG = $(DEBUG)

endif
@@ -679,18 +646,6 @@ else 
	endif

endif



ifneq ($(findstring $(MAKEFLAGS),s),s)

ifndef V

	QUIET_CC       = @echo '   ' CC $@;

	QUIET_AR       = @echo '   ' AR $@;

	QUIET_LINK     = @echo '   ' LINK $@;

	QUIET_MKDIR    = @echo '   ' MKDIR $@;

	QUIET_GEN      = @echo '   ' GEN $@;

	QUIET_FLEX     = @echo '   ' FLEX $@;

	QUIET_BISON    = @echo '   ' BISON $@;

endif

endif



ifdef ASCIIDOC8

	export ASCIIDOC8

endif

tools/scripts/Makefile.include

0 → 100644
+57 −0
Original line number Diff line number Diff line 
ifeq ("$(origin O)", "command line")

	OUTPUT := $(O)/

endif



ifneq ($(OUTPUT),)

# check that the output directory actually exists

OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)

$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))

endif



#

# Include saner warnings here, which can catch bugs:

#

EXTRA_WARNINGS := -Wformat

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wformat-security

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wformat-y2k

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wshadow

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Winit-self

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wpacked

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wredundant-decls

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-aliasing=3

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wswitch-default

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wswitch-enum

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wno-system-headers

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wundef

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wwrite-strings

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wbad-function-cast

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wmissing-declarations

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wmissing-prototypes

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wnested-externs

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wold-style-definition

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-prototypes

EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wdeclaration-after-statement



ifneq ($(findstring $(MAKEFLAGS), w),w)

PRINT_DIR = --no-print-directory

else

NO_SUBDIR = :

endif



QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir

QUIET_SUBDIR1  =



ifneq ($(findstring $(MAKEFLAGS),s),s)

ifndef V

	QUIET_CC       = @echo '   ' CC $@;

	QUIET_AR       = @echo '   ' AR $@;

	QUIET_LINK     = @echo '   ' LINK $@;

	QUIET_MKDIR    = @echo '   ' MKDIR $@;

	QUIET_GEN      = @echo '   ' GEN $@;

	QUIET_SUBDIR0  = +@subdir=

	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \

			 $(MAKE) $(PRINT_DIR) -C $$subdir

	QUIET_FLEX     = @echo '   ' FLEX $@;

	QUIET_BISON    = @echo '   ' BISON $@;

endif

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE