mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.3.4'

Browse source
This commit is contained in:
Nick Mathewson 2018-06-19 19:10:28 -04:00
commit b63d6984a6
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/or/include.am
View file

@ -116,8 +116,9 @@ LIBTOR_A_SOURCES = \
# Modules are conditionnally compiled in tor starting here. We add the C files # Modules are conditionnally compiled in tor starting here. We add the C files
# only if the modules has been enabled at configure time. We always add the # only if the modules has been enabled at configure time. We always add the
# source files of every module to libtor-testing.a so we can build the unit # source files of every module to libtor-testing.a so we can build the unit
# tests for everything. # tests for everything. See the UNITTESTS_ENABLED branch below.
# #
LIBTOR_TESTING_A_SOURCES = $(LIBTOR_A_SOURCES)
# The Directory Authority module. # The Directory Authority module.
MODULE_DIRAUTH_SOURCES = \ MODULE_DIRAUTH_SOURCES = \
@ -131,7 +132,11 @@ endif
src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
if UNITTESTS_ENABLED if UNITTESTS_ENABLED
src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
# Add the sources of the modules that are needed for tests to work here.
LIBTOR_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
src_or_libtor_testing_a_SOURCES = $(LIBTOR_TESTING_A_SOURCES)
else else
src_or_libtor_testing_a_SOURCES = src_or_libtor_testing_a_SOURCES =
endif endif