diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-25 08:12:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-25 08:12:59 -0400 |
| commit | ba405f86bf33ed0e6c9552b3d9aad87bb79c1237 (patch) | |
| tree | 4f50dd06a62263594e69c701253d4a632d1c7574 /src/or/include.am | |
| parent | db95a6e17129b51e0409dbcad1707367f9388173 (diff) | |
| parent | 2210b330e757d234346191e5d05af761fe8561e6 (diff) | |
| download | tor-ba405f86bf33ed0e6c9552b3d9aad87bb79c1237.tar.gz tor-ba405f86bf33ed0e6c9552b3d9aad87bb79c1237.zip | |
Merge branch 'ahf_prop278_21662_squashed'
Diffstat (limited to 'src/or/include.am')
| -rw-r--r-- | src/or/include.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/include.am b/src/or/include.am index dd27bc8411..483ea2f2aa 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -121,7 +121,8 @@ src_or_tor_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-ctime.a \ 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@ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ + @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ if COVERAGE_ENABLED src_or_tor_cov_SOURCES = src/or/tor_main.c @@ -133,7 +134,8 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ 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@ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ + @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ endif ORHEADERS = \ |