]> Pileus Git - ~andy/linux/commitdiff
perf tools: Move libaudit check config into config/Makefile
authorJiri Olsa <jolsa@redhat.com>
Sun, 24 Mar 2013 23:54:36 +0000 (00:54 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 29 May 2013 11:38:45 +0000 (14:38 +0300)
Moving libaudit check config into config/Makefile.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1369398928-9809-9-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/Makefile
tools/perf/config/Makefile

index 7dc6615219f27974433784f3cb17ecf2be106153..57d39ed23f5b2766ed115c2faf28d202f8908444 100644 (file)
@@ -505,14 +505,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
index 438574bdf4b1ef7cb27b5c688588ecabdf0e37f8..02e58ff9b7449cc6fb7cc6b86b42594017c27af1 100644 (file)
@@ -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