Bug 1293784 - Only recurse into xpcom/idl-parser/xpidl once; r?gps draft
authorMike Shal <mshal@mozilla.com>
Tue, 09 Aug 2016 16:58:18 -0400
changeset 398862 c6b246ff0815fb6d6508ff25baf3c14c670e654e
parent 398604 6cf0089510fad8deb866136f5b92bbced9498447
child 527776 d473430cf8fc351d4cf94b978b42df4ee55cc28b
push id25660
push userbmo:mshal@mozilla.com
push dateTue, 09 Aug 2016 22:02:51 +0000
reviewersgps
bugs1293784
milestone51.0a1
Bug 1293784 - Only recurse into xpcom/idl-parser/xpidl once; r?gps MozReview-Commit-ID: 823OM551BH6
config/recurse.mk
xpcom/xpidl/Makefile.in
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -142,16 +142,19 @@ recurse:
 ifeq (.,$(DEPTH))
 # Interdependencies for parallel export.
 js/xpconnect/src/export: dom/bindings/export xpcom/xpidl/export
 accessible/xpcom/export: xpcom/xpidl/export
 
 # The widget binding generator code is part of the annotationProcessors.
 widget/android/bindings/export: build/annotationProcessors/export
 
+# .xpt generation needs the xpidl lex/yacc files
+xpcom/xpidl/export: xpcom/idl-parser/xpidl/export
+
 # The roboextender addon includes a classes.dex containing a test Java addon.
 # The test addon must be built first.
 mobile/android/tests/browser/robocop/roboextender/tools: mobile/android/tests/javaaddons/tools
 
 ifdef ENABLE_CLANG_PLUGIN
 $(filter-out config/host build/unix/stdc++compat/% build/clang-plugin/%,$(compile_targets)): build/clang-plugin/target build/clang-plugin/tests/target
 build/clang-plugin/tests/target: build/clang-plugin/target
 endif
--- a/xpcom/xpidl/Makefile.in
+++ b/xpcom/xpidl/Makefile.in
@@ -1,11 +1,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 export::
-	$(call SUBMAKE,xpidllex.py,$(DEPTH)/xpcom/idl-parser/xpidl)
 	$(call py_action,process_install_manifest,$(DIST)/idl $(DEPTH)/_build_manifests/install/dist_idl)
 	$(call SUBMAKE,xpidl,$(DEPTH)/config/makefiles/xpidl)
 
 clean clobber realclean clobber_all distclean::
 	$(call SUBMAKE,$@,$(DEPTH)/config/makefiles/xpidl)