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>

diff --git a/apps/Makefile b/apps/Makefile
index 90e6014b38e0f3c8d3bba6b504fcab7197a67d44..bf554abd33947519de3f650ac4927a9c7938c6d7 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -139,10 +139,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 $(EXE_OBJ) $(DLIBCRYPTO) $(DLIBSSL)
        $(RM) $(EXE)

diff --git a/test/Makefile b/test/Makefile
index d37e0208deaeef7d584478a72b19fcc97a0b4f12..343c21af2855d3dd2014eb46a0d831427577a975 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -409,10 +409,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)"; \