diff options
author | rl1987 <rl1987@sdf.lonestar.org> | 2018-07-16 10:49:40 +0000 |
---|---|---|
committer | rl1987 <rl1987@sdf.lonestar.org> | 2018-07-16 10:49:40 +0000 |
commit | d663ef9858060c6dde4dfb84fcde07ebe1f347d0 (patch) | |
tree | 4afcb98e52d2db5a86c8ee2a6a3183520c3a7963 /Makefile.am | |
parent | ef234ba303a358f956d4c2afded388b54cfc91bc (diff) | |
download | tor-d663ef9858060c6dde4dfb84fcde07ebe1f347d0.tar.gz tor-d663ef9858060c6dde4dfb84fcde07ebe1f347d0.zip |
Fix build to work with --disable-unittests again
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 0f934cf0f2..202197f5f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,7 @@ TOR_UTIL_LIBS = \ # 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-process-testing.a \ src/lib/libtor-time-testing.a \ @@ -90,6 +91,7 @@ TOR_UTIL_TESTING_LIBS = \ src/lib/libtor-err-testing.a \ src/lib/libtor-intmath.a \ src/lib/libtor-ctime-testing.a +endif # Internal crypto libraries used in Tor TOR_CRYPTO_LIBS = \ @@ -100,11 +102,13 @@ TOR_CRYPTO_LIBS = \ # 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 = \ @@ -118,6 +122,7 @@ TOR_INTERNAL_LIBS = \ # 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 \ @@ -126,6 +131,7 @@ TOR_INTERNAL_TESTING_LIBS = \ $(TOR_UTIL_TESTING_LIBS) \ src/trunnel/libor-trunnel-testing.a \ src/lib/libtor-trace.a +endif # All libraries used to link tor-cov |