diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-06-09 23:06:23 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-06-10 02:01:49 +0200 |
| commit | acaff3b797f50a0a0e17a0be45b7fafad962004e (patch) | |
| tree | 1fe599422f5ed38bee9bf425177c27d70366b847 | |
| parent | 177b5f9c82e1152d6ce20a83556db629697fff65 (diff) | |
| download | openssl-acaff3b797f50a0a0e17a0be45b7fafad962004e.tar.gz | |
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>
| -rw-r--r-- | apps/Makefile | 4 | ||||
| -rw-r--r-- | test/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/Makefile b/apps/Makefile index 90e6014b38..bf554abd33 100644 --- 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 d37e0208de..343c21af28 100644 --- 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)"; \ |