generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When making libcrypto from apps or test, make sure to include engines

Browse Source 
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>
This commit is contained in:
Richard Levitte 2015-06-09 23:06:23 +02:00
parent 177b5f9c82
commit acaff3b797
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/Makefile
View File

@ -139,10 +139,10 @@ clean:
rm -f req rm -f req
$(DLIBSSL): $(DLIBSSL):
(cd ..; $(MAKE) DIRS=ssl all) (cd ..; $(MAKE) build_libssl)
$(DLIBCRYPTO): $(DLIBCRYPTO):
(cd ..; $(MAKE) DIRS=crypto all) (cd ..; $(MAKE) build_libcrypto)
$(EXE): progs.h $(EXE_OBJ) $(DLIBCRYPTO) $(DLIBSSL) $(EXE): progs.h $(EXE_OBJ) $(DLIBCRYPTO) $(DLIBSSL)
$(RM) $(EXE) $(RM) $(EXE)

4
test/Makefile
View File

@ -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 rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest
$(DLIBSSL): $(DLIBSSL):
(cd ..; $(MAKE) DIRS=ssl all) (cd ..; $(MAKE) build_libssl)
$(DLIBCRYPTO): $(DLIBCRYPTO):
(cd ..; $(MAKE) DIRS=crypto all) (cd ..; $(MAKE) build_libcrypto)
BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
shlib_target="$(SHLIB_TARGET)"; \ shlib_target="$(SHLIB_TARGET)"; \