RT468: SSL_CTX_sess_set_cache_size wrong

[openssl.git] / util / clean-depend.pl

diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index af676af751458363e8f6c735be2d97c3615f5916..d3525b0ed06967b1309fd15f7c52fa242c45f9d8 100755 (executable)
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -11,20 +11,40 @@ while(<STDIN>) {
 
 my %files;
 
+my $thisfile="";
 while(<STDIN>) {
-    my ($file,$deps)=/^(.*): (.*)$/;
+    my ($dummy, $file,$deps)=/^((.*):)? (.*)$/;
+    my $origfile="";
+    $thisfile=$file if defined $file;
     next if !defined $deps;
+    $origfile=$thisfile;
+    $origfile=~s/\.o$/.c/;
     my @deps=split ' ',$deps;
-    @deps=grep(!/^\/usr\/include/,@deps);
-    @deps=grep(!/^\/usr\/lib\/gcc-lib/,@deps);
-    push @{$files{$file}},@deps;
+    @deps=grep(!/^\//,@deps);
+    @deps=grep(!/^\\$/,@deps);
+    @deps=grep(!/^$origfile$/,@deps);
+# pull out the kludged kerberos header (if present).
+    @deps=grep(!/^[.\/]+\/krb5.h/,@deps);
+    push @{$files{$thisfile}},@deps;
 }
 
 my $file;
 foreach $file (sort keys %files) {
     my $len=0;
     my $dep;
-    foreach $dep (sort @{$files{$file}}) {
+    my $origfile=$file;
+    $origfile=~s/\.o$/.c/;
+    $file=~s/^\.\///;
+    push @{$files{$file}},$origfile;
+    my $prevdep="";
+
+    # Remove leading ./ before sorting
+    my @deps = map { $_ =~ s/^\.\///; $_ } @{$files{$file}};
+
+    foreach $dep (sort @deps) {
+       $dep=~s/^\.\///;
+       next if $prevdep eq $dep; # to exterminate duplicates...
+       $prevdep = $dep;
        $len=0 if $len+length($dep)+1 >= 80;
        if($len == 0) {
            print "\n$file:";