summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-11 16:32:58 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-11 16:32:58 -0400
commitb55e31aeb453875728295de664383b12e76fefdc (patch)
tree11c0d776603d83fce7fa73340039bc3263526492 /src/or
parent42ff326afa2148f321ea7dce30e3008ff509ab35 (diff)
parenteeedc5c13c51ea508280be7539a261520b715ff6 (diff)
downloadtor-b55e31aeb453875728295de664383b12e76fefdc.tar.gz
tor-b55e31aeb453875728295de664383b12e76fefdc.zip
Merge remote-tracking branch 'rransom-tor/bug3427'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/Makefile.am8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index a12d56b73d..344e63ff87 100644
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -137,11 +137,13 @@ micro-revision.i: FORCE
mv micro-revision.tmp micro-revision.i; \
fi; true
-or_sha1.i: $(tor_SOURCES)
+or_sha1.i: $(tor_SOURCES) $(libtor_a_SOURCES)
if test "@SHA1SUM@" != none; then \
- @SHA1SUM@ $(tor_SOURCES) | @SED@ -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \
+ @SHA1SUM@ $(tor_SOURCES) $(libtor_a_SOURCES) | \
+ @SED@ -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \
elif test "@OPENSSL@" != none; then \
- @OPENSSL@ sha1 $(tor_SOURCES) | @SED@ -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > or_sha1.i; \
+ @OPENSSL@ sha1 $(tor_SOURCES) $(libtor_a_SOURCES) | \
+ @SED@ -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > or_sha1.i; \
else \
rm or_sha1.i; \
touch or_sha1.i; \