summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2015-06-09 23:06:23 +0200
committerRichard Levitte <levitte@openssl.org>2015-06-10 02:09:49 +0200
commit80d586d97f4e8cd80d0f0c4152617250d261948d (patch)
tree9eb519dc9223301cc65ce314a5acf8ce76f92c28 /apps
parentcbfec68a79a327e1ec177f09d960df0fa2e09529 (diff)
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)
Diffstat (limited to 'apps')
-rw-r--r--apps/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/Makefile b/apps/Makefile
index a6c9d54ec7..64c3baadb3 100644
--- 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)