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/or/include.am | |
| parent | 1b04dab60c549d9f0d621e1a115cab8a49c839f9 (diff) | |
| parent | b7fae0f48ce63371cd2454a0b59d423778a2a7c6 (diff) | |
| download | tor-8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8.tar.gz tor-8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8.zip | |
Merge remote-tracking branch 'rl1987/bug24891'
Diffstat (limited to 'src/or/include.am')
| -rw-r--r-- | src/or/include.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/include.am b/src/or/include.am index bc0b9d2bfb..0e2aac4aae 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -130,7 +130,11 @@ LIBTOR_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) endif src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) +if UNITTESTS_ENABLED src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) $(MODULE_DIRAUTH_SOURCES) +else +src_or_libtor_testing_a_SOURCES = +endif src_or_tor_SOURCES = src/or/tor_main.c AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or |