aboutsummaryrefslogtreecommitdiff
path: root/src/common/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-09 13:45:27 -0400
committerNick Mathewson <nickm@torproject.org>2014-06-14 11:40:27 -0400
commit4ed03965a5a412bf58540e678f48f6c331ad30d9 (patch)
tree3f5b5783104d00129773c2e07a170b824373cf57 /src/common/include.am
parent87e16087b74d1348a1500a24cce238a2463822dc (diff)
downloadtor-4ed03965a5a412bf58540e678f48f6c331ad30d9.tar
tor-4ed03965a5a412bf58540e678f48f6c331ad30d9.tar.gz
New waitpid-handler functions to run callbacks when a child exits.
Also, move 'procmon' into libor_event library, since it uses libevent.
Diffstat (limited to 'src/common/include.am')
-rw-r--r--src/common/include.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/common/include.am b/src/common/include.am
index 7b2465cd8..c9dcedd52 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -57,9 +57,9 @@ LIBOR_A_SOURCES = \
src/common/log.c \
src/common/memarea.c \
src/common/mempool.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)
@@ -72,7 +72,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)
@@ -111,7 +113,8 @@ COMMONHEADERS = \
src/common/torint.h \
src/common/torlog.h \
src/common/tortls.h \
- src/common/util.h
+ src/common/util.h \
+ src/common/util_process.h
noinst_HEADERS+= $(COMMONHEADERS)