Back out bug 859894 to open this CLOSED TREE.

dom/bindings/Makefile.in

@@ -98,7 +98,23 @@ LOCAL_INCLUDES += \
   $(NULL)
 endif
 
-EXTRA_MDDEPEND_FILES := $(addsuffix .pp,$(binding_cpp_files) $(binding_header_files))
+# XXXkhuey this is a terrible hack to avoid blowing out the command line
+ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
+$(shell echo "$(addsuffix .pp,$(binding_header_files))" > hpp.list)
+$(shell echo "$(addsuffix .pp,$(binding_cpp_files))" > cpp.list)
+
+# The script mddepend.pl checks the dependencies and writes to stdout
+# one rule to force out-of-date objects. For example,
+#   foo.o boo.o: FORCE
+# The script has an advantage over including the *.pp files directly
+# because it handles the case when header files are removed from the build.
+# 'make' would complain that there is no way to build missing headers.
+HPP_PP_RESULTS = $(shell cat hpp.list | $(PERL) $(BUILD_TOOLS)/mddepend.pl)
+$(eval $(HPP_PP_RESULTS))
+CPP_PP_RESULTS = $(shell cat cpp.list | $(PERL) $(BUILD_TOOLS)/mddepend.pl)
+$(eval $(CPP_PP_RESULTS))
+
+endif
 
 EXPORTS_GENERATED_FILES := $(exported_binding_headers)
 EXPORTS_GENERATED_DEST := $(DIST)/include/$(binding_include_path)
@@ -155,11 +171,11 @@ $(binding_header_files): %Binding.h: $(bindinggen_dependencies) \
 	  $(srcdir)/BindingGen.py header \
 	  $(srcdir)/Bindings.conf \
 	  $*Binding \
-	  $(CURDIR)/ \
+	  $(topsrcdir)/dom/webidl/ \
 	  $*.webidl
 
 $(binding_cpp_files): %Binding.cpp: $(bindinggen_dependencies) \
-                                    $(CURDIR)/%.webidl \
+                                    %.webidl \
                                     $(call mkdir_deps,$(MDDEPDIR)) \
                                     $(NULL)
 	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
@@ -167,7 +183,7 @@ $(binding_cpp_files): %Binding.cpp: $(bindinggen_dependencies) \
 	  $(srcdir)/BindingGen.py cpp \
 	  $(srcdir)/Bindings.conf \
 	  $*Binding \
-	  $(CURDIR) \
+	  $(topsrcdir)/dom/webidl/ \
 	  $*.webidl
 
 $(globalgen_targets): ParserResults.pkl

dom/bindings/test/Makefile.in

@@ -14,11 +14,6 @@ FORCE_STATIC_LIB = 1
 # Do NOT export this library.  We don't actually want our test code
 # being added to libxul or anything.
 
-# pymake can't handle descending into dom/bindings several times simultaneously
-ifdef .PYMAKE
-.NOTPARALLEL:
-endif
-
 include $(DEPTH)/config/autoconf.mk
 
 # Need this to find all our DOM source files.