It seems like gcc does canonicalisation of file names. More

specifically, a starting './' is removed.  makedepend doesn't do this,
resulting in another possible commit war, so let's fix that by doing a
poor mans canonicalisation of file names that gives the same effect as
doing dependencies through gcc.

diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index 322bfcc582fc7d14da5831f1e12de736f8319805..6c485d1e2fb12d9a83817e9e026e5fac8656199c 100755 (executable)
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -34,9 +34,11 @@ foreach $file (sort keys %files) {
     my $dep;
     my $origfile=$file;
     $origfile=~s/\.o$/.c/;
+    $file=~s/^\.\///;
     push @{$files{$file}},$origfile;
     my $prevdep="";
     foreach $dep (sort @{$files{$file}}) {
+       $dep=~s/^\.\///;
        next if $prevdep eq $dep; # to exterminate duplicates...
        $prevdep = $dep;
        $len=0 if $len+length($dep)+1 >= 80;