[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f919c12f5c8b92f0318c650573e774fe6522c27c (commit)
      from  7643a1723ef8eb4e542e57dfadeeb8eff788ec05 (commit)


- Log -----------------------------------------------------------------
commit f919c12f5c8b92f0318c650573e774fe6522c27c
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Apr 22 15:06:35 2017 +0200

    Port Ben's parallell Makefile hack to Windows
    
    jom is an nmake clone that does parallell building, via the same -j
    argument as GNU make.  To make it work, we need to apply the same
    dependeency build up as done in 27c40a93175d4dcb559325db9354910b3d16cd4e
    
    Fixes #3272
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3277)

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

Summary of changes:
 Configurations/windows-makefile.tmpl | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index d744110..f16df75 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -47,6 +47,13 @@
 
      return $dso . $dsoext;
  }
+ # This makes sure things get built in the order they need
+ # to. You're welcome.
+ sub dependmagic {
+     my $target = shift;
+
+     return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
+ }
  '';
 -}
 
@@ -177,23 +184,21 @@ PROCESSOR= {- $config{processor} -}
 
 # The main targets ###################################################
 
-all: build_generated \
-     build_libs_nodep build_engines_nodep build_programs_nodep depend
+{- dependmagic('all'); -}: build_libs_nodep build_engines_nodep build_programs_nodep
+{- dependmagic('build_libs'); -}: build_libs_nodep
+{- dependmagic('build_engines'); -}: build_engines_nodep
+{- dependmagic('build_programs'); -}: build_programs_nodep
 
-build_libs: build_generated build_libs_nodep depend
+build_generated: $(GENERATED_MANDATORY)
 build_libs_nodep: $(LIBS) {- join(" ",map { shlib_import($_) } @{$unified_info{libraries}}) -}
-build_engines: build_generated build_engines_nodep depend
 build_engines_nodep: $(ENGINES)
-build_programs: build_generated build_programs_nodep depend
 build_programs_nodep: $(PROGRAMS) $(SCRIPTS)
 
-build_generated: $(GENERATED_MANDATORY)
-
 # Kept around for backward compatibility
 build_apps build_tests: build_programs
 
 test: tests
-tests: build_generated build_programs_nodep build_engines_nodep depend
+{- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep
 	@rem {- output_off() if $disabled{tests}; "" -}
 	set SRCTOP=$(SRCDIR)
 	set BLDTOP=$(BLDDIR)