From: Richard Levitte <levitte@openssl.org>
Date: Tue, 9 Jun 2015 21:06:23 +0000 (+0200)
Subject: When making libcrypto from apps or test, make sure to include engines
X-Git-Tag: OpenSSL_1_0_1n~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cb972a4fe710c3e07300cdd3e3c3d41a42fc9672;p=oweals%2Fopenssl.git

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)
---

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)"; \