Make it possible to use gcc to generate the dependency tables.

diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index af676af751458363e8f6c735be2d97c3615f5916..c37d98521c6a48b41f31b78c072f98df0407b2cc 100755 (executable)
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -11,13 +11,16 @@ while(<STDIN>) {
 
 my %files;
 
+my $thisfile="";
 while(<STDIN>) {
-    my ($file,$deps)=/^(.*): (.*)$/;
+    my ($dummy, $file,$deps)=/^((.*):)? (.*)$/;
+    $thisfile=$file if defined $file;
     next if !defined $deps;
     my @deps=split ' ',$deps;
     @deps=grep(!/^\/usr\/include/,@deps);
     @deps=grep(!/^\/usr\/lib\/gcc-lib/,@deps);
-    push @{$files{$file}},@deps;
+    @deps=grep(!/^\\$/,@deps);
+    push @{$files{$thisfile}},@deps;
 }
 
 my $file;

diff --git a/util/domd b/util/domd
index 9f75131f221ea3b8334269878a81f83a8de5442f..23b7dcbade97b50d7f1cd33ef8418b0f66548267 100755 (executable)
--- a/util/domd
+++ b/util/domd
@@ -4,8 +4,19 @@
 
 TOP=$1
 shift
+MAKEDEPEND=$1
+shift
+if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
 
 cp Makefile.ssl Makefile.save
-makedepend -f Makefile.ssl $@
-perl $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
+if [ "$MAKEDEPEND" = "gcc" ]; then
+    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp
+    echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
+    gcc -M $@ >> Makefile.tmp
+    perl $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
+    #cat Makefile.tmp > Makefile.new
+else
+    ${MAKEDEPEND} -f Makefile.ssl $@
+    perl $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
+fi
 mv Makefile.new Makefile.ssl