|
@@ -220,8 +220,7 @@ src_test_test_switch_id_CPPFLAGS= $(src_test_AM_CPPFLAGS)
|
|
|
src_test_test_switch_id_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
|
|
|
src_test_test_switch_id_LDFLAGS = @TOR_LDFLAGS_zlib@
|
|
|
src_test_test_switch_id_LDADD = \
|
|
|
- src/common/libor-testing.a \
|
|
|
- src/common/libor-ctime-testing.a \
|
|
|
+ $(TOR_UTIL_TESTING_LIBS) \
|
|
|
$(rust_ldadd) \
|
|
|
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
|
|
|
@TOR_LIB_WS32@ @TOR_LIB_USERENV@ \
|
|
@@ -229,15 +228,8 @@ src_test_test_switch_id_LDADD = \
|
|
|
|
|
|
src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
|
|
|
@TOR_LDFLAGS_libevent@
|
|
|
-src_test_test_LDADD = src/or/libtor-testing.a \
|
|
|
- src/common/libor-crypto-testing.a \
|
|
|
- $(LIBKECCAK_TINY) \
|
|
|
- $(LIBDONNA) \
|
|
|
- src/common/libor-testing.a \
|
|
|
- src/common/libor-ctime-testing.a \
|
|
|
- src/common/libor-event-testing.a \
|
|
|
- src/trunnel/libor-trunnel-testing.a \
|
|
|
- src/trace/libor-trace.a \
|
|
|
+src_test_test_LDADD = \
|
|
|
+ $(TOR_INTERNAL_TESTING_LIBS) \
|
|
|
$(rust_ldadd) \
|
|
|
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
|
|
|
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
|
|
@@ -259,11 +251,8 @@ src_test_test_memwipe_LDFLAGS = $(src_test_test_LDFLAGS) @CFLAGS_BUGTRAP@
|
|
|
|
|
|
src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
|
|
|
@TOR_LDFLAGS_libevent@
|
|
|
-src_test_bench_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 \
|
|
|
- src/trace/libor-trace.a \
|
|
|
+src_test_bench_LDADD = \
|
|
|
+ $(TOR_INTERNAL_LIBS) \
|
|
|
$(rust_ldadd) \
|
|
|
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
|
|
|
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
|
|
@@ -272,12 +261,8 @@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \
|
|
|
|
|
|
src_test_test_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
|
|
|
@TOR_LDFLAGS_libevent@
|
|
|
-src_test_test_workqueue_LDADD = src/or/libtor-testing.a \
|
|
|
- src/common/libor-testing.a \
|
|
|
- src/common/libor-ctime-testing.a \
|
|
|
- src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \
|
|
|
- src/common/libor-event-testing.a \
|
|
|
- src/trace/libor-trace.a \
|
|
|
+src_test_test_workqueue_LDADD = \
|
|
|
+ $(TOR_INTERNAL_TESTING_LIBS) \
|
|
|
$(rust_ldadd) \
|
|
|
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
|
|
|
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
|
|
@@ -287,10 +272,9 @@ src_test_test_workqueue_LDADD = src/or/libtor-testing.a \
|
|
|
src_test_test_timers_CPPFLAGS = $(src_test_test_CPPFLAGS)
|
|
|
src_test_test_timers_CFLAGS = $(src_test_test_CFLAGS)
|
|
|
src_test_test_timers_LDADD = \
|
|
|
- src/common/libor-testing.a \
|
|
|
- src/common/libor-ctime-testing.a \
|
|
|
src/common/libor-event-testing.a \
|
|
|
- src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \
|
|
|
+ $(TOR_CRYPTO_TESTING_LIBS) \
|
|
|
+ $(TOR_UTIL_TESTING_LIBS) \
|
|
|
$(rust_ldadd) \
|
|
|
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
|
|
|
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
|
|
@@ -319,10 +303,8 @@ noinst_PROGRAMS+= src/test/test-ntor-cl
|
|
|
noinst_PROGRAMS+= src/test/test-hs-ntor-cl
|
|
|
src_test_test_ntor_cl_SOURCES = src/test/test_ntor_cl.c
|
|
|
src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
|
|
|
-src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
|
|
|
- src/common/libor-ctime.a \
|
|
|
- src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
|
|
|
- src/trace/libor-trace.a \
|
|
|
+src_test_test_ntor_cl_LDADD = \
|
|
|
+ $(TOR_INTERNAL_LIBS) \
|
|
|
$(rust_ldadd) \
|
|
|
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
|
|
|
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
|
|
@@ -332,9 +314,8 @@ src_test_test_ntor_cl_AM_CPPFLAGS = \
|
|
|
|
|
|
src_test_test_hs_ntor_cl_SOURCES = src/test/test_hs_ntor_cl.c
|
|
|
src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
|
|
|
-src_test_test_hs_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
|
|
|
- src/common/libor-ctime.a \
|
|
|
- src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
|
|
|
+src_test_test_hs_ntor_cl_LDADD = \
|
|
|
+ $(TOR_INTERNAL_LIBS) \
|
|
|
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
|
|
|
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
|
|
|
src_test_test_hs_ntor_cl_AM_CPPFLAGS = \
|
|
@@ -343,9 +324,8 @@ src_test_test_hs_ntor_cl_AM_CPPFLAGS = \
|
|
|
|
|
|
noinst_PROGRAMS += src/test/test-bt-cl
|
|
|
src_test_test_bt_cl_SOURCES = src/test/test_bt_cl.c
|
|
|
-src_test_test_bt_cl_LDADD = src/common/libor-testing.a \
|
|
|
- src/common/libor-ctime-testing.a \
|
|
|
- src/trace/libor-trace.a \
|
|
|
+src_test_test_bt_cl_LDADD = \
|
|
|
+ $(TOR_UTIL_TESTING_LIBS) \
|
|
|
$(rust_ldadd) \
|
|
|
@TOR_LIB_MATH@ \
|
|
|
@TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@
|