[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a9936b5a127f8f5816073bf0f3e82dd23b46b668 (commit)
      from  d485806092ec0ac583ac0cf59ce74dd1d2ece929 (commit)


- Log -----------------------------------------------------------------
commit a9936b5a127f8f5816073bf0f3e82dd23b46b668
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Jun 4 20:35:58 2016 +0200

    Clean away the last unixmake vestiges
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configure | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/Configure b/Configure
index 3064151..645548d 100755
--- a/Configure
+++ b/Configure
@@ -1941,51 +1941,12 @@ for (@generated_headers) {
                catfile($srcdir, $_.".in"));
 }
 
-###
-### When the old "unixmake" scheme goes away, so does this function
-###
-sub build_Makefile {
-    run_dofile("Makefile","Makefile.in");
-
-    # Copy all Makefile.in to Makefile (except top-level)
-    use File::Find;
-    use IO::File;
-    find(
-        {
-            preprocess => sub {
-                grep(!/^\./, @_);
-            },
-            wanted => sub {
-                return if ($_ ne "Makefile.in" || $File::Find::dir eq ".");
-                my $in = IO::File->new($_, "r") or
-                    die sprintf "Error reading Makefile.in in %s: !$\n",
-                    $File::Find::dir;
-                my $out = IO::File->new("Makefile", "w") or
-                    die sprintf "Error writing Makefile in %s: !$\n",
-                    $File::Find::dir;
-                print $out "# Generated from $_, do not edit\n";
-                while (my $line = <$in>) { print $out $line }
-                $in->close() or
-                    die sprintf "Error reading Makefile.in in %s: !$\n",
-                    $File::Find::dir;
-                $out->close() or
-                    die sprintf "Error writing Makefile in %s: !$\n",
-                    $File::Find::dir;
-            },
-        },
-        ".");
-}
-
 my %builders = (
     unified => sub {
         run_dofile(catfile($blddir, $target{build_file}),
                    $config{build_file_template},
                    catfile($srcdir, "Configurations", "common.tmpl"));
     },
-    unixmake => sub {
-        build_Makefile();
-
-    },
     );
 
 $builders{$builder}->($builder_platform, @builder_opts);