diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 237 |
1 files changed, 225 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 2c6de35743..803e9d00df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Copyright (c) 2001-2004, Roger Dingledine # Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson -# Copyright (c) 2007-2017, The Tor Project, Inc. +# Copyright (c) 2007-2018, The Tor Project, Inc. # See LICENSE for licensing information ACLOCAL_AMFLAGS = -I m4 @@ -15,33 +15,150 @@ TESTS= noinst_PROGRAMS= DISTCLEANFILES= bin_SCRIPTS= -AM_CPPFLAGS= +AM_CPPFLAGS=\ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/ext \ + -I$(top_srcdir)/src/ext/trunnel \ + -I$(top_srcdir)/src/trunnel + AM_CFLAGS=@TOR_SYSTEMD_CFLAGS@ @CFLAGS_BUGTRAP@ @TOR_LZMA_CFLAGS@ @TOR_ZSTD_CFLAGS@ SHELL=@SHELL@ if COVERAGE_ENABLED -TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov$(EXEEXT) +TESTING_TOR_BINARY=$(top_builddir)/src/app/tor-cov$(EXEEXT) else -TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) +TESTING_TOR_BINARY=$(top_builddir)/src/app/tor$(EXEEXT) endif if USE_RUST -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ +rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH) else rust_ldadd= endif +# "Common" libraries used to link tor's utility code. +TOR_UTIL_LIBS = \ + src/lib/libtor-geoip.a \ + src/lib/libtor-process.a \ + src/lib/libtor-time.a \ + src/lib/libtor-fs.a \ + src/lib/libtor-encoding.a \ + src/lib/libtor-sandbox.a \ + src/lib/libtor-container.a \ + src/lib/libtor-net.a \ + src/lib/libtor-thread.a \ + src/lib/libtor-memarea.a \ + src/lib/libtor-math.a \ + src/lib/libtor-meminfo.a \ + src/lib/libtor-osinfo.a \ + src/lib/libtor-log.a \ + src/lib/libtor-lock.a \ + src/lib/libtor-fdio.a \ + src/lib/libtor-string.a \ + src/lib/libtor-term.a \ + src/lib/libtor-smartlist-core.a \ + src/lib/libtor-malloc.a \ + src/lib/libtor-wallclock.a \ + src/lib/libtor-err.a \ + src/lib/libtor-version.a \ + src/lib/libtor-intmath.a \ + src/lib/libtor-ctime.a + +# Variants of the above for linking the testing variant of tor (for coverage +# and tests) +if UNITTESTS_ENABLED +TOR_UTIL_TESTING_LIBS = \ + src/lib/libtor-geoip-testing.a \ + src/lib/libtor-process-testing.a \ + src/lib/libtor-time-testing.a \ + src/lib/libtor-fs-testing.a \ + src/lib/libtor-encoding-testing.a \ + src/lib/libtor-sandbox-testing.a \ + src/lib/libtor-container-testing.a \ + src/lib/libtor-net-testing.a \ + 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-osinfo-testing.a \ + src/lib/libtor-term-testing.a \ + src/lib/libtor-log-testing.a \ + src/lib/libtor-lock-testing.a \ + src/lib/libtor-fdio-testing.a \ + src/lib/libtor-string-testing.a \ + src/lib/libtor-smartlist-core-testing.a \ + src/lib/libtor-malloc-testing.a \ + src/lib/libtor-wallclock-testing.a \ + src/lib/libtor-err-testing.a \ + src/lib/libtor-version-testing.a \ + src/lib/libtor-intmath.a \ + src/lib/libtor-ctime-testing.a +endif + +# Internal crypto libraries used in Tor +TOR_CRYPTO_LIBS = \ + src/lib/libtor-tls.a \ + src/lib/libtor-crypt-ops.a \ + $(LIBKECCAK_TINY) \ + $(LIBDONNA) + +# Variants of the above for linking the testing variant of tor (for coverage +# and tests) +if UNITTESTS_ENABLED +TOR_CRYPTO_TESTING_LIBS = \ + src/lib/libtor-tls-testing.a \ + src/lib/libtor-crypt-ops-testing.a \ + $(LIBKECCAK_TINY) \ + $(LIBDONNA) +endif + +# All static libraries used to link tor. +TOR_INTERNAL_LIBS = \ + src/core/libtor-app.a \ + src/lib/libtor-compress.a \ + src/lib/libtor-evloop.a \ + $(TOR_CRYPTO_LIBS) \ + $(TOR_UTIL_LIBS) \ + src/trunnel/libor-trunnel.a \ + src/lib/libtor-trace.a + +# Variants of the above for linking the testing variant of tor (for coverage +# and tests) +if UNITTESTS_ENABLED +TOR_INTERNAL_TESTING_LIBS = \ + src/core/libtor-app-testing.a \ + src/lib/libtor-compress-testing.a \ + src/lib/libtor-evloop-testing.a \ + $(TOR_CRYPTO_TESTING_LIBS) \ + $(TOR_UTIL_TESTING_LIBS) \ + src/trunnel/libor-trunnel-testing.a \ + src/lib/libtor-trace.a +endif + +TOR_LDFLAGS_CRYPTLIB=@TOR_LDFLAGS_openssl@ +TOR_LIBS_CRYPTLIB=@TOR_OPENSSL_LIBS@ +TOR_CFLAGS_CRYPTLIB= +if USE_NSS +TOR_CFLAGS_CRYPTLIB+=@NSS_CFLAGS@ +TOR_LIBS_CRYPTLIB+=@NSS_LIBS@ +endif + +# All libraries used to link tor-cov + include src/include.am include doc/include.am include contrib/include.am EXTRA_DIST+= \ ChangeLog \ + CONTRIBUTING \ + CODE_OF_CONDUCT \ INSTALL \ LICENSE \ Makefile.nmake \ README \ ReleaseNotes \ + scripts/maint/checkIncludes.py \ scripts/maint/checkSpace.pl ## This tells etags how to find mockable function definitions. @@ -50,14 +167,14 @@ AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*\([a-zA-Z0-9_]+\)\W*,/\1/s' if COVERAGE_ENABLED TEST_CFLAGS=-fno-inline -fprofile-arcs -ftest-coverage if DISABLE_ASSERTS_IN_UNIT_TESTS -TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE -DDISABLE_ASSERTS_IN_UNIT_TESTS +TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE -DDISABLE_ASSERTS_IN_UNIT_TESTS @TOR_MODULES_ALL_ENABLED@ else -TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE +TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE @TOR_MODULES_ALL_ENABLED@ endif TEST_NETWORK_FLAGS=--coverage --hs-multi-client 1 else TEST_CFLAGS= -TEST_CPPFLAGS=-DTOR_UNIT_TESTS +TEST_CPPFLAGS=-DTOR_UNIT_TESTS @TOR_MODULES_ALL_ENABLED@ TEST_NETWORK_FLAGS=--hs-multi-client 1 endif TEST_NETWORK_WARNING_FLAGS=--quiet --only-warnings @@ -96,7 +213,7 @@ doxygen: test: all $(top_builddir)/src/test/test -check-local: check-spaces check-changes +check-local: check-spaces check-changes check-includes need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ @@ -124,6 +241,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert # because they're incompatible test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) + rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log $(TEST_NETWORK_ALL_LOG_DIR)/*.trs @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \ echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ @@ -147,7 +265,7 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_WARNING_FLAGS); \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ - ! grep -q FAIL test_network_log/*.trs + ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \ @@ -202,13 +320,20 @@ coverage-html-full: all check-spaces: if USE_PERL $(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \ - $(top_srcdir)/src/common/*.[ch] \ - $(top_srcdir)/src/or/*.[ch] \ + $(top_srcdir)/src/lib/*/*.[ch] \ + $(top_srcdir)/src/core/*/*.[ch] \ + $(top_srcdir)/src/feature/*/*.[ch] \ + $(top_srcdir)/src/app/*/*.[ch] \ $(top_srcdir)/src/test/*.[ch] \ $(top_srcdir)/src/test/*/*.[ch] \ $(top_srcdir)/src/tools/*.[ch] endif +check-includes: +if USEPYTHON + $(PYTHON) $(top_srcdir)/scripts/maint/checkIncludes.py +endif + check-docs: all $(PERL) $(top_builddir)/scripts/maint/checkOptionDocs.pl @@ -216,6 +341,71 @@ check-logs: $(top_srcdir)/scripts/maint/checkLogs.pl \ $(top_srcdir)/src/*/*.[ch] | sort -n +.PHONY: check-typos +check-typos: + @if test -x "`which misspell 2>&1;true`"; then \ + echo "Checking for Typos ..."; \ + (misspell \ + $(top_srcdir)/src/[^e]*/*.[ch] \ + $(top_srcdir)/doc \ + $(top_srcdir)/contrib \ + $(top_srcdir)/scripts \ + $(top_srcdir)/README \ + $(top_srcdir)/ChangeLog \ + $(top_srcdir)/INSTALL \ + $(top_srcdir)/ReleaseNotes \ + $(top_srcdir)/LICENSE); \ + else \ + echo "Tor can use misspell to check for typos."; \ + echo "It seems that you don't have misspell installed."; \ + echo "You can install the latest version of misspell here: https://github.com/client9/misspell#install"; \ + fi + +.PHONY: rustfmt +rustfmt: +if USE_RUST + @if test -x "`which cargo-fmt 2>&1;true`"; then \ + echo "Formatting Rust code ..."; \ + (cd "$(top_srcdir)/src/rust" && cargo fmt --all --); \ + else \ + echo "Tor uses rustfmt (via cargo-fmt) to format Rust code."; \ + echo "However, it seems that you don't have rustfmt installed."; \ + printf "You can install rustfmt by following the directions here:"; \ + echo " https://github.com/rust-lang-nursery/rustfmt"; \ + fi +endif + +.PHONY: check-rustfmt +check-rustfmt: +if USE_RUST + @if test -x "`which cargo-fmt 2>&1;true`"; then \ + printf "Running rustfmt..."; \ + (cd "$(top_srcdir)/src/rust" && cargo fmt --all -- --check && echo "done.") || \ + (echo "**************** check-rustfmt failed. ****************"; \ + echo " Run \`make rustfmt\` to apply the above changes."; \ + exit 1); \ + else \ + echo "Tor uses rustfmt (via cargo-fmt) to format Rust code."; \ + echo "However, it seems that you don't have rustfmt installed."; \ + printf "You can install rustfmt by following the directions here:"; \ + echo " https://github.com/rust-lang-nursery/rustfmt"; \ + fi +endif + +.PHONY: clippy +clippy: +if USE_RUST + @if test -x "`which cargo-clippy 2>&1;true`"; then \ + echo "Running cargo clippy ..."; \ + echo "Prepare yourself for the onslaught of suggestions ..."; \ + (cd "$(top_srcdir)/src/rust" && cargo clippy); \ + else \ + echo "Tor can use clippy to lint Rust code."; \ + echo "However, it seems that you don't have clippy installed."; \ + echo "You can install the latest version of clippy by following the directions here: https://github.com/rust-lang-nursery/rust-clippy"; \ + fi +endif + .PHONY: check-changes check-changes: if USEPYTHON @@ -253,3 +443,26 @@ if USE_RUST distclean-local: distclean-rust endif +# This relies on some internal details of how automake implements +# distcheck. We check two directories because automake-1.15 changed +# from $(distdir)/_build to $(distdir)/_build/sub. +show-distdir-testlog: + @if test -d "$(distdir)/_build/sub"; then \ + cat $(distdir)/_build/sub/$(TEST_SUITE_LOG); \ + else \ + cat $(distdir)/_build/$(TEST_SUITE_LOG); fi + +# Similarly, this relies on automake internals to run file on an +# intermittent core file whose provenance is not known to us. See +# ticket 26787. +show-distdir-core: + @if test -d "$(distdir)/_build/sub"; then \ + file $(distdir)/_build/sub/core ; \ + else \ + file $(distdir)/_build/core; fi + +show-libs: + @echo $(TOR_INTERNAL_LIBS) + +show-testing-libs: + @echo $(TOR_INTERNAL_TESTING_LIBS) |