Prop#329: Add conflux to build

Signed-off-by: David Goulet <dgoulet@torproject.org>

diff --git a/src/core/or/include.am b/src/core/or/include.am
index 9a4841e937282d43891c05cc877ddd6119cc6173..12456b98dd7355d0105fbe96861d4f87e71f6f18 100644 (file)
--- a/src/core/or/include.am
+++ b/src/core/or/include.am
@@ -39,6 +39,12 @@ LIBTOR_APP_A_SOURCES +=                              \
        src/core/or/congestion_control_nola.c                   \
        src/core/or/congestion_control_westwood.c                       \
        src/core/or/congestion_control_flow.c                   \
+       src/core/or/conflux.c                   \
+       src/core/or/conflux_cell.c                      \
+       src/core/or/conflux_params.c                    \
+       src/core/or/conflux_pool.c                      \
+       src/core/or/conflux_sys.c                       \
+       src/core/or/conflux_util.c                      \
        src/core/or/status.c                    \
        src/core/or/versions.c
 
@@ -109,7 +115,12 @@ noinst_HEADERS +=                                  \
        src/core/or/congestion_control_nola.h                           \
        src/core/or/congestion_control_westwood.h                               \
        src/core/or/conflux.h                           \
+       src/core/or/conflux_cell.h                      \
+       src/core/or/conflux_params.h                    \
+       src/core/or/conflux_pool.h                      \
        src/core/or/conflux_st.h                                \
+       src/core/or/conflux_sys.h                       \
+       src/core/or/conflux_util.h                      \
        src/core/or/server_port_cfg_st.h                \
        src/core/or/socks_request_st.h                  \
        src/core/or/status.h                            \