lkml.org 
[lkml]   [2013]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/27] perf tools: Move libaudit check config into config/Makefile
    Date
    Moving libaudit 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>
    ---
    tools/perf/Makefile | 9 +--------
    tools/perf/config/Makefile | 11 +++++++++++
    2 files changed, 12 insertions(+), 8 deletions(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 5e877a4..16d1362 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -493,14 +493,7 @@ ifndef NO_LIBUNWIND
    endif

    ifndef NO_LIBAUDIT
    - FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit
    - ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT),libaudit),y)
    - msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev);
    - else
    - BASIC_CFLAGS += -DLIBAUDIT_SUPPORT
    - BUILTIN_OBJS += $(OUTPUT)builtin-trace.o
    - EXTLIBS += -laudit
    - endif
    + BUILTIN_OBJS += $(OUTPUT)builtin-trace.o
    endif

    ifndef NO_SLANG
    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 92c395f..52d6fe9 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -197,3 +197,14 @@ ifndef NO_LIBUNWIND
    BASIC_CFLAGS := $(LIBUNWIND_CFLAGS) $(BASIC_CFLAGS)
    BASIC_LDFLAGS := $(LIBUNWIND_LDFLAGS) $(BASIC_LDFLAGS)
    endif # NO_LIBUNWIND
    +
    +ifndef NO_LIBAUDIT
    + FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit
    + ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT),libaudit),y)
    + msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev);
    + NO_LIBAUDIT := 1
    + else
    + BASIC_CFLAGS += -DLIBAUDIT_SUPPORT
    + EXTLIBS += -laudit
    + endif
    +endif
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2013-04-01 22:01    [W:3.243 / U:2.468 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site