Bug 1444534 - Pre: Don't hide l10n Make invocations. r=ted.mielczarek
authorNick Alexander <nalexander@mozilla.com>
Wed, 07 Mar 2018 12:25:26 -0800
changeset 766778 e71baaa6c4b65f6ae14f687e721dd8bdac17993d
parent 766777 2222a3f4ae1b0ab8bea4ae6e656a77e6be083742
child 766779 c49612687020f15197ca5024fc562f405c1df127
push id102399
push userbmo:mratcliffe@mozilla.com
push dateTue, 13 Mar 2018 10:12:19 +0000
reviewersted.mielczarek
bugs1444534
milestone60.0a1
Bug 1444534 - Pre: Don't hide l10n Make invocations. r=ted.mielczarek There's just no need for this: it makes interpreting build logs that little bit harder. MozReview-Commit-ID: 7gq73I8I3Bt
mobile/android/locales/Makefile.in
--- a/mobile/android/locales/Makefile.in
+++ b/mobile/android/locales/Makefile.in
@@ -36,48 +36,48 @@ clobber-stage:
 	$(RM) -rf $(STAGEDIST)
 	$(RM) $(DEPTH)/mobile/android/base/res/values-*/strings.xml
 	$(RM) $(DEPTH)/mobile/android/base/res/raw-*/suggestedsites.json
 
 # merge if we're not en-US, using conditional function as we need
 # the current value of AB_CD
 libs-%: AB_CD=$*
 libs-%:
-	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
-	@$(MAKE) -C $(DEPTH)/mobile/locales libs-$*
-	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
-	@$(MAKE) multilocale.txt-$* AB_CD=$* XPI_NAME=locale-$*
+	$(if $(filter en-US,$(AB_CD)),, $(MAKE) merge-$*)
+	$(MAKE) -C $(DEPTH)/mobile/locales libs-$*
+	$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
+	$(MAKE) multilocale.txt-$* AB_CD=$* XPI_NAME=locale-$*
 ifeq ($(OS_TARGET),Android)
-	@$(MAKE) -C $(DEPTH)/mobile/android/base/locales AB_CD=$* XPI_NAME=locale-$*
+	$(MAKE) -C $(DEPTH)/mobile/android/base/locales AB_CD=$* XPI_NAME=locale-$*
 endif
 
 # Tailored target to just add the chrome processing for multi-locale builds
 # merge if we're not en-US, using conditional function as we need
 # the current value of AB_CD
 chrome-%: AB_CD=$*
 chrome-%: IS_LANGUAGE_REPACK=1
 chrome-%:
-	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
-	@$(MAKE) -C $(DEPTH)/mobile/locales chrome-$*
-	@$(MAKE) chrome AB_CD=$*
+	$(if $(filter en-US,$(AB_CD)),, $(MAKE) merge-$*)
+	$(MAKE) -C $(DEPTH)/mobile/locales chrome-$*
+	$(MAKE) chrome AB_CD=$*
 ifeq ($(OS_TARGET),Android)
-	@$(MAKE) -C $(DEPTH)/mobile/android/base/locales chrome-$*
+	$(MAKE) -C $(DEPTH)/mobile/android/base/locales chrome-$*
 endif
 
 langpack: langpack-$(AB_CD)
 
 # This is a generic target that will make a langpack and repack tarball
 # builds. It is called from the tinderbox scripts. Alter it with caution.
 
 installers-%: IS_LANGUAGE_REPACK=1
 installers-%:
-	@$(MAKE) clobber-stage
-	@$(MAKE) libs-$*
-	@$(MAKE) package-langpack-$*
-	@$(MAKE) repackage-zip-$*
+	$(MAKE) clobber-stage
+	$(MAKE) libs-$*
+	$(MAKE) package-langpack-$*
+	$(MAKE) repackage-zip-$*
 	@echo 'repackaging done'
 
 # When we unpack fennec on MacOS X the platform.ini and application.ini are in slightly
 # different locations that on all other platforms
 ifeq (Darwin, $(OS_ARCH))
 GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/platform.ini'
 FENNEC_APPLICATION_INI_PATH='$(STAGEDIST)/application.ini'
 else