X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fclean-depend.pl;h=2b2bdb404880590ee6c553884fa333349b712970;hb=46bf0ba87665c5aa215673d87e9ee7dd4ce28359;hp=d2b78282c02fb43be182b35f57bd63a4ebd4752a;hpb=3b4cfea688be0bbe3270848f9640aef78028caab;p=oweals%2Fopenssl.git

diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index d2b78282c0..2b2bdb4048 100755
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -14,11 +14,17 @@ my %files;
 my $thisfile="";
 while(<STDIN>) {
     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(!/^\//,@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;
 }
 
@@ -26,7 +32,18 @@ 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) {
+	next if $prevdep eq $dep; # to exterminate duplicates...
+	$prevdep = $dep;
 	$len=0 if $len+length($dep)+1 >= 80;
 	if($len == 0) {
 	    print "\n$file:";