summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-04 12:09:33 +0100
committerNick Mathewson <nickm@torproject.org>2015-03-04 12:09:33 +0100
commit930ab95e1fb0dfd5af35e7d84ca58ff21b65a605 (patch)
treef290d12738f385e551b48381dbe7fa413c34d612
parent51e36026e5b04384bf3311354ef0cd5a5cbf2d59 (diff)
downloadtor-930ab95e1fb0dfd5af35e7d84ca58ff21b65a605.tar.gz
tor-930ab95e1fb0dfd5af35e7d84ca58ff21b65a605.zip
Missing dependencies; fixes 15127.
-rw-r--r--changes/bug151273
-rw-r--r--src/common/include.am1
-rw-r--r--src/or/include.am1
3 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug15127 b/changes/bug15127
new file mode 100644
index 0000000000..642dc02bc1
--- /dev/null
+++ b/changes/bug15127
@@ -0,0 +1,3 @@
+ o Minor bugfixes (compilation):
+ - Add missing dependencies to fix compilation on BSD. Patch from
+ Peter Palfrader. Fixes bug 15127; bugfix on 0.2.5.1-alpha.
diff --git a/src/common/include.am b/src/common/include.am
index 68e0110c26..06d94f987e 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -139,4 +139,5 @@ src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEA
fi
src/common/util_codedigest.o: src/common/common_sha1.i
+src/common/src_common_libor_testing_a-util_codedigest.o: src/common/common_sha1.i
diff --git a/src/or/include.am b/src/or/include.am
index 47bdd09901..2e46f8a43b 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -191,6 +191,7 @@ ORHEADERS = \
noinst_HEADERS+= $(ORHEADERS) micro-revision.i
src/or/config_codedigest.o: src/or/or_sha1.i
+src/or/src_or_libtor_testing_a-config_codedigest.o: src/or/or_sha1.i
micro-revision.i: FORCE
@rm -f micro-revision.tmp; \