lkml.org 
[lkml]   [2013]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/26] perf tools: Move slang check config into config/Makefile
    Date
    Moving slang check config into config/Makefile.

    Signed-off-by: Jiri Olsa <jolsa@redhat.com>
    Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Cc: David Ahern <dsahern@gmail.com>
    ---
    tools/perf/Makefile | 39 +++++++++++++--------------------------
    tools/perf/config/Makefile | 17 +++++++++++++++++
    2 files changed, 30 insertions(+), 26 deletions(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index b738e01..2187a2c 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -101,10 +101,6 @@ ifeq ($(config),1)
    include config/Makefile
    endif

    -ifdef NO_NEWT
    - NO_SLANG=1
    -endif
    -
    # Among the variables below, these:
    # perfexecdir
    # template_dir
    @@ -511,28 +507,19 @@ ifndef NO_LIBAUDIT
    endif

    ifndef NO_SLANG
    - FLAGS_SLANG=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -I/usr/include/slang -lslang
    - ifneq ($(call try-cc,$(SOURCE_SLANG),$(FLAGS_SLANG),libslang),y)
    - msg := $(warning slang not found, disables TUI support. Please install slang-devel or libslang-dev);
    - else
    - # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h
    - BASIC_CFLAGS += -I/usr/include/slang
    - BASIC_CFLAGS += -DSLANG_SUPPORT
    - EXTLIBS += -lslang
    - LIB_OBJS += $(OUTPUT)ui/browser.o
    - LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o
    - LIB_OBJS += $(OUTPUT)ui/browsers/hists.o
    - LIB_OBJS += $(OUTPUT)ui/browsers/map.o
    - LIB_OBJS += $(OUTPUT)ui/browsers/scripts.o
    - LIB_OBJS += $(OUTPUT)ui/tui/setup.o
    - LIB_OBJS += $(OUTPUT)ui/tui/util.o
    - LIB_OBJS += $(OUTPUT)ui/tui/helpline.o
    - LIB_OBJS += $(OUTPUT)ui/tui/progress.o
    - LIB_H += ui/browser.h
    - LIB_H += ui/browsers/map.h
    - LIB_H += ui/keysyms.h
    - LIB_H += ui/libslang.h
    - endif
    + LIB_OBJS += $(OUTPUT)ui/browser.o
    + LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o
    + LIB_OBJS += $(OUTPUT)ui/browsers/hists.o
    + LIB_OBJS += $(OUTPUT)ui/browsers/map.o
    + LIB_OBJS += $(OUTPUT)ui/browsers/scripts.o
    + LIB_OBJS += $(OUTPUT)ui/tui/setup.o
    + LIB_OBJS += $(OUTPUT)ui/tui/util.o
    + LIB_OBJS += $(OUTPUT)ui/tui/helpline.o
    + LIB_OBJS += $(OUTPUT)ui/tui/progress.o
    + LIB_H += ui/browser.h
    + LIB_H += ui/browsers/map.h
    + LIB_H += ui/keysyms.h
    + LIB_H += ui/libslang.h
    endif

    ifndef NO_GTK2
    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 52d6fe9..008b212 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -208,3 +208,20 @@ ifndef NO_LIBAUDIT
    EXTLIBS += -laudit
    endif
    endif
    +
    +ifdef NO_NEWT
    + NO_SLANG=1
    +endif
    +
    +ifndef NO_SLANG
    + FLAGS_SLANG=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -I/usr/include/slang -lslang
    + ifneq ($(call try-cc,$(SOURCE_SLANG),$(FLAGS_SLANG),libslang),y)
    + msg := $(warning slang not found, disables TUI support. Please install slang-devel or libslang-dev);
    + NO_SLANG := 1
    + else
    + # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h
    + BASIC_CFLAGS += -I/usr/include/slang
    + BASIC_CFLAGS += -DSLANG_SUPPORT
    + EXTLIBS += -lslang
    + endif
    +endif
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2013-04-24 12:21    [W:2.778 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site