From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org,
eranian@google.com, paulus@samba.org, hpa@zytor.com,
mingo@kernel.org, sam@ravnborg.org, a.p.zijlstra@chello.nl,
namhyung@kernel.org, bp@alien8.de, jolsa@redhat.com,
fweisbec@gmail.com, tglx@linutronix.de,
cjashfor@linux.vnet.ibm.com, mingo@elte.hu
Subject: [tip:perf/core] perf tools: Move slang check config into config/ Makefile
Date: Fri, 31 May 2013 05:04:58 -0700 [thread overview]
Message-ID: <tip-4a8f888a63248db76096a8c9ac8f2124d601c60e@git.kernel.org> (raw)
In-Reply-To: <1369398928-9809-10-git-send-email-jolsa@redhat.com>
Commit-ID: 4a8f888a63248db76096a8c9ac8f2124d601c60e
Gitweb: http://git.kernel.org/tip/4a8f888a63248db76096a8c9ac8f2124d601c60e
Author: Jiri Olsa <jolsa@redhat.com>
AuthorDate: Mon, 25 Mar 2013 00:56:08 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 29 May 2013 14:40:18 +0300
perf tools: Move slang check config into config/Makefile
Moving slang 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-10-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.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 57d39ed..f0c23ce 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -99,10 +99,6 @@ ifeq ($(config),1)
include config/Makefile
endif
-ifdef NO_NEWT
- NO_SLANG=1
-endif
-
# Among the variables below, these:
# perfexecdir
# template_dir
@@ -509,28 +505,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 02e58ff..06634be 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
next prev parent reply other threads:[~2013-05-31 12:05 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-24 12:35 [PATCHv3 00/25] perf tools: Makefile changes Jiri Olsa
2013-05-24 12:35 ` [PATCH 01/25] perf tools: Add automated make test suite Jiri Olsa
2013-05-31 11:54 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 02/25] perf tools: Move arch check into config/Makefile Jiri Olsa
2013-05-31 11:55 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 03/25] perf tools: Move programs " Jiri Olsa
2013-05-31 11:57 ` [tip:perf/core] perf tools: Move programs check into config/ Makefile tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 04/25] perf tools: Move compiler and linker flags check into config/Makefile Jiri Olsa
2013-05-31 11:58 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 05/25] perf tools: Move libelf check config " Jiri Olsa
2013-05-31 11:59 ` [tip:perf/core] perf tools: Move libelf check config into config/ Makefile tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 06/25] perf tools: Move libdw check config into config/Makefile Jiri Olsa
2013-05-31 12:01 ` [tip:perf/core] perf tools: Move libdw check config into config/ Makefile tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 07/25] perf tools: Move libunwind check config into config/Makefile Jiri Olsa
2013-05-31 12:02 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 08/25] perf tools: Move libaudit " Jiri Olsa
2013-05-31 12:03 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 09/25] perf tools: Move slang " Jiri Olsa
2013-05-31 12:04 ` tip-bot for Jiri Olsa [this message]
2013-05-24 12:35 ` [PATCH 10/25] perf tools: Move gtk2 " Jiri Olsa
2013-05-31 12:06 ` [tip:perf/core] perf tools: Move gtk2 check config into config/ Makefile tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 11/25] perf tools: Move libperl check config into config/Makefile Jiri Olsa
2013-05-31 12:07 ` [tip:perf/core] perf tools: Move libperl check config into config /Makefile tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 12/25] perf tools: Move libpython check config into config/Makefile Jiri Olsa
2013-05-31 12:08 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 13/25] perf tools: Move libbfd " Jiri Olsa
2013-05-31 12:10 ` [tip:perf/core] perf tools: Move libbfd check config into config/ Makefile tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 14/25] perf tools: Move stdlib check config into config/Makefile Jiri Olsa
2013-05-31 12:11 ` [tip:perf/core] perf tools: Move stdlib check config into config/ Makefile tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 15/25] perf tools: Move libnuma check config into config/Makefile Jiri Olsa
2013-05-31 12:12 ` [tip:perf/core] perf tools: Move libnuma check config into config /Makefile tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 16/25] perf tools: Move paths config into config/Makefile Jiri Olsa
2013-05-31 12:13 ` [tip:perf/core] perf tools: Move paths config into config/ Makefile tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 17/25] perf tools: Final touches for CHK config move Jiri Olsa
2013-05-31 12:15 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 18/25] perf tools: Merge all *CFLAGS* make variable into CFLAGS Jiri Olsa
2013-05-31 12:29 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 19/25] perf tools: Merge all *LDFLAGS* make variable into LDFLAGS Jiri Olsa
2013-05-31 12:30 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 20/25] perf tools: Switch to full path C include directories Jiri Olsa
2013-05-31 12:31 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 21/25] perf tools: Add NO_BIONIC variable to confiure bionic setup Jiri Olsa
2013-05-31 12:33 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 22/25] perf tools: Replace tabs with spaces for all non-commands statements Jiri Olsa
2013-05-31 12:34 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 23/25] perf tools: Replace multiple line assignment with multiple statements Jiri Olsa
2013-05-31 12:35 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 24/25] perf tools: Remove '?=' Makefile STRIP assignment Jiri Olsa
2013-05-31 12:37 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-05-24 12:35 ` [PATCH 25/25] perf tools: Add missing liblk.a dependency for python/perf.so Jiri Olsa
2013-05-31 12:38 ` [tip:perf/core] " tip-bot for Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-4a8f888a63248db76096a8c9ac8f2124d601c60e@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=bp@alien8.de \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=sam@ravnborg.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox