Bug 950736 - Part 2: Make build failures of codegen.pp fatal; r=glandium

--HG--
extra : rebase_source : a2a815dd0342a8fdf2dacd7d643d4504e2f29eb5
extra : amend_source : 474af6a65c7ad26cdfc7d6eb26caf0b42fe741c3

config/baseconfig.mk

@@ -29,7 +29,7 @@ endif
 endif # WINNT
 
 ifdef .PYMAKE
-include_deps = $(eval -includedeps $(1))
+include_deps = $(eval $(if $(2),,-)includedeps $(1))
 else
-include_deps = $(eval -include $(1))
+include_deps = $(eval $(if $(2),,-)include $(1))
 endif

dom/bindings/Makefile.in

@@ -58,11 +58,10 @@ codegen_dependencies := \
   $(GLOBAL_DEPS) \
   $(NULL)
 
-$(call include_deps,codegen.pp)
+# The 1 is to make codegen.pp not optional.
+$(call include_deps,codegen.pp,1)
 
-codegen.pp: codegen.done
-
-codegen.done: $(codegen_dependencies)
+codegen.pp: $(codegen_dependencies)
 	$(call py_action,webidl,$(srcdir))
 	@$(TOUCH) $@
 

dom/bindings/mozwebidlcodegen/__init__.py

@@ -546,7 +546,7 @@ def create_build_system_manager(topsrcdir, topobjdir, dist_dir):
         cache_dir=cache_dir,
         # The make rules include a codegen.pp file containing dependencies.
         make_deps_path=os.path.join(obj_dir, 'codegen.pp'),
-        make_deps_target='codegen.done',
+        make_deps_target='codegen.pp',
     )