diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-10-23 10:33:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-10-23 10:33:07 -0400 |
| commit | 2908086694ee3822c8d3116952bec5a415387d75 (patch) | |
| tree | f91342c8b52ad57e995c4dabe815fd0b0520e84c /src/app/include.am | |
| parent | 0d420918e71f94bec3fd4c5010e570b45667d48d (diff) | |
| parent | e834702f9d33f228815403055666e957b33c1857 (diff) | |
| download | tor-2908086694ee3822c8d3116952bec5a415387d75.tar.gz tor-2908086694ee3822c8d3116952bec5a415387d75.zip | |
Merge branch 'combined_libs'
Diffstat (limited to 'src/app/include.am')
| -rw-r--r-- | src/app/include.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/app/include.am b/src/app/include.am index 8488a1bf19..b81fad0276 100644 --- a/src/app/include.am +++ b/src/app/include.am @@ -15,7 +15,7 @@ src_app_tor_SOURCES = src/app/main/tor_main.c # matters a lot there, and is quite hard to debug if you forget to do it. src_app_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) @TOR_LDFLAGS_libevent@ -src_app_tor_LDADD = $(TOR_INTERNAL_LIBS) \ +src_app_tor_LDADD = libtor.a \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -27,7 +27,7 @@ src_app_tor_cov_SOURCES = $(src_app_tor_SOURCES) src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) @TOR_LDFLAGS_libevent@ -src_app_tor_cov_LDADD = $(TOR_INTERNAL_TESTING_LIBS) \ +src_app_tor_cov_LDADD = src/test/libtor-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ |