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 a6c9d54ec7bd1f9193dc2156b8a34b29e484db41..64c3baadb3f2ed59a549b6c613a483b964685c5e 100644 (file)
--- 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 1b65d4ee081d0e7c75c2ec59960cf3057f33ddea..a570fadf9843f38e8f97504b4a7b4ad14ebd1e9a 100644 (file)
--- 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)"; \