From cb972a4fe710c3e07300cdd3e3c3d41a42fc9672 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 9 Jun 2015 23:06:23 +0200 Subject: [PATCH] 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 (cherry picked from commit acaff3b797f50a0a0e17a0be45b7fafad962004e) --- apps/Makefile | 4 ++-- test/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index 963780f5d7..a2c15657bb 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -147,10 +147,10 @@ clean: rm -f req $(DLIBSSL): - (cd ..; $(MAKE) DIRS=ssl all) + (cd ..; $(MAKE) build_libssl) $(DLIBCRYPTO): - (cd ..; $(MAKE) DIRS=crypto all) + (cd ..; $(MAKE) build_libcrypto) $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) $(RM) $(EXE) diff --git a/test/Makefile b/test/Makefile index 6205d80e05..0ee4ec2852 100644 --- a/test/Makefile +++ b/test/Makefile @@ -355,10 +355,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)"; \ -- 2.34.1