[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-198430b56d4ab49d77381ef7cd3daf418a2c00c0@git.kernel.org>
Date: Tue, 14 Jan 2014 08:38:19 -0800
From: tip-bot for Jiri Olsa <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: acme@...hat.com, linux-kernel@...r.kernel.org, paulus@...ba.org,
hpa@...or.com, mingo@...nel.org, a.p.zijlstra@...llo.nl,
namhyung@...nel.org, jolsa@...hat.com, fweisbec@...il.com,
rostedt@...dmis.org, dsahern@...il.com, tglx@...utronix.de,
cjashfor@...ux.vnet.ibm.com, mingo@...e.hu
Subject: [tip:perf/core] tools lib traceevent:
Replace tabs with spaces for all non-commands statements
Commit-ID: 198430b56d4ab49d77381ef7cd3daf418a2c00c0
Gitweb: http://git.kernel.org/tip/198430b56d4ab49d77381ef7cd3daf418a2c00c0
Author: Jiri Olsa <jolsa@...hat.com>
AuthorDate: Thu, 2 Jan 2014 10:53:04 +0100
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Mon, 13 Jan 2014 10:06:23 -0300
tools lib traceevent: Replace tabs with spaces for all non-commands statements
The tabbed indentation in non-commands statements could be sometimes
considered as follow up for the rule command in the Makefile.
This error is hard to find, so as a precaution replacing tabs with
spaces for all non-commands statements.
Signed-off-by: Jiri Olsa <jolsa@...hat.com>
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: Steven Rostedt <rostedt@...dmis.org>
Link: http://marc.info/?t=136484403900003&r=1&w=2
Link: http://lkml.kernel.org/r/20140102095304.GA1196@krava.brq.redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/lib/traceevent/Makefile | 54 +++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index ca4ab78..76fe0ae 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -86,8 +86,8 @@ ifeq ($(BUILD_SRC),)
ifneq ($(OUTPUT),)
define build_output
- $(if $(VERBOSE:1=),@)+$(MAKE) -C $(OUTPUT) \
- BUILD_SRC=$(CURDIR)/ -f $(CURDIR)/Makefile $1
+ $(if $(VERBOSE:1=),@)+$(MAKE) -C $(OUTPUT) \
+ BUILD_SRC=$(CURDIR)/ -f $(CURDIR)/Makefile $1
endef
all: sub-make
@@ -221,23 +221,23 @@ $(PLUGINS): %.so: %.o
$(QUIET_LINK)$(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<
define make_version.h
- (echo '/* This file is automatically generated. Do not modify. */'; \
- echo \#define VERSION_CODE $(shell \
- expr $(VERSION) \* 256 + $(PATCHLEVEL)); \
- echo '#define EXTRAVERSION ' $(EXTRAVERSION); \
- echo '#define VERSION_STRING "'$(VERSION).$(PATCHLEVEL).$(EXTRAVERSION)'"'; \
- echo '#define FILE_VERSION '$(FILE_VERSION); \
- ) > $1
+ (echo '/* This file is automatically generated. Do not modify. */'; \
+ echo \#define VERSION_CODE $(shell \
+ expr $(VERSION) \* 256 + $(PATCHLEVEL)); \
+ echo '#define EXTRAVERSION ' $(EXTRAVERSION); \
+ echo '#define VERSION_STRING "'$(VERSION).$(PATCHLEVEL).$(EXTRAVERSION)'"'; \
+ echo '#define FILE_VERSION '$(FILE_VERSION); \
+ ) > $1
endef
define update_version.h
- ($(call make_version.h, $@...p); \
- if [ -r $@ ] && cmp -s $@ $@...p; then \
- rm -f $@...p; \
- else \
- echo ' UPDATE $@'; \
- mv -f $@...p $@; \
- fi);
+ ($(call make_version.h, $@...p); \
+ if [ -r $@ ] && cmp -s $@ $@...p; then \
+ rm -f $@...p; \
+ else \
+ echo ' UPDATE $@'; \
+ mv -f $@...p $@; \
+ fi);
endef
ep_version.h: force
@@ -246,13 +246,13 @@ ep_version.h: force
VERSION_FILES = ep_version.h
define update_dir
- (echo $1 > $@...p; \
- if [ -r $@ ] && cmp -s $@ $@...p; then \
- rm -f $@...p; \
- else \
- echo ' UPDATE $@'; \
- mv -f $@...p $@; \
- fi);
+ (echo $1 > $@...p; \
+ if [ -r $@ ] && cmp -s $@ $@...p; then \
+ rm -f $@...p; \
+ else \
+ echo ' UPDATE $@'; \
+ mv -f $@...p $@; \
+ fi);
endef
## make deps
@@ -262,10 +262,10 @@ all_deps := $(all_objs:%.o=.%.d)
# let .d file also depends on the source and header files
define check_deps
- @set -e; $(RM) $@; \
- $(CC) -MM $(CFLAGS) $< > $@...$$; \
- sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@...$$ > $@; \
- $(RM) $@...$$
+ @set -e; $(RM) $@; \
+ $(CC) -MM $(CFLAGS) $< > $@...$$; \
+ sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@...$$ > $@; \
+ $(RM) $@...$$
endef
$(all_deps): .%.d: $(src)/%.c
--
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