Bug 599809 - mailnews/Makefile points to wrong topsrcdir, using m-c instead of c-c. r=Standard8
authorJustin Wood <Callek@gmail.com>
Tue, 28 Sep 2010 22:24:57 -0400
changeset 6450 57c6179c357b10e4c082276ffa039438163559bc
parent 6449 3b4c41cd5a425caf577f23e8c36487278381441f
child 6451 d50957c225de4a6972acc4601aa9baebd9ed797e
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs599809
Bug 599809 - mailnews/Makefile points to wrong topsrcdir, using m-c instead of c-c. r=Standard8
Makefile.in
bridge/bridge.mk
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,41 +55,49 @@ default::
 ifdef COMPILE_ENVIRONMENT
 include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
 endif
 
 include $(topsrcdir)/config/config.mk
 
 default alldep all:: $(topsrcdir)/configure config.status
 
+ifndef INCLUDED_BRIDGE_MK
+include $(topsrcdir)/bridge/bridge.mk
+endif
+
+# workaround Bug 599809 by making these makefiles be generated here
+SUBMAKEFILES += $(addsuffix /Makefile, $(APP_LIBXUL_DIRS) $(APP_LIBXUL_STATICDIRS))
+
 $(topsrcdir)/configure: $(topsrcdir)/configure.in
 	@echo "STOP!  configure.in has changed, and your configure is out of date."
 	@echo "Please rerun autoconf and configure."
 	@echo "To ignore this message, touch 'configure' in the source directory."
 	@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."
 	@exit 1
 
-default export libs clean realclean distclean alldep maybe_clobber_profiledbuild uploadsymbols all::
+default export libs clean realclean distclean alldep \
+maybe_clobber_profiledbuild uploadsymbols all:: $(SUBMAKEFILES)
 	$(MAKE) -C mozilla $@
 
 ifdef ENABLE_TESTS
-check mochitest reftest crashtest xpcshell-tests::
+check mochitest reftest crashtest xpcshell-tests:: $(SUBMAKEFILES)
 	$(MAKE) -C mozilla $@
 
-mochitest-% ::
+mochitest-% :: $(SUBMAKEFILES)
 	$(MAKE) -C mozilla $@
 endif
 
 ifndef MOZ_THUNDERBIRD
-package-tests::
+package-tests:: $(SUBMAKEFILES)
 	$(MAKE) -C mozilla $@
 endif
 
 # http://bugzilla.mozilla.org/show_bug.cgi?id=450485
 MAKE_SYM_STORE_PATH=dist/bin
 ifeq ($(OS_ARCH),Darwin)
 ifdef UNIVERSAL_BINARY
   MAKE_SYM_STORE_PATH=dist/universal
@@ -98,17 +106,17 @@ endif
 
 include $(topsrcdir)/mozilla/toolkit/mozapps/installer/package-name.mk
 
 ifeq ($(OS_ARCH),WINNT)
   # PDB files don't get moved to dist, so we need to scan the whole objdir
   MAKE_SYM_STORE_PATH=..
 endif
 
-buildsymbols ::
+buildsymbols :: $(SUBMAKEFILES)
 	$(MAKE) -C mozilla MAKE_SYM_STORE_PATH=$(MAKE_SYM_STORE_PATH) SYM_STORE_SOURCE_DIRS="$(topsrcdir)/mozilla/extensions/inspector $(topsrcdir)/mozilla $(topsrcdir)" $@
 
 include $(topsrcdir)/config/rules.mk
 
 # defined in (mozilla/.../)package-name.mk
 export MOZ_SOURCE_STAMP
 
 DIST_GARBAGE = config.cache config.log config.status config-defs.h \
--- a/bridge/bridge.mk
+++ b/bridge/bridge.mk
@@ -29,16 +29,18 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
+INCLUDED_BRIDGE_MK = 1
+
 APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
 
 #ifdef MOZ_LDAP_XPCOM
 APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/directory/c-sdk
 APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/directory/xpcom
 #endif
 
 ifdef MOZ_MAIL_NEWS