Make sure the source file is included among the dependencies. This is

the norm for 'gcc -M' but not for 'makedepend', and is merely
introduced here to avoid commit wars.

diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index d2b78282c02fb43be182b35f57bd63a4ebd4752a..15ce8f09594c78ee06531fe2e7e1d5495a392b52 100755 (executable)
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -14,11 +14,15 @@ my %files;
 my $thisfile="";
 while(<STDIN>) {
     my ($dummy, $file,$deps)=/^((.*):)? (.*)$/;
 my $thisfile="";
 while(<STDIN>) {
     my ($dummy, $file,$deps)=/^((.*):)? (.*)$/;

+    my $origfile="";

     $thisfile=$file if defined $file;
     next if !defined $deps;
     $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);
     my @deps=split ' ',$deps;
     @deps=grep(!/^\//,@deps);
     @deps=grep(!/^\\$/,@deps);

+    @deps=grep(!/^$origfile$/,@deps);

     push @{$files{$thisfile}},@deps;
 }
 
     push @{$files{$thisfile}},@deps;
 }
 


@@ -26,6 +30,9 @@ my $file;
 foreach $file (sort keys %files) {
     my $len=0;
     my $dep;
 foreach $file (sort keys %files) {
     my $len=0;
     my $dep;

+    my $origfile=$file;
+    $origfile=~s/\.o$/.c/;
+    push @{$files{$file}},$origfile;

     foreach $dep (sort @{$files{$file}}) {
        $len=0 if $len+length($dep)+1 >= 80;
        if($len == 0) {
     foreach $dep (sort @{$files{$file}}) {
        $len=0 if $len+length($dep)+1 >= 80;
        if($len == 0) {