[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  dbbb6a87a716765f4f9ef9fe48b634c23bbe8636 (commit)
       via  cfef7e9e681bb981ebd5af08eac3432eec336032 (commit)
      from  c3fd55d4a6ed1025c471603b67fbbbce606a5171 (commit)


- Log -----------------------------------------------------------------
commit dbbb6a87a716765f4f9ef9fe48b634c23bbe8636
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Jun 26 18:20:39 2016 +0200

    unix-Makefile.tmpl: omit lib<rary>.a updates from directory targets.
    
    Since corresponding rule was removed from windows-makefile.tmpl out
    of necessity, question popped if it's appropriate to harmonize even
    unix-Makefile.tmpl. Note that as long as you work on single directory
    'make lib<rary>.a' is effectively equivalent to 'make <dir/ectory>'
    prior this modification.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit cfef7e9e681bb981ebd5af08eac3432eec336032
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Jun 26 14:40:35 2016 +0200

    windows-makefile.tmpl: don't use $? in library targets.
    
    Problem with Microsoft lib.exe is that it doesn't *update* modules
    in .lib archive, but creates new one upon every invocation. As result
    if a source file was updated and nmake was executed, a useless archive
    with only one module was created. In other words one has to always
    pass all .obj modules on command line, not only recently recompiled.
    
    [This also creates dilemma for directory targets, e.g. crypto\aes,
    that were added to simplify every-day life for developer. Since
    whole idea behind those targets is to minimize the re-compile time
    upon single file modification, the only sensible thing to do is to
    omit intended library update.]
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configurations/unix-Makefile.tmpl    | 5 +----
 Configurations/windows-makefile.tmpl | 8 ++------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 34971a9..2ec5076 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1086,10 +1086,7 @@ EOF
           next unless defined($unified_info{dirinfo}->{$dir}->{products}->{$type});
           if ($type eq "lib") {
               foreach my $lib (@{$unified_info{dirinfo}->{$dir}->{products}->{$type}}) {
-                  push @actions, <<"EOF";
-	\$(AR) $lib$libext \$\?
-	\$(RANLIB) $lib$libext || echo Never mind.
-EOF
+                  push @actions, "";
               }
           } else {
               foreach my $prod (@{$unified_info{dirinfo}->{$dir}->{products}->{$type}}) {
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 0d21c50..aae7de3 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -484,7 +484,7 @@ EOF
      return <<"EOF";
 $lib$libext: $deps
 	\$(AR) \$(ARFLAGS) \$(AROUTFLAG)$lib$libext @<<
-\$\?
+\$**
 <<
 EOF
  }
@@ -530,11 +530,7 @@ EOF
           next unless defined($unified_info{dirinfo}->{$dir}->{products}->{$type});
           if ($type eq "lib") {
               foreach my $lib (@{$unified_info{dirinfo}->{$dir}->{products}->{$type}}) {
-                  push @actions, <<"EOF";
-	\$(AR) \$(ARFLAGS) \$(AROUTFLAG)$lib$libext @<<
-\$\?
-<<
-EOF
+                  push @actions, "";
               }
           } else {
               foreach my $prod (@{$unified_info{dirinfo}->{$dir}->{products}->{$type}}) {