projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update from HEAD
[openssl.git]
/
util
/
mkfiles.pl
diff --git
a/util/mkfiles.pl
b/util/mkfiles.pl
index 70d1348a343ebfc6a806d1f3b229a879fb449ffc..6d158314509f1279ebf4cce8c09f4d0a11690634 100755
(executable)
--- a/
util/mkfiles.pl
+++ b/
util/mkfiles.pl
@@
-24,6
+24,9
@@
my @dirs = (
"crypto/bf",
"crypto/cast",
"crypto/aes",
"crypto/bf",
"crypto/cast",
"crypto/aes",
+"crypto/camellia",
+"crypto/seed",
+"crypto/modes",
"crypto/bn",
"crypto/rsa",
"crypto/dsa",
"crypto/bn",
"crypto/rsa",
"crypto/dsa",
@@
-44,7
+47,9
@@
my @dirs = (
"crypto/pem",
"crypto/x509",
"crypto/x509v3",
"crypto/pem",
"crypto/x509",
"crypto/x509v3",
+"crypto/cms",
"crypto/conf",
"crypto/conf",
+"crypto/jpake",
"crypto/txt_db",
"crypto/pkcs7",
"crypto/pkcs12",
"crypto/txt_db",
"crypto/pkcs7",
"crypto/pkcs12",
@@
-53,14
+58,22
@@
my @dirs = (
"crypto/ocsp",
"crypto/ui",
"crypto/krb5",
"crypto/ocsp",
"crypto/ui",
"crypto/krb5",
+#"crypto/store",
+"crypto/pqueue",
+"crypto/whrlpool",
+"crypto/ts",
"ssl",
"apps",
"ssl",
"apps",
+"engines",
+"engines/ccgost",
"test",
"tools"
);
"test",
"tools"
);
+%top;
+
foreach (@dirs) {
foreach (@dirs) {
- &files_dir ($_, "Makefile
.ssl
");
+ &files_dir ($_, "Makefile");
}
exit(0);
}
exit(0);
@@
-102,8
+115,8
@@
while (<IN>)
$o =~ s/\s+$//;
$o =~ s/\s+/ /g;
$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)
;
}
}
}
}
@@
-113,6
+126,15
@@
foreach (sort keys %sym)
{
print "$_=$sym{$_}\n";
}
{
print "$_=$sym{$_}\n";
}
+if ($dir eq "." && defined($sym{"BUILDENV"}))
+ {
+ foreach (split(' ',$sym{"BUILDENV"}))
+ {
+ /^(.+)=/;
+ $top{$1}=$sym{$1};
+ }
+ }
+
print "RELATIVE_DIRECTORY=\n";
close (IN);
print "RELATIVE_DIRECTORY=\n";
close (IN);