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>

diff --git a/tools/build/Build.include b/tools/build/Build.include
index 475152c528713b5991ace25bacc689b352fc99e8..418871d02ebf2eeffc924fbc1eac6774dcd098ad 100644 (file)
--- a/tools/build/Build.include
+++ b/tools/build/Build.include
@@ -72,15 +72,15 @@ dep-cmd = $(if $(wildcard $(fixdep)),
 #                   target, or command line has changed and update
 #                   dependencies in the cmd file
 if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)),         \
-       @set -e;                                                   \
-       $(echo-cmd) $(cmd_$(1)) && $(dep-cmd))
+                  @set -e;                                         \
+                  $(echo-cmd) $(cmd_$(1)) && $(dep-cmd))
 
 # if_changed      - execute command if any prerequisite is newer than
 #                   target, or command line has changed
-if_changed = $(if $(strip $(any-prereq) $(arg-check)),             \
-       @set -e;                                                   \
-       $(echo-cmd) $(cmd_$(1));                                   \
-       printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd)
+if_changed = $(if $(strip $(any-prereq) $(arg-check)),                   \
+              @set -e;                                                   \
+              $(echo-cmd) $(cmd_$(1));                                   \
+              printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd)
 
 ###
 # C flags to be used in rule definitions, includes:

diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index ae52e029dd226101a57b913bc210e6b6c88f359b..e3fb5ecbdcb65cee24172baecbe7f87da959b640 100644 (file)
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -27,58 +27,58 @@ endef
 #   the rule that uses them - an example for that is the 'bionic'
 #   feature check. ]
 #
-FEATURE_TESTS_BASIC :=                 \
-       backtrace                       \
-       dwarf                           \
-       dwarf_getlocations              \
-       fortify-source                  \
-       sync-compare-and-swap           \
-       glibc                           \
-       gtk2                            \
-       gtk2-infobar                    \
-       libaudit                        \
-       libbfd                          \
-       libelf                          \
-       libelf-getphdrnum               \
-       libelf-gelf_getnote             \
-       libelf-getshdrstrndx            \
-       libelf-mmap                     \
-       libnuma                         \
-       numa_num_possible_cpus          \
-       libperl                         \
-       libpython                       \
-       libpython-version               \
-       libslang                        \
-       libcrypto                       \
-       libunwind                       \
-       libunwind-x86                   \
-       libunwind-x86_64                \
-       libunwind-arm                   \
-       libunwind-aarch64               \
-       pthread-attr-setaffinity-np     \
-       stackprotector-all              \
-       timerfd                         \
-       libdw-dwarf-unwind              \
-       zlib                            \
-       lzma                            \
-       get_cpuid                       \
-       bpf                             \
-       sdt
+FEATURE_TESTS_BASIC :=                  \
+        backtrace                       \
+        dwarf                           \
+        dwarf_getlocations              \
+        fortify-source                  \
+        sync-compare-and-swap           \
+        glibc                           \
+        gtk2                            \
+        gtk2-infobar                    \
+        libaudit                        \
+        libbfd                          \
+        libelf                          \
+        libelf-getphdrnum               \
+        libelf-gelf_getnote             \
+        libelf-getshdrstrndx            \
+        libelf-mmap                     \
+        libnuma                         \
+        numa_num_possible_cpus          \
+        libperl                         \
+        libpython                       \
+        libpython-version               \
+        libslang                        \
+        libcrypto                       \
+        libunwind                       \
+        libunwind-x86                   \
+        libunwind-x86_64                \
+        libunwind-arm                   \
+        libunwind-aarch64               \
+        pthread-attr-setaffinity-np     \
+        stackprotector-all              \
+        timerfd                         \
+        libdw-dwarf-unwind              \
+        zlib                            \
+        lzma                            \
+        get_cpuid                       \
+        bpf                             \
+        sdt
 
 # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list
 # of all feature tests
-FEATURE_TESTS_EXTRA :=                 \
-       bionic                          \
-       compile-32                      \
-       compile-x32                     \
-       cplus-demangle                  \
-       hello                           \
-       libbabeltrace                   \
-       liberty                         \
-       liberty-z                       \
-       libunwind-debug-frame           \
-       libunwind-debug-frame-arm       \
-       libunwind-debug-frame-aarch64
+FEATURE_TESTS_EXTRA :=                  \
+         bionic                         \
+         compile-32                     \
+         compile-x32                    \
+         cplus-demangle                 \
+         hello                          \
+         libbabeltrace                  \
+         liberty                        \
+         liberty-z                      \
+         libunwind-debug-frame          \
+         libunwind-debug-frame-arm      \
+         libunwind-debug-frame-aarch64
 
 FEATURE_TESTS ?= $(FEATURE_TESTS_BASIC)
 
@@ -86,26 +86,26 @@ ifeq ($(FEATURE_TESTS),all)
   FEATURE_TESTS := $(FEATURE_TESTS_BASIC) $(FEATURE_TESTS_EXTRA)
 endif
 
-FEATURE_DISPLAY ?=                     \
-       dwarf                           \
-       dwarf_getlocations              \
-       glibc                           \
-       gtk2                            \
-       libaudit                        \
-       libbfd                          \
-       libelf                          \
-       libnuma                         \
-       numa_num_possible_cpus          \
-       libperl                         \
-       libpython                       \
-       libslang                        \
-       libcrypto                       \
-       libunwind                       \
-       libdw-dwarf-unwind              \
-       zlib                            \
-       lzma                            \
-       get_cpuid                       \
-       bpf
+FEATURE_DISPLAY ?=              \
+         dwarf                  \
+         dwarf_getlocations     \
+         glibc                  \
+         gtk2                   \
+         libaudit               \
+         libbfd                 \
+         libelf                 \
+         libnuma                \
+         numa_num_possible_cpus \
+         libperl                \
+         libpython              \
+         libslang               \
+         libcrypto              \
+         libunwind              \
+         libdw-dwarf-unwind     \
+         zlib                   \
+         lzma                   \
+         get_cpuid              \
+         bpf
 
 # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.
 # 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 871d5536951d1c1cef762431bde75e8677071949..303196c16019182d89a9ec1ef4cf27c17519a559 100644 (file)
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -1,54 +1,54 @@
-FILES=                                 \
-       test-all.bin                    \
-       test-backtrace.bin              \
-       test-bionic.bin                 \
-       test-dwarf.bin                  \
-       test-dwarf_getlocations.bin     \
-       test-fortify-source.bin         \
-       test-sync-compare-and-swap.bin  \
-       test-glibc.bin                  \
-       test-gtk2.bin                   \
-       test-gtk2-infobar.bin           \
-       test-hello.bin                  \
-       test-libaudit.bin               \
-       test-libbfd.bin                 \
-       test-liberty.bin                \
-       test-liberty-z.bin              \
-       test-cplus-demangle.bin         \
-       test-libelf.bin                 \
-       test-libelf-getphdrnum.bin      \
-       test-libelf-gelf_getnote.bin    \
-       test-libelf-getshdrstrndx.bin   \
-       test-libelf-mmap.bin            \
-       test-libnuma.bin                \
-       test-numa_num_possible_cpus.bin \
-       test-libperl.bin                \
-       test-libpython.bin              \
-       test-libpython-version.bin      \
-       test-libslang.bin               \
-       test-libcrypto.bin              \
-       test-libunwind.bin              \
-       test-libunwind-debug-frame.bin  \
-       test-libunwind-x86.bin          \
-       test-libunwind-x86_64.bin       \
-       test-libunwind-arm.bin          \
-       test-libunwind-aarch64.bin      \
-       test-libunwind-debug-frame-arm.bin      \
-       test-libunwind-debug-frame-aarch64.bin  \
-       test-pthread-attr-setaffinity-np.bin    \
-       test-stackprotector-all.bin     \
-       test-timerfd.bin                \
-       test-libdw-dwarf-unwind.bin     \
-       test-libbabeltrace.bin          \
-       test-compile-32.bin             \
-       test-compile-x32.bin            \
-       test-zlib.bin                   \
-       test-lzma.bin                   \
-       test-bpf.bin                    \
-       test-get_cpuid.bin              \
-       test-sdt.bin                    \
-       test-cxx.bin                    \
-       test-jvmti.bin
+FILES=                                          \
+         test-all.bin                           \
+         test-backtrace.bin                     \
+         test-bionic.bin                        \
+         test-dwarf.bin                         \
+         test-dwarf_getlocations.bin            \
+         test-fortify-source.bin                \
+         test-sync-compare-and-swap.bin         \
+         test-glibc.bin                         \
+         test-gtk2.bin                          \
+         test-gtk2-infobar.bin                  \
+         test-hello.bin                         \
+         test-libaudit.bin                      \
+         test-libbfd.bin                        \
+         test-liberty.bin                       \
+         test-liberty-z.bin                     \
+         test-cplus-demangle.bin                \
+         test-libelf.bin                        \
+         test-libelf-getphdrnum.bin             \
+         test-libelf-gelf_getnote.bin           \
+         test-libelf-getshdrstrndx.bin          \
+         test-libelf-mmap.bin                   \
+         test-libnuma.bin                       \
+         test-numa_num_possible_cpus.bin        \
+         test-libperl.bin                       \
+         test-libpython.bin                     \
+         test-libpython-version.bin             \
+         test-libslang.bin                      \
+         test-libcrypto.bin                     \
+         test-libunwind.bin                     \
+         test-libunwind-debug-frame.bin         \
+         test-libunwind-x86.bin                 \
+         test-libunwind-x86_64.bin              \
+         test-libunwind-arm.bin                 \
+         test-libunwind-aarch64.bin             \
+         test-libunwind-debug-frame-arm.bin     \
+         test-libunwind-debug-frame-aarch64.bin \
+         test-pthread-attr-setaffinity-np.bin   \
+         test-stackprotector-all.bin            \
+         test-timerfd.bin                       \
+         test-libdw-dwarf-unwind.bin            \
+         test-libbabeltrace.bin                 \
+         test-compile-32.bin                    \
+         test-compile-x32.bin                   \
+         test-zlib.bin                          \
+         test-lzma.bin                          \
+         test-bpf.bin                           \
+         test-get_cpuid.bin                     \
+         test-sdt.bin                           \
+         test-cxx.bin                           \
+         test-jvmti.bin
 
 FILES := $(addprefix $(OUTPUT),$(FILES))