diff options
| author | Stewart Smith <stewart@flamingspork.com> | 2012-08-03 11:20:52 +1000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-09 11:03:48 -0400 |
| commit | 2606c8b289eb654c6b0cec8d3f25c72b426eab2b (patch) | |
| tree | 707052be01b84a4539c72f2c6a2d85d175ac1776 /src/common/include.am | |
| parent | 2e80ae895dbec1e2922aef584bafa0ddad728a14 (diff) | |
| download | tor-2606c8b289eb654c6b0cec8d3f25c72b426eab2b.tar.gz tor-2606c8b289eb654c6b0cec8d3f25c72b426eab2b.zip | |
Fix up make distcheck and greatly simplify docs dependencies (although it's still a bit odd)
Diffstat (limited to 'src/common/include.am')
| -rw-r--r-- | src/common/include.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/common/include.am b/src/common/include.am index e6a19d8af7..7bae31b994 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -56,15 +56,17 @@ noinst_HEADERS+= \ src/common/tortls.h \ src/common/util.h +DISTCLEANFILES+= src/common/common_sha1.i + src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \ - (cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > src/common/common_sha1.i; \ + (cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > $@; \ elif test "@OPENSSL@" != none; then \ - (cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_common_libor_SOURCES) $(src_Common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > src/common/common_sha1.i; \ + (cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_common_libor_SOURCES) $(src_Common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > $@; \ else \ - rm src/common/common_sha1.i; \ - touch src/common/common_sha1.i; \ + rm $@; \ + touch $@; \ fi -src/common/util_codedigest.c: src/common/common_sha1.i +src/common/util_codedigest.o: src/common/common_sha1.i src/common/crypto.c: src/common/sha256.c |