Commit cb972a4f authored Jun 09, 2015 by Richard Levitte

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

parent ee2d14be

apps/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

test/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)"; \