Bug 596585: Toplevel makefile should be aware of js/src's configure. r=Mitch a=NPOTB
authorKyle Huey <khuey@kylehuey.com>
Sat, 02 Oct 2010 04:27:19 -0400
changeset 54971 0ac9a37f942828d1987a7adcdbe9512cbf9d3988
parent 54970 2cd506bdbd5069a2f4d62a3d0eb0a9bacec2de82
child 54972 a701d821ef362fc3ea6ceddfcd53f1ccd6300b8b
child 55112 84520ab36a4c348f56ff37d4d050360058c715d6
push idunknown
push userunknown
push dateunknown
reviewersMitch, NPOTB
bugs596585
milestone2.0b8pre
Bug 596585: Toplevel makefile should be aware of js/src's configure. r=Mitch a=NPOTB
Makefile.in
content/base/test/file_mozfiledataurl_doc.html
content/base/test/file_mozfiledataurl_img.jpg
content/base/test/file_mozfiledataurl_inner.html
content/base/test/file_mozfiledataurl_text.txt
content/base/test/test_mozfiledataurl.html
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,38 +84,52 @@ DIST_GARBAGE = config.cache config.log c
    netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
    $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
 
 ifdef WINCE
 check::
 	$(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy $(DIST)/bin
 endif
 
-default alldep all:: $(topsrcdir)/configure config.status
+default alldep all:: $(topsrcdir)/configure $(topsrcdir)/js/src/configure config.status js/src/config.status
 	$(RM) -rf $(DIST)/sdk
 	$(RM) -rf $(DIST)/include
 	$(RM) -rf $(DIST)/private
 	$(RM) -rf $(DIST)/public
 	$(RM) -rf $(DIST)/bin/components
 	$(RM) -rf _tests
 
 $(topsrcdir)/configure: $(topsrcdir)/configure.in
 	@echo "STOP!  configure.in has changed, and your configure is out of date."
 	@echo "Please rerun autoconf and re-configure your build directory."
 	@echo "To ignore this message, touch 'configure' in the source directory,"
 	@echo "but your build might not succeed."
 	@exit 1
 
+$(topsrcdir)/js/src/configure: $(topsrcdir)/js/src/configure.in
+	@echo "STOP!  js/src/configure.in has changed, and your js/src/configure is out of date."
+	@echo "Please rerun autoconf in js/src and re-configure your build directory."
+	@echo "To ignore this message, touch 'js/src/configure' in the source directory,"
+	@echo "but your build might not succeed."
+	@exit 1
+
 config.status: $(topsrcdir)/configure
 	@echo "STOP!  configure has changed and needs to be run in this build directory."
 	@echo "Please rerun configure."
 	@echo "To ignore this message, touch 'config.status' in the build directory,"
 	@echo "but your build might not succeed."
 	@exit 1
 
+js/src/config.status: $(topsrcdir)/js/src/configure
+	@echo "STOP!  js/src/configure has changed and needs to be run in this build directory."
+	@echo "Please rerun js/src/configure."
+	@echo "To ignore this message, touch 'js/src/config.status' in the build directory,"
+	@echo "but your build might not succeed."
+	@exit 1
+
 # Build pseudo-external modules first when export is explicitly called
 export::
 	$(RM) -rf $(DIST)/sdk
 	$(MAKE) -C config export
 	$(MAKE) tier_nspr
 
 ifdef ENABLE_TESTS
 # Additional makefile targets to call automated test suites