commit ae6e60281c44cc34189c5f3cd6114aed2b2a9bc4
Author: Nick Mathewson <ni...@torproject.org>
Date:   Wed Sep 11 10:22:01 2019 -0400

    Update include.am files to refer to new location of confparse.[ch]
    
    Tests should now pass again.
---
 src/core/include.am        | 2 --
 src/lib/confmgt/include.am | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/include.am b/src/core/include.am
index 914c370ec..9b4b251c8 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -9,7 +9,6 @@ endif
 # ADD_C_FILE: INSERT SOURCES HERE.
 LIBTOR_APP_A_SOURCES =                                 \
        src/app/config/config.c                 \
-       src/app/config/confparse.c              \
        src/app/config/statefile.c              \
        src/app/main/main.c                     \
        src/app/main/shutdown.c                 \
@@ -214,7 +213,6 @@ src_core_libtor_app_testing_a_CFLAGS = $(AM_CFLAGS) 
$(TEST_CFLAGS)
 # ADD_C_FILE: INSERT HEADERS HERE.
 noinst_HEADERS +=                                      \
        src/app/config/config.h                         \
-       src/app/config/confparse.h                      \
        src/app/config/or_options_st.h                  \
        src/app/config/or_state_st.h                    \
        src/app/config/statefile.h                      \
diff --git a/src/lib/confmgt/include.am b/src/lib/confmgt/include.am
index aa5b37fdb..81cd868e5 100644
--- a/src/lib/confmgt/include.am
+++ b/src/lib/confmgt/include.am
@@ -6,6 +6,7 @@ endif
 
 # ADD_C_FILE: INSERT SOURCES HERE.
 src_lib_libtor_confmgt_a_SOURCES =                     \
+       src/lib/confmgt/confparse.c                     \
        src/lib/confmgt/structvar.c                      \
        src/lib/confmgt/type_defs.c                      \
        src/lib/confmgt/typedvar.c                      \
@@ -18,6 +19,7 @@ src_lib_libtor_confmgt_testing_a_CFLAGS = $(AM_CFLAGS) 
$(TEST_CFLAGS)
 
 # ADD_C_FILE: INSERT HEADERS HERE.
 noinst_HEADERS +=                                      \
+       src/lib/confmgt/confparse.h                     \
        src/lib/confmgt/structvar.h                     \
        src/lib/confmgt/type_defs.h                     \
        src/lib/confmgt/typedvar.h                      \



_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to