aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/container/smartlist.h1
-rw-r--r--src/lib/log/include.am3
-rw-r--r--src/or/include.am4
3 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/container/smartlist.h b/src/lib/container/smartlist.h
index 7b1d06d7b0..c202e134f9 100644
--- a/src/lib/container/smartlist.h
+++ b/src/lib/container/smartlist.h
@@ -65,6 +65,7 @@ void smartlist_subtract(smartlist_t *sl1, const smartlist_t *sl2);
/* smartlist_choose() is defined in crypto.[ch] */
#ifdef DEBUG_SMARTLIST
#include "lib/err/torerr.h"
+#include <stdlib.h>
/** Return the number of items in sl.
*/
static inline int smartlist_len(const smartlist_t *sl);
diff --git a/src/lib/log/include.am b/src/lib/log/include.am
index e3041ed78d..bbe345de7a 100644
--- a/src/lib/log/include.am
+++ b/src/lib/log/include.am
@@ -15,6 +15,9 @@ src_lib_libtor_log_testing_a_SOURCES = \
src_lib_libtor_log_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_lib_libtor_log_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
+src/lib/log/torlog.$(OBJEXT) \
+ src/lib/log/src_lib_libtor_log_testing_a-torlog.$(OBJEXT): micro-revision.i
+
noinst_HEADERS += \
src/lib/log/ratelim.h \
src/lib/log/torlog.h \
diff --git a/src/or/include.am b/src/or/include.am
index a2532cd4d1..9e80de1f5b 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -143,8 +143,8 @@ endif
src_or_tor_SOURCES = src/or/tor_main.c
-src/or/tor_main.$(OBJEXT) \
- src/or/src_or_tor_cov-tor_main.$(OBJEXT): micro-revision.i
+src/or/git_revision.$(OBJEXT) \
+ src/or/src_or_libtor_app_testing_a-git_revision.$(OBJEXT): micro-revision.i
AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \
-DLOCALSTATEDIR="\"$(localstatedir)\"" \