aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-27 14:45:14 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-27 14:45:14 -0400
commit21136037182f55b5aef3730853e65fa2c7ebd722 (patch)
treeb7c34c053994378170a4b080adcc1c77ccc51b40 /Makefile.am
parentb9b05e437d09c4d06b554d0484c7ae1a3aa1d647 (diff)
parent05040a9e84caab86fb66793a7604887d2aaaa2d9 (diff)
downloadtor-21136037182f55b5aef3730853e65fa2c7ebd722.tar.gz
tor-21136037182f55b5aef3730853e65fa2c7ebd722.zip
Merge branch 'sandbox_refactor'
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 c151d441cc..c10790c52c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,7 @@ endif
# "Common" libraries used to link tor's utility code.
TOR_UTIL_LIBS = \
src/common/libor.a \
+ src/lib/libtor-sandbox.a \
src/lib/libtor-container.a \
src/lib/libtor-net.a \
src/lib/libtor-log.a \
@@ -57,6 +58,7 @@ TOR_UTIL_LIBS = \
# and tests)
TOR_UTIL_TESTING_LIBS = \
src/common/libor-testing.a \
+ src/lib/libtor-sandbox-testing.a \
src/lib/libtor-container-testing.a \
src/lib/libtor-net-testing.a \
src/lib/libtor-log-testing.a \