diff options
author | Nick Mathewson <nickm@torproject.org> | 2019-12-19 07:55:06 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2019-12-19 07:55:06 -0500 |
commit | a6ba56761b6dc22011eee015f371d37d7b399a64 (patch) | |
tree | 77a53e71a12098296a8931342679fc9fbfa36222 /src/core | |
parent | 5c98a42f491145a0d706ba01bfc1947477f76534 (diff) | |
parent | 13df7449217cec5d4a9baf73adec850614b43633 (diff) | |
download | tor-a6ba56761b6dc22011eee015f371d37d7b399a64.tar.gz tor-a6ba56761b6dc22011eee015f371d37d7b399a64.zip |
Merge branch 'dirauth_config_squashed'
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/include.am | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/core/include.am b/src/core/include.am index 83230fb3ca..911932d46b 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -157,6 +157,11 @@ LIBTOR_APP_A_SOURCES = \ src/feature/stats/rephist.c \ src/feature/stats/predict_ports.c +# +# Sources that we only add for the real libtor_a, and not for testing. +# +LIBTOR_APP_A_STUB_SOURCES = + if BUILD_NT_SERVICES LIBTOR_APP_A_SOURCES += src/app/main/ntmain.c endif @@ -199,13 +204,19 @@ MODULE_DIRAUTH_SOURCES = \ if BUILD_MODULE_RELAY LIBTOR_APP_A_SOURCES += $(MODULE_RELAY_SOURCES) +else +LIBTOR_APP_A_STUB_SOURCES += src/feature/relay/relay_stub.c endif if BUILD_MODULE_DIRAUTH LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) +else +LIBTOR_APP_A_STUB_SOURCES += src/feature/dirauth/dirauth_stub.c endif -src_core_libtor_app_a_SOURCES = $(LIBTOR_APP_A_SOURCES) +src_core_libtor_app_a_SOURCES = \ + $(LIBTOR_APP_A_SOURCES) \ + $(LIBTOR_APP_A_STUB_SOURCES) if UNITTESTS_ENABLED # Add the sources of the modules that are needed for tests to work here. @@ -344,6 +355,8 @@ noinst_HEADERS += \ src/feature/dirauth/bridgeauth.h \ src/feature/dirauth/bwauth.h \ src/feature/dirauth/dirauth_config.h \ + src/feature/dirauth/dirauth_options.inc \ + src/feature/dirauth/dirauth_options_st.h \ src/feature/dirauth/dirauth_periodic.h \ src/feature/dirauth/dirauth_sys.h \ src/feature/dirauth/dircollate.h \ |