diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2009-10-15 17:13:54 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2009-10-15 17:13:54 +0000 |
commit | 42733b3beaa5cdd25eb1ba3ff893aa7dba73dcf8 (patch) | |
tree | 0651a866160e9d4ac2766d655b29db37f9db5810 /Makefile.org | |
parent | 8aab301b669ddf0d63fbbbe95ccfa3f1a541003b (diff) | |
download | openssl-42733b3beaa5cdd25eb1ba3ff893aa7dba73dcf8.tar.gz |
PR: 2066
Submitted by: Guenter <lists@gknw.net>
Approved by: steve@openssl.org
Add -r option to dgst to produce format compatible with core utilities.
Diffstat (limited to 'Makefile.org')
-rw-r--r-- | Makefile.org | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/Makefile.org b/Makefile.org index 20a5c4cab5..1eacb09028 100644 --- a/Makefile.org +++ b/Makefile.org @@ -360,7 +360,7 @@ libclean: rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib clean: libclean - rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c + rm -f shlib/*.o *.o core a.out fluff testlog make.log cctest cctest.c @set -e; target=clean; $(RECURSIVE_BUILD_CMD) rm -f $(LIBS) rm -f openssl.pc libssl.pc libcrypto.pc @@ -389,23 +389,12 @@ gentests: $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate ); dclean: - rm -rf *.bak include/openssl certs/.0 + rm -rf *.bak include/openssl @set -e; target=dclean; $(RECURSIVE_BUILD_CMD) -rehash: rehash.time -rehash.time: certs apps - @if [ -z "$(CROSS_COMPILE_PREFIX)" ]; then \ - (OPENSSL="`pwd`/util/opensslwrap.sh"; \ - [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \ - OPENSSL_DEBUG_MEMORY=on; \ - export OPENSSL OPENSSL_DEBUG_MEMORY; \ - $(PERL) tools/c_rehash certs) && \ - touch rehash.time; \ - else :; fi - test: tests -tests: rehash +tests: @(cd test && echo "testing..." && \ $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests ); OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a |