lkml.org 
[lkml]   [2012]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] tools: Add Makefile.include
    Commit-ID:  98d89bfd0d4b2f218ec709e90ddcab6d82d7671e
    Gitweb: http://git.kernel.org/tip/98d89bfd0d4b2f218ec709e90ddcab6d82d7671e
    Author: Borislav Petkov <borislav.petkov@amd.com>
    AuthorDate: Wed, 11 Apr 2012 18:36:14 +0200
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Wed, 11 Apr 2012 14:57:36 -0300

    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 a3d1ee10d1bf) which are
    going to be used in the following patches.

    Signed-off-by: Borislav 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: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/Makefile | 47 +--------------------------------
    tools/scripts/Makefile.include | 57 ++++++++++++++++++++++++++++++++++++++++
    2 files changed, 58 insertions(+), 46 deletions(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 820371f..4ca77cc 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -1,18 +1,10 @@
    -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
    diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
    new file mode 100644
    index 0000000..52348d3
    --- /dev/null
    +++ b/tools/scripts/Makefile.include
    @@ -0,0 +1,57 @@
    +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

    \
     
     \ /
      Last update: 2012-04-13 20:19    [W:0.032 / U:1.964 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site