Refactor file writing - Remake Makefile.org into a template

It is time for Makefile.org to fold into the new regime and have a run
through util/dofile.pl.  This forces some information out of there and
into Configure, which isn't a bad thing, it makes Configure
increasingly the center of build information, which is as it should
be.

A few extra defaults were needed in the BASE template to get rid of
warnings about missing values.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>

4 files changed, 319 insertions, 341 deletions

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 90633c4abf..c5ff592e33 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -20,6 +20,10 @@
 	poly1305_obj	=> "",
 
 	unistd		=> "<unistd.h>",
+	shared_target	=> "",
+	shared_cflag	=> "",
+	shared_ldflag	=> "",
+	shared_extension	=> "",
 	build_scheme	=> "unixmake",
     },
 
diff --git a/Configure b/Configure
index e717eb3973..b1d6259e89 100755
--- a/Configure
+++ b/Configure
@@ -167,6 +167,35 @@ sub read_config;
 sub resolve_config;
 
 
+# Information collection #############################################
+
+# Collect version numbers
+$config{version} = "unknown";
+$config{version_num} = "unknown";
+$config{shlib_version_number} = "unknown";
+$config{shlib_version_history} = "unknown";
+
+collect_information(
+    '<include/openssl/opensslv.h',
+    undef,
+    qr/OPENSSL.VERSION.TEXT.*OpenSSL (\S+) / => sub { $config{version} = $1; },
+    qr/OPENSSL.VERSION.NUMBER.*(0x\S+)/	     => sub { $config{version_num}=$1 },
+    qr/SHLIB_VERSION_NUMBER *"([^"]+)"/	     => sub { $config{shlib_version_number}=$1 },
+    qr/SHLIB_VERSION_HISTORY *"([^"]*)"/     => sub { $config{shlib_version_history}=$1 }
+    );
+if ($config{shlib_version_history} ne "") { $config{shlib_version_history} .= ":"; }
+
+($config{major}, $config{minor})
+    = ($config{version} =~ /^([0-9]+)\.([0-9\.]+)/);
+($config{shlib_major}, $config{shlib_minor})
+    = ($config{shlib_version_number} =~ /^([0-9]+)\.([0-9\.]+)/);
+die "erroneous version information in opensslv.h: ",
+    "$config{major}, $config{minor}, $config{shlib_major}, $config{shlib_minor}\n"
+    if ($config{major} eq "" || $config{minor} eq ""
+	|| $config{shlib_major} eq "" ||  $config{shlib_minor} eq "");
+
+# Collect target configurations
+
 my ($vol, $dir, $dummy) = File::Spec->splitpath($0);
 my $pattern = File::Spec->catpath($vol, $dir, "Configurations/*.conf");
 foreach (sort glob($pattern) ) {
@@ -174,17 +203,18 @@ foreach (sort glob($pattern) ) {
 }
 
 
+print "Configuring OpenSSL version $config{version} (0x$config{version_num})\n";
+
 $config{perl};
 $config{prefix}="";
 $config{openssldir}="";
 $config{processor}="";
-my $libdir="";
-my $exe_ext="";
-my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
+$config{libdir}="";
+$config{install_prefix}= "$ENV{'INSTALL_PREFIX'}";
 $config{cross_compile_prefix}="";
-my $fipslibdir="/usr/local/ssl/fips-2.0/lib/";
+$config{fipslibdir}="/usr/local/ssl/fips-2.0/lib/";
 my $nofipscanistercheck=0;
-my $baseaddr="0xFB00000";
+$config{baseaddr}="0xFB00000";
 my $no_threads=0;
 my $threads=0;
 $config{no_shared}=0; # but "no-shared" is default
@@ -192,10 +222,22 @@ my $zlib=1;      # but "no-zlib" is default
 my $no_rfc3779=0;
 my $no_asm=0;
 my $no_dso=0;
-my @skip=();
 my $Makefile="Makefile";
 my $default_ranlib;
-my $fips=0;
+$config{fips}=0;
+
+# Top level directories to build
+$config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "tools" ];
+# crypto/ subdirectories to build
+$config{sdirs} = [
+    "objects",
+    "md2", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305",
+    "des", "aes", "rc2", "rc4", "rc5", "idea", "bf", "cast", "camellia", "seed", "chacha", "modes",
+    "bn", "ec", "rsa", "dsa", "dh", "dso", "engine",
+    "buffer", "bio", "stack", "lhash", "rand", "err",
+    "evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui",
+    "cms", "ts", "jpake", "srp", "store", "cmac", "ct", "async", "kdf"
+    ];
 
 # Known TLS and DTLS protocols
 my @tls = qw(ssl3 tls1 tls1_1 tls1_2);
@@ -366,10 +408,10 @@ while ((my $first, my $second) = (shift @list, shift @list)) {
     unshift @list, $second;
 }
 
-# Construct the string of what $depflags should look like with the defaults
+# Construct the string of what $config{depflags} should look like with the defaults
 # from %disabled above.  (we need this to see if we should advise the user
 # to run "make depend"):
-my $default_depflags = " ".join(" ",
+my $default_depflags = join(" ",
     map { my $x = $_; $x =~ tr{[a-z]-}{[A-Z]_}; "-DOPENSSL_NO_$x"; }
     grep { $disabled{$_} !~ /\(no-depflags\)$/ }
     sort keys %disabled);
@@ -388,7 +430,7 @@ my $no_sse2=0;
 &usage if ($#ARGV < 0);
 
 my $flags="";
-my $depflags="";
+$config{depflags}="";
 $config{openssl_experimental_defines}=[];
 $config{openssl_api_defines}=[];
 $config{openssl_algorithm_defines}=[];
@@ -398,7 +440,6 @@ $config{openssl_other_defines}=[];
 my $libs="";
 my $target="";
 $config{options}="";
-my $api;
 my $make_depend=0;
 my %withargs=();
 my $build_prefix = "release_";
@@ -544,7 +585,7 @@ foreach (@argvcopy)
 		{ $config{processor}=386; }
 	elsif (/^fips$/)
 		{
-		$fips=1;
+		$config{fips}=1;
 		}
 	elsif (/^rsaref$/)
 		{
@@ -554,7 +595,7 @@ foreach (@argvcopy)
 		}
 	elsif (/^nofipscanistercheck$/)
 		{
-		$fips = 1;
+		$config{fips} = 1;
 		$nofipscanistercheck = 1;
 		}
 	elsif (/^[-+]/)
@@ -565,11 +606,11 @@ foreach (@argvcopy)
 			}
 		elsif (/^--api=(.*)$/)
 			{
-			$api=$1;
+			$config{api}=$1;
 			}
 		elsif (/^--libdir=(.*)$/)
 			{
-			$libdir=$1;
+			$config{libdir}=$1;
 			}
 		elsif (/^--openssldir=(.*)$/)
 			{
@@ -577,7 +618,7 @@ foreach (@argvcopy)
 			}
 		elsif (/^--install.prefix=(.*)$/)
 			{
-			$install_prefix=$1;
+			$config{install_prefix}=$1;
 			}
 		elsif (/^--with-zlib-lib=(.*)$/)
 			{
@@ -589,11 +630,11 @@ foreach (@argvcopy)
 			}
 		elsif (/^--with-fipslibdir=(.*)$/)
 			{
-			$fipslibdir="$1/";
+			$config{fipslibdir}="$1/";
 			}
 		elsif (/^--with-baseaddr=(.*)$/)
 			{
-			$baseaddr="$1";
+			$config{baseaddr}="$1";
 			}
 		elsif (/^--cross-compile-prefix=(.*)$/)
 			{
@@ -636,8 +677,8 @@ foreach (@argvcopy)
 			{ $config{options} .= " ".$_; }
 		}
 
-        if (defined($api) && !exists $apitable->{$api}) {
-		die "***** Unsupported api compatibility level: $api\n",
+        if (defined($config{api}) && !exists $apitable->{$config{api}}) {
+		die "***** Unsupported api compatibility level: $config{api}\n",
         }
 
 	if (keys %unsupported_options)
@@ -647,10 +688,14 @@ foreach (@argvcopy)
 		}
 	}
 
-if ($fips)
+if ($config{fips})
 	{
 	delete $disabled{"shared"} if ($disabled{"shared"} =~ /^default/);
 	}
+else
+	{
+	@{$config{dirs}} = grep !/^fips$/, @{$config{dirs}};
+	}
 
 my @tocheckfor = (keys %disabled);
 while (@tocheckfor) {
@@ -714,6 +759,10 @@ foreach (sort (keys %disabled))
 		{ }
 	elsif (/^sse2$/)
 		{ $no_sse2 = 1; }
+	elsif (/^engine$/)
+		{ @{$config{dirs}} = grep !/^engine$/, @{$config{dirs}}; }
+	elsif (/^gost$/)
+		{ @{$config{engdirs}} = grep !/^ccgost$/, @{$config{engdirs}}; }
 	else
 		{
 		my ($ALGO, $algo);
@@ -732,16 +781,15 @@ foreach (sort (keys %disabled))
 			($ALGO,$algo) = ("RMD160","rmd160") if ($algo eq "ripemd");
 
 			push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$ALGO";
+			$config{depflags} .= " -DOPENSSL_NO_$ALGO";
 			print " OPENSSL_NO_$ALGO";
 
-			push @skip, $algo;
 			# fix-up crypto/directory name(s)
-			$skip[$#skip]="whrlpool" if $algo eq "whirlpool";
-			$skip[$#skip]="ripemd" if $algo eq "rmd160";
+			$algo="whrlpool" if $algo eq "whirlpool";
+			$algo="ripemd" if $algo eq "rmd160";
+			@{$config{sdirs}} = grep { $_ ne $algo} @{$config{sdirs}};
 
 			print " (skip dir)";
-
-			$depflags .= " -DOPENSSL_NO_$ALGO";
 			}
 		}
 
@@ -778,9 +826,10 @@ my %target = ( %{$table{$base_target}}, resolve_config($target) );
 
 &usage if (!%target || $target{template});
 
-$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
-$exe_ext=".nlm" if ($target =~ /netware/);
-$exe_ext=".pm"  if ($target =~ /vos/);
+$target{exe_extension}="";
+$target{exe_extension}=".exe" if ($config{target} eq "Cygwin" || $config{target} eq "DJGPP" || $config{target} =~ /^mingw/);
+$target{exe_extension}=".nlm" if ($config{target} =~ /netware/);
+$target{exe_extension}=".pm"  if ($config{target} =~ /vos/);
 
 $default_ranlib	= which("ranlib") || "true";
 $config{perl}	= $ENV{'PERL'} || which("perl5") || which("perl") || "perl";
@@ -799,15 +848,17 @@ $target{cc} = $ENV{CC} || $target{cc};
 
 # For cflags and lflags, add the debug_ or release_ attributes
 # Do it in such a way that no spurious space is appended (hence the grep).
-my $cflags = join(" ",
-		  grep { $_ } ($target{cflags},
-			       $target{$build_prefix."cflags"}));
-my $lflags = join(" ",
-		  grep { $_ } ($target{lflags},
-			       $target{$build_prefix."lflags"}));
+$config{cflags} = join(" ",
+		       grep { $_ ne "" } ($target{cflags},
+					  $target{$build_prefix."cflags"}));
+$config{lflags} = join(" ",
+		       grep { $_ ne "" } ($target{lflags},
+					  $target{$build_prefix."lflags"}));
 
 $target{ranlib} = $ENV{'RANLIB'} || $target{ranlib} || $default_ranlib;
 $target{ar} = $ENV{'AR'} || "ar";
+$target{arflags} = "" if !defined($target{arflags});
+$target{nm} = "nm";
 # Make sure build_scheme is consistent.
 $target{build_scheme} = [ $target{build_scheme} ]
     if ref($target{build_scheme}) ne "ARRAY";
@@ -818,32 +869,32 @@ $target{build_scheme} = [ $target{build_scheme} ]
 # we're ready to tolerate, so don't...
 $target{multilib}="" if !-d "$config{prefix}/lib$target{multilib}";
 
-$libdir="lib$target{multilib}" if $libdir eq "";
-$config{enginesdir}=$config{prefix} . "/" . $libdir  . "/engines";
+$config{libdir}="lib$target{multilib}" if $config{libdir} eq "";
+$config{enginesdir}=$config{prefix} . "/" . $config{libdir}  . "/engines";
 
-$cflags = "$cflags$exp_cflags";
+$config{cflags} .= "$exp_cflags";
 
-# '%' in $lflags is used to split flags to "pre-" and post-flags
-my ($prelflags,$postlflags)=split('%',$lflags);
-if (defined($postlflags))	{ $lflags=$postlflags;	}
-else				{ $lflags=$prelflags; undef $prelflags;	}
+# '%' in $config{lflags} is used to split flags to "pre-" and post-flags
+my ($pre,$post)=split('%',$config{lflags});
+if (defined($post))	{ $config{prelflags}=$pre; $config{lflags}=$post;	}
+else			{ $config{prelflags}="";   $config{lflags}=$pre;	}
 
-if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` !~ m/\-mno\-cygwin/m)
+if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` !~ m/-mno-cygwin/m)
 	{
-	$cflags =~ s/\-mno\-cygwin\s*//;
-	$target{shared_ldflag} =~ s/\-mno\-cygwin\s*//;
+	$config{cflags} =~ s/-mno-cygwin\s*//;
+	$target{shared_ldflag} =~ s/-mno-cygwin\s*//;
 	}
 
-if ($target =~ /linux.*\-mips/ && !$no_asm && $flags !~ /\-m(ips|arch=)/) {
+if ($target =~ /linux.*-mips/ && !$no_asm && $flags !~ /-m(ips|arch=)/) {
 	# minimally required architecture flags for assembly modules
-	$cflags="-mips2 $cflags" if ($target =~ /mips32/);
-	$cflags="-mips3 $cflags" if ($target =~ /mips64/);
+	$config{cflags}="-mips2 $config{cflags}" if ($target =~ /mips32/);
+	$config{cflags}="-mips3 $config{cflags}" if ($target =~ /mips64/);
 }
 
 my $no_shared_warn=0;
 my $no_user_cflags=0;
 
-if ($flags ne "")	{ $cflags="$flags$cflags"; }
+if ($flags ne "")	{ $config{cflags}="$flags$config{cflags}"; }
 else			{ $no_user_cflags=1;       }
 
 # The DSO code currently always implements all functions so that no
@@ -868,7 +919,7 @@ if (!$no_dso && $target{dso_scheme} ne "")
 		{
 		$dso_cflags = "-DDSO_$target{dso_scheme}";
 		}
-	$cflags = "$dso_cflags $cflags";
+	$config{cflags} = "$dso_cflags $config{cflags}";
 	}
 
 my $thread_cflags;
@@ -889,12 +940,12 @@ if ($target{thread_cflag} eq "(unknown)" && $threads)
 		print "provide any system-specific compiler options\n";
 		exit(1);
 		}
-	$thread_cflags="-DOPENSSL_THREADS $cflags" ;
+	$thread_cflags="-DOPENSSL_THREADS $config{cflags}" ;
 	push @thread_defines, "OPENSSL_THREADS";
 	}
 else
 	{
-	$thread_cflags="-DOPENSSL_THREADS $target{thread_cflag} $cflags";
+	$thread_cflags="-DOPENSSL_THREADS $target{thread_cflag} $config{cflags}";
 	push @thread_defines, "OPENSSL_THREADS";
 #	my $def;
 #	foreach $def (split ' ',$target{thread_cflag})
@@ -906,57 +957,55 @@ else
 #		}
 	}
 
-$lflags="$libs$lflags" if ($libs ne "");
+$config{lflags}="$libs$config{lflags}" if ($libs ne "");
 
 if ($no_asm)
 	{
-	$cflags=~s/\-D[BL]_ENDIAN//		if ($fips);
-	$thread_cflags=~s/\-D[BL]_ENDIAN//	if ($fips);
+	$config{cflags}=~s/-D[BL]_ENDIAN//		if ($config{fips});
+	$thread_cflags=~s/-D[BL]_ENDIAN//	if ($config{fips});
 	}
 
 if ($threads)
 	{
-	$cflags=$thread_cflags;
+	$config{cflags}=$thread_cflags;
 	push @{$config{openssl_thread_defines}}, @thread_defines;
 	}
 
 if ($zlib)
 	{
-	$cflags = "-DZLIB $cflags";
+	$config{cflags} = "-DZLIB $config{cflags}";
 	if (defined($disabled{"zlib-dynamic"}))
 		{
 		if (defined($withargs{"zlib-lib"}))
 			{
-			$lflags = "$lflags -L" . $withargs{"zlib-lib"} . " -lz";
+			$config{lflags} .= " -L" . $withargs{"zlib-lib"} . " -lz";
 			}
 		else
 			{
-			$lflags = "$lflags -lz";
+			$config{lflags} .= " -lz";
 			}
 		}
 	else
 		{
-		$cflags = "-DZLIB_SHARED $cflags";
+		$config{cflags} = "-DZLIB_SHARED $config{cflags}";
 		}
 	}
 
 # With "deprecated" disable all deprecated features.
 if (defined($disabled{"deprecated"})) {
-        $api = $maxapi;
+        $config{api} = $maxapi;
 }
 
-# You will find shlib_mark1 and shlib_mark2 explained in Makefile.in
-my $shared_mark = "";
 if ($target{shared_target} eq "")
 	{
-	$no_shared_warn = 1 if !$config{no_shared} && !$fips;
+	$no_shared_warn = 1 if !$config{no_shared} && !$config{fips};
 	$config{no_shared} = 1;
 	}
 if (!$config{no_shared})
 	{
 	if ($target{shared_cflag} ne "")
 		{
-		$cflags = "$target{shared_cflag} -DOPENSSL_PIC $cflags";
+		$config{cflags} = "$target{shared_cflag} -DOPENSSL_PIC $config{cflags}";
 		}
 	}
 
@@ -978,7 +1027,7 @@ if ($target{build_scheme}->[0] ne "mk1mf")
 #
 # Platform fix-ups
 #
-if ($target =~ /\-icc$/)	# Intel C compiler
+if ($target =~ /-icc$/)	# Intel C compiler
 	{
 	my $iccver=0;
 	if (open(FD,"$target{cc} -V 2>&1 |"))
@@ -988,25 +1037,25 @@ if ($target =~ /\-icc$/)	# Intel C compiler
 		}
 	if ($iccver>=8)
 		{
-		$cflags=~s/\-KPIC/-fPIC/;
+		$config{cflags}=~s/-KPIC/-fPIC/;
 		# Eliminate unnecessary dependency from libirc.a. This is
 		# essential for shared library support, as otherwise
 		# apps/openssl can end up in endless loop upon startup...
-		$cflags.=" -Dmemcpy=__builtin_memcpy -Dmemset=__builtin_memset";
+		$config{cflags}.=" -Dmemcpy=__builtin_memcpy -Dmemset=__builtin_memset";
 		}
 	if ($iccver>=9)
 		{
-		$lflags.=" -i-static";
-		$lflags=~s/\-no_cpprt/-no-cpprt/;
+		$config{lflags}.=" -i-static";
+		$config{lflags}=~s/-no_cpprt/-no-cpprt/;
 		}
 	if ($iccver>=10)
 		{
-		$lflags=~s/\-i\-static/-static-intel/;
+		$config{lflags}=~s/-i-static/-static-intel/;
 		}
 	if ($iccver>=11)
 		{
-		$cflags.=" -no-intel-extensions";	# disable Cilk
-		$lflags=~s/\-no\-cpprt/-no-cxxlib/;
+		$config{cflags}.=" -no-intel-extensions";	# disable Cilk
+		$config{lflags}=~s/-no-cpprt/-no-cxxlib/;
 		}
 	}
 
@@ -1018,14 +1067,14 @@ if ($target =~ /\-icc$/)	# Intel C compiler
 # should engrave this into Makefile.shared rules or into BSD-* config
 # lines above. Meanwhile let's try to be cautious and pass -rpath to
 # linker only when --prefix is not /usr.
-if ($target =~ /^BSD\-/)
+if ($target =~ /^BSD-/)
 	{
 	$target{shared_ldflag}.=" -Wl,-rpath,\$\$(LIBRPATH)" if ($config{prefix} !~ m|^/usr[/]*$|);
 	}
 
 if ($target{sys_id} ne "")
 	{
-	#$cflags="-DOPENSSL_SYS_$target{sys_id} $cflags";
+	#$config{cflags}="-DOPENSSL_SYS_$target{sys_id} $config{cflags}";
 	push @{$config{openssl_sys_defines}}, "OPENSSL_SYS_$target{sys_id}";
 	}
 
@@ -1036,68 +1085,95 @@ if ($target{ranlib} eq "")
 
 if (!$no_asm) {
     $target{cpuid_obj}=$table{BASE}->{cpuid_obj} if ($config{processor} eq "386");
-    $target{cpuid_obj}.=" uplink.o uplink-x86.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
+    $target{cpuid_obj}.=" uplink.o uplink-x86.o" if ($config{cflags} =~ /-DOPENSSL_USE_APPLINK/);
 
     $target{bn_obj} =~ s/\w+-gf2m.o// if (defined($disabled{ec2m}));
 
     # bn-586 is the only one implementing bn_*_part_words
-    $cflags.=" -DOPENSSL_BN_ASM_PART_WORDS" if ($target{bn_obj} =~ /bn-586/);
-    $cflags.=" -DOPENSSL_IA32_SSE2" if (!$no_sse2 && $target{bn_obj} =~ /86/);
+    $config{cflags}.=" -DOPENSSL_BN_ASM_PART_WORDS" if ($target{bn_obj} =~ /bn-586/);
+    $config{cflags}.=" -DOPENSSL_IA32_SSE2" if (!$no_sse2 && $target{bn_obj} =~ /86/);
 
-    $cflags.=" -DOPENSSL_BN_ASM_MONT" if ($target{bn_obj} =~ /-mont/);
-    $cflags.=" -DOPENSSL_BN_ASM_MONT5" if ($target{bn_obj} =~ /-mont5/);
-    $cflags.=" -DOPENSSL_BN_ASM_GF2m" if ($target{bn_obj} =~ /-gf2m/);
+    $config{cflags}.=" -DOPENSSL_BN_ASM_MONT" if ($target{bn_obj} =~ /-mont/);
+    $config{cflags}.=" -DOPENSSL_BN_ASM_MONT5" if ($target{bn_obj} =~ /-mont5/);
+    $config{cflags}.=" -DOPENSSL_BN_ASM_GF2m" if ($target{bn_obj} =~ /-gf2m/);
 
-    if ($fips) {
+    if ($config{fips}) {
 	push @{$config{openssl_other_defines}}, "OPENSSL_FIPS";
     }
 
     if ($target{sha1_obj} =~ /\.o$/) {
-	$cflags.=" -DSHA1_ASM"   if ($target{sha1_obj} =~ /sx86/ || $target{sha1_obj} =~ /sha1/);
-	$cflags.=" -DSHA256_ASM" if ($target{sha1_obj} =~ /sha256/);
-	$cflags.=" -DSHA512_ASM" if ($target{sha1_obj} =~ /sha512/);
+	$config{cflags}.=" -DSHA1_ASM"   if ($target{sha1_obj} =~ /sx86/ || $target{sha1_obj} =~ /sha1/);
+	$config{cflags}.=" -DSHA256_ASM" if ($target{sha1_obj} =~ /sha256/);
+	$config{cflags}.=" -DSHA512_ASM" if ($target{sha1_obj} =~ /sha512/);
 	if ($target{sha1_obj} =~ /sse2/) {
 	    if ($no_sse2) {
 		$target{sha1_obj} =~ s/\S*sse2\S+//;
-	    } elsif ($cflags !~ /OPENSSL_IA32_SSE2/) {
-		$cflags.=" -DOPENSSL_IA32_SSE2";
+	    } elsif ($config{cflags} !~ /OPENSSL_IA32_SSE2/) {
+		$config{cflags}.=" -DOPENSSL_IA32_SSE2";
 	    }
 	}
     }
     if ($target{md5_obj} =~ /\.o$/) {
-	$cflags.=" -DMD5_ASM";
+	$config{cflags}.=" -DMD5_ASM";
     }
     $target{cast_obj}=$table{BASE}->{cast_obj} if (!$config{no_shared}); # CAST assembler is not PIC
     if ($target{rmd160_obj} =~ /\.o$/) {
-	$cflags.=" -DRMD160_ASM";
+	$config{cflags}.=" -DRMD160_ASM";
     }
     if ($target{aes_obj} =~ /\.o$/) {
-	$cflags.=" -DAES_ASM" if ($target{aes_obj} =~ m/\baes\-/);;
+	$config{cflags}.=" -DAES_ASM" if ($target{aes_obj} =~ m/\baes-/);;
 	# aes-ctr.o is not a real file, only indication that assembler
 	# module implements AES_ctr32_encrypt...
-	$cflags.=" -DAES_CTR_ASM" if ($target{aes_obj} =~ s/\s*aes\-ctr\.o//);
+	$config{cflags}.=" -DAES_CTR_ASM" if ($target{aes_obj} =~ s/\s*aes-ctr\.o//);
 	# aes-xts.o indicates presence of AES_xts_[en|de]crypt...
-	$cflags.=" -DAES_XTS_ASM" if ($target{aes_obj} =~ s/\s*aes\-xts\.o//);
-	$target{aes_obj} =~ s/\s*(vpaes|aesni)\-x86\.o//g if ($no_sse2);
-	$cflags.=" -DVPAES_ASM" if ($target{aes_obj} =~ m/vpaes/);
-	$cflags.=" -DBSAES_ASM" if ($target{aes_obj} =~ m/bsaes/);
+	$config{cflags}.=" -DAES_XTS_ASM" if ($target{aes_obj} =~ s/\s*aes-xts\.o//);
+	$target{aes_obj} =~ s/\s*(vpaes|aesni)-x86\.o//g if ($no_sse2);
+	$config{cflags}.=" -DVPAES_ASM" if ($target{aes_obj} =~ m/vpaes/);
+	$config{cflags}.=" -DBSAES_ASM" if ($target{aes_obj} =~ m/bsaes/);
     }
     if ($target{wp_obj} =~ /mmx/ && $config{processor} eq "386") {
 	$target{wp_obj}=$table{BASE}->{wp_obj};
     } elsif (!$disabled{"whirlpool"}) {
-	$cflags.=" -DWHIRLPOOL_ASM";
+	$config{cflags}.=" -DWHIRLPOOL_ASM";
     }
-    if ($target{modes_obj} =~ /ghash\-/) {
-	$cflags.=" -DGHASH_ASM";
+    if ($target{modes_obj} =~ /ghash-/) {
+	$config{cflags}.=" -DGHASH_ASM";
     }
     if ($target{ec_obj} =~ /ecp_nistz256/) {
-	$cflags.=" -DECP_NISTZ256_ASM";
+	$config{cflags}.=" -DECP_NISTZ256_ASM";
     }
     if ($target{poly1305_obj} =~ /\.o$/) {
-	$cflags.=" -DPOLY1305_ASM";
+	$config{cflags}.=" -DPOLY1305_ASM";
     }
 }
 
+$config{makedepprog} = "makedepend";
+if ($target{cc} eq "gcc" || ($target{cc} eq 'cc' && $config{target} =~ /darwin/)) {
+    $config{makedepprog} = $target{cc};
+}
+# On different platforms, shared library suffixes takes interesting forms.
+# On Most Unixen, it's .so.{version} or .sl.{version}, while on MacOS X,
+# it's .{version}.dylib.  We're want to separate the two so we can calculate
+# symlinks.
+# FIXME: is this actually needed any more?  Makefile.shared seems to just
+# symlink a file name without SOVER to the file with full SOVER, nothing in
+# between.
+if ($target{shared_extension} =~ /^(|(?<e>\.s[ol])(?<v>\..*)|(?<v>\..*)(?<e>\.dylib))$/) {
+    my @vernums = split /\./, $+{v};
+    shift @vernums;             # Because the initial period in shlib_extension.
+    my @s = ();
+    while (@vernums) {
+	pop @vernums;
+	push @s, join(".", $+{e} eq ".dylib" ? "" : $+{e},
+		      @vernums,
+		      $+{e} eq ".dylib" ? $+{e} : () );
+    }
+    $config{shared_link_extensions} = join(" ", @s);
+} else {
+    $config{shared_link_extensions} = "";
+}
+$config{depflags} =~ s/^\s*//;
+
 
 # Deal with bn_ops ###################################################
 
@@ -1157,45 +1233,13 @@ foreach (sort split(/\s+/,$target{bn_ops})) {
 
 # "Stringify" the C flags string.  This permits it to be made part of a string
 # and works as well on command lines.
-$cflags =~ s/([\\\"])/\\\1/g;
-
-$config{version} = "unknown";
-$config{version_num} = "unknown";
-$config{major} = "unknown";
-$config{minor} = "unknown";
-$config{shlib_version_number} = "unknown";
-$config{shlib_version_history} = "unknown";
-$config{shlib_major} = "unknown";
-$config{shlib_minor} = "unknown";
-
-open(IN,'<include/openssl/opensslv.h') || die "unable to read opensslv.h:$!\n";
-while (<IN>)
-	{
-	$config{version}=$1 if /OPENSSL.VERSION.TEXT.*OpenSSL (\S+) /;
-	$config{version_num}=$1 if /OPENSSL.VERSION.NUMBER.*(0x\S+)/;
-	$config{shlib_version_number}=$1 if /SHLIB_VERSION_NUMBER *"([^"]+)"/;
-	$config{shlib_version_history}=$1 if /SHLIB_VERSION_HISTORY *"([^"]*)"/;
-	}
-close(IN);
-if ($config{shlib_version_history} ne "") { $config{shlib_version_history} .= ":"; }
-
-if ($config{version} =~ /(^[0-9]*)\.([0-9\.]*)/)
-	{
-	$config{major}=$1;
-	$config{minor}=$2;
-	}
-
-if ($config{shlib_version_number} =~ /(^[0-9]*)\.([0-9\.]*)/)
-	{
-	$config{shlib_major}=$1;
-	$config{shlib_minor}=$2;
-	}
+$config{cflags} =~ s/([\\\"])/\\\1/g;
 
-if (defined($api)) {
-    $config{openssl_api_defines} = [ "OPENSSL_MIN_API=".$apitable->{$api} ];
-    my $apiflag = sprintf("-DOPENSSL_API_COMPAT=%s", $apitable->{$api});
+if (defined($config{api})) {
+    $config{openssl_api_defines} = [ "OPENSSL_MIN_API=".$apitable->{$config{api}} ];
+    my $apiflag = sprintf("-DOPENSSL_API_COMPAT=%s", $apitable->{$config{api}});
     $default_depflags .= " $apiflag";
-    $cflags .= " $apiflag";
+    $config{cflags} .= " $apiflag";
 }
 
 my $ecc = $target{cc};
@@ -1207,24 +1251,24 @@ if ($strict_warnings)
 	die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc(-\d(\.\d)*)?$/ or $ecc =~ /clang$/);
 	foreach $wopt (split /\s+/, $gcc_devteam_warn)
 		{
-		$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
+		$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/)
 		}
 	if ($ecc eq "clang")
 		{
 		foreach $wopt (split /\s+/, $clang_devteam_warn)
 			{
-			$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
+			$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/)
 			}
 		}
 	if ($target !~ /^mingw/)
 		{
 		foreach $wopt (split /\s+/, $memleak_devteam_backtrace)
 			{
-			$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
+			$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/)
 			}
 		if ($target =~ /^BSD-/)
 			{
-			$lflags .= " -lexecinfo";
+			$config{lflags} .= " -lexecinfo";
 			}
 		}
 	}
@@ -1241,7 +1285,7 @@ use warnings;
 use Exporter;
 #use vars qw(\@ISA \@EXPORT);
 our \@ISA = qw(Exporter);
-our \@EXPORT = qw(\%config \%target);
+our \@EXPORT = qw(\%config \%target %withargs);
 
 EOF
 print OUT "our %config = (\n";
@@ -1271,126 +1315,28 @@ foreach (sort keys %target) {
 print OUT <<"EOF";
 );
 
-1;
 EOF
-close(OUT);
-
-open(IN,"<Makefile.in") || die "unable to read Makefile.in: $!\n";
-open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-print OUT "### Generated automatically from Makefile.in by Configure.\n\n";
-my $sdirs=0;
+print OUT "our %withargs = (\n";
+foreach (sort keys %withargs) {
+    if (ref($withargs{$_}) eq "ARRAY") {
+	print OUT "  ", $_, " => [ ", join(", ",
+					   map { quotify("perl", $_) }
+					   @{$withargs{$_}}), " ],\n";
+    } else {
+	print OUT "  ", $_, " => ", quotify("perl", $withargs{$_}), ",\n"
+    }
+}
+print OUT <<"EOF";
+);
 
-while (<IN>)
-	{
-	chomp;
-	$sdirs = 1 if /^SDIRS=/;
-	if ($sdirs) {
-		my $dir;
-		foreach $dir (@skip) {
-			s/(\s)$dir /$1/;
-			s/\s$dir$//;
-			}
-		}
-	$sdirs = 0 unless /\\$/;
-        s/fips // if (/^DIRS=/ && !$fips);
-        s/engines // if (/^DIRS=/ && $disabled{"engine"});
-	s/^VERSION=.*/VERSION=$config{version}/;
-	s/^MAJOR=.*/MAJOR=$config{major}/;
-	s/^MINOR=.*/MINOR=$config{minor}/;
-	s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$config{shlib_version_number}/;
-	s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$config{shlib_version_history}/;
-	s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$config{shlib_major}/;
-	s/^SHLIB_MINOR=.*/SHLIB_MINOR=$config{shlib_minor}/;
-	s/^SHLIB_EXT=.*/SHLIB_EXT=$target{shared_extension}/;
-	s/^INSTALLTOP=.*$/INSTALLTOP=$config{prefix}/;
-	s/^MULTILIB=.*$/MULTILIB=$target{multilib}/;
-	s/^OPENSSLDIR=.*$/OPENSSLDIR=$config{openssldir}/;
-	s/^LIBDIR=.*$/LIBDIR=$libdir/;
-	s/^INSTALL_PREFIX=.*$/INSTALL_PREFIX=$install_prefix/;
-	s/^PLATFORM=.*$/PLATFORM=$target/;
-	s/^OPTIONS=.*$/OPTIONS=$config{options}/;
-	my $argvstring = "(".join(", ", map { quotify("perl", $_) } @argvcopy).")";
-	s/^CONFIGURE_ARGS=.*$/CONFIGURE_ARGS=$argvstring/;
-	if ($config{cross_compile_prefix})
-		{
-		s/^CC=.*$/CROSS_COMPILE= $config{cross_compile_prefix}\nCC= \$\(CROSS_COMPILE\)$target{cc}/;
-		s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/;
-		s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/;
-		s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;
-		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$target{cc}/ if $target{cc} eq "gcc";
-		}
-	else	{
-		s/^CC=.*$/CC= $target{cc}/;
-		s/^AR=\s*ar/AR= $target{ar}/;
-		s/^RANLIB=.*/RANLIB= $target{ranlib}/;
-		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $target{cc}/ if $ecc eq "gcc" || $ecc eq "clang";
-		}
-	s/^CFLAG=.*$/CFLAG= $cflags/;
-	s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
-	s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/;
-	s/^EX_LIBS=.*$/EX_LIBS= $lflags/;
-	s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/;
-	s/^CPUID_OBJ=.*$/CPUID_OBJ= $target{cpuid_obj}/;
-	s/^BN_ASM=.*$/BN_ASM= $target{bn_obj}/;
-	s/^EC_ASM=.*$/EC_ASM= $target{ec_obj}/;
-	s/^DES_ENC=.*$/DES_ENC= $target{des_obj}/;
-	s/^AES_ENC=.*$/AES_ENC= $target{aes_obj}/;
-	s/^BF_ENC=.*$/BF_ENC= $target{bf_obj}/;
-	s/^CAST_ENC=.*$/CAST_ENC= $target{cast_obj}/;
-	s/^RC4_ENC=.*$/RC4_ENC= $target{rc4_obj}/;
-	s/^RC5_ENC=.*$/RC5_ENC= $target{rc5_obj}/;
-	s/^MD5_ASM_OBJ=.*$/MD5_ASM_OBJ= $target{md5_obj}/;
-	s/^SHA1_ASM_OBJ=.*$/SHA1_ASM_OBJ= $target{sha1_obj}/;
-	s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $target{rmd160_obj}/;
-	s/^WP_ASM_OBJ=.*$/WP_ASM_OBJ= $target{wp_obj}/;
-	s/^CMLL_ENC=.*$/CMLL_ENC= $target{cmll_obj}/;
-	s/^MODES_ASM_OBJ.=*$/MODES_ASM_OBJ= $target{modes_obj}/;
-	s/^ENGINES_ASM_OBJ.=*$/ENGINES_ASM_OBJ= $target{engines_obj}/;
-	s/^CHACHA_ENC=.*$/CHACHA_ENC= $target{chacha_obj}/;
-	s/^POLY1305_ASM_OBJ=.*$/POLY1305_ASM_OBJ= $target{poly1305_obj}/;
-	s/^PERLASM_SCHEME=.*$/PERLASM_SCHEME= $target{perlasm_scheme}/;
-	s/^PROCESSOR=.*/PROCESSOR= $config{processor}/;
-	s/^ARFLAGS=.*/ARFLAGS= $target{arflags}/;
-	s/^PERL=.*/PERL= $config{perl}/;
-	s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
-	s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
-	s/^FIPSLIBDIR=.*/FIPSLIBDIR=$fipslibdir/;
-	s/^FIPSCANLIB=.*/FIPSCANLIB=libcrypto/ if $fips;
-	s/^SHARED_FIPS=.*/SHARED_FIPS=/;
-	s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl/;
-	s/^BASEADDR=.*/BASEADDR=$baseaddr/;
-	s/^SHLIB_TARGET=.*/SHLIB_TARGET=$target{shared_target}/;
-	s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
-	s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$config{no_shared});
-	if ($target{shared_extension} ne "" && $target{shared_extension} =~ /^\.s([ol])\.[^\.]*$/)
-		{
-		my $sotmp = $1;
-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
-		}
-	elsif ($target{shared_extension} ne "" && $target{shared_extension} =~ /^\.[^\.]*\.dylib$/)
-		{
-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.dylib/;
-		}
-	elsif ($target{shared_extension} ne "" && $target{shared_extension} =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
-		{
-		my $sotmp = $1;
-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-		}
-	elsif ($target{shared_extension} ne "" && $target{shared_extension} =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
-		{
-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/;
-		}
-	s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$target{shared_ldflag}/;
-	print OUT $_."\n";
-	}
-close(IN);
+1;
+EOF
 close(OUT);
-rename("$Makefile.new",$Makefile) || die "unable to rename $Makefile.new\n";
 
 print "IsMK1MF       =", ($target{build_scheme}->[0] eq "mk1mf" ? "yes" : "no"), "\n";
 print "CC            =$target{cc}\n";
-print "CFLAG         =$cflags\n";
-print "EX_LIBS       =$lflags\n";
+print "CFLAG         =$config{cflags}\n";
+print "EX_LIBS       =$config{lflags}\n";
 print "CPUID_OBJ     =$target{cpuid_obj}\n";
 print "BN_ASM        =$target{bn_obj}\n";
 print "EC_ASM        =$target{ec_obj}\n";
@@ -1413,23 +1359,15 @@ print "RANLIB        =$target{ranlib}\n";
 print "ARFLAGS       =$target{arflags}\n";
 print "PERL          =$config{perl}\n";
 
-sub
-run_dofile()
-{
-    my $in = shift;
-    my $out = shift;
+run_dofile("$Makefile.in","$Makefile.new");
 
-    # should we remove $out ?
-    system("$config{perl} -I. -Mconfigdata util/dofile.pl <$in >$out.new");
-    exit 1 if $? != 0;
-    rename("$out.new", $out) || die "Can't rename $out.new, $!";
-}
+run_dofile("include/openssl/opensslconf.h.in", "include/openssl/opensslconf.h");
 
-&run_dofile("include/openssl/opensslconf.h.in", "include/openssl/opensslconf.h");
+run_dofile("include/openssl/opensslconf.h.in", "include/openssl/opensslconf.h");
 
 foreach my $alg ( 'bf', 'bn', 'des', 'rc4' ) {
-    &run_dofile("crypto/include/internal/${alg}_conf.h.in",
-        "crypto/include/internal/${alg}_conf.h");
+    run_dofile("crypto/include/internal/${alg}_conf.h.in",
+	       "crypto/include/internal/${alg}_conf.h");
 }
 
 # Fix the date
@@ -1480,10 +1418,10 @@ my %builders = (
     unixmake => sub {
 	my $make_command = "$make PERL=\'$config{perl}\'";
 	my $make_targets = "";
-	$make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;
+	$make_targets .= " depend" if $config{depflags} ne $default_depflags && $make_depend;
 	(system $make_command.$make_targets) == 0 or die "make $make_targets failed"
 	    if $make_targets ne "";
-	if ($depflags ne $default_depflags && !$make_depend) {
+	if ($config{depflags} ne $default_depflags && !$make_depend) {
             $warn_make_depend++;
         }
     },
@@ -1815,6 +1753,17 @@ sub usage
 	exit(1);
 	}
 
+sub run_dofile()
+{
+    my $in = shift;
+    my $out = shift;
+
+    # should we remove $out ?
+    system("$config{perl} -I. -Mconfigdata util/dofile.pl <$in >$out.new");
+    exit 1 if $? != 0;
+    rename("$out.new", $out) || die "Can't rename $out.new, $!";
+}
+
 # Configuration printer ##############################################
 
 sub print_table_entry
@@ -1890,10 +1839,10 @@ sub which
 	my $path;
 	foreach $path (split /:/, $ENV{PATH})
 		{
-		if (-f "$path/$name$exe_ext" and -x _)
+		if (-f "$path/$name$target{exe_extension}" and -x _)
 			{
-			return "$path/$name$exe_ext" unless ($name eq "perl" and
-			 system("$path/$name$exe_ext -e " . '\'exit($]<5.0);\''));
+			return "$path/$name$target{exe_extension}" unless ($name eq "perl" and
+			 system("$path/$name$target{exe_extension} -e " . '\'exit($]<5.0);\''));
 			}
 		}
 	}
@@ -2015,3 +1964,35 @@ sub quotify {
 
     map { $processor->($_); } @_;
 }
+
+# collect_information($filename, $line_continue, $regexp => $CODEref, ...)
+# $filename is the file to read.
+# $line_continue is either undef (which is a noop), or two arguments, where
+# the first is a regexp detecting a line continuation ending, and the
+# following argument is a CODEref that takes care of concatenating two
+# lines.
+# All following arguments are regex/CODEref pairs, where the regexp detects a
+# line and the CODEref does something with the result of the regexp.
+sub collect_information {
+    my $filename = shift;
+    my $line_continue_re = shift;
+    my $line_concat = defined($line_continue_re) ? shift : undef;
+    my %collectors = @_;
+
+    my $saved_line = "";
+    open IN, $filename || die "unable to read $filename: $!\n";
+    while(<IN>) {
+	chomp;
+	if (defined $line_concat) {
+	    $_ = $line_concat->($saved_line, $_);
+	}
+	if (defined $line_continue_re && /$line_continue_re/) {
+	    $saved_line = $_;
+	    next;
+	}
+	foreach my $re (keys %collectors) {
+	    if (/$re/) { $collectors{$re}->() };
+	}
+    }
+    close IN;
+}
diff --git a/Makefile.in b/Makefile.in
index 9278783c8d..e875f43bdc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,18 +2,18 @@
 ## Makefile for OpenSSL
 ##
 
-VERSION=
-MAJOR=
-MINOR=
-SHLIB_VERSION_NUMBER=
-SHLIB_VERSION_HISTORY=
-SHLIB_MAJOR=
-SHLIB_MINOR=
-SHLIB_EXT=
-PLATFORM=dist
-OPTIONS=
-CONFIGURE_ARGS=
-SHLIB_TARGET=
+VERSION={- $config{version} -}
+MAJOR={- $config{major} -}
+MINOR={- $config{minor} -}
+SHLIB_VERSION_NUMBER={- $config{shlib_version_number