diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-04 12:50:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-04 12:50:41 -0400 |
| commit | 751b3aabb5ab88fca16834e559a8d9835831b05f (patch) | |
| tree | d33cea9ef5d1c59a9de1ecebe0c9516c2fa448fa /src/common/include.am | |
| parent | be33c3f6006c4cb06e21483c0c0460502ac2c366 (diff) | |
| parent | be68c1fb43a34c61c7a589faec1b3cbaf4ced07f (diff) | |
| download | tor-751b3aabb5ab88fca16834e559a8d9835831b05f.tar.gz tor-751b3aabb5ab88fca16834e559a8d9835831b05f.zip | |
Merge remote-tracking branch 'public/openssl_1_is_best'
Diffstat (limited to 'src/common/include.am')
| -rw-r--r-- | src/common/include.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/include.am b/src/common/include.am index 299c92e065..ba08aa7e5a 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -3,7 +3,6 @@ noinst_LIBRARIES+= src/common/libor.a src/common/libor-crypto.a src/common/libor EXTRA_DIST+= \ src/common/common_sha1.i \ - src/common/sha256.c \ src/common/Makefile.nmake #CFLAGS = -Wall -Wpointer-arith -O2 @@ -72,4 +71,4 @@ 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/crypto.o: src/common/sha256.c + |