Tabify all of the .am files.

diff --git a/Makefile.am b/Makefile.am
index d1c52b0f52ce11d9af6d671eac2a8159235c1480..e77c8a92ec6abbd72576ec803cc925797bf62dfc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,7 @@ TOR_UTIL_LIBS = \
        src/lib/libtor-thread.a \
        src/lib/libtor-memarea.a \
        src/lib/libtor-math.a \
-        src/lib/libtor-meminfo.a \
+       src/lib/libtor-meminfo.a \
        src/lib/libtor-osinfo.a \
        src/lib/libtor-log.a \
        src/lib/libtor-lock.a \
@@ -79,7 +79,7 @@ TOR_UTIL_TESTING_LIBS = \
        src/lib/libtor-thread-testing.a \
        src/lib/libtor-memarea-testing.a \
        src/lib/libtor-math-testing.a \
-        src/lib/libtor-meminfo-testing.a \
+       src/lib/libtor-meminfo-testing.a \
        src/lib/libtor-osinfo-testing.a \
        src/lib/libtor-term-testing.a \
        src/lib/libtor-log-testing.a \
@@ -111,7 +111,7 @@ TOR_CRYPTO_TESTING_LIBS = \
 # All static libraries used to link tor.
 TOR_INTERNAL_LIBS = \
        src/or/libtor-app.a \
-        src/lib/libtor-compress.a \
+       src/lib/libtor-compress.a \
        $(TOR_CRYPTO_LIBS) \
        $(TOR_UTIL_LIBS) \
        src/common/libor-event.a \
@@ -122,7 +122,7 @@ TOR_INTERNAL_LIBS = \
 # and tests)
 TOR_INTERNAL_TESTING_LIBS = \
        src/or/libtor-app-testing.a \
-        src/lib/libtor-compress-testing.a \
+       src/lib/libtor-compress-testing.a \
        $(TOR_CRYPTO_TESTING_LIBS) \
        $(TOR_UTIL_TESTING_LIBS) \
        src/common/libor-event-testing.a \

diff --git a/doc/include.am b/doc/include.am
index 7942188eaf53ea3a4da37235d6f8acac2c585cfc..e429d05a49e0045352ffed7fb922a4d825281d86 100644 (file)
--- a/doc/include.am
+++ b/doc/include.am
@@ -29,9 +29,9 @@ doc_DATA =
 endif
 
 EXTRA_DIST+= doc/asciidoc-helper.sh                    \
-             $(html_in) $(man_in) $(txt_in)                    \
-             doc/state-contents.txt                            \
-             doc/torrc_format.txt                              \
+            $(html_in) $(man_in) $(txt_in)                     \
+            doc/state-contents.txt                             \
+            doc/torrc_format.txt                               \
             doc/TUNING                                         \
             doc/HACKING/README.1st.md                          \
             doc/HACKING/CodingStandards.md                     \

diff --git a/src/lib/encoding/include.am b/src/lib/encoding/include.am
index cf9fb1b259088a06e4e23d6d554c0f12ef78da8c..868e531b6b0bb5b4b5ec228b634f75fc196aadb5 100644 (file)
--- a/src/lib/encoding/include.am
+++ b/src/lib/encoding/include.am
@@ -6,9 +6,9 @@ endif
 
 src_lib_libtor_encoding_a_SOURCES =                    \
        src/lib/encoding/binascii.c                     \
-        src/lib/encoding/confline.c                    \
-        src/lib/encoding/cstring.c                     \
-        src/lib/encoding/keyval.c                      \
+       src/lib/encoding/confline.c                     \
+       src/lib/encoding/cstring.c                      \
+       src/lib/encoding/keyval.c                       \
        src/lib/encoding/time_fmt.c
 
 src_lib_libtor_encoding_testing_a_SOURCES = \
@@ -18,7 +18,7 @@ src_lib_libtor_encoding_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 noinst_HEADERS +=                                      \
        src/lib/encoding/binascii.h                     \
-        src/lib/encoding/confline.h                    \
-        src/lib/encoding/cstring.h                     \
-        src/lib/encoding/keyval.h                      \
+       src/lib/encoding/confline.h                     \
+       src/lib/encoding/cstring.h                      \
+       src/lib/encoding/keyval.h                       \
        src/lib/encoding/time_fmt.h

diff --git a/src/lib/smartlist_core/include.am b/src/lib/smartlist_core/include.am
index 9ee93fdee73cc9d6e276884797f0d965d23051aa..99d65f0b23381592b4311406795cad5034aacff5 100644 (file)
--- a/src/lib/smartlist_core/include.am
+++ b/src/lib/smartlist_core/include.am
@@ -12,7 +12,7 @@ src_lib_libtor_smartlist_core_a_SOURCES =                     \
 src_lib_libtor_smartlist_core_testing_a_SOURCES = \
        $(src_lib_libtor_smartlist_core_a_SOURCES)
 src_lib_libtor_smartlist_core_testing_a_CPPFLAGS = \
-        $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
+       $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
 src_lib_libtor_smartlist_core_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 noinst_HEADERS +=                                      \

diff --git a/src/or/include.am b/src/or/include.am
index ed5d0c95c4e785fd9d6d48ab3983cae4286072d5..491341374d99a04924e21da82a9613c964541e8b 100644 (file)
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -174,7 +174,7 @@ src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_l
 src_or_tor_cov_LDADD = $(TOR_INTERNAL_TESTING_LIBS) \
        @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
        @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ \
-        @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
+       @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
        @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
 endif
 

diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am
index bcf94193f430c2130cc7815ffa2981248063b09f..ecc821a8871ca7743fc2fd587806886e3ec6e37d 100644 (file)
--- a/src/rust/tor_rust/include.am
+++ b/src/rust/tor_rust/include.am
@@ -9,16 +9,16 @@ EXTRA_CARGO_OPTIONS=
                CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
                CARGO_HOME="$(abs_top_builddir)/src/rust" \
                $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \
-               $(CARGO_ONLINE) \
-                --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )
+               $(CARGO_ONLINE) \
+               --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )
 
 distclean-rust:
        ( cd "$(abs_top_builddir)/src/rust" ; \
                CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
                CARGO_HOME="$(abs_top_builddir)/src/rust" \
                $(CARGO) clean $(EXTRA_CARGO_OPTIONS) \
-               $(CARGO_ONLINE) \
-                --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )
+               $(CARGO_ONLINE) \
+               --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )
        rm -rf "$(abs_top_builddir)/src/rust/registry"
 
 if USE_RUST

diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am
index b09e32d431b28402f70cf16afb16dcb0c651137f..87dfe91675251d834bdfa69cbb0bfb1a69b72d66 100644 (file)
--- a/src/test/fuzz/include.am
+++ b/src/test/fuzz/include.am
@@ -17,7 +17,7 @@ FUZZING_LIBS = \
        @TOR_ZSTD_LIBS@
 
 oss-fuzz-prereqs: \
-        $(TOR_INTERNAL_TESTING_LIBS)
+       $(TOR_INTERNAL_TESTING_LIBS)
 
 noinst_HEADERS += \
        src/test/fuzz/fuzzing.h

diff --git a/src/test/include.am b/src/test/include.am
index 1be56bbffc4746e86bcc51b2c5fd91bc84cc2401..827b780ce3e58aade5b686c44b9aea76dcb3e608 100644 (file)
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -11,9 +11,9 @@ TESTS_ENVIRONMENT = \
        export CARGO="$(CARGO)"; \
        export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \
        export CARGO_ONLINE="$(CARGO_ONLINE)"; \
-        export CCLD="$(CCLD)"; \
-        chmod +x "$(abs_top_builddir)/link_rust.sh"; \
-        export RUSTFLAGS="-C linker=$(abs_top_builddir)/link_rust.sh";
+       export CCLD="$(CCLD)"; \
+       chmod +x "$(abs_top_builddir)/link_rust.sh"; \
+       export RUSTFLAGS="-C linker=$(abs_top_builddir)/link_rust.sh";
 
 TESTSCRIPTS = \
        src/test/fuzz_static_testcases.sh \
@@ -72,8 +72,8 @@ noinst_PROGRAMS+= \
 endif
 
 src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
-        -DLOCALSTATEDIR="\"$(localstatedir)\"" \
-        -DBINDIR="\"$(bindir)\""              \
+       -DLOCALSTATEDIR="\"$(localstatedir)\"" \
+       -DBINDIR="\"$(bindir)\""               \
        -DTOR_UNIT_TESTS                       \
        $(AM_CPPFLAGS)
 
@@ -226,9 +226,9 @@ src_test_test_switch_id_LDADD = \
        @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
 
 src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
-        @TOR_LDFLAGS_libevent@
+       @TOR_LDFLAGS_libevent@
 src_test_test_LDADD = \
-        $(TOR_INTERNAL_TESTING_LIBS) \
+       $(TOR_INTERNAL_TESTING_LIBS) \
        $(rust_ldadd) \
        @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
        @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
@@ -249,9 +249,9 @@ src_test_test_memwipe_LDADD = $(src_test_test_LDADD)
 src_test_test_memwipe_LDFLAGS = $(src_test_test_LDFLAGS) @CFLAGS_BUGTRAP@
 
 src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
-        @TOR_LDFLAGS_libevent@
+       @TOR_LDFLAGS_libevent@
 src_test_bench_LDADD = \
-        $(TOR_INTERNAL_LIBS) \
+       $(TOR_INTERNAL_LIBS) \
        $(rust_ldadd) \
        @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
        @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
@@ -259,9 +259,9 @@ src_test_bench_LDADD = \
        @TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
 
 src_test_test_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
-        @TOR_LDFLAGS_libevent@
+       @TOR_LDFLAGS_libevent@
 src_test_test_workqueue_LDADD = \
-        $(TOR_INTERNAL_TESTING_LIBS) \
+       $(TOR_INTERNAL_TESTING_LIBS) \
        $(rust_ldadd) \
        @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
        @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
@@ -303,7 +303,7 @@ noinst_PROGRAMS+= src/test/test-hs-ntor-cl
 src_test_test_ntor_cl_SOURCES  = src/test/test_ntor_cl.c
 src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
 src_test_test_ntor_cl_LDADD = \
-        $(TOR_INTERNAL_LIBS) \
+       $(TOR_INTERNAL_LIBS) \
        $(rust_ldadd) \
        @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
        @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
@@ -340,7 +340,7 @@ EXTRA_DIST += \
        src/test/fuzz_static_testcases.sh \
        src/test/slownacl_curve25519.py \
        src/test/zero_length_keys.sh \
-        src/test/rust_supp.txt \
+       src/test/rust_supp.txt \
        src/test/test_keygen.sh \
        src/test/test_key_expiration.sh \
        src/test/test_zero_length_keys.sh \

diff --git a/src/tools/include.am b/src/tools/include.am
index e6465233b632ac03481f58859cd25c6dd8146ca7..900154f961ecb220e128b2dfc5f1afe3f4e425d7 100644 (file)
--- a/src/tools/include.am
+++ b/src/tools/include.am
@@ -7,7 +7,7 @@ endif
 src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c
 src_tools_tor_resolve_LDFLAGS =
 src_tools_tor_resolve_LDADD = \
-        $(TOR_UTIL_LIBS) \
+       $(TOR_UTIL_LIBS) \
        $(rust_ldadd) \
        @TOR_LIB_MATH@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_USERENV@
 
@@ -16,15 +16,15 @@ src_tools_tor_cov_resolve_SOURCES = src/tools/tor-resolve.c
 src_tools_tor_cov_resolve_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
 src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 src_tools_tor_cov_resolve_LDADD = \
-        $(TOR_UTIL_TESTING_LIBS) \
+       $(TOR_UTIL_TESTING_LIBS) \
        @TOR_LIB_MATH@ @TOR_LIB_WS32@
 endif
 
 src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c
 src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
 src_tools_tor_gencert_LDADD = \
-        $(TOR_CRYPTO_LIBS) \
-        $(TOR_UTIL_LIBS) \
+       $(TOR_CRYPTO_LIBS) \
+       $(TOR_UTIL_LIBS) \
        $(rust_ldadd) \
        @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
        @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@