Bug 777379 - Ensure that default is always the default target. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 08 Aug 2012 09:33:16 +0200
changeset 101801 0aff1ee2a4fd5a52aad87254c0d8426fb72217be
parent 101800 9428d40e8ead32f380a7e31bbaa52232096b0550
child 101802 fda1cd4d7dbab3e58143df8c5179afb16f7000fa
push idunknown
push userunknown
push dateunknown
reviewersted
bugs777379
milestone17.0a1
Bug 777379 - Ensure that default is always the default target. r=ted
browser/installer/windows/Makefile.in
config/rules.mk
js/src/config/rules.mk
tools/update-packaging/Makefile.in
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -53,16 +53,17 @@ PPL_LOCALE_ARGS = \
   --l10n-dir=$(LOCALE_MERGEDIR)/browser/installer \
   --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer \
   --l10n-dir=$(topsrcdir)/browser/locales/en-US/installer \
   $(NULL)
 else
 PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer
 endif
 
+.DEFAULT_GOAL := installer
 installer::
 	$(MAKE) -C .. installer-stage
 	$(MAKE) $(CONFIG_DIR)/setup.exe
 
 # For building the uninstaller during the application build so it can be
 # included for mar file generation.
 uninstaller::
 	$(RM) -r $(CONFIG_DIR)
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1769,16 +1769,17 @@ CHECK_FROZEN_VARIABLES = $(foreach var,$
   $(if $(subst $($(var)_FROZEN),,'$($(var))'),$(error Makefile variable '$(var)' changed value after including rules.mk. Was $($(var)_FROZEN), now $($(var)).)))
 
 libs export::
 	$(CHECK_FROZEN_VARIABLES)
 
 default all::
 	if test -d $(DIST)/bin ; then touch $(DIST)/bin/.purgecaches ; fi
 
+.DEFAULT_GOAL ?= default
 
 #############################################################################
 # Derived targets and dependencies
 
 include $(topsrcdir)/config/makefiles/autotargets.mk
 ifneq ($(NULL),$(AUTO_DEPS))
   default all libs tools export:: $(AUTO_DEPS)
 endif
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1769,16 +1769,17 @@ CHECK_FROZEN_VARIABLES = $(foreach var,$
   $(if $(subst $($(var)_FROZEN),,'$($(var))'),$(error Makefile variable '$(var)' changed value after including rules.mk. Was $($(var)_FROZEN), now $($(var)).)))
 
 libs export::
 	$(CHECK_FROZEN_VARIABLES)
 
 default all::
 	if test -d $(DIST)/bin ; then touch $(DIST)/bin/.purgecaches ; fi
 
+.DEFAULT_GOAL ?= default
 
 #############################################################################
 # Derived targets and dependencies
 
 include $(topsrcdir)/config/makefiles/autotargets.mk
 ifneq ($(NULL),$(AUTO_DEPS))
   default all libs tools export:: $(AUTO_DEPS)
 endif
--- a/tools/update-packaging/Makefile.in
+++ b/tools/update-packaging/Makefile.in
@@ -30,16 +30,17 @@ PACKAGE_DIR	= $(PACKAGE_BASE_DIR)/$(MOZ_
 endif
 else
 PACKAGE_DIR	= $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)
 endif
 
 MAR_BIN	= $(LIBXUL_DIST)/host/bin/mar$(HOST_BIN_SUFFIX)
 MBSDIFF_BIN	= $(LIBXUL_DIST)/host/bin/mbsdiff$(HOST_BIN_SUFFIX)
 
+.DEFAULT_GOAL := full-update
 full-update:: complete-patch
 
 ifeq ($(OS_TARGET), WINNT)
 MOZ_PKG_FORMAT	:= SFX7Z
 UNPACKAGE	= "$(subst $(DIST),$(_ABS_DIST),$(INSTALLER_PACKAGE))"
 ifdef AB_CD
 UNPACKAGE	= "$(PACKAGE_BASE_DIR)/$(PACKAGE)"
 endif