diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-20 14:10:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-20 14:10:52 -0500 |
| commit | 7b0cbf22c0fb347db1e7436464865d395aed0ce5 (patch) | |
| tree | 90d202086d3e75187bf42017797f8a101ffb15d3 /src/or | |
| parent | 14c9b9905180a21b8aa648b642ff5d3f7d86e29f (diff) | |
| parent | 081b159abc6cc89942dc11bd5745ec0fd5cc25bb (diff) | |
| download | tor-7b0cbf22c0fb347db1e7436464865d395aed0ce5.tar.gz tor-7b0cbf22c0fb347db1e7436464865d395aed0ce5.zip | |
Merge remote-tracking branch 'yawning/feature17783_take2'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/include.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/include.am b/src/or/include.am index 5ec96e5a93..dab0048b10 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -109,7 +109,7 @@ src_or_libtor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_or_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \ - src/common/libor-crypto.a $(LIBDONNA) \ + src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ src/common/libor-event.a src/trunnel/libor-trunnel.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ @@ -120,7 +120,7 @@ src_or_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_or_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ - src/common/libor-crypto-testing.a $(LIBDONNA) \ + src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ |