[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-f9619d693a3aad365598ed5f718bd5883c7cb7f8@git.kernel.org>
Date: Fri, 31 May 2013 04:29:20 -0700
From: tip-bot for Jiri Olsa <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: acme@...hat.com, eranian@...gle.com, mingo@...nel.org,
sam@...nborg.org, a.p.zijlstra@...llo.nl, jolsa@...hat.com,
fweisbec@...il.com, dsahern@...il.com, tglx@...utronix.de,
cjashfor@...ux.vnet.ibm.com, hpa@...or.com, paulus@...ba.org,
linux-kernel@...r.kernel.org, bp@...en8.de, namhyung@...nel.org,
mingo@...e.hu
Subject: [tip:perf/core] perf tools:
Fix tab vs spaces issue in Makefile ifdef/endif
Commit-ID: f9619d693a3aad365598ed5f718bd5883c7cb7f8
Gitweb: http://git.kernel.org/tip/f9619d693a3aad365598ed5f718bd5883c7cb7f8
Author: Jiri Olsa <jolsa@...hat.com>
AuthorDate: Wed, 24 Apr 2013 11:37:29 +0200
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 28 May 2013 16:23:57 +0300
perf tools: Fix tab vs spaces issue in Makefile ifdef/endif
Unmatched spaces/tabs Makefile indentation could make the
Makefile fails. While the tabed line could be considered
sometimes as follow up for rule command, the mixed space
tab meses up with makefile if conditions.
Signed-off-by: Jiri Olsa <jolsa@...hat.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Corey Ashford <cjashfor@...ux.vnet.ibm.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Sam Ravnborg <sam@...nborg.org>
Cc: Stephane Eranian <eranian@...gle.com>
Link: http://lkml.kernel.org/r/1366796273-4780-3-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index b0f164b..c8fb0fd 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -90,7 +90,7 @@ endif
# Treat warnings as errors unless directed not to
ifneq ($(WERROR),0)
- CFLAGS_WERROR := -Werror
+ CFLAGS_WERROR := -Werror
endif
ifeq ("$(origin DEBUG)", "command line")
@@ -819,10 +819,10 @@ endif
ifdef NO_DEMANGLE
BASIC_CFLAGS += -DNO_DEMANGLE
else
- ifdef HAVE_CPLUS_DEMANGLE
+ ifdef HAVE_CPLUS_DEMANGLE
EXTLIBS += -liberty
BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE
- else
+ else
FLAGS_BFD=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -DPACKAGE='perf' -lbfd
has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD),libbfd)
ifeq ($(has_bfd),y)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists