X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=util%2Fclean-depend.pl;h=d3525b0ed06967b1309fd15f7c52fa242c45f9d8;hp=15ce8f09594c78ee06531fe2e7e1d5495a392b52;hb=3bc522a246b34197362a4c34b517aa4c67c26f9a;hpb=6da980e2b56f245ff3c4be277ede0f93c5f174c0

diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index 15ce8f0959..d3525b0ed0 100755
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -23,6 +23,8 @@ while(<STDIN>) {
     @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;
 }
 
@@ -32,8 +34,17 @@ foreach $file (sort keys %files) {
     my $dep;
     my $origfile=$file;
     $origfile=~s/\.o$/.c/;
+    $file=~s/^\.\///;
     push @{$files{$file}},$origfile;
-    foreach $dep (sort @{$files{$file}}) {
+    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:";