lkml.org 
[lkml]   [2011]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/18] perf: Add Makefile.lib
    Date
    From: Borislav Petkov <borislav.petkov@amd.com>

    Put build settings which will be reused by other tools into a common
    .lib file.

    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    ---
    tools/perf/Makefile | 45 +------------------------------------------
    tools/scripts/Makefile.lib | 46 ++++++++++++++++++++++++++++++++++++++++++++
    2 files changed, 47 insertions(+), 44 deletions(-)
    create mode 100644 tools/scripts/Makefile.lib

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 91ad5cc..ab9f667 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -1,18 +1,10 @@
    -ifeq ("$(origin O)", "command line")
    - OUTPUT := $(O)/
    -endif
    +include ../scripts/Makefile.lib

    # 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 PYTHON to point to the python binary if the default
    @@ -54,31 +46,6 @@ ifeq ($(ARCH),x86_64)
    ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S
    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
    @@ -597,16 +564,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 $@;
    -endif
    -endif
    -
    ifdef ASCIIDOC8
    export ASCIIDOC8
    endif
    diff --git a/tools/scripts/Makefile.lib b/tools/scripts/Makefile.lib
    new file mode 100644
    index 0000000..854fefb
    --- /dev/null
    +++ b/tools/scripts/Makefile.lib
    @@ -0,0 +1,46 @@
    +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),s),s)
    +ifndef V
    + QUIET_CC = @echo ' ' CC $@;
    + QUIET_AR = @echo ' ' AR $@;
    + QUIET_LINK = @echo ' ' LINK $@;
    + QUIET_MKDIR = @echo ' ' MKDIR $@;
    + QUIET_GEN = @echo ' ' GEN $@;
    +endif
    +endif
    +
    +
    --
    1.7.4.rc2


    \
     
     \ /
      Last update: 2011-04-23 18:31    [W:0.026 / U:95.496 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site