diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-06-14 11:46:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-06-14 11:46:38 -0400 |
| commit | a7cafb1ea9307864c94ad3e019af93d09d48350e (patch) | |
| tree | 1c6cc26fb0a93f46d839b3cb46855c93aca135f4 /src/common/include.am | |
| parent | a58d94fb7c6c304ecba930eaa7ebbade1d0686ab (diff) | |
| parent | e07d328457b26babe89abdcc1d5a550ee8273462 (diff) | |
| download | tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.tar tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.tar.gz | |
Merge branch 'bug8746_v2_squashed'
Conflicts:
src/common/include.am
Diffstat (limited to 'src/common/include.am')
| -rw-r--r-- | src/common/include.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/common/include.am b/src/common/include.am index 61a90cd35..68e0110c2 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -64,9 +64,9 @@ LIBOR_A_SOURCES = \ src/common/di_ops.c \ src/common/log.c \ src/common/memarea.c \ - src/common/procmon.c \ src/common/util.c \ src/common/util_codedigest.c \ + src/common/util_process.c \ src/common/sandbox.c \ src/ext/csiphash.c \ $(libor_extra_source) \ @@ -80,7 +80,9 @@ LIBOR_CRYPTO_A_SOURCES = \ src/common/tortls.c \ $(libcrypto_extra_source) -LIBOR_EVENT_A_SOURCES = src/common/compat_libevent.c +LIBOR_EVENT_A_SOURCES = \ + src/common/compat_libevent.c \ + src/common/procmon.c src_common_libor_a_SOURCES = $(LIBOR_A_SOURCES) src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES) @@ -119,6 +121,7 @@ COMMONHEADERS = \ src/common/torlog.h \ src/common/tortls.h \ src/common/util.h \ + src/common/util_process.h \ $(libor_mempool_header) noinst_HEADERS+= $(COMMONHEADERS) |