diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-06 13:59:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-06 13:59:40 -0400 |
| commit | 10c782d7fa227bb426af5bcbe0073c366d93594a (patch) | |
| tree | a6ea441483899b3495f47ba185fb48d05e64d45a | |
| parent | 8b0920bb6f0d52402026d38dcc8405c0ff263dbb (diff) | |
| download | tor-10c782d7fa227bb426af5bcbe0073c366d93594a.tar.gz tor-10c782d7fa227bb426af5bcbe0073c366d93594a.zip | |
Move ntmain.c into libtor-app again
It's needed by main.c
Fixes bug 26662; bug not in any released Tor.
| -rw-r--r-- | src/app/include.am | 3 | ||||
| -rw-r--r-- | src/core/include.am | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/app/include.am b/src/app/include.am index 8e86bbeeb5..7cf20191ab 100644 --- a/src/app/include.am +++ b/src/app/include.am @@ -9,9 +9,6 @@ noinst_HEADERS += \ src/app/main/ntmain.h src_app_tor_SOURCES = src/app/main/tor_main.c -if BUILD_NT_SERVICES -src_app_tor_SOURCES += src/app/main/ntmain.c -endif # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. # This seems to matter nowhere but on windows, but I assure you that it diff --git a/src/core/include.am b/src/core/include.am index b35367ccbb..1f37044e9a 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -101,6 +101,10 @@ LIBTOR_APP_A_SOURCES = \ src/feature/stats/geoip.c \ src/feature/stats/rephist.c +if BUILD_NT_SERVICES +LIBTOR_APP_A_SOURCES += src/app/main/ntmain.c +endif + # # 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 |