aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2019-07-23 09:46:29 -0400
committerDavid Goulet <dgoulet@torproject.org>2019-07-23 09:46:29 -0400
commitef2dd1ba967eb457c3ace590e4a00d14cb6cf854 (patch)
treef61a7db60287c5b30bb0c3e79576f1e76724eca8 /Makefile.am
parent2fce1274de5bcfd053d6b4b4b5858f6061eb2989 (diff)
parent3e34840a77c45da3575b8a929ed8bbd7370aad63 (diff)
downloadtor-ef2dd1ba967eb457c3ace590e4a00d14cb6cf854.tar.gz
tor-ef2dd1ba967eb457c3ace590e4a00d14cb6cf854.zip
Merge branch 'tor-github/pr/1116'
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index e823f9e103..309696ede9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ TOR_UTIL_LIBS = \
src/lib/libtor-geoip.a \
src/lib/libtor-process.a \
src/lib/libtor-buf.a \
+ src/lib/libtor-confmgt.a \
src/lib/libtor-pubsub.a \
src/lib/libtor-dispatch.a \
src/lib/libtor-time.a \
@@ -74,6 +75,7 @@ TOR_UTIL_TESTING_LIBS = \
src/lib/libtor-geoip-testing.a \
src/lib/libtor-process-testing.a \
src/lib/libtor-buf-testing.a \
+ src/lib/libtor-confmgt-testing.a \
src/lib/libtor-pubsub-testing.a \
src/lib/libtor-dispatch-testing.a \
src/lib/libtor-time-testing.a \