Fix Windows build

[openssl.git] / util / mkfiles.pl

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 8bfbcae255f1c84abba728ec322c9c021c413ea5..68a9a6c042df5b9be7ee73d2e6172b162f13d938 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -58,11 +58,12 @@ my @dirs = (
 "crypto/engine",
 "crypto/ocsp",
 "crypto/ui",
-"crypto/krb5",
 #"crypto/store",
 "crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
+"crypto/srp",
+"crypto/ct",
 "ssl",
 "apps",
 "engines",
@@ -73,7 +74,10 @@ my @dirs = (
 
 %top;
 
+my $fipscanisteronly = 0;
+
 foreach (@dirs) {
+       next if ($fipscanisteronly && !(-d $_));
        &files_dir ($_, "Makefile");
 }
 
@@ -93,7 +97,7 @@ while (<IN>)
        {
        chop;
        s/#.*//;
-       if (/^(\S+)\s*=\s*(.*)$/)
+       if (/^([^\s=]+)\s*=\s*(.*)$/)
                {
                $o="";
                ($s,$b)=($1,$2);
@@ -139,4 +143,8 @@ if ($dir eq "." && defined($sym{"BUILDENV"}))
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);
+if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")
+       {
+       $fipscanisteronly = 1;
+       }
 }