summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2015-06-09 23:06:23 +0200
committerRichard Levitte <levitte@openssl.org>2015-06-10 02:09:49 +0200
commit80d586d97f4e8cd80d0f0c4152617250d261948d (patch)
tree9eb519dc9223301cc65ce314a5acf8ce76f92c28 /test
parentcbfec68a79a327e1ec177f09d960df0fa2e09529 (diff)
downloadopenssl-new-80d586d97f4e8cd80d0f0c4152617250d261948d.tar.gz
When making libcrypto from apps or test, make sure to include engines
For librypto to be complete, the stuff in both crypto/ and engines/ have to be built. Doing 'make test' or 'make apps' from a clean source tree failed to do so. Corrected by using the new 'build_libcrypto' in the top Makefile. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit acaff3b797f50a0a0e17a0be45b7fafad962004e)
Diffstat (limited to 'test')
-rw-r--r--test/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Makefile b/test/Makefile
index 1b65d4ee08..a570fadf98 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -369,10 +369,10 @@ clean:
rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest
$(DLIBSSL):
- (cd ..; $(MAKE) DIRS=ssl all)
+ (cd ..; $(MAKE) build_libssl)
$(DLIBCRYPTO):
- (cd ..; $(MAKE) DIRS=crypto all)
+ (cd ..; $(MAKE) build_libcrypto)
BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
shlib_target="$(SHLIB_TARGET)"; \