tools lib traceevent: Replace tabs with spaces for all non-commands statements
PATCH 1/2 tools lib traceevent: Replace tabs with spaces for all non-commands statements
Replacing tabs with spaces for all non-commands statements in 'Makefile'.
--- tools/lib/traceevent/Makefile | 54 +++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-)
tools/lib/traceevent/Makefile +27 -27
@@ -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, [email protected]); \ - if [ -r $@ ] && cmp -s $@ [email protected]; then \ - rm -f [email protected]; \ - else \ - echo ' UPDATE $@'; \ - mv -f [email protected] $@; \ - fi); + ($(call make_version.h, [email protected]); \ + if [ -r $@ ] && cmp -s $@ [email protected]; then \ + rm -f [email protected]; \ + else \ + echo ' UPDATE $@'; \ + mv -f [email protected] $@; \ + fi); endef ep_version.h: force
@@ -246,13 +246,13 @@ ep_version.h: force VERSION_FILES = ep_version.h define update_dir - (echo $1 > [email protected]; \ - if [ -r $@ ] && cmp -s $@ [email protected]; then \ - rm -f [email protected]; \ - else \ - echo ' UPDATE $@'; \ - mv -f [email protected] $@; \ - fi); + (echo $1 > [email protected]; \ + if [ -r $@ ] && cmp -s $@ [email protected]; then \ + rm -f [email protected]; \ + else \ + echo ' UPDATE $@'; \ + mv -f [email protected] $@; \ + 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
Signature · 1 line
1.8.3.1
PATCH 2/2 tools lib traceevent: Shut up plugins make message
Getting rid of following build output:
$ make O=/tmp/build/perf -C tools/perf/ install-bin ... make[3]: Nothing to be done for `plugins'. make[2]: Nothing to be done for `plugins'. ...
which triggers when traceevent library needs to be rebuilt, but we have plugins built already.
Adding extra 'plugins' target with nop which is visible and triggers in both Makefile parts (for detached output directory (O=...) the traceevent Makefile spawns sub make for the build itself).
--- tools/lib/traceevent/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/lib/traceevent/Makefile +4 -1
@@ -329,9 +329,12 @@ clean: endif # skip-makefile -PHONY += force +PHONY += force plugins force: +plugins: + @echo > /dev/null + # Declare the contents of the .PHONY variable as phony. We keep that # information in a variable so we can use it in if_changed and friends. .PHONY: $(PHONY)
Signature · 1 line
1.8.3.1
tip-bot for Jiri Olsa
merge bot[tip:perf/core] tools lib traceevent: Shut up plugins make message
tools lib traceevent: Shut up plugins make message
Commit-ID: 9bb8e5edcf37182d0c97e98131cc3c5c03014b0e Gitweb: http://git.kernel.org/tip/9bb8e5edcf37182d0c97e98131cc3c5c03014b0e Author: Jiri Olsa <[email protected]> AuthorDate: Wed, 1 Jan 2014 17:50:50 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 13 Jan 2014 10:06:23 -0300
tools lib traceevent: Shut up plugins make message
Getting rid of following build output:
$ make O=/tmp/build/perf -C tools/perf/ install-bin ... make[3]: Nothing to be done for `plugins'. make[2]: Nothing to be done for `plugins'. ...
which triggers when traceevent library needs to be rebuilt, but we have plugins built already.
Adding extra 'plugins' target with nop which is visible and triggers in both Makefile parts (for detached output directory (O=...) the traceevent Makefile spawns sub make for the build itself).
--- tools/lib/traceevent/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/lib/traceevent/Makefile +4 -1
@@ -329,9 +329,12 @@ clean: endif # skip-makefile -PHONY += force +PHONY += force plugins force: +plugins: + @echo > /dev/null + # Declare the contents of the .PHONY variable as phony. We keep that # information in a variable so we can use it in if_changed and friends. .PHONY: $(PHONY)
Quoted 3 lines · Jiri Olsa
Replacing tabs with spaces for all non-commands statements in '
Makefile'.
Instead of just stating what you did, can you also include a "why" you did it?
Thanks,
-- Steve
PATCH v2 1/2 tools lib traceevent: Replace tabs with spaces for all non-commands statements
Quoted 7 lines · Steven Rostedt
Quoted 3 lines · Jiri Olsa
Replacing tabs with spaces for all non-commands statements in '
Makefile'.Instead of just stating what you did, can you also include a "why" you did it?
sry about that.. attached v2 with updated changelog
it was already discussed before in here:
http://marc.info/?t=136484403900003&r=1&w=2
thanks,
jirka
---
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.
--- tools/lib/traceevent/Makefile | 54 +++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-)
tools/lib/traceevent/Makefile +27 -27
@@ -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, [email protected]); \ - if [ -r $@ ] && cmp -s $@ [email protected]; then \ - rm -f [email protected]; \ - else \ - echo ' UPDATE $@'; \ - mv -f [email protected] $@; \ - fi); + ($(call make_version.h, [email protected]); \ + if [ -r $@ ] && cmp -s $@ [email protected]; then \ + rm -f [email protected]; \ + else \ + echo ' UPDATE $@'; \ + mv -f [email protected] $@; \ + fi); endef ep_version.h: force
@@ -246,13 +246,13 @@ ep_version.h: force VERSION_FILES = ep_version.h define update_dir - (echo $1 > [email protected]; \ - if [ -r $@ ] && cmp -s $@ [email protected]; then \ - rm -f [email protected]; \ - else \ - echo ' UPDATE $@'; \ - mv -f [email protected] $@; \ - fi); + (echo $1 > [email protected]; \ + if [ -r $@ ] && cmp -s $@ [email protected]; then \ + rm -f [email protected]; \ + else \ + echo ' UPDATE $@'; \ + mv -f [email protected] $@; \ + 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
Signature · 1 line
1.8.3.1
tip-bot for Jiri Olsa
merge bottools lib traceevent: Replace tabs with spaces for all non-commands statements
Commit-ID: 198430b56d4ab49d77381ef7cd3daf418a2c00c0 Gitweb: http://git.kernel.org/tip/198430b56d4ab49d77381ef7cd3daf418a2c00c0 Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 2 Jan 2014 10:53:04 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> 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.
--- tools/lib/traceevent/Makefile | 54 +++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-)
tools/lib/traceevent/Makefile +27 -27
@@ -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, [email protected]); \ - if [ -r $@ ] && cmp -s $@ [email protected]; then \ - rm -f [email protected]; \ - else \ - echo ' UPDATE $@'; \ - mv -f [email protected] $@; \ - fi); + ($(call make_version.h, [email protected]); \ + if [ -r $@ ] && cmp -s $@ [email protected]; then \ + rm -f [email protected]; \ + else \ + echo ' UPDATE $@'; \ + mv -f [email protected] $@; \ + fi); endef ep_version.h: force
@@ -246,13 +246,13 @@ ep_version.h: force VERSION_FILES = ep_version.h define update_dir - (echo $1 > [email protected]; \ - if [ -r $@ ] && cmp -s $@ [email protected]; then \ - rm -f [email protected]; \ - else \ - echo ' UPDATE $@'; \ - mv -f [email protected] $@; \ - fi); + (echo $1 > [email protected]; \ + if [ -r $@ ] && cmp -s $@ [email protected]; then \ + rm -f [email protected]; \ + else \ + echo ' UPDATE $@'; \ + mv -f [email protected] $@; \ + 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