Backing out Bug 596585
authorKyle Huey <khuey@kylehuey.com>
Thu, 07 Oct 2010 12:11:19 -0400
changeset 55113 7e44c351984ec8cc2e1e94e66d2b6003e2163866
parent 55110 db10eec8f8ab599872f3bd675587c6f9c6b12827 (current diff)
parent 55112 84520ab36a4c348f56ff37d4d050360058c715d6 (diff)
child 55114 3880abf71fc262ebce9310141aef658bd68431c1
push id16134
push userkhuey@kylehuey.com
push dateThu, 07 Oct 2010 16:19:40 +0000
treeherdermozilla-central@3880abf71fc2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs596585
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backing out Bug 596585
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,52 +84,38 @@ 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 $(topsrcdir)/js/src/configure config.status js/src/config.status
+default alldep all:: $(topsrcdir)/configure 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