Bug 913842 - Avoid recursing under mobile/android/base/locales when rebuilding gecko.ap_. r=ted
☠☠ backed out by 4c431a919737 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 10 Sep 2013 07:11:58 +0900
changeset 146217 24af5272b52f75bb44116fa46b81c3ea013f11bd
parent 146216 a468b2e34b043362715ea032ca204d35bd99fc9f
child 146218 740094c07328b57ade70fb279022641eafb02ba3
push id25246
push usermh@glandium.org
push dateMon, 09 Sep 2013 22:13:05 +0000
treeherdermozilla-central@740094c07328 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs913842
milestone26.0a1
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
Bug 913842 - Avoid recursing under mobile/android/base/locales when rebuilding gecko.ap_. r=ted
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -1381,25 +1381,26 @@ res/drawable-hdpi/icon.png: $(ICON_PATH_
 res/drawable-xhdpi/icon.png: $(ICON_PATH_XHDPI)
 	$(NSINSTALL) -D res/drawable-xhdpi
 	cp $(ICON_PATH_XHDPI) $@
 
 res/drawable-xxhdpi/icon.png: $(ICON_PATH_XXHDPI)
 	$(NSINSTALL) -D res/drawable-xxhdpi
 	cp $(ICON_PATH_XXHDPI) $@
 
-$(RES_DIRS): $(subst res/,$(srcdir)/resources/,$(RESOURCES))
-	$(RM) -r $@
-	$(NSINSTALL) -D $@
+$(call mkdir_deps,$(RES_DIRS)): $(subst res/,$(srcdir)/resources/,$(RESOURCES))
+	$(RM) -r $(@D)
+	$(NSINSTALL) -D $(@D)
+	$(TOUCH) -t 198001030000 $@
 
-$(RESOURCES): $(RES_DIRS) $(subst res/,$(srcdir)/resources/,$(RESOURCES))
+$(RESOURCES): $(call mkdir_deps,$(RES_DIRS)) $(subst res/,$(srcdir)/resources/,$(RESOURCES))
 	@echo "creating $@"
 	$(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@)
 
-res/values/strings.xml: $(RES_DIRS)
+res/values/strings.xml: $(call mkdir_deps,$(RES_DIRS))
 	$(MAKE) -C locales
 
 # With multilocale builds, there will be multiple strings.xml files. We need to
 # rebuild gecko.ap_ if any of them change.
 MULTILOCALE_STRINGS_XML_FILES := $(wildcard res/values-*/strings.xml)
 all_resources = \
   res/drawable-mdpi/icon.png \
   res/drawable-hdpi/icon.png \