diff options
author | Jiri Olsa <jolsa@redhat.com> | 2013-03-24 19:54:36 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-05-29 07:38:45 -0400 |
commit | a8279525f42b4073e06b8b0061be1e55be29a023 (patch) | |
tree | b37eeed1ee186c1476f027152ffc4a755dc71d5c /tools | |
parent | 0e433feb109da0a174d838f0a5fb1af144848761 (diff) |
perf tools: Move libaudit check config into config/Makefile
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>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/Makefile | 9 | ||||
-rw-r--r-- | tools/perf/config/Makefile | 11 |
2 files changed, 12 insertions, 8 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 7dc6615219f2..57d39ed23f5b 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
@@ -505,14 +505,7 @@ ifndef NO_LIBUNWIND | |||
505 | endif | 505 | endif |
506 | 506 | ||
507 | ifndef NO_LIBAUDIT | 507 | ifndef NO_LIBAUDIT |
508 | FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit | 508 | BUILTIN_OBJS += $(OUTPUT)builtin-trace.o |
509 | ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT),libaudit),y) | ||
510 | msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev); | ||
511 | else | ||
512 | BASIC_CFLAGS += -DLIBAUDIT_SUPPORT | ||
513 | BUILTIN_OBJS += $(OUTPUT)builtin-trace.o | ||
514 | EXTLIBS += -laudit | ||
515 | endif | ||
516 | endif | 509 | endif |
517 | 510 | ||
518 | ifndef NO_SLANG | 511 | ifndef NO_SLANG |
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 438574bdf4b1..02e58ff9b744 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -197,3 +197,14 @@ ifndef NO_LIBUNWIND | |||
197 | BASIC_CFLAGS := $(LIBUNWIND_CFLAGS) $(BASIC_CFLAGS) | 197 | BASIC_CFLAGS := $(LIBUNWIND_CFLAGS) $(BASIC_CFLAGS) |
198 | BASIC_LDFLAGS := $(LIBUNWIND_LDFLAGS) $(BASIC_LDFLAGS) | 198 | BASIC_LDFLAGS := $(LIBUNWIND_LDFLAGS) $(BASIC_LDFLAGS) |
199 | endif # NO_LIBUNWIND | 199 | endif # NO_LIBUNWIND |
200 | |||
201 | ifndef NO_LIBAUDIT | ||
202 | FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit | ||
203 | ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT),libaudit),y) | ||
204 | msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev); | ||
205 | NO_LIBAUDIT := 1 | ||
206 | else | ||
207 | BASIC_CFLAGS += -DLIBAUDIT_SUPPORT | ||
208 | EXTLIBS += -laudit | ||
209 | endif | ||
210 | endif | ||