[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Richard Levitte]

The branch OpenSSL_1_0_1-stable has been updated
       via  cb972a4fe710c3e07300cdd3e3c3d41a42fc9672 (commit)
       via  ee2d14be9411c46242bdbe87c10c3bd58137332a (commit)
      from  3d2c3fa5fc7e1cf119b50c0baf7511d7d75254e1 (commit)


- Log -----------------------------------------------------------------
commit cb972a4fe710c3e07300cdd3e3c3d41a42fc9672
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jun 9 23:06:23 2015 +0200

    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 at openssl.org>
    (cherry picked from commit acaff3b797f50a0a0e17a0be45b7fafad962004e)

commit ee2d14be9411c46242bdbe87c10c3bd58137332a
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jun 10 01:34:26 2015 +0200

    Add and rearrange building of libraries
    
    There's a need for a target that will build all of libcrypto, so let's
    add 'build_libcrypto' that does this.  For ortogonality, let's also
    add 'build_libssl'.  Have both also depend on 'libcrypto.pc' and
    'libssl.pc' so those get built together with the libraries.
    This makes 'all' depend on fewer things directly.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 177b5f9c82e1152d6ce20a83556db629697fff65)
    
    Conflicts:
    	Makefile.org

-----------------------------------------------------------------------

Summary of changes:
 Makefile.org  | 7 +++++--
 apps/Makefile | 4 ++--
 test/Makefile | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Makefile.org b/Makefile.org
index 8b4de74..cf82487 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -184,7 +184,7 @@ WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os2.h
 HEADER=         e_os.h
 
-all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
+all: Makefile build_all
 
 # as we stick to -e, CLEARENV ensures that local variables in lower
 # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -270,7 +270,10 @@ reflect:
 sub_all: build_all
 build_all: build_libs build_apps build_tests build_tools
 
-build_libs: build_crypto build_ssl build_engines
+build_libs: build_libcrypto build_libssl openssl.pc
+
+build_libcrypto: build_crypto build_engines libcrypto.pc
+build_libssl: build_ssl libssl.pc
 
 build_crypto:
 	@dir=crypto; target=all; $(BUILD_ONE_CMD)
diff --git a/apps/Makefile b/apps/Makefile
index 963780f..a2c1565 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)
diff --git a/test/Makefile b/test/Makefile
index 6205d80..0ee4ec2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -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)"; \