Move ntmain.c into libtor-app again

It's needed by main.c

Fixes bug 26662; bug not in any released Tor.

diff --git a/src/app/include.am b/src/app/include.am
index 8e86bbeeb592d77ea5e47d5ff6590646336c854b..7cf20191ab89dd9f625c32b0ae69b4454be6e346 100644 (file)
--- 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 b35367ccbbb7ea8427f5a5d50c7f50fc10c1ecc0..1f37044e9a6a0e9e320b4a2bd916dea2df55914f 100644 (file)
--- 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