diff options
| author | Jiri Olsa <jolsa@redhat.com> | 2013-04-14 22:06:58 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-05-30 09:46:48 -0400 |
| commit | 8e1b3f68684c51c96df2a71b5e16167b43e5daa0 (patch) | |
| tree | 5185cadbf65e0967d30a611e242360ad95330dae /tools | |
| parent | 4e22db46495f951d3b652277047639ea60c89d3c (diff) | |
perf tools: Replace tabs with spaces for all non-commands statements
Replacing tabs with spaces for all non-commands statements
in 'Makefile' and 'config/Makefile' files.
Suggested-by: Sam Ravnborg <sam@ravnborg.org>
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-23-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 | 80 | ||||
| -rw-r--r-- | tools/perf/config/Makefile | 396 |
2 files changed, 238 insertions, 238 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 8f50afe09c02..ac52598e0f5a 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -124,14 +124,14 @@ strip-libs = $(filter-out -l%,$(1)) | |||
| 124 | LK_PATH=$(LK_DIR) | 124 | LK_PATH=$(LK_DIR) |
| 125 | 125 | ||
| 126 | ifneq ($(OUTPUT),) | 126 | ifneq ($(OUTPUT),) |
| 127 | TE_PATH=$(OUTPUT) | 127 | TE_PATH=$(OUTPUT) |
| 128 | ifneq ($(subdir),) | 128 | ifneq ($(subdir),) |
| 129 | LK_PATH=$(OUTPUT)$(LK_DIR) | 129 | LK_PATH=$(OUTPUT)$(LK_DIR) |
| 130 | else | 130 | else |
| 131 | LK_PATH=$(OUTPUT) | 131 | LK_PATH=$(OUTPUT) |
| 132 | endif | 132 | endif |
| 133 | else | 133 | else |
| 134 | TE_PATH=$(TRACE_EVENT_DIR) | 134 | TE_PATH=$(TRACE_EVENT_DIR) |
| 135 | endif | 135 | endif |
| 136 | 136 | ||
| 137 | LIBTRACEEVENT = $(TE_PATH)libtraceevent.a | 137 | LIBTRACEEVENT = $(TE_PATH)libtraceevent.a |
| @@ -175,10 +175,10 @@ OTHER_PROGRAMS = $(OUTPUT)perf | |||
| 175 | 175 | ||
| 176 | # Set paths to tools early so that they can be used for version tests. | 176 | # Set paths to tools early so that they can be used for version tests. |
| 177 | ifndef SHELL_PATH | 177 | ifndef SHELL_PATH |
| 178 | SHELL_PATH = /bin/sh | 178 | SHELL_PATH = /bin/sh |
| 179 | endif | 179 | endif |
| 180 | ifndef PERL_PATH | 180 | ifndef PERL_PATH |
| 181 | PERL_PATH = /usr/bin/perl | 181 | PERL_PATH = /usr/bin/perl |
| 182 | endif | 182 | endif |
| 183 | 183 | ||
| 184 | export PERL_PATH | 184 | export PERL_PATH |
| @@ -433,7 +433,7 @@ PERFLIBS = $(LIB_FILE) $(LIBLK) $(LIBTRACEEVENT) | |||
| 433 | -include arch/$(ARCH)/Makefile | 433 | -include arch/$(ARCH)/Makefile |
| 434 | 434 | ||
| 435 | ifneq ($(OUTPUT),) | 435 | ifneq ($(OUTPUT),) |
| 436 | CFLAGS += -I$(OUTPUT) | 436 | CFLAGS += -I$(OUTPUT) |
| 437 | endif | 437 | endif |
| 438 | 438 | ||
| 439 | ifdef NO_LIBELF | 439 | ifdef NO_LIBELF |
| @@ -452,67 +452,67 @@ LIB_OBJS += $(OUTPUT)util/symbol-minimal.o | |||
| 452 | 452 | ||
| 453 | else # NO_LIBELF | 453 | else # NO_LIBELF |
| 454 | ifndef NO_DWARF | 454 | ifndef NO_DWARF |
| 455 | LIB_OBJS += $(OUTPUT)util/probe-finder.o | 455 | LIB_OBJS += $(OUTPUT)util/probe-finder.o |
| 456 | LIB_OBJS += $(OUTPUT)util/dwarf-aux.o | 456 | LIB_OBJS += $(OUTPUT)util/dwarf-aux.o |
| 457 | endif # NO_DWARF | 457 | endif # NO_DWARF |
| 458 | endif # NO_LIBELF | 458 | endif # NO_LIBELF |
| 459 | 459 | ||
| 460 | ifndef NO_LIBUNWIND | 460 | ifndef NO_LIBUNWIND |
| 461 | LIB_OBJS += $(OUTPUT)util/unwind.o | 461 | LIB_OBJS += $(OUTPUT)util/unwind.o |
| 462 | endif | 462 | endif |
| 463 | 463 | ||
| 464 | ifndef NO_LIBAUDIT | 464 | ifndef NO_LIBAUDIT |
| 465 | BUILTIN_OBJS += $(OUTPUT)builtin-trace.o | 465 | BUILTIN_OBJS += $(OUTPUT)builtin-trace.o |
| 466 | endif | 466 | endif |
| 467 | 467 | ||
| 468 | ifndef NO_SLANG | 468 | ifndef NO_SLANG |
| 469 | LIB_OBJS += $(OUTPUT)ui/browser.o | 469 | LIB_OBJS += $(OUTPUT)ui/browser.o |
| 470 | LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o | 470 | LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o |
| 471 | LIB_OBJS += $(OUTPUT)ui/browsers/hists.o | 471 | LIB_OBJS += $(OUTPUT)ui/browsers/hists.o |
| 472 | LIB_OBJS += $(OUTPUT)ui/browsers/map.o | 472 | LIB_OBJS += $(OUTPUT)ui/browsers/map.o |
| 473 | LIB_OBJS += $(OUTPUT)ui/browsers/scripts.o | 473 | LIB_OBJS += $(OUTPUT)ui/browsers/scripts.o |
| 474 | LIB_OBJS += $(OUTPUT)ui/tui/setup.o | 474 | LIB_OBJS += $(OUTPUT)ui/tui/setup.o |
| 475 | LIB_OBJS += $(OUTPUT)ui/tui/util.o | 475 | LIB_OBJS += $(OUTPUT)ui/tui/util.o |
| 476 | LIB_OBJS += $(OUTPUT)ui/tui/helpline.o | 476 | LIB_OBJS += $(OUTPUT)ui/tui/helpline.o |
| 477 | LIB_OBJS += $(OUTPUT)ui/tui/progress.o | 477 | LIB_OBJS += $(OUTPUT)ui/tui/progress.o |
| 478 | LIB_H += ui/browser.h | 478 | LIB_H += ui/browser.h |
| 479 | LIB_H += ui/browsers/map.h | 479 | LIB_H += ui/browsers/map.h |
| 480 | LIB_H += ui/keysyms.h | 480 | LIB_H += ui/keysyms.h |
| 481 | LIB_H += ui/libslang.h | 481 | LIB_H += ui/libslang.h |
| 482 | endif | 482 | endif |
| 483 | 483 | ||
| 484 | ifndef NO_GTK2 | 484 | ifndef NO_GTK2 |
| 485 | LIB_OBJS += $(OUTPUT)ui/gtk/browser.o | 485 | LIB_OBJS += $(OUTPUT)ui/gtk/browser.o |
| 486 | LIB_OBJS += $(OUTPUT)ui/gtk/hists.o | 486 | LIB_OBJS += $(OUTPUT)ui/gtk/hists.o |
| 487 | LIB_OBJS += $(OUTPUT)ui/gtk/setup.o | 487 | LIB_OBJS += $(OUTPUT)ui/gtk/setup.o |
| 488 | LIB_OBJS += $(OUTPUT)ui/gtk/util.o | 488 | LIB_OBJS += $(OUTPUT)ui/gtk/util.o |
| 489 | LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o | 489 | LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o |
| 490 | LIB_OBJS += $(OUTPUT)ui/gtk/progress.o | 490 | LIB_OBJS += $(OUTPUT)ui/gtk/progress.o |
| 491 | LIB_OBJS += $(OUTPUT)ui/gtk/annotate.o | 491 | LIB_OBJS += $(OUTPUT)ui/gtk/annotate.o |
| 492 | endif | 492 | endif |
| 493 | 493 | ||
| 494 | ifndef NO_LIBPERL | 494 | ifndef NO_LIBPERL |
| 495 | LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-perl.o | 495 | LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-perl.o |
| 496 | LIB_OBJS += $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o | 496 | LIB_OBJS += $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o |
| 497 | endif | 497 | endif |
| 498 | 498 | ||
| 499 | ifndef NO_LIBPYTHON | 499 | ifndef NO_LIBPYTHON |
| 500 | LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o | 500 | LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o |
| 501 | LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o | 501 | LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o |
| 502 | endif | 502 | endif |
| 503 | 503 | ||
| 504 | ifeq ($(NO_PERF_REGS),0) | 504 | ifeq ($(NO_PERF_REGS),0) |
| 505 | ifeq ($(ARCH),x86) | 505 | ifeq ($(ARCH),x86) |
| 506 | LIB_H += arch/x86/include/perf_regs.h | 506 | LIB_H += arch/x86/include/perf_regs.h |
| 507 | endif | 507 | endif |
| 508 | endif | 508 | endif |
| 509 | 509 | ||
| 510 | ifndef NO_LIBNUMA | 510 | ifndef NO_LIBNUMA |
| 511 | BUILTIN_OBJS += $(OUTPUT)bench/numa.o | 511 | BUILTIN_OBJS += $(OUTPUT)bench/numa.o |
| 512 | endif | 512 | endif |
| 513 | 513 | ||
| 514 | ifdef ASCIIDOC8 | 514 | ifdef ASCIIDOC8 |
| 515 | export ASCIIDOC8 | 515 | export ASCIIDOC8 |
| 516 | endif | 516 | endif |
| 517 | 517 | ||
| 518 | LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group | 518 | LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group |
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index cc464f12354e..976599319c6e 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
| @@ -1,37 +1,37 @@ | |||
| 1 | uname_M := $(shell uname -m 2>/dev/null || echo not) | 1 | uname_M := $(shell uname -m 2>/dev/null || echo not) |
| 2 | 2 | ||
| 3 | ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ | 3 | ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ |
| 4 | -e s/arm.*/arm/ -e s/sa110/arm/ \ | 4 | -e s/arm.*/arm/ -e s/sa110/arm/ \ |
| 5 | -e s/s390x/s390/ -e s/parisc64/parisc/ \ | 5 | -e s/s390x/s390/ -e s/parisc64/parisc/ \ |
| 6 | -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ | 6 | -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ |
| 7 | -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) | 7 | -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) |
| 8 | NO_PERF_REGS := 1 | 8 | NO_PERF_REGS := 1 |
| 9 | CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) | 9 | CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) |
| 10 | 10 | ||
| 11 | # Additional ARCH settings for x86 | 11 | # Additional ARCH settings for x86 |
| 12 | ifeq ($(ARCH),i386) | 12 | ifeq ($(ARCH),i386) |
| 13 | override ARCH := x86 | 13 | override ARCH := x86 |
| 14 | NO_PERF_REGS := 0 | 14 | NO_PERF_REGS := 0 |
| 15 | LIBUNWIND_LIBS = -lunwind -lunwind-x86 | 15 | LIBUNWIND_LIBS = -lunwind -lunwind-x86 |
| 16 | endif | 16 | endif |
| 17 | 17 | ||
| 18 | ifeq ($(ARCH),x86_64) | 18 | ifeq ($(ARCH),x86_64) |
| 19 | override ARCH := x86 | 19 | override ARCH := x86 |
| 20 | IS_X86_64 := 0 | 20 | IS_X86_64 := 0 |
| 21 | ifeq (, $(findstring m32,$(CFLAGS))) | 21 | ifeq (, $(findstring m32,$(CFLAGS))) |
| 22 | IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) | 22 | IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) |
| 23 | endif | 23 | endif |
| 24 | ifeq (${IS_X86_64}, 1) | 24 | ifeq (${IS_X86_64}, 1) |
| 25 | RAW_ARCH := x86_64 | 25 | RAW_ARCH := x86_64 |
