summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-03-26 20:13:49 -0400
committerNick Mathewson <nickm@torproject.org>2019-03-26 20:13:49 -0400
commita47b61f329fbe06b7b4935cf9c1923d96a74b649 (patch)
tree283c23aa4230a26fe9b40b1001cb05a457995b4d /Makefile.am
parent57999e330b82fa3a360406dfb28b7a35fb50d602 (diff)
parent3767eff9bb712bccc86718647c7dc84998a7f95f (diff)
downloadtor-a47b61f329fbe06b7b4935cf9c1923d96a74b649.tar.gz
tor-a47b61f329fbe06b7b4935cf9c1923d96a74b649.zip
Merge branch 'messaging_v3' into messaging_v3_merged
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index eea7c3a12f..673643cd31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,8 @@ TOR_UTIL_LIBS = \
src/lib/libtor-geoip.a \
src/lib/libtor-process.a \
src/lib/libtor-buf.a \
+ src/lib/libtor-pubsub.a \
+ src/lib/libtor-dispatch.a \
src/lib/libtor-time.a \
src/lib/libtor-fs.a \
src/lib/libtor-encoding.a \
@@ -72,6 +74,8 @@ 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-pubsub-testing.a \
+ src/lib/libtor-dispatch-testing.a \
src/lib/libtor-time-testing.a \
src/lib/libtor-fs-testing.a \
src/lib/libtor-encoding-testing.a \