diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-27 12:52:31 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-27 12:52:31 -0400 |
commit | b9b05e437d09c4d06b554d0484c7ae1a3aa1d647 (patch) | |
tree | ea45c980cb972a74be77ae7813dc249ff31ab4e8 /Makefile.am | |
parent | 300e3bebd19b2686501d5400da1ca4a748027ba4 (diff) | |
parent | d893be190fc244330543c9e98613a3f0daebc6ed (diff) | |
download | tor-b9b05e437d09c4d06b554d0484c7ae1a3aa1d647.tar.gz tor-b9b05e437d09c4d06b554d0484c7ae1a3aa1d647.zip |
Merge branch 'net_refactor'
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 482189eebd..c151d441cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,6 +41,7 @@ endif TOR_UTIL_LIBS = \ src/common/libor.a \ src/lib/libtor-container.a \ + src/lib/libtor-net.a \ src/lib/libtor-log.a \ src/lib/libtor-lock.a \ src/lib/libtor-fdio.a \ @@ -57,6 +58,7 @@ TOR_UTIL_LIBS = \ TOR_UTIL_TESTING_LIBS = \ src/common/libor-testing.a \ src/lib/libtor-container-testing.a \ + src/lib/libtor-net-testing.a \ src/lib/libtor-log-testing.a \ src/lib/libtor-lock-testing.a \ src/lib/libtor-fdio-testing.a \ |