X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fmkfiles.pl;h=1326c9856a30be22a82b6960b2fdb169d669dbbb;hb=592a207b94dadbd03f352e8f74133efc0a141e3d;hp=0e174a6d26f10e73eae25ad047d413d09cddfc75;hpb=b4f682d32fb8bf375fd0c8edce6d113dfdf1c6ba;p=oweals%2Fopenssl.git

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 0e174a6d26..1326c9856a 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -23,13 +23,17 @@ my @dirs = (
 "crypto/idea",
 "crypto/bf",
 "crypto/cast",
-"crypto/rijndael",
+"crypto/aes",
+"crypto/camellia",
+"crypto/seed",
 "crypto/bn",
 "crypto/rsa",
 "crypto/dsa",
 "crypto/dso",
 "crypto/dh",
 "crypto/ec",
+"crypto/ecdh",
+"crypto/ecdsa",
 "crypto/buffer",
 "crypto/bio",
 "crypto/stack",
@@ -42,6 +46,7 @@ my @dirs = (
 "crypto/pem",
 "crypto/x509",
 "crypto/x509v3",
+"crypto/cms",
 "crypto/conf",
 "crypto/txt_db",
 "crypto/pkcs7",
@@ -49,14 +54,24 @@ my @dirs = (
 "crypto/comp",
 "crypto/engine",
 "crypto/ocsp",
+"crypto/ui",
+"crypto/krb5",
+#"crypto/store",
+"crypto/pqueue",
+"crypto/whrlpool",
+"crypto/ts",
 "ssl",
 "apps",
+"engines",
+"engines/ccgost",
 "test",
 "tools"
 );
 
+%top;
+
 foreach (@dirs) {
-	&files_dir ($_, "Makefile.ssl");
+	&files_dir ($_, "Makefile");
 }
 
 exit(0);
@@ -98,8 +113,8 @@ while (<IN>)
 		$o =~ s/\s+$//;
 		$o =~ s/\s+/ /g;
 
-		$o =~ s/\$[({]([^)}]+)[)}]/$sym{$1}/g;
-		$sym{$s}=$o;
+		$o =~ s/\$[({]([^)}]+)[)}]/$top{$1} or $sym{$1}/ge;
+		$sym{$s}=($top{$s} or $o);
 		}
 	}
 
@@ -109,6 +124,15 @@ foreach (sort keys %sym)
 	{
 	print "$_=$sym{$_}\n";
 	}
+if ($dir eq "." && defined($sym{"BUILDENV"}))
+	{
+	foreach (split(' ',$sym{"BUILDENV"}))
+		{
+		/^(.+)=/;
+		$top{$1}=$sym{$1};
+		}
+	}
+
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);