diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-13 09:46:50 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-13 09:46:50 -0400 |
commit | 8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8 (patch) | |
tree | 4a794d685c23d8d6622108a542d458fa66448433 /src/common | |
parent | 1b04dab60c549d9f0d621e1a115cab8a49c839f9 (diff) | |
parent | b7fae0f48ce63371cd2454a0b59d423778a2a7c6 (diff) | |
download | tor-8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8.tar.gz tor-8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8.zip |
Merge remote-tracking branch 'rl1987/bug24891'
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/include.am | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/common/include.am b/src/common/include.am index bce3fa20f6..cfaf993674 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -74,7 +74,11 @@ LIBOR_CTIME_A_SRC = \ src/common/di_ops.c src_common_libor_ctime_a_SOURCES = $(LIBOR_CTIME_A_SRC) +if UNITTESTS_ENABLED src_common_libor_ctime_testing_a_SOURCES = $(LIBOR_CTIME_A_SRC) +else +src_common_libor_ctime_testing_a_SOURCES = +endif src_common_libor_ctime_a_CFLAGS = @CFLAGS_CONSTTIME@ src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS) @@ -137,9 +141,15 @@ src_common_libor_a_SOURCES = $(LIBOR_A_SRC) src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SRC) +if UNITTESTS_ENABLED src_common_libor_testing_a_SOURCES = $(LIBOR_A_SRC) src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SRC) +else +src_common_libor_testing_a_SOURCES = +src_common_libor_crypto_testing_a_SOURCES = +src_common_libor_event_testing_a_SOURCES = +endif src_common_libor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_common_libor_crypto_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) |