merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index bfffec3f466b24087a117240370eee9df76de9ac..0fc64dd9d0afdfb582ff46fad208ca97453b35c5 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-15  DJ Delorie  <dj@redhat.com>
+
+       * maint-tool (deps): Scan for headers in $srcdir also.
+
 2003-04-15  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        PR target/10338

diff --git a/libiberty/maint-tool b/libiberty/maint-tool
index ceeb48dbf39ff14a338e91850f819667fa4323e5..6b9bf7f2cdbe419957a92c0046271740899e63ff 100644 (file)
--- a/libiberty/maint-tool
+++ b/libiberty/maint-tool
@@ -223,6 +223,14 @@ sub deps {
     }
     $mine{'config.h'} = "config.h";
 
+    opendir(INC, $srcdir);
+    while ($f = readdir INC) {
+       next unless $f =~ /\.h$/;
+       $mine{$f} = "\$(srcdir)/$f";
+       $deps{$f} = join(' ', &deps_for("$srcdir/$f"));
+    }
+    $mine{'config.h'} = "config.h";
+
     open(IN, "$srcdir/Makefile.in");
     open(OUT, ">$srcdir/Makefile.tmp");
     while (<IN>) {