nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tabify all of the .am files.

Browse Source
This commit is contained in:
Nick Mathewson 2018-07-01 09:37:28 -04:00
parent 028523c801
commit 43dc92441d
9 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -51,7 +51,7 @@ TOR_UTIL_LIBS = \
src/lib/libtor-thread.a \ src/lib/libtor-thread.a \
src/lib/libtor-memarea.a \ src/lib/libtor-memarea.a \
src/lib/libtor-math.a \ src/lib/libtor-math.a \
src/lib/libtor-meminfo.a \ src/lib/libtor-meminfo.a \
src/lib/libtor-osinfo.a \ src/lib/libtor-osinfo.a \
src/lib/libtor-log.a \ src/lib/libtor-log.a \
src/lib/libtor-lock.a \ src/lib/libtor-lock.a \
@ -79,7 +79,7 @@ TOR_UTIL_TESTING_LIBS = \
src/lib/libtor-thread-testing.a \ src/lib/libtor-thread-testing.a \
src/lib/libtor-memarea-testing.a \ src/lib/libtor-memarea-testing.a \
src/lib/libtor-math-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-osinfo-testing.a \
src/lib/libtor-term-testing.a \ src/lib/libtor-term-testing.a \
src/lib/libtor-log-testing.a \ src/lib/libtor-log-testing.a \
@ -111,7 +111,7 @@ TOR_CRYPTO_TESTING_LIBS = \
# All static libraries used to link tor. # All static libraries used to link tor.
TOR_INTERNAL_LIBS = \ TOR_INTERNAL_LIBS = \
src/or/libtor-app.a \ src/or/libtor-app.a \
src/lib/libtor-compress.a \ src/lib/libtor-compress.a \
$(TOR_CRYPTO_LIBS) \ $(TOR_CRYPTO_LIBS) \
$(TOR_UTIL_LIBS) \ $(TOR_UTIL_LIBS) \
src/common/libor-event.a \ src/common/libor-event.a \
@ -122,7 +122,7 @@ TOR_INTERNAL_LIBS = \
# and tests) # and tests)
TOR_INTERNAL_TESTING_LIBS = \ TOR_INTERNAL_TESTING_LIBS = \
src/or/libtor-app-testing.a \ src/or/libtor-app-testing.a \
src/lib/libtor-compress-testing.a \ src/lib/libtor-compress-testing.a \
$(TOR_CRYPTO_TESTING_LIBS) \ $(TOR_CRYPTO_TESTING_LIBS) \
$(TOR_UTIL_TESTING_LIBS) \ $(TOR_UTIL_TESTING_LIBS) \
src/common/libor-event-testing.a \ src/common/libor-event-testing.a \

6
doc/include.am
View File

@ -29,9 +29,9 @@ doc_DATA =
endif endif
EXTRA_DIST+= doc/asciidoc-helper.sh \ EXTRA_DIST+= doc/asciidoc-helper.sh \
$(html_in) $(man_in) $(txt_in) \ $(html_in) $(man_in) $(txt_in) \
doc/state-contents.txt \ doc/state-contents.txt \
doc/torrc_format.txt \ doc/torrc_format.txt \
doc/TUNING \ doc/TUNING \
doc/HACKING/README.1st.md \ doc/HACKING/README.1st.md \
doc/HACKING/CodingStandards.md \ doc/HACKING/CodingStandards.md \

12
src/lib/encoding/include.am
View File

@ -6,9 +6,9 @@ endif
src_lib_libtor_encoding_a_SOURCES = \ src_lib_libtor_encoding_a_SOURCES = \
src/lib/encoding/binascii.c \ src/lib/encoding/binascii.c \
src/lib/encoding/confline.c \ src/lib/encoding/confline.c \
src/lib/encoding/cstring.c \ src/lib/encoding/cstring.c \
src/lib/encoding/keyval.c \ src/lib/encoding/keyval.c \
src/lib/encoding/time_fmt.c src/lib/encoding/time_fmt.c
src_lib_libtor_encoding_testing_a_SOURCES = \ src_lib_libtor_encoding_testing_a_SOURCES = \
@ -18,7 +18,7 @@ src_lib_libtor_encoding_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
noinst_HEADERS += \ noinst_HEADERS += \
src/lib/encoding/binascii.h \ src/lib/encoding/binascii.h \
src/lib/encoding/confline.h \ src/lib/encoding/confline.h \
src/lib/encoding/cstring.h \ src/lib/encoding/cstring.h \
src/lib/encoding/keyval.h \ src/lib/encoding/keyval.h \
src/lib/encoding/time_fmt.h src/lib/encoding/time_fmt.h

2
src/lib/smartlist_core/include.am
View File

@ -12,7 +12,7 @@ src_lib_libtor_smartlist_core_a_SOURCES = \
src_lib_libtor_smartlist_core_testing_a_SOURCES = \ src_lib_libtor_smartlist_core_testing_a_SOURCES = \
$(src_lib_libtor_smartlist_core_a_SOURCES) $(src_lib_libtor_smartlist_core_a_SOURCES)
src_lib_libtor_smartlist_core_testing_a_CPPFLAGS = \ 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) src_lib_libtor_smartlist_core_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
noinst_HEADERS += \ noinst_HEADERS += \

2
src/or/include.am
View File

@ -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) \ src_or_tor_cov_LDADD = $(TOR_INTERNAL_TESTING_LIBS) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ \ @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@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
endif endif

8
src/rust/tor_rust/include.am
View File

@ -9,16 +9,16 @@ EXTRA_CARGO_OPTIONS=
CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
CARGO_HOME="$(abs_top_builddir)/src/rust" \ CARGO_HOME="$(abs_top_builddir)/src/rust" \
$(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \ $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \
$(CARGO_ONLINE) \ $(CARGO_ONLINE) \
--manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )
distclean-rust: distclean-rust:
( cd "$(abs_top_builddir)/src/rust" ; \ ( cd "$(abs_top_builddir)/src/rust" ; \
CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
CARGO_HOME="$(abs_top_builddir)/src/rust" \ CARGO_HOME="$(abs_top_builddir)/src/rust" \
$(CARGO) clean $(EXTRA_CARGO_OPTIONS) \ $(CARGO) clean $(EXTRA_CARGO_OPTIONS) \
$(CARGO_ONLINE) \ $(CARGO_ONLINE) \
--manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )
rm -rf "$(abs_top_builddir)/src/rust/registry" rm -rf "$(abs_top_builddir)/src/rust/registry"
if USE_RUST if USE_RUST

2
src/test/fuzz/include.am
View File

@ -17,7 +17,7 @@ FUZZING_LIBS = \
@TOR_ZSTD_LIBS@ @TOR_ZSTD_LIBS@
oss-fuzz-prereqs: \ oss-fuzz-prereqs: \
$(TOR_INTERNAL_TESTING_LIBS) $(TOR_INTERNAL_TESTING_LIBS)
noinst_HEADERS += \ noinst_HEADERS += \
src/test/fuzz/fuzzing.h src/test/fuzz/fuzzing.h

26
src/test/include.am
View File

@ -11,9 +11,9 @@ TESTS_ENVIRONMENT = \
export CARGO="$(CARGO)"; \ export CARGO="$(CARGO)"; \
export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \ export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \
export CARGO_ONLINE="$(CARGO_ONLINE)"; \ export CARGO_ONLINE="$(CARGO_ONLINE)"; \
export CCLD="$(CCLD)"; \ export CCLD="$(CCLD)"; \
chmod +x "$(abs_top_builddir)/link_rust.sh"; \ chmod +x "$(abs_top_builddir)/link_rust.sh"; \
export RUSTFLAGS="-C linker=$(abs_top_builddir)/link_rust.sh"; export RUSTFLAGS="-C linker=$(abs_top_builddir)/link_rust.sh";
TESTSCRIPTS = \ TESTSCRIPTS = \
src/test/fuzz_static_testcases.sh \ src/test/fuzz_static_testcases.sh \
@ -72,8 +72,8 @@ noinst_PROGRAMS+= \
endif endif
src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
-DLOCALSTATEDIR="\"$(localstatedir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \
-DBINDIR="\"$(bindir)\"" \ -DBINDIR="\"$(bindir)\"" \
-DTOR_UNIT_TESTS \ -DTOR_UNIT_TESTS \
$(AM_CPPFLAGS) $(AM_CPPFLAGS)
@ -226,9 +226,9 @@ src_test_test_switch_id_LDADD = \
@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
@TOR_LDFLAGS_libevent@ @TOR_LDFLAGS_libevent@
src_test_test_LDADD = \ src_test_test_LDADD = \
$(TOR_INTERNAL_TESTING_LIBS) \ $(TOR_INTERNAL_TESTING_LIBS) \
$(rust_ldadd) \ $(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @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_test_memwipe_LDFLAGS = $(src_test_test_LDFLAGS) @CFLAGS_BUGTRAP@
src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
@TOR_LDFLAGS_libevent@ @TOR_LDFLAGS_libevent@
src_test_bench_LDADD = \ src_test_bench_LDADD = \
$(TOR_INTERNAL_LIBS) \ $(TOR_INTERNAL_LIBS) \
$(rust_ldadd) \ $(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @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@ @TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@
src_test_test_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ src_test_test_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
@TOR_LDFLAGS_libevent@ @TOR_LDFLAGS_libevent@
src_test_test_workqueue_LDADD = \ src_test_test_workqueue_LDADD = \
$(TOR_INTERNAL_TESTING_LIBS) \ $(TOR_INTERNAL_TESTING_LIBS) \
$(rust_ldadd) \ $(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @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_SOURCES = src/test/test_ntor_cl.c
src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
src_test_test_ntor_cl_LDADD = \ src_test_test_ntor_cl_LDADD = \
$(TOR_INTERNAL_LIBS) \ $(TOR_INTERNAL_LIBS) \
$(rust_ldadd) \ $(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @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/fuzz_static_testcases.sh \
src/test/slownacl_curve25519.py \ src/test/slownacl_curve25519.py \
src/test/zero_length_keys.sh \ src/test/zero_length_keys.sh \
src/test/rust_supp.txt \ src/test/rust_supp.txt \
src/test/test_keygen.sh \ src/test/test_keygen.sh \
src/test/test_key_expiration.sh \ src/test/test_key_expiration.sh \
src/test/test_zero_length_keys.sh \ src/test/test_zero_length_keys.sh \

8
src/tools/include.am
View File

@ -7,7 +7,7 @@ endif
src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c
src_tools_tor_resolve_LDFLAGS = src_tools_tor_resolve_LDFLAGS =
src_tools_tor_resolve_LDADD = \ src_tools_tor_resolve_LDADD = \
$(TOR_UTIL_LIBS) \ $(TOR_UTIL_LIBS) \
$(rust_ldadd) \ $(rust_ldadd) \
@TOR_LIB_MATH@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_USERENV@ @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_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
src_tools_tor_cov_resolve_LDADD = \ src_tools_tor_cov_resolve_LDADD = \
$(TOR_UTIL_TESTING_LIBS) \ $(TOR_UTIL_TESTING_LIBS) \
@TOR_LIB_MATH@ @TOR_LIB_WS32@ @TOR_LIB_MATH@ @TOR_LIB_WS32@
endif endif
src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c 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_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
src_tools_tor_gencert_LDADD = \ src_tools_tor_gencert_LDADD = \
$(TOR_CRYPTO_LIBS) \ $(TOR_CRYPTO_LIBS) \
$(TOR_UTIL_LIBS) \ $(TOR_UTIL_LIBS) \
$(rust_ldadd) \ $(rust_ldadd) \
@TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@