diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2016-12-04 15:42:53 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-12-05 14:06:03 -0500 |
| commit | 2fedf79b69cf05b7e8e82a42d749c621155dd812 (patch) | |
| tree | 80b37d3a133bb73b7691098c792aca002157acfd /tools/build | |
| parent | a5ba0a1a5af312c4b4bfe78dc054d832103ec27d (diff) | |
tools build: Move tabs to spaces where suitable
We've been hit several times by a Makefile bug where line indented by
tab was falsely considered as target command.
We prevent this by always using space indentation for everything except
for the target commands.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1480884178-8072-3-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/build')
| -rw-r--r-- | tools/build/Build.include | 12 | ||||
| -rw-r--r-- | tools/build/Makefile.feature | 138 | ||||
| -rw-r--r-- | tools/build/feature/Makefile | 102 |
3 files changed, 126 insertions, 126 deletions
diff --git a/tools/build/Build.include b/tools/build/Build.include index 475152c52871..418871d02ebf 100644 --- a/tools/build/Build.include +++ b/tools/build/Build.include | |||
| @@ -72,15 +72,15 @@ dep-cmd = $(if $(wildcard $(fixdep)), | |||
| 72 | # target, or command line has changed and update | 72 | # target, or command line has changed and update |
| 73 | # dependencies in the cmd file | 73 | # dependencies in the cmd file |
| 74 | if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)), \ | 74 | if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)), \ |
| 75 | @set -e; \ | 75 | @set -e; \ |
| 76 | $(echo-cmd) $(cmd_$(1)) && $(dep-cmd)) | 76 | $(echo-cmd) $(cmd_$(1)) && $(dep-cmd)) |
| 77 | 77 | ||
| 78 | # if_changed - execute command if any prerequisite is newer than | 78 | # if_changed - execute command if any prerequisite is newer than |
| 79 | # target, or command line has changed | 79 | # target, or command line has changed |
| 80 | if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ | 80 | if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ |
| 81 | @set -e; \ | 81 | @set -e; \ |
| 82 | $(echo-cmd) $(cmd_$(1)); \ | 82 | $(echo-cmd) $(cmd_$(1)); \ |
| 83 | printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd) | 83 | printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd) |
| 84 | 84 | ||
| 85 | ### | 85 | ### |
| 86 | # C flags to be used in rule definitions, includes: | 86 | # C flags to be used in rule definitions, includes: |
diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index ae52e029dd22..e3fb5ecbdcb6 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature | |||
| @@ -27,58 +27,58 @@ endef | |||
| 27 | # the rule that uses them - an example for that is the 'bionic' | 27 | # the rule that uses them - an example for that is the 'bionic' |
| 28 | # feature check. ] | 28 | # feature check. ] |
| 29 | # | 29 | # |
| 30 | FEATURE_TESTS_BASIC := \ | 30 | FEATURE_TESTS_BASIC := \ |
| 31 | backtrace \ | 31 | backtrace \ |
| 32 | dwarf \ | 32 | dwarf \ |
| 33 | dwarf_getlocations \ | 33 | dwarf_getlocations \ |
| 34 | fortify-source \ | 34 | fortify-source \ |
| 35 | sync-compare-and-swap \ | 35 | sync-compare-and-swap \ |
| 36 | glibc \ | 36 | glibc \ |
| 37 | gtk2 \ | 37 | gtk2 \ |
| 38 | gtk2-infobar \ | 38 | gtk2-infobar \ |
| 39 | libaudit \ | 39 | libaudit \ |
| 40 | libbfd \ | 40 | libbfd \ |
| 41 | libelf \ | 41 | libelf \ |
| 42 | libelf-getphdrnum \ | 42 | libelf-getphdrnum \ |
| 43 | libelf-gelf_getnote \ | 43 | libelf-gelf_getnote \ |
| 44 | libelf-getshdrstrndx \ | 44 | libelf-getshdrstrndx \ |
| 45 | libelf-mmap \ | 45 | libelf-mmap \ |
| 46 | libnuma \ | 46 | libnuma \ |
| 47 | numa_num_possible_cpus \ | 47 | numa_num_possible_cpus \ |
| 48 | libperl \ | 48 | libperl \ |
| 49 | libpython \ | 49 | libpython \ |
| 50 | libpython-version \ | 50 | libpython-version \ |
| 51 | libslang \ | 51 | libslang \ |
| 52 | libcrypto \ | 52 | libcrypto \ |
| 53 | libunwind \ | 53 | libunwind \ |
| 54 | libunwind-x86 \ | 54 | libunwind-x86 \ |
| 55 | libunwind-x86_64 \ | 55 | libunwind-x86_64 \ |
| 56 | libunwind-arm \ | 56 | libunwind-arm \ |
| 57 | libunwind-aarch64 \ | 57 | libunwind-aarch64 \ |
| 58 | pthread-attr-setaffinity-np \ | 58 | pthread-attr-setaffinity-np \ |
| 59 | stackprotector-all \ | 59 | stackprotector-all \ |
| 60 | timerfd \ | 60 | timerfd \ |
| 61 | libdw-dwarf-unwind \ | 61 | libdw-dwarf-unwind \ |
| 62 | zlib \ | 62 | zlib \ |
| 63 | lzma \ | 63 | lzma \ |
| 64 | get_cpuid \ | 64 | get_cpuid \ |
| 65 | bpf \ | 65 | bpf \ |
| 66 | sdt | 66 | sdt |
| 67 | 67 | ||
| 68 | # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list | 68 | # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list |
| 69 | # of all feature tests | 69 | # of all feature tests |
| 70 | FEATURE_TESTS_EXTRA := \ | 70 | FEATURE_TESTS_EXTRA := \ |
| 71 | bionic \ | 71 | bionic \ |
| 72 | compile-32 \ | 72 | compile-32 \ |
| 73 | compile-x32 \ | 73 | compile-x32 \ |
| 74 | cplus-demangle \ | 74 | cplus-demangle \ |
| 75 | hello \ | 75 | hello \ |
| 76 | libbabeltrace \ | 76 | libbabeltrace \ |
| 77 | liberty \ | 77 | liberty \ |
| 78 | liberty-z \ | 78 | liberty-z \ |
| 79 | libunwind-debug-frame \ | 79 | libunwind-debug-frame \ |
| 80 | libunwind-debug-frame-arm \ | 80 | libunwind-debug-frame-arm \ |
| 81 | libunwind-debug-frame-aarch64 | 81 | libunwind-debug-frame-aarch64 |
| 82 | 82 | ||
| 83 | FEATURE_TESTS ?= $(FEATURE_TESTS_BASIC) | 83 | FEATURE_TESTS ?= $(FEATURE_TESTS_BASIC) |
| 84 | 84 | ||
| @@ -86,26 +86,26 @@ ifeq ($(FEATURE_TESTS),all) | |||
| 86 | FEATURE_TESTS := $(FEATURE_TESTS_BASIC) $(FEATURE_TESTS_EXTRA) | 86 | FEATURE_TESTS := $(FEATURE_TESTS_BASIC) $(FEATURE_TESTS_EXTRA) |
| 87 | endif | 87 | endif |
| 88 | 88 | ||
| 89 | FEATURE_DISPLAY ?= \ | 89 | FEATURE_DISPLAY ?= \ |
| 90 | dwarf \ | 90 | dwarf \ |
| 91 | dwarf_getlocations \ | 91 | dwarf_getlocations \ |
| 92 | glibc \ | 92 | glibc \ |
| 93 | gtk2 \ | 93 | gtk2 \ |
| 94 | libaudit \ | 94 | libaudit \ |
| 95 | libbfd \ | 95 | libbfd \ |
| 96 | libelf \ | 96 | libelf \ |
| 97 | libnuma \ | 97 | libnuma \ |
| 98 | numa_num_possible_cpus \ | 98 | numa_num_possible_cpus \ |
| 99 | libperl \ | 99 | libperl \ |
| 100 | libpython \ | 100 | libpython \ |
| 101 | libslang \ | 101 | libslang \ |
| 102 | libcrypto \ | 102 | libcrypto \ |
| 103 | libunwind \ | 103 | libunwind \ |
| 104 | libdw-dwarf-unwind \ | 104 | libdw-dwarf-unwind \ |
| 105 | zlib \ | 105 | zlib \ |
| 106 | lzma \ | 106 | lzma \ |
| 107 | get_cpuid \ | 107 | get_cpuid \ |
| 108 | bpf | 108 | bpf |
| 109 | 109 | ||
| 110 | # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features. | 110 | # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features. |
| 111 | # If in the future we need per-feature checks/flags for features not | 111 | # If in the future we need per-feature checks/flags for features not |
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index 871d5536951d..303196c16019 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile | |||
| @@ -1,54 +1,54 @@ | |||
| 1 | FILES= \ | 1 | FILES= \ |
| 2 | test-all.bin \ | 2 | test-all.bin \ |
| 3 | test-backtrace.bin \ | 3 | test-backtrace.bin \ |
| 4 | test-bionic.bin \ | 4 | test-bionic.bin \ |
| 5 | test-dwarf.bin \ | 5 | test-dwarf.bin \ |
| 6 | test-dwarf_getlocations.bin \ | 6 | test-dwarf_getlocations.bin \ |
| 7 | test-fortify-source.bin \ | 7 | test-fortify-source.bin \ |
| 8 | test-sync-compare-and-swap.bin \ | 8 | test-sync-compare-and-swap.bin \ |
| 9 | test-glibc.bin \ | 9 | test-glibc.bin \ |
| 10 | test-gtk2.bin \ | 10 | test-gtk2.bin \ |
| 11 | test-gtk2-infobar.bin \ | 11 | test-gtk2-infobar.bin \ |
| 12 | test-hello.bin \ | 12 | test-hello.bin \ |
| 13 | test-libaudit.bin \ | 13 | test-libaudit.bin \ |
| 14 | test-libbfd.bin \ | 14 | test-libbfd.bin \ |
| 15 | test-liberty.bin \ | 15 | test-liberty.bin \ |
| 16 | test-liberty-z.bin \ | 16 | test-liberty-z.bin \ |
| 17 | test-cplus-demangle.bin \ | 17 | test-cplus-demangle.bin \ |
| 18 | test-libelf.bin \ | 18 | test-libelf.bin \ |
| 19 | test-libelf-getphdrnum.bin \ | 19 | test-libelf-getphdrnum.bin \ |
| 20 | test-libelf-gelf_getnote.bin \ | 20 | test-libelf-gelf_getnote.bin \ |
| 21 | test-libelf-getshdrstrndx.bin \ | 21 | test-libelf-getshdrstrndx.bin \ |
| 22 | test-libelf-mmap.bin \ | 22 | test-libelf-mmap.bin \ |
| 23 | test-libnuma.bin \ | 23 | test-libnuma.bin \ |
| 24 | test-numa_num_possible_cpus.bin \ | 24 | test-numa_num_possible_cpus.bin \ |
| 25 | test-libperl.bin \ | 25 | test-libperl.bin \ |
| 26 | test-libpython.bin \ | 26 | test-libpython.bin \ |
| 27 | test-libpython-version.bin \ | 27 | test-libpython-version.bin \ |
| 28 | test-libslang.bin \ | 28 | test-libslang.bin \ |
| 29 | test-libcrypto.bin \ | 29 | test-libcrypto.bin \ |
| 30 | test-libunwind.bin \ | 30 | test-libunwind.bin \ |
| 31 | test-libunwind-debug-frame.bin \ | 31 | test-libunwind-debug-frame.bin \ |
| 32 | test-libunwind-x86.bin \ | 32 | test-libunwind-x86.bin \ |
| 33 | test-libunwind-x86_64.bin \ | 33 | test-libunwind-x86_64.bin \ |
| 34 | test-libunwind-arm.bin \ | 34 | test-libunwind-arm.bin \ |
| 35 | test-libunwind-aarch64.bin \ | 35 | test-libunwind-aarch64.bin \ |
| 36 | test-libunwind-debug-frame-arm.bin \ | 36 | test-libunwind-debug-frame-arm.bin \ |
| 37 | test-libunwind-debug-frame-aarch64.bin \ | 37 | test-libunwind-debug-frame-aarch64.bin \ |
| 38 | test-pthread-attr-setaffinity-np.bin \ | 38 | test-pthread-attr-setaffinity-np.bin \ |
| 39 | test-stackprotector-all.bin \ | 39 | test-stackprotector-all.bin \ |
| 40 | test-timerfd.bin \ | 40 | test-timerfd.bin \ |
| 41 | test-libdw-dwarf-unwind.bin \ | 41 | test-libdw-dwarf-unwind.bin \ |
| 42 | test-libbabeltrace.bin \ | 42 | test-libbabeltrace.bin \ |
| 43 | test-compile-32.bin \ | 43 | test-compile-32.bin \ |
| 44 | test-compile-x32.bin \ | 44 | test-compile-x32.bin \ |
| 45 | test-zlib.bin \ | 45 | test-zlib.bin \ |
| 46 | test-lzma.bin \ | 46 | test-lzma.bin \ |
| 47 | test-bpf.bin \ | 47 | test-bpf.bin \ |
| 48 | test-get_cpuid.bin \ | 48 | test-get_cpuid.bin \ |
| 49 | test-sdt.bin \ | 49 | test-sdt.bin \ |
| 50 | test-cxx.bin \ | 50 | test-cxx.bin \ |
| 51 | test-jvmti.bin | 51 | test-jvmti.bin |
| 52 | 52 | ||
| 53 | FILES := $(addprefix $(OUTPUT),$(FILES)) | 53 | FILES := $(addprefix $(OUTPUT),$(FILES)) |
| 54 | 54 | ||