Have -MD dependencies cope will missing headerfiles.

config/mddepend.pl

@@ -0,0 +1,76 @@
+#!/usr/bin/env perl
+
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is this file as it was released upon March 8, 1999.
+#
+# The Initial Developer of the Original Code is Netscape Communications
+# Corporation. Portions created by Netscape are Copyright (C) 1999
+# Netscape Communications Corporation. All Rights Reserved.
+
+# mddepend.pl - Reads in dependencies generated my -MD flag. Prints list
+#   of objects that need to be rebuilt. These can then be added to the
+#   PHONY target. Using this script copes with the problem of header
+#   files that have been removed from the build.
+#    
+# Usage:
+#   mddepend.pl <dependency files>
+#
+# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
+
+@alldeps=();
+# Parse dependency files
+while ($line = <>) {
+  chomp $line;
+  ($obj,$rest) = split /:\s+/o, $line, 2;
+  next if $obj eq '';
+
+  if ($line =~ /\\$/o) {
+    chop $rest;
+    $hasSlash = 1;
+  } else {
+    $hasSlash = 0;
+  }
+  $deps = [ $obj, split /\s+/o, $rest ];
+
+  while ($hasSlash and $line = <>) {
+    chomp $line;
+    if ($line =~ /\\$/o) {
+      chop $line;
+    } else {
+      $hasSlash = 0;
+    }
+    $line =~ s/^\s+//o;
+    push @{$deps}, split /\s+/o, $line;
+  }
+  push @alldeps, $deps;
+}
+
+# Test dependencies
+foreach $deps (@alldeps) {
+  $obj = shift @{$deps};
+
+  ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
+   $atime,$mtime,$ctime,$blksize,$blocks) = stat($obj)
+      or next;
+
+  foreach $dep_file (@{$deps}) {
+    if (not defined($dep_mtime = $modtimes{$dep_file})) {
+      ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
+       $atime,$dep_mtime,$ctime,$blksize,$blocks) = stat($dep_file);
+      $modtimes{$dep_file} = $dep_mtime;
+    }
+    if ($dep_mtime eq '' or $dep_mtime > $mtime) {
+      print "$obj ";
+      last;
+    }
+  }
+}

config/rules.mk

@@ -918,7 +918,7 @@ $(MKDEPENDENCIES)::
 	@$(MAKE_OBJDIR)
 	touch $(MKDEPENDENCIES)
 ifdef USE_AUTOCONF
-	$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(DEFINES) $(AC_DEFINES) $(INCLUDES) $(addprefix $(srcdir)/,$(CSRCS) $(CPPSRCS)) >/dev/null 2>/dev/null
+	$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(DEFINES) $(ACDEFINES) $(INCLUDES) $(addprefix $(srcdir)/,$(CSRCS) $(CPPSRCS)) >/dev/null 2>/dev/null
 	@mv depend.mk depend.mk.old && cat depend.mk.old | sed "s|^$(OBJDIR_NAME)/$(srcdir)/|$(OBJDIR_NAME)/|g" > depend.mk && rm -f depend.mk.old
 else
 	$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(INCLUDES) $(CSRCS) $(CPPSRCS)
@@ -965,11 +965,19 @@ endif
 #############################################################################
 # Yet another depend system: -MD
 
-
-MDDEPENDENCIES		:= $(addprefix $(OBJDIR)/.deps/,$(OBJS:.o=.pp))
-
-ifdef MDDEPENDENCIES
--include $(MDDEPENDENCIES)
+ifdef COMPILER_DEPEND
+ifdef OBJS
+#ifneq ($@,install)
+MDDEPEND_FILES := $(foreach obj, $(OBJS), \
+                    $(dir $(obj)).deps/$(basename $(notdir $(obj))).pp)
+MDDEPEND_FILES := $(wildcard $(MDDEPEND_FILES))
+ifdef MDDEPEND_FILES
+# Get the list of objects to force.
+MDDEPEND_FORCE := $(shell $(PERL) $(topsrcdir)/config/mddepend.pl $(MDDEPEND_FILES))
+# (MDDEPEND_FORCE gets added to the PHONY target).
+endif
+#endif
+endif
 endif
 #############################################################################
 
@@ -1013,7 +1021,7 @@ endif
 # Fake targets.  Always run these rules, even if a file/directory with that
 # name already exists.
 #
-.PHONY: all all_platforms alltags boot checkout clean clobber clobber_all export install libs realclean run_viewer run_apprunner $(OBJDIR) $(DIRS)
+.PHONY: all all_platforms alltags boot checkout clean clobber clobber_all export install libs realclean run_viewer run_apprunner $(OBJDIR) $(DIRS) $(MDDEPEND_FORCE)
 
 envirocheck::
 	@echo -----------------------------------