Remove dirs from mkfiles.pl

[openssl.git] / util / mkfiles.pl

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 853f69c0eb00819287c1006f19a4629f3e2738cc..d668316d697de59ca5cf6de8c093700edfb6693c 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -26,14 +26,14 @@ my @dirs = (
 "crypto/aes",
 "crypto/camellia",
 "crypto/seed",
+"crypto/modes",
+"crypto/cmac",
 "crypto/bn",
 "crypto/rsa",
 "crypto/dsa",
 "crypto/dso",
 "crypto/dh",
 "crypto/ec",
-"crypto/ecdh",
-"crypto/ecdsa",
 "crypto/buffer",
 "crypto/bio",
 "crypto/stack",
@@ -56,22 +56,28 @@ my @dirs = (
 "crypto/engine",
 "crypto/ocsp",
 "crypto/ui",
-"crypto/krb5",
 #"crypto/store",
-"crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
+"crypto/srp",
+"crypto/ct",
+"crypto/async",
+"crypto/chacha",
+"crypto/poly1305",
+"crypto/kdf",
 "ssl",
 "apps",
 "engines",
-"engines/ccgost",
 "test",
 "tools"
 );
 
 %top;
 
+my $fipscanisteronly = 0;
+
 foreach (@dirs) {
+       next if ($fipscanisteronly && !(-d $_));
        &files_dir ($_, "Makefile");
 }
 
@@ -91,7 +97,7 @@ while (<IN>)
        {
        chop;
        s/#.*//;
-       if (/^(\S+)\s*=\s*(.*)$/)
+       if (/^([^\s=]+)\s*=\s*(.*)$/)
                {
                $o="";
                ($s,$b)=($1,$2);
@@ -137,4 +143,8 @@ if ($dir eq "." && defined($sym{"BUILDENV"}))
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);
+if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")
+       {
+       $fipscanisteronly = 1;
+       }
 }